mDimInfo.mSizes[a].x = 10 + 2 + 2*x->mDimInfo.mHorizGap;
- x->mDimInfo.mSizes[a].y = 10 + 2 + 2*x->mDimInfo.mVertGap;
- }
- x->mpBarWnd->SetSize(10,10);
- mpLayout->SetBarState(x, wxCBAR_FLOATING, true); // HACK !!!
- mpLayout->SetBarState(x, 0, true); // HACK !!!
- wxYield(); // HACK !!! needed to resize BEFORE redraw
- mpLayout->RefreshNow( true ); // HACK !!! needed to trigger redraw
-
- // mpLayout->SetBarState(x, wxCBAR_FLOATING, true);
- // mpLayout->RecalcLayout(true);
- // mpLayout->RepositionFloatedBar(x);
- // mpLayout->RecalcLayout(true);
- // mpLayout->RepositionFloatedBar(x);
- // mpLayout->SetBarState(x, 0, true);
- // wxYield();
- // mpLayout->RefreshNow( true );
- // mpLayout->RecalcLayout(true);
- }
- else
- {
- wxBell();
- }
-
- break;
- }
- }
- i++;
-}
diff --git a/contrib/samples/fl/fl_sample3.rc b/contrib/samples/fl/fl_sample3.rc
deleted file mode 100644
index 626b82f58a..0000000000
--- a/contrib/samples/fl/fl_sample3.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/fl/makefile.bcc b/contrib/samples/fl/makefile.bcc
deleted file mode 100644
index 3324af66c6..0000000000
--- a/contrib/samples/fl/makefile.bcc
+++ /dev/null
@@ -1,343 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FL_DEMO1_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_7) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
- -I.\..\..\..\samples -DNOPCH -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
- $(CPPFLAGS) $(CXXFLAGS)
-FL_DEMO1_OBJECTS = \
- $(OBJS)\fl_demo1_fl_demo1.obj
-FL_DEMO2_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_7) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
- -I.\..\..\..\samples -DNOPCH -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
- $(CPPFLAGS) $(CXXFLAGS)
-FL_DEMO2_OBJECTS = \
- $(OBJS)\fl_demo2_fl_demo2.obj
-FL_SAMPLE1_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_7) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
- -I.\..\..\..\samples -DNOPCH -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
- $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE1_OBJECTS = \
- $(OBJS)\fl_sample1_fl_sample1.obj
-FL_SAMPLE2_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_7) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
- -I.\..\..\..\samples -DNOPCH -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
- $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE2_OBJECTS = \
- $(OBJS)\fl_sample2_fl_sample2.obj
-FL_SAMPLE3_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG) $(__THREADSFLAG_7) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
- -I.\..\..\..\samples -DNOPCH -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
- $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE3_OBJECTS = \
- $(OBJS)\fl_sample3_fl_sample3.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_3 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_3 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_12 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_12 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_12 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_12 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_12 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_12 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_12 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_12 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_12 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_12 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\fl_demo1.exe $(OBJS)\fl_demo2.exe $(OBJS)\fl_sample1.exe $(OBJS)\fl_sample2.exe $(OBJS)\fl_sample3.exe data_files
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\fl_demo1.exe del $(OBJS)\fl_demo1.exe
- -if exist $(OBJS)\fl_demo1.tds del $(OBJS)\fl_demo1.tds
- -if exist $(OBJS)\fl_demo1.ilc del $(OBJS)\fl_demo1.ilc
- -if exist $(OBJS)\fl_demo1.ild del $(OBJS)\fl_demo1.ild
- -if exist $(OBJS)\fl_demo1.ilf del $(OBJS)\fl_demo1.ilf
- -if exist $(OBJS)\fl_demo1.ils del $(OBJS)\fl_demo1.ils
- -if exist $(OBJS)\fl_demo2.exe del $(OBJS)\fl_demo2.exe
- -if exist $(OBJS)\fl_demo2.tds del $(OBJS)\fl_demo2.tds
- -if exist $(OBJS)\fl_demo2.ilc del $(OBJS)\fl_demo2.ilc
- -if exist $(OBJS)\fl_demo2.ild del $(OBJS)\fl_demo2.ild
- -if exist $(OBJS)\fl_demo2.ilf del $(OBJS)\fl_demo2.ilf
- -if exist $(OBJS)\fl_demo2.ils del $(OBJS)\fl_demo2.ils
- -if exist $(OBJS)\fl_sample1.exe del $(OBJS)\fl_sample1.exe
- -if exist $(OBJS)\fl_sample1.tds del $(OBJS)\fl_sample1.tds
- -if exist $(OBJS)\fl_sample1.ilc del $(OBJS)\fl_sample1.ilc
- -if exist $(OBJS)\fl_sample1.ild del $(OBJS)\fl_sample1.ild
- -if exist $(OBJS)\fl_sample1.ilf del $(OBJS)\fl_sample1.ilf
- -if exist $(OBJS)\fl_sample1.ils del $(OBJS)\fl_sample1.ils
- -if exist $(OBJS)\fl_sample2.exe del $(OBJS)\fl_sample2.exe
- -if exist $(OBJS)\fl_sample2.tds del $(OBJS)\fl_sample2.tds
- -if exist $(OBJS)\fl_sample2.ilc del $(OBJS)\fl_sample2.ilc
- -if exist $(OBJS)\fl_sample2.ild del $(OBJS)\fl_sample2.ild
- -if exist $(OBJS)\fl_sample2.ilf del $(OBJS)\fl_sample2.ilf
- -if exist $(OBJS)\fl_sample2.ils del $(OBJS)\fl_sample2.ils
- -if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
- -if exist $(OBJS)\fl_sample3.tds del $(OBJS)\fl_sample3.tds
- -if exist $(OBJS)\fl_sample3.ilc del $(OBJS)\fl_sample3.ilc
- -if exist $(OBJS)\fl_sample3.ild del $(OBJS)\fl_sample3.ild
- -if exist $(OBJS)\fl_sample3.ilf del $(OBJS)\fl_sample3.ilf
- -if exist $(OBJS)\fl_sample3.ils del $(OBJS)\fl_sample3.ils
-
-$(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(FL_DEMO1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_demo1_fl_demo1.res
-|
-
-$(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(FL_DEMO2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_demo2_fl_demo2.res
-|
-
-$(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(FL_SAMPLE1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample1_fl_sample1.res
-|
-
-$(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(FL_SAMPLE2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample2_fl_sample2.res
-|
-
-$(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(FL_SAMPLE3_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample3_fl_sample3.res
-|
-
-data_files:
- if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
- for %f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
-
-$(OBJS)\fl_demo1_fl_demo1.obj: .\fl_demo1.cpp
- $(CXX) -q -c -P -o$@ $(FL_DEMO1_CXXFLAGS) $**
-
-$(OBJS)\fl_demo1_fl_demo1.res: .\fl_demo1.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_12) -i.\..\..\..\samples -dNOPCH -i.\..\..\include -dBMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_demo2_fl_demo2.obj: .\fl_demo2.cpp
- $(CXX) -q -c -P -o$@ $(FL_DEMO2_CXXFLAGS) $**
-
-$(OBJS)\fl_demo2_fl_demo2.res: .\fl_demo2.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_12) -i.\..\..\..\samples -dNOPCH -i.\..\..\include -dBMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample1_fl_sample1.obj: .\fl_sample1.cpp
- $(CXX) -q -c -P -o$@ $(FL_SAMPLE1_CXXFLAGS) $**
-
-$(OBJS)\fl_sample1_fl_sample1.res: .\fl_sample1.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_12) -i.\..\..\..\samples -dNOPCH -i.\..\..\include -dBMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample2_fl_sample2.obj: .\fl_sample2.cpp
- $(CXX) -q -c -P -o$@ $(FL_SAMPLE2_CXXFLAGS) $**
-
-$(OBJS)\fl_sample2_fl_sample2.res: .\fl_sample2.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_12) -i.\..\..\..\samples -dNOPCH -i.\..\..\include -dBMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample3_fl_sample3.obj: .\fl_sample3.cpp
- $(CXX) -q -c -P -o$@ $(FL_SAMPLE3_CXXFLAGS) $**
-
-$(OBJS)\fl_sample3_fl_sample3.res: .\fl_sample3.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_12) -i.\..\..\..\samples -dNOPCH -i.\..\..\include -dBMP_DIR="bitmaps/" $**
-
diff --git a/contrib/samples/fl/makefile.gcc b/contrib/samples/fl/makefile.gcc
deleted file mode 100644
index d91c9fe816..0000000000
--- a/contrib/samples/fl/makefile.gcc
+++ /dev/null
@@ -1,321 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FL_DEMO1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH -I.\..\..\include \
- -DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
- -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FL_DEMO1_OBJECTS = \
- $(OBJS)\fl_demo1_fl_demo1.o \
- $(OBJS)\fl_demo1_fl_demo1_rc.o
-FL_DEMO2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH -I.\..\..\include \
- -DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
- -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FL_DEMO2_OBJECTS = \
- $(OBJS)\fl_demo2_fl_demo2.o \
- $(OBJS)\fl_demo2_fl_demo2_rc.o
-FL_SAMPLE1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH -I.\..\..\include \
- -DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
- -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE1_OBJECTS = \
- $(OBJS)\fl_sample1_fl_sample1.o \
- $(OBJS)\fl_sample1_fl_sample1_rc.o
-FL_SAMPLE2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH -I.\..\..\include \
- -DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
- -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE2_OBJECTS = \
- $(OBJS)\fl_sample2_fl_sample2.o \
- $(OBJS)\fl_sample2_fl_sample2_rc.o
-FL_SAMPLE3_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH -I.\..\..\include \
- -DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
- -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE3_OBJECTS = \
- $(OBJS)\fl_sample3_fl_sample3.o \
- $(OBJS)\fl_sample3_fl_sample3_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_12 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_12 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_12 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_12 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_12 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_12 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_12 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_12 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_12 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_12 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\fl_demo1.exe $(OBJS)\fl_demo2.exe $(OBJS)\fl_sample1.exe $(OBJS)\fl_sample2.exe $(OBJS)\fl_sample3.exe data_files
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\fl_demo1.exe del $(OBJS)\fl_demo1.exe
- -if exist $(OBJS)\fl_demo2.exe del $(OBJS)\fl_demo2.exe
- -if exist $(OBJS)\fl_sample1.exe del $(OBJS)\fl_sample1.exe
- -if exist $(OBJS)\fl_sample2.exe del $(OBJS)\fl_sample2.exe
- -if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
-
-$(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1_rc.o
- $(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2_rc.o
- $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1_rc.o
- $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2_rc.o
- $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3_rc.o
- $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-data_files:
- if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
- for %%f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%%f copy .\bitmaps\%%f $(OBJS)\bitmaps
-
-$(OBJS)\fl_demo1_fl_demo1.o: ./fl_demo1.cpp
- $(CXX) -c -o $@ $(FL_DEMO1_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fl_demo1_fl_demo1_rc.o: ./fl_demo1.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
-
-$(OBJS)\fl_demo2_fl_demo2.o: ./fl_demo2.cpp
- $(CXX) -c -o $@ $(FL_DEMO2_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fl_demo2_fl_demo2_rc.o: ./fl_demo2.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
-
-$(OBJS)\fl_sample1_fl_sample1.o: ./fl_sample1.cpp
- $(CXX) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fl_sample1_fl_sample1_rc.o: ./fl_sample1.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
-
-$(OBJS)\fl_sample2_fl_sample2.o: ./fl_sample2.cpp
- $(CXX) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fl_sample2_fl_sample2_rc.o: ./fl_sample2.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
-
-$(OBJS)\fl_sample3_fl_sample3.o: ./fl_sample3.cpp
- $(CXX) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fl_sample3_fl_sample3_rc.o: ./fl_sample3.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
-
-.PHONY: all clean data_files
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/fl/makefile.vc b/contrib/samples/fl/makefile.vc
deleted file mode 100644
index 598cd9e64b..0000000000
--- a/contrib/samples/fl/makefile.vc
+++ /dev/null
@@ -1,442 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FL_DEMO1_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\fl_demo1.pdb $(____DEBUGRUNTIME) \
- $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH /I.\..\..\include \
- /DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
- $(CXXFLAGS)
-FL_DEMO1_OBJECTS = \
- $(OBJS)\fl_demo1_fl_demo1.obj \
- $(OBJS)\fl_demo1_fl_demo1.res
-FL_DEMO2_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\fl_demo2.pdb $(____DEBUGRUNTIME) \
- $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH /I.\..\..\include \
- /DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
- $(CXXFLAGS)
-FL_DEMO2_OBJECTS = \
- $(OBJS)\fl_demo2_fl_demo2.obj \
- $(OBJS)\fl_demo2_fl_demo2.res
-FL_SAMPLE1_CXXFLAGS = /M$(__RUNTIME_LIBS_36)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\fl_sample1.pdb $(____DEBUGRUNTIME) \
- $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH /I.\..\..\include \
- /DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
- $(CXXFLAGS)
-FL_SAMPLE1_OBJECTS = \
- $(OBJS)\fl_sample1_fl_sample1.obj \
- $(OBJS)\fl_sample1_fl_sample1.res
-FL_SAMPLE2_CXXFLAGS = /M$(__RUNTIME_LIBS_50)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\fl_sample2.pdb $(____DEBUGRUNTIME) \
- $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH /I.\..\..\include \
- /DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
- $(CXXFLAGS)
-FL_SAMPLE2_OBJECTS = \
- $(OBJS)\fl_sample2_fl_sample2.obj \
- $(OBJS)\fl_sample2_fl_sample2.res
-FL_SAMPLE3_CXXFLAGS = /M$(__RUNTIME_LIBS_64)$(__DEBUGRUNTIME) /DWIN32 \
- $(__DEBUGINFO) /Fd$(OBJS)\fl_sample3.pdb $(____DEBUGRUNTIME) \
- $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH /I.\..\..\include \
- /DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
- $(CXXFLAGS)
-FL_SAMPLE3_OBJECTS = \
- $(OBJS)\fl_sample3_fl_sample3.obj \
- $(OBJS)\fl_sample3_fl_sample3.res
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_22 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_36 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_36 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_50 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_50 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_64 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_64 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_4 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_4 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_4 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_4 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_12 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_12 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_12 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_12 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_12 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_12 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_12 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_12 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_12 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_12 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_12 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_12 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\fl_demo1.exe $(OBJS)\fl_demo2.exe $(OBJS)\fl_sample1.exe $(OBJS)\fl_sample2.exe $(OBJS)\fl_sample3.exe data_files
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\fl_demo1.exe del $(OBJS)\fl_demo1.exe
- -if exist $(OBJS)\fl_demo1.ilk del $(OBJS)\fl_demo1.ilk
- -if exist $(OBJS)\fl_demo1.pdb del $(OBJS)\fl_demo1.pdb
- -if exist $(OBJS)\fl_demo2.exe del $(OBJS)\fl_demo2.exe
- -if exist $(OBJS)\fl_demo2.ilk del $(OBJS)\fl_demo2.ilk
- -if exist $(OBJS)\fl_demo2.pdb del $(OBJS)\fl_demo2.pdb
- -if exist $(OBJS)\fl_sample1.exe del $(OBJS)\fl_sample1.exe
- -if exist $(OBJS)\fl_sample1.ilk del $(OBJS)\fl_sample1.ilk
- -if exist $(OBJS)\fl_sample1.pdb del $(OBJS)\fl_sample1.pdb
- -if exist $(OBJS)\fl_sample2.exe del $(OBJS)\fl_sample2.exe
- -if exist $(OBJS)\fl_sample2.ilk del $(OBJS)\fl_sample2.ilk
- -if exist $(OBJS)\fl_sample2.pdb del $(OBJS)\fl_sample2.pdb
- -if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
- -if exist $(OBJS)\fl_sample3.ilk del $(OBJS)\fl_sample3.ilk
- -if exist $(OBJS)\fl_sample3.pdb del $(OBJS)\fl_sample3.pdb
-
-$(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(FL_DEMO1_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(FL_DEMO2_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(FL_SAMPLE1_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(FL_SAMPLE2_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(FL_SAMPLE3_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-data_files:
- if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
- for %f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
-
-$(OBJS)\fl_demo1_fl_demo1.obj: .\fl_demo1.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(FL_DEMO1_CXXFLAGS) $**
-
-$(OBJS)\fl_demo1_fl_demo1.res: .\fl_demo1.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3) $(__NO_VC_CRTDBG_p_12) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_12) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include /d BMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_demo2_fl_demo2.obj: .\fl_demo2.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(FL_DEMO2_CXXFLAGS) $**
-
-$(OBJS)\fl_demo2_fl_demo2.res: .\fl_demo2.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3) $(__NO_VC_CRTDBG_p_12) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_12) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include /d BMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample1_fl_sample1.obj: .\fl_sample1.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE1_CXXFLAGS) $**
-
-$(OBJS)\fl_sample1_fl_sample1.res: .\fl_sample1.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3) $(__NO_VC_CRTDBG_p_12) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_12) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include /d BMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample2_fl_sample2.obj: .\fl_sample2.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE2_CXXFLAGS) $**
-
-$(OBJS)\fl_sample2_fl_sample2.res: .\fl_sample2.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3) $(__NO_VC_CRTDBG_p_12) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_12) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include /d BMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample3_fl_sample3.obj: .\fl_sample3.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE3_CXXFLAGS) $**
-
-$(OBJS)\fl_sample3_fl_sample3.res: .\fl_sample3.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3) $(__NO_VC_CRTDBG_p_12) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_12) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include /d BMP_DIR="bitmaps/" $**
-
diff --git a/contrib/samples/fl/makefile.wat b/contrib/samples/fl/makefile.wat
deleted file mode 100644
index 2d5313a39c..0000000000
--- a/contrib/samples/fl/makefile.wat
+++ /dev/null
@@ -1,383 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO = -d2
-!endif
-__DEBUGINFO_4 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_4 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_4 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_4 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_4 = debug all
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__THREADSFLAG =
-!ifeq USE_THREADS 0
-__THREADSFLAG =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG = -bm
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS =
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FL_DEMO1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
- $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
- -dBMP_DIR="bitmaps/" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
- $(CXXFLAGS)
-FL_DEMO1_OBJECTS = &
- $(OBJS)\fl_demo1_fl_demo1.obj
-FL_DEMO2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
- $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
- -dBMP_DIR="bitmaps/" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
- $(CXXFLAGS)
-FL_DEMO2_OBJECTS = &
- $(OBJS)\fl_demo2_fl_demo2.obj
-FL_SAMPLE1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
- $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
- -dBMP_DIR="bitmaps/" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
- $(CXXFLAGS)
-FL_SAMPLE1_OBJECTS = &
- $(OBJS)\fl_sample1_fl_sample1.obj
-FL_SAMPLE2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
- $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
- -dBMP_DIR="bitmaps/" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
- $(CXXFLAGS)
-FL_SAMPLE2_OBJECTS = &
- $(OBJS)\fl_sample2_fl_sample2.obj
-FL_SAMPLE3_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
- $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
- -dBMP_DIR="bitmaps/" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
- $(CXXFLAGS)
-FL_SAMPLE3_OBJECTS = &
- $(OBJS)\fl_sample3_fl_sample3.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\fl_demo1.exe $(OBJS)\fl_demo2.exe $(OBJS)\fl_sample1.exe $(OBJS)\fl_sample2.exe $(OBJS)\fl_sample3.exe data_files
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\fl_demo1.exe del $(OBJS)\fl_demo1.exe
- -if exist $(OBJS)\fl_demo2.exe del $(OBJS)\fl_demo2.exe
- -if exist $(OBJS)\fl_sample1.exe del $(OBJS)\fl_sample1.exe
- -if exist $(OBJS)\fl_sample2.exe del $(OBJS)\fl_sample2.exe
- -if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
-
-$(OBJS)\fl_demo1.exe : $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res
- @%create $(OBJS)\fl_demo1.lbc
- @%append $(OBJS)\fl_demo1.lbc option quiet
- @%append $(OBJS)\fl_demo1.lbc name $^@
- @%append $(OBJS)\fl_demo1.lbc option caseexact
- @%append $(OBJS)\fl_demo1.lbc $(LDFLAGS) $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(FL_DEMO1_OBJECTS)) do @%append $(OBJS)\fl_demo1.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fl_demo1.lbc library %i
- @%append $(OBJS)\fl_demo1.lbc option resource=$(OBJS)\fl_demo1_fl_demo1.res
- @for %i in () do @%append $(OBJS)\fl_demo1.lbc option stack=%i
- wlink @$(OBJS)\fl_demo1.lbc
-
-$(OBJS)\fl_demo2.exe : $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res
- @%create $(OBJS)\fl_demo2.lbc
- @%append $(OBJS)\fl_demo2.lbc option quiet
- @%append $(OBJS)\fl_demo2.lbc name $^@
- @%append $(OBJS)\fl_demo2.lbc option caseexact
- @%append $(OBJS)\fl_demo2.lbc $(LDFLAGS) $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(FL_DEMO2_OBJECTS)) do @%append $(OBJS)\fl_demo2.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fl_demo2.lbc library %i
- @%append $(OBJS)\fl_demo2.lbc option resource=$(OBJS)\fl_demo2_fl_demo2.res
- @for %i in () do @%append $(OBJS)\fl_demo2.lbc option stack=%i
- wlink @$(OBJS)\fl_demo2.lbc
-
-$(OBJS)\fl_sample1.exe : $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.res
- @%create $(OBJS)\fl_sample1.lbc
- @%append $(OBJS)\fl_sample1.lbc option quiet
- @%append $(OBJS)\fl_sample1.lbc name $^@
- @%append $(OBJS)\fl_sample1.lbc option caseexact
- @%append $(OBJS)\fl_sample1.lbc $(LDFLAGS) $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(FL_SAMPLE1_OBJECTS)) do @%append $(OBJS)\fl_sample1.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fl_sample1.lbc library %i
- @%append $(OBJS)\fl_sample1.lbc option resource=$(OBJS)\fl_sample1_fl_sample1.res
- @for %i in () do @%append $(OBJS)\fl_sample1.lbc option stack=%i
- wlink @$(OBJS)\fl_sample1.lbc
-
-$(OBJS)\fl_sample2.exe : $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.res
- @%create $(OBJS)\fl_sample2.lbc
- @%append $(OBJS)\fl_sample2.lbc option quiet
- @%append $(OBJS)\fl_sample2.lbc name $^@
- @%append $(OBJS)\fl_sample2.lbc option caseexact
- @%append $(OBJS)\fl_sample2.lbc $(LDFLAGS) $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(FL_SAMPLE2_OBJECTS)) do @%append $(OBJS)\fl_sample2.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fl_sample2.lbc library %i
- @%append $(OBJS)\fl_sample2.lbc option resource=$(OBJS)\fl_sample2_fl_sample2.res
- @for %i in () do @%append $(OBJS)\fl_sample2.lbc option stack=%i
- wlink @$(OBJS)\fl_sample2.lbc
-
-$(OBJS)\fl_sample3.exe : $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.res
- @%create $(OBJS)\fl_sample3.lbc
- @%append $(OBJS)\fl_sample3.lbc option quiet
- @%append $(OBJS)\fl_sample3.lbc name $^@
- @%append $(OBJS)\fl_sample3.lbc option caseexact
- @%append $(OBJS)\fl_sample3.lbc $(LDFLAGS) $(__DEBUGINFO_4) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(FL_SAMPLE3_OBJECTS)) do @%append $(OBJS)\fl_sample3.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\fl_sample3.lbc library %i
- @%append $(OBJS)\fl_sample3.lbc option resource=$(OBJS)\fl_sample3_fl_sample3.res
- @for %i in () do @%append $(OBJS)\fl_sample3.lbc option stack=%i
- wlink @$(OBJS)\fl_sample3.lbc
-
-data_files : .SYMBOLIC
- if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
- for %f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
-
-$(OBJS)\fl_demo1_fl_demo1.obj : .AUTODEPEND .\fl_demo1.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(FL_DEMO1_CXXFLAGS) $<
-
-$(OBJS)\fl_demo1_fl_demo1.res : .AUTODEPEND .\fl_demo1.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
-
-$(OBJS)\fl_demo2_fl_demo2.obj : .AUTODEPEND .\fl_demo2.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(FL_DEMO2_CXXFLAGS) $<
-
-$(OBJS)\fl_demo2_fl_demo2.res : .AUTODEPEND .\fl_demo2.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
-
-$(OBJS)\fl_sample1_fl_sample1.obj : .AUTODEPEND .\fl_sample1.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(FL_SAMPLE1_CXXFLAGS) $<
-
-$(OBJS)\fl_sample1_fl_sample1.res : .AUTODEPEND .\fl_sample1.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
-
-$(OBJS)\fl_sample2_fl_sample2.obj : .AUTODEPEND .\fl_sample2.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(FL_SAMPLE2_CXXFLAGS) $<
-
-$(OBJS)\fl_sample2_fl_sample2.res : .AUTODEPEND .\fl_sample2.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
-
-$(OBJS)\fl_sample3_fl_sample3.obj : .AUTODEPEND .\fl_sample3.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(FL_SAMPLE3_CXXFLAGS) $<
-
-$(OBJS)\fl_sample3_fl_sample3.res : .AUTODEPEND .\fl_sample3.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
-
diff --git a/contrib/samples/foldbar/extended/Makefile.in b/contrib/samples/foldbar/extended/Makefile.in
deleted file mode 100644
index 314e8e0a46..0000000000
--- a/contrib/samples/foldbar/extended/Makefile.in
+++ /dev/null
@@ -1,207 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_XML = @EXTRALIBS_XML@
-EXTRALIBS_HTML = @EXTRALIBS_HTML@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-EXTRALIBS_SDL = @EXTRALIBS_SDL@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-EXTENDED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
- -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-EXTENDED_OBJECTS = \
- $(__extended_os2_lib_res) \
- extended_extended.o \
- $(__extended___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__extended___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C extended$(EXEEXT)
-@COND_PLATFORM_MAC_1@__extended___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___extended___os2_emxbindcmd = $(NM) extended$(EXEEXT) | if \
- grep -q pmwin.763 ; then emxbind -ep extended$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__extended___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___extended___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__extended_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__extended_bundle___depname = extended_bundle
-@COND_TOOLKIT_COCOA@____extended_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@ extended.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____extended_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@ extended.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_ADV_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
-COND_MONOLITHIC_0___WXLIB_HTML_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
-COND_MONOLITHIC_0___WXLIB_XML_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__extended___win32rc = extended_extended_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../../include -o extended$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: extended$(EXEEXT) $(__extended_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f extended$(EXEEXT)
- rm -rf extended.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-extended$(EXEEXT): $(EXTENDED_OBJECTS) $(__extended___win32rc)
- $(CXX) -o $@ $(EXTENDED_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__extended___mac_rezcmd)
- $(__extended___mac_setfilecmd)
- $(__extended___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p extended.app/Contents
- mkdir -p extended.app/Contents/MacOS
- mkdir -p extended.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/extended/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >extended.app/Contents/Info.plist
-
-
- echo -n "APPL????" >extended.app/Contents/PkgInfo
-
-
- ln -f extended$(EXEEXT) extended.app/Contents/MacOS/extended
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns extended.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@extended_bundle: $(____extended_BUNDLE_TGT_REF_DEP)
-
-extended_extended.o: $(srcdir)/extended.cpp
- $(CXXC) -c -o $@ $(EXTENDED_CXXFLAGS) $(srcdir)/extended.cpp
-
-extended_extended_rc.o: $(srcdir)/extended.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean extended_bundle
diff --git a/contrib/samples/foldbar/extended/extended.bkl b/contrib/samples/foldbar/extended/extended.bkl
deleted file mode 100644
index 8eb0558884..0000000000
--- a/contrib/samples/foldbar/extended/extended.bkl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- $(SRCDIR)/../../../include
-
-
- extended.cpp
-
- foldbar
- adv
- html
- xml
- core
- base
- extended.rc
-
-
-
diff --git a/contrib/samples/foldbar/extended/extended.cpp b/contrib/samples/foldbar/extended/extended.cpp
deleted file mode 100644
index 9151d06f9f..0000000000
--- a/contrib/samples/foldbar/extended/extended.cpp
+++ /dev/null
@@ -1,540 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: expended.cpp
-// Purpose: Layout/foldpanelbar sample
-// Author: Jorgen Bodde
-// Modified by:
-// Created: 24/07/2004
-// Copyright: (c) Jorgen Bodde based upon FoldPanelBarTest (c) Julian Smart
-// Licence: wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#include "wx/mdi.h"
-#endif
-
-#include "wx/toolbar.h"
-#include "wx/laywin.h"
-#include "wx/spinctrl.h"
-#include "wx/slider.h"
-
-#include "sample.xpm"
-
-#include "extended.h"
-
-MyFrame *frame = NULL;
-wxList my_children;
-
-IMPLEMENT_APP(MyApp)
-
-// For drawing lines in a canvas
-long xpos = -1;
-long ypos = -1;
-
-int winNumber = 1;
-
-// Initialise this in OnInit, not statically
-bool MyApp::OnInit(void)
-{
- // Create the main frame window
-
- frame = new MyFrame(NULL, wxID_ANY, _T("FoldPanelBar Extended Demo"), wxDefaultPosition, wxSize(500, 600),
- wxDEFAULT_FRAME_STYLE |
- wxNO_FULL_REPAINT_ON_RESIZE |
- wxHSCROLL | wxVSCROLL);
-
- frame->SetIcon(wxIcon(sample_xpm));
-
- // Associate the menu bar with the frame
- frame->SetMenuBar(CreateMenuBar(false));
-
- frame->CreateStatusBar();
-
- frame->Show(true);
-
- SetTopWindow(frame);
-
- return true;
-}
-
-BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
- EVT_MENU(FPBTEST_ABOUT, MyFrame::OnAbout)
- EVT_MENU(FPBTEST_NEW_WINDOW, MyFrame::OnNewWindow)
- EVT_SIZE(MyFrame::OnSize)
- EVT_MENU(FPBTEST_QUIT, MyFrame::OnQuit)
- EVT_MENU(FPBTEST_TOGGLE_WINDOW, MyFrame::OnToggleWindow)
- EVT_SASH_DRAGGED_RANGE(ID_WINDOW_TOP, ID_WINDOW_BOTTOM, MyFrame::OnFoldPanelBarDrag)
- EVT_MENU(FPB_BOTTOM_STICK, MyFrame::OnCreateBottomStyle)
- EVT_MENU(FPB_SINGLE_FOLD, MyFrame::OnCreateNormalStyle)
- EVT_BUTTON(ID_COLLAPSEME, MyFrame::OnCollapseMe)
- EVT_BUTTON(ID_APPLYTOALL, MyFrame::OnExpandMe)
- EVT_SCROLL(MyFrame::OnSlideColour)
- EVT_RADIOBUTTON(ID_USE_HGRADIENT, MyFrame::OnStyleChange)
- EVT_RADIOBUTTON(ID_USE_VGRADIENT, MyFrame::OnStyleChange)
- EVT_RADIOBUTTON(ID_USE_SINGLE, MyFrame::OnStyleChange)
- EVT_RADIOBUTTON(ID_USE_RECTANGLE, MyFrame::OnStyleChange)
- EVT_RADIOBUTTON(ID_USE_FILLED_RECTANGLE, MyFrame::OnStyleChange)
-END_EVENT_TABLE()
-
-
-// Define my frame constructor
-MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
- const long style)
- : wxMDIParentFrame(parent, id, title, pos, size, style)
- , m_flags(0)
-{
- m_leftWindow1 = new wxSashLayoutWindow(this, ID_WINDOW_LEFT1,
- wxDefaultPosition, wxSize(200, 30),
- wxNO_BORDER | wxSW_3D | wxCLIP_CHILDREN);
-
- m_leftWindow1->SetDefaultSize(wxSize(160, 1000));
- m_leftWindow1->SetOrientation(wxLAYOUT_VERTICAL);
- m_leftWindow1->SetAlignment(wxLAYOUT_LEFT);
- m_leftWindow1->SetSashVisible(wxSASH_RIGHT, true);
- m_leftWindow1->SetExtraBorderSize(0);
-
- m_pnl = NULL;
- ReCreateFoldPanel(0);
-}
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
- Close(true);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
- (void)wxMessageBox(_T("wxWidgets 2.0 FoldPanelBar Demo\nAuthor: Julian Smart (c) 1998"), _T("About FoldPanelBar Demo"));
-}
-
-void MyFrame::OnToggleWindow(wxCommandEvent& WXUNUSED(event))
-{
- m_leftWindow1->Show(!m_leftWindow1->IsShown());
-#if wxUSE_MDI_ARCHITECTURE
- wxLayoutAlgorithm layout;
- layout.LayoutMDIFrame(this);
-#endif // wxUSE_MDI_ARCHITECTURE
-}
-
-void MyFrame::OnFoldPanelBarDrag(wxSashEvent& event)
-{
- if (event.GetDragStatus() == wxSASH_STATUS_OUT_OF_RANGE)
- return;
-
- if(event.GetId() == ID_WINDOW_LEFT1)
- m_leftWindow1->SetDefaultSize(wxSize(event.GetDragRect().width, 1000));
-
-#if wxUSE_MDI_ARCHITECTURE
- wxLayoutAlgorithm layout;
- layout.LayoutMDIFrame(this);
-#endif // wxUSE_MDI_ARCHITECTURE
-
- // Leaves bits of itself behind sometimes
- GetClientWindow()->Refresh();
-}
-
-void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
-{
- // Make another frame, containing a canvas
- MyChild *subframe = new MyChild(frame, _T("Canvas Frame"),
- wxPoint(10, 10), wxSize(300, 300),
- wxDEFAULT_FRAME_STYLE |
- wxNO_FULL_REPAINT_ON_RESIZE);
-
- subframe->SetTitle(wxString::Format(_T("Canvas Frame %d"), winNumber));
- winNumber ++;
-
- // Give it a status line
- subframe->CreateStatusBar();
-
- // Associate the menu bar with the frame
- subframe->SetMenuBar(CreateMenuBar(true));
-
- int width, height;
- subframe->GetClientSize(&width, &height);
- MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
- canvas->SetCursor(wxCursor(wxCURSOR_PENCIL));
- subframe->canvas = canvas;
-
- // Give it scrollbars
- canvas->SetScrollbars(20, 20, 50, 50);
-
- subframe->Show(true);
-}
-
-void MyFrame::ReCreateFoldPanel(int fpb_flags)
-{
- // delete earlier panel
- m_leftWindow1->DestroyChildren();
-
- // recreate the foldpanelbar
-
- m_pnl = new wxFoldPanelBar(m_leftWindow1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFPB_DEFAULT_STYLE, fpb_flags);
-
- wxFoldPanel item = m_pnl->AddFoldPanel(_T("Caption colours"), false);
-
- m_pnl->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), wxID_ANY, _T("Adjust the first colour")),
- wxFPB_ALIGN_WIDTH, 5, 20);
-
- // RED color spin control
- m_rslider1 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
- m_pnl->AddFoldPanelWindow(item, m_rslider1, wxFPB_ALIGN_WIDTH,
- 2, 20);
-
- // GREEN color spin control
- m_gslider1 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
- m_pnl->AddFoldPanelWindow(item, m_gslider1, wxFPB_ALIGN_WIDTH,
- 0, 20);
-
- // BLUE color spin control
- m_bslider1 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
- m_pnl->AddFoldPanelWindow(item, m_bslider1, wxFPB_ALIGN_WIDTH,
- 0, 20);
-
- m_pnl->AddFoldPanelSeperator(item);
-
- m_pnl->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), wxID_ANY, _T("Adjust the second colour")),
- wxFPB_ALIGN_WIDTH, 5, 20);
-
- // RED color spin control
- m_rslider2 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
- m_pnl->AddFoldPanelWindow(item, m_rslider2, wxFPB_ALIGN_WIDTH,
- 2, 20);
-
- // GREEN color spin control
- m_gslider2 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
- m_pnl->AddFoldPanelWindow(item, m_gslider2, wxFPB_ALIGN_WIDTH,
- 0, 20);
-
- // BLUE color spin control
- m_bslider2 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
- m_pnl->AddFoldPanelWindow(item, m_bslider2, wxFPB_ALIGN_WIDTH,
- 0, 20);
-
- m_pnl->AddFoldPanelSeperator(item);
-
- m_btn = new wxButton(item.GetParent(), ID_APPLYTOALL, _T("Apply to all"));
- m_pnl->AddFoldPanelWindow(item, m_btn);
-
- // read back current gradients and set the sliders
- // for the colour which is now taken as default
-
- wxCaptionBarStyle style = m_pnl->GetCaptionStyle(item);
- wxColour col = style.GetFirstColour();
- m_rslider1->SetValue(col.Red());
- m_gslider1->SetValue(col.Green());
- m_bslider1->SetValue(col.Blue());
-
- col = style.GetSecondColour();
- m_rslider2->SetValue(col.Red());
- m_gslider2->SetValue(col.Green());
- m_bslider2->SetValue(col.Blue());
-
- // put down some caption styles from which the user can
- // select to show how the current or all caption bars will look like
-
- item = m_pnl->AddFoldPanel(_T("Caption style"), false);
-
- wxRadioButton *currStyle = new wxRadioButton(item.GetParent(), ID_USE_VGRADIENT, _T("&Vertical gradient"));
- m_pnl->AddFoldPanelWindow(item, currStyle, wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
- currStyle->SetValue(true);
-
- m_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_HGRADIENT, _T("&Horizontal gradient")),
- wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
- m_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_SINGLE, _T("&Single colour")),
- wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
- m_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_RECTANGLE, _T("&Rectangle box")),
- wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
- m_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_FILLED_RECTANGLE, _T("&Filled rectangle box")),
- wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
-
- m_pnl->AddFoldPanelSeperator(item);
-
- m_single = new wxCheckBox(item.GetParent(), wxID_ANY, _T("&Only this caption"));
- m_pnl->AddFoldPanelWindow(item, m_single, wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
-
-
- // one more panel to finish it
-
- wxCaptionBarStyle cs;
- cs.SetCaptionStyle(wxCAPTIONBAR_RECTANGLE);
-
- item = m_pnl->AddFoldPanel(_T("Misc stuff"), true, cs);
-
- m_pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_COLLAPSEME, _T("Collapse All")));
-
- m_pnl->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), wxID_ANY, _T("Enter some comments")),
- wxFPB_ALIGN_WIDTH, 5, 20);
-
- m_pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, _T("Comments")),
- wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
-
- m_leftWindow1->SizeWindows();
-
-}
-
-void MyFrame::OnCreateBottomStyle(wxCommandEvent& event)
-{
- // recreate with style collapse to bottom, which means
- // all panels that are collapsed are placed at the bottom,
- // or normal
-
- if(event.IsChecked())
- m_flags |= wxFPB_COLLAPSE_TO_BOTTOM;
- else
- m_flags &= ~wxFPB_COLLAPSE_TO_BOTTOM;
-
- ReCreateFoldPanel(m_flags);
-}
-
-void MyFrame::OnCreateNormalStyle(wxCommandEvent& event)
-{
- // receate with style where only one panel at the time is
- // allowed to be opened
-
- // TODO: Not yet implemented!
-
- if(event.IsChecked())
- m_flags |= wxFPB_SINGLE_FOLD;
- else
- m_flags &= ~wxFPB_SINGLE_FOLD;
-
- ReCreateFoldPanel(m_flags);
-}
-
-void MyFrame::OnCollapseMe(wxCommandEvent &WXUNUSED(event))
-{
- wxFoldPanel item(0);
- for(size_t i = 0; i < m_pnl->GetCount(); i++)
- {
- item = m_pnl->Item(i);
- m_pnl->Collapse(item);
- }
-}
-
-void MyFrame::OnExpandMe(wxCommandEvent &WXUNUSED(event))
-{
- wxColour col1((unsigned char)m_rslider1->GetValue(),
- (unsigned char)m_gslider1->GetValue(),
- (unsigned char)m_bslider1->GetValue()),
- col2((unsigned char)m_rslider2->GetValue(),
- (unsigned char)m_gslider2->GetValue(),
- (unsigned char)m_bslider2->GetValue());
-
- wxCaptionBarStyle style;
-
- style.SetFirstColour(col1);
- style.SetSecondColour(col2);
-
- m_pnl->ApplyCaptionStyleAll(style);
-}
-
-wxMenuBar *CreateMenuBar(bool with_window)
-{
- // Make a menubar
- wxMenu *file_menu = new wxMenu;
-
- file_menu->Append(FPBTEST_NEW_WINDOW, _T("&New window"));
- if(with_window)
- file_menu->Append(FPBTEST_CHILD_QUIT, _T("&Close child"));
-
- file_menu->AppendSeparator();
- file_menu->Append(FPBTEST_QUIT, _T("&Exit"));
-
- wxMenu *option_menu = 0;
- if(with_window)
- {
- // Dummy option
- option_menu = new wxMenu;
- option_menu->Append(FPBTEST_REFRESH, _T("&Refresh picture"));
- }
-
- // make fold panel menu
-
- wxMenu *fpb_menu = new wxMenu;
- fpb_menu->AppendCheckItem(FPB_BOTTOM_STICK, _T("Create with &wxFPB_COLLAPSE_TO_BOTTOM"));
- //fpb_menu->AppendCheckItem(FPB_SINGLE_FOLD, _T("Create with &wxFPB_SINGLE_FOLD"));
-
- fpb_menu->AppendSeparator();
- fpb_menu->Append(FPBTEST_TOGGLE_WINDOW, _T("&Toggle FoldPanelBar"));
-
- wxMenu *help_menu = new wxMenu;
- help_menu->Append(FPBTEST_ABOUT, _T("&About"));
-
- wxMenuBar *menu_bar = new wxMenuBar;
-
- menu_bar->Append(file_menu, _T("&File"));
- menu_bar->Append(fpb_menu, _T("&FoldPanel"));
- if(option_menu)
- menu_bar->Append(option_menu, _T("&Options"));
- menu_bar->Append(help_menu, _T("&Help"));
-
- return menu_bar;
-}
-
-void MyFrame::OnSlideColour(wxScrollEvent &WXUNUSED(event))
-{
- wxColour col1((unsigned char)m_rslider1->GetValue(),
- (unsigned char)m_gslider1->GetValue(),
- (unsigned char)m_bslider1->GetValue()),
- col2((unsigned char)m_rslider2->GetValue(),
- (unsigned char)m_gslider2->GetValue(),
- (unsigned char)m_bslider2->GetValue());
- //m_btn->SetBackgroundColour(col);
-
- wxCaptionBarStyle style;
-
- style.SetFirstColour(col1);
- style.SetSecondColour(col2);
-
- wxFoldPanel item = m_pnl->Item(0);
- m_pnl->ApplyCaptionStyle(item, style);
-}
-
-void MyFrame::OnStyleChange(wxCommandEvent &event)
-{
- wxCaptionBarStyle style;
- switch(event.GetId())
- {
- case ID_USE_HGRADIENT:
- style.SetCaptionStyle(wxCAPTIONBAR_GRADIENT_H);
- break;
-
- case ID_USE_VGRADIENT:
- style.SetCaptionStyle(wxCAPTIONBAR_GRADIENT_V);
- break;
-
- case ID_USE_SINGLE:
- style.SetCaptionStyle(wxCAPTIONBAR_SINGLE);
- break;
-
- case ID_USE_RECTANGLE:
- style.SetCaptionStyle(wxCAPTIONBAR_RECTANGLE);
- break;
-
- case ID_USE_FILLED_RECTANGLE:
- style.SetCaptionStyle(wxCAPTIONBAR_FILLED_RECTANGLE);
- break;
-
- default:
- break;
- }
-
- if(m_single->GetValue())
- {
- wxFoldPanel item = m_pnl->Item(1);
- m_pnl->ApplyCaptionStyle(item, style);
- }
- else
- {
- m_pnl->ApplyCaptionStyleAll(style);
- }
-}
-
-/* ----------------------------------------------------------------------------------------------- */
-
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
- EVT_MOUSE_EVENTS(MyCanvas::OnEvent)
-END_EVENT_TABLE()
-
-// Define a constructor for my canvas
-MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
- :wxScrolledWindow(parent, wxID_ANY, pos, size,
- wxSUNKEN_BORDER | wxNO_FULL_REPAINT_ON_RESIZE)
-{
- SetBackgroundColour(* wxWHITE);
-}
-
-// Define the repainting behaviour
-void MyCanvas::OnDraw(wxDC& dc)
-{
- dc.SetFont(*wxSWISS_FONT);
- dc.SetPen(*wxGREEN_PEN);
- dc.DrawLine(0, 0, 200, 200);
- dc.DrawLine(200, 0, 0, 200);
-
- dc.SetBrush(*wxCYAN_BRUSH);
- dc.SetPen(*wxRED_PEN);
- dc.DrawRectangle(100, 100, 100, 50);
- dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
-
- dc.DrawEllipse(250, 250, 100, 50);
-#if wxUSE_SPLINES
- dc.DrawSpline(50, 200, 50, 100, 200, 10);
-#endif // wxUSE_SPLINES
- dc.DrawLine(50, 230, 200, 230);
- dc.DrawText(_T("This is a test string"), 50, 230);
-
- wxPoint points[3];
- points[0].x = 200; points[0].y = 300;
- points[1].x = 100; points[1].y = 400;
- points[2].x = 300; points[2].y = 400;
-
- dc.DrawPolygon(3, points);
-}
-
-// This implements a tiny doodling program! Drag the mouse using
-// the left button.
-void MyCanvas::OnEvent(wxMouseEvent& event)
-{
- wxClientDC dc(this);
- PrepareDC(dc);
-
- wxPoint pt(event.GetLogicalPosition(dc));
-
- if (xpos > -1 && ypos > -1 && event.Dragging())
- {
- dc.SetPen(*wxBLACK_PEN);
- dc.DrawLine(xpos, ypos, pt.x, pt.y);
- }
- xpos = pt.x;
- ypos = pt.y;
-}
-
-void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-#if wxUSE_MDI_ARCHITECTURE
- wxLayoutAlgorithm layout;
- layout.LayoutMDIFrame(this);
-#endif // wxUSE_MDI_ARCHITECTURE
-}
-
-// Note that FPBTEST_NEW_WINDOW and FPBTEST_ABOUT commands get passed
-// to the parent window for processing, so no need to
-// duplicate event handlers here.
-
-BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
- EVT_MENU(FPBTEST_CHILD_QUIT, MyChild::OnQuit)
-END_EVENT_TABLE()
-
-MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
- const wxPoint& pos, const wxSize& size,
- const long style)
- :wxMDIChildFrame(parent, wxID_ANY, title, pos, size, style)
-{
- canvas = NULL;
- my_children.Append(this);
-}
-
-MyChild::~MyChild(void)
-{
- my_children.DeleteObject(this);
-}
-
-void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
- Close(true);
-}
-
-void MyChild::OnActivate(wxActivateEvent& event)
-{
- if (event.GetActive() && canvas)
- canvas->SetFocus();
-}
diff --git a/contrib/samples/foldbar/extended/extended.dsp b/contrib/samples/foldbar/extended/extended.dsp
deleted file mode 100644
index 4c2b1222d7..0000000000
--- a/contrib/samples/foldbar/extended/extended.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="extended" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=extended - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "extended.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "extended.mak" CFG="extended - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "extended - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "extended - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_foldbar.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_foldbar.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_foldbar.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_foldbar.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_foldbar.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_foldbar.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_foldbar.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_foldbar.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\extended.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_foldbar.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_foldbar.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "extended - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\extended.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_foldbar.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_foldbar.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "extended - Win32 DLL Universal Unicode Release"
-# Name "extended - Win32 DLL Universal Unicode Debug"
-# Name "extended - Win32 DLL Universal Release"
-# Name "extended - Win32 DLL Universal Debug"
-# Name "extended - Win32 DLL Unicode Release"
-# Name "extended - Win32 DLL Unicode Debug"
-# Name "extended - Win32 DLL Release"
-# Name "extended - Win32 DLL Debug"
-# Name "extended - Win32 Universal Unicode Release"
-# Name "extended - Win32 Universal Unicode Debug"
-# Name "extended - Win32 Universal Release"
-# Name "extended - Win32 Universal Debug"
-# Name "extended - Win32 Unicode Release"
-# Name "extended - Win32 Unicode Debug"
-# Name "extended - Win32 Release"
-# Name "extended - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\extended.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\extended.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/foldbar/extended/extended.h b/contrib/samples/foldbar/extended/extended.h
deleted file mode 100644
index 4a891e6f10..0000000000
--- a/contrib/samples/foldbar/extended/extended.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: extended.h
-// Purpose: Layout/foldpanelbar sample
-// Author: Jorgen Bodde
-// Modified by:
-// Created: 24/07/2004
-// Copyright: Jorgen Bodde based upon FoldPanelBar sample (c) Julian Smart
-// Licence: wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/toolbar.h"
-#include "wx/foldbar/foldpanelbar.h"
-
-wxMenuBar *CreateMenuBar(bool with_window);
-
-enum
-{
- ID_COLLAPSEME = 10000,
- ID_APPLYTOALL,
- ID_USE_HGRADIENT,
- ID_USE_VGRADIENT,
- ID_USE_SINGLE,
- ID_USE_RECTANGLE,
- ID_USE_FILLED_RECTANGLE
-};
-
-// Define a new application
-class MyApp: public wxApp
-{
- public:
- bool OnInit(void);
-};
-
-class MyCanvas: public wxScrolledWindow
-{
- public:
- MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
- virtual void OnDraw(wxDC& dc);
- void OnEvent(wxMouseEvent& event);
-
- DECLARE_EVENT_TABLE()
-};
-
-// Define a new frame
-class MyFrame: public wxMDIParentFrame
-{
- public:
-
- MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-
- void OnSize(wxSizeEvent& event);
- void OnAbout(wxCommandEvent& event);
- void OnNewWindow(wxCommandEvent& event);
- void OnQuit(wxCommandEvent& event);
- void OnToggleWindow(wxCommandEvent& event);
- void OnFoldPanelBarDrag(wxSashEvent& event);
- void OnCreateBottomStyle(wxCommandEvent& event);
- void OnCreateNormalStyle(wxCommandEvent& event);
-
- void OnCollapseMe(wxCommandEvent &event);
- void OnExpandMe(wxCommandEvent &event);
-
- void OnSlideColour(wxScrollEvent &event);
-
- void OnStyleChange(wxCommandEvent &event);
-
-protected:
- wxSashLayoutWindow* m_leftWindow1;
-
-private:
- void ReCreateFoldPanel(int fpb_flags);
- wxFoldPanelBar *m_pnl;
- wxButton *m_btn;
- wxCheckBox *m_single;
- wxSlider *m_rslider1, *m_gslider1, *m_bslider1, *m_rslider2, *m_gslider2, *m_bslider2;
- int m_flags;
-
-DECLARE_EVENT_TABLE()
-};
-
-class MyChild: public wxMDIChildFrame
-{
- public:
- MyCanvas *canvas;
- MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
- ~MyChild(void);
- void OnActivate(wxActivateEvent& event);
- void OnQuit(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-#define FPBTEST_QUIT 1
-#define FPBTEST_NEW_WINDOW 2
-#define FPBTEST_REFRESH 3
-#define FPBTEST_CHILD_QUIT 4
-#define FPBTEST_ABOUT 5
-#define FPBTEST_TOGGLE_WINDOW 6
-#define FPB_BOTTOM_STICK 7
-#define FPB_SINGLE_FOLD 8
-
-#define ID_WINDOW_TOP 100
-#define ID_WINDOW_LEFT1 101
-#define ID_WINDOW_LEFT2 102
-#define ID_WINDOW_BOTTOM 103
-
diff --git a/contrib/samples/foldbar/extended/extended.rc b/contrib/samples/foldbar/extended/extended.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/contrib/samples/foldbar/extended/extended.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/contrib/samples/foldbar/extended/makefile.bcc b/contrib/samples/foldbar/extended/makefile.bcc
deleted file mode 100644
index 1355aa38a9..0000000000
--- a/contrib/samples/foldbar/extended/makefile.bcc
+++ /dev/null
@@ -1,247 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-EXTENDED_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(CPPFLAGS) $(CXXFLAGS)
-EXTENDED_OBJECTS = \
- $(OBJS)\extended_extended.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\extended.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\extended.exe del $(OBJS)\extended.exe
- -if exist $(OBJS)\extended.tds del $(OBJS)\extended.tds
- -if exist $(OBJS)\extended.ilc del $(OBJS)\extended.ilc
- -if exist $(OBJS)\extended.ild del $(OBJS)\extended.ild
- -if exist $(OBJS)\extended.ilf del $(OBJS)\extended.ilf
- -if exist $(OBJS)\extended.ils del $(OBJS)\extended.ils
-
-$(OBJS)\extended.exe: $(EXTENDED_OBJECTS) $(OBJS)\extended_extended.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(EXTENDED_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\extended_extended.res
-|
-
-$(OBJS)\extended_extended.obj: .\extended.cpp
- $(CXX) -q -c -P -o$@ $(EXTENDED_CXXFLAGS) $**
-
-$(OBJS)\extended_extended.res: .\extended.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/foldbar/extended/makefile.gcc b/contrib/samples/foldbar/extended/makefile.gcc
deleted file mode 100644
index 771f50f170..0000000000
--- a/contrib/samples/foldbar/extended/makefile.gcc
+++ /dev/null
@@ -1,245 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-EXTENDED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-EXTENDED_OBJECTS = \
- $(OBJS)\extended_extended.o \
- $(OBJS)\extended_extended_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_ADV_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\extended.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\extended.exe del $(OBJS)\extended.exe
-
-$(OBJS)\extended.exe: $(EXTENDED_OBJECTS) $(OBJS)\extended_extended_rc.o
- $(CXX) -o $@ $(EXTENDED_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\extended_extended.o: ./extended.cpp
- $(CXX) -c -o $@ $(EXTENDED_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\extended_extended_rc.o: ./extended.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/foldbar/extended/makefile.vc b/contrib/samples/foldbar/extended/makefile.vc
deleted file mode 100644
index 2d7c98d268..0000000000
--- a/contrib/samples/foldbar/extended/makefile.vc
+++ /dev/null
@@ -1,322 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-EXTENDED_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\extended.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /DNOPCH \
- /I.\..\..\..\include $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
- $(CXXFLAGS)
-EXTENDED_OBJECTS = \
- $(OBJS)\extended_extended.obj \
- $(OBJS)\extended_extended.res
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\extended.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\extended.exe del $(OBJS)\extended.exe
- -if exist $(OBJS)\extended.ilk del $(OBJS)\extended.ilk
- -if exist $(OBJS)\extended.pdb del $(OBJS)\extended.pdb
-
-$(OBJS)\extended.exe: $(EXTENDED_OBJECTS) $(OBJS)\extended_extended.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(EXTENDED_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\extended_extended.obj: .\extended.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(EXTENDED_CXXFLAGS) $**
-
-$(OBJS)\extended_extended.res: .\extended.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/foldbar/extended/makefile.wat b/contrib/samples/foldbar/extended/makefile.wat
deleted file mode 100644
index e5ab9b96fd..0000000000
--- a/contrib/samples/foldbar/extended/makefile.wat
+++ /dev/null
@@ -1,277 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_ADV_p =
-!ifeq MONOLITHIC 0
-__WXLIB_ADV_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-__WXLIB_HTML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_HTML_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-__WXLIB_XML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_XML_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-EXTENDED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-EXTENDED_OBJECTS = &
- $(OBJS)\extended_extended.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\extended.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\extended.exe del $(OBJS)\extended.exe
-
-$(OBJS)\extended.exe : $(EXTENDED_OBJECTS) $(OBJS)\extended_extended.res
- @%create $(OBJS)\extended.lbc
- @%append $(OBJS)\extended.lbc option quiet
- @%append $(OBJS)\extended.lbc name $^@
- @%append $(OBJS)\extended.lbc option caseexact
- @%append $(OBJS)\extended.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(EXTENDED_OBJECTS)) do @%append $(OBJS)\extended.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\extended.lbc library %i
- @%append $(OBJS)\extended.lbc option resource=$(OBJS)\extended_extended.res
- @for %i in () do @%append $(OBJS)\extended.lbc option stack=%i
- wlink @$(OBJS)\extended.lbc
-
-$(OBJS)\extended_extended.obj : .AUTODEPEND .\extended.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(EXTENDED_CXXFLAGS) $<
-
-$(OBJS)\extended_extended.res : .AUTODEPEND .\extended.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/foldbar/foldpanelbar/Makefile.in b/contrib/samples/foldbar/foldpanelbar/Makefile.in
deleted file mode 100644
index 834b787191..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/Makefile.in
+++ /dev/null
@@ -1,207 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-FOLDTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
- -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-FOLDTEST_OBJECTS = \
- $(__foldtest_os2_lib_res) \
- foldtest_foldpanelbartest.o \
- foldtest_foldtestpanel.o \
- foldtest_layouttest.o \
- foldtest_test.o \
- $(__foldtest___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__foldtest___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C foldtest$(EXEEXT)
-@COND_PLATFORM_MAC_1@__foldtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___foldtest___os2_emxbindcmd = $(NM) foldtest$(EXEEXT) | if \
- grep -q pmwin.763 ; then emxbind -ep foldtest$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__foldtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___foldtest___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__foldtest_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__foldtest_bundle___depname = foldtest_bundle
-@COND_TOOLKIT_COCOA@____foldtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@ foldtest.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____foldtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@ foldtest.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__foldtest___win32rc = \
-@COND_PLATFORM_WIN32_1@ foldtest_foldpanelbartest_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../../include -o foldtest$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: foldtest$(EXEEXT) $(__foldtest_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f foldtest$(EXEEXT)
- rm -rf foldtest.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-foldtest$(EXEEXT): $(FOLDTEST_OBJECTS) $(__foldtest___win32rc)
- $(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__foldtest___mac_rezcmd)
- $(__foldtest___mac_setfilecmd)
- $(__foldtest___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-foldtest.app/Contents/PkgInfo: foldtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p foldtest.app/Contents
- mkdir -p foldtest.app/Contents/MacOS
- mkdir -p foldtest.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/foldtest/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >foldtest.app/Contents/Info.plist
-
-
- echo -n "APPL????" >foldtest.app/Contents/PkgInfo
-
-
- ln -f foldtest$(EXEEXT) foldtest.app/Contents/MacOS/foldtest
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns foldtest.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@foldtest_bundle: $(____foldtest_BUNDLE_TGT_REF_DEP)
-
-foldtest_foldpanelbartest.o: $(srcdir)/foldpanelbartest.cpp
- $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/foldpanelbartest.cpp
-
-foldtest_foldtestpanel.o: $(srcdir)/foldtestpanel.cpp
- $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/foldtestpanel.cpp
-
-foldtest_layouttest.o: $(srcdir)/layouttest.cpp
- $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/layouttest.cpp
-
-foldtest_test.o: $(srcdir)/test.cpp
- $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/test.cpp
-
-foldtest_foldpanelbartest_rc.o: $(srcdir)/foldpanelbartest.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean foldtest_bundle
diff --git a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp b/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp
deleted file mode 100644
index 2a17ea90f5..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: foldpanelbartest.cpp
-// Purpose:
-// Author: Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-// : wxWidgets coding standards
-// Created: 18/06/2004
-// RCS-ID: $Id$
-// Copyright: (c) Jorgen Bodde
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/foldbar/foldpanelbar.h"
-#include "foldtestpanel.h"
-
-// ----------------------------------------------------------------------------
-// resources
-// ----------------------------------------------------------------------------
-
-// the application icon (under Windows and OS/2 it is in resources)
-#include "sample.xpm"
-
-// ----------------------------------------------------------------------------
-// MyApp Class
-// ----------------------------------------------------------------------------
-
-class MyApp : public wxApp
-{
-public:
- virtual bool OnInit();
-};
-
-// ----------------------------------------------------------------------------
-// MyAppFrame Class
-// ----------------------------------------------------------------------------
-
-class MyAppFrame : public wxFrame
-{
-public:
- MyAppFrame(const wxString& title,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxDEFAULT_FRAME_STYLE);
-
-private:
- void OnQuit(wxCommandEvent& event);
- void OnAbout(wxCommandEvent& event);
- void OnOrientation(wxCommandEvent& event);
-
- // extra handlers for the bar, to show how it works
-
- void OnCollapseMe(wxCommandEvent &event);
- void OnExpandMe(wxCommandEvent &event);
-
-private:
- wxMenuBar *CreateMenuBar();
- void CreateFoldBar(bool vertical = true);
- wxFoldPanelBar *m_pnl;
-
-private:
- DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-enum
-{
- // menu items
- FoldPanelBarTest_Quit = wxID_EXIT,
- FoldPanelBarTest_About = wxID_ABOUT,
- ID_COLLAPSEME = wxID_HIGHEST,
- ID_EXPANDME,
- FoldPanelBarTest_Horizontal,
- FoldPanelBarTest_Vertical
-};
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWidgets
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(MyAppFrame, wxFrame)
- EVT_MENU(FoldPanelBarTest_Quit, MyAppFrame::OnQuit)
- EVT_MENU(FoldPanelBarTest_About, MyAppFrame::OnAbout)
- EVT_MENU(FoldPanelBarTest_Horizontal, MyAppFrame::OnOrientation)
- EVT_MENU(FoldPanelBarTest_Vertical, MyAppFrame::OnOrientation)
- EVT_BUTTON(ID_COLLAPSEME, MyAppFrame::OnCollapseMe)
- EVT_BUTTON(ID_EXPANDME, MyAppFrame::OnExpandMe)
-END_EVENT_TABLE()
-
-IMPLEMENT_APP(MyApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// MyApp Implementation
-// ----------------------------------------------------------------------------
-
-bool MyApp::OnInit()
-{
- MyAppFrame *frame = new MyAppFrame(_T("FoldPanelBarTest wxWidgets Test Application"));
-
- SetTopWindow(frame);
-
- frame->Show(true);
- return true;
-}
-
-// ----------------------------------------------------------------------------
-// MyAppFrame Implementation
-// ----------------------------------------------------------------------------
-
-MyAppFrame::MyAppFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
- : wxFrame(NULL, wxID_ANY, title, pos, size, style), m_pnl(NULL)
-{
- SetIcon(wxIcon(sample_xpm));
-
- SetMenuBar(CreateMenuBar());
-
- CreateFoldBar();
-
- CreateStatusBar(2);
- SetStatusText(_T("Welcome to wxWidgets!"));
-}
-
-wxMenuBar *MyAppFrame::CreateMenuBar()
-{
- wxMenu *menuFile = new wxMenu;
- menuFile->Append(FoldPanelBarTest_Horizontal, _T("&Horizontal\tAlt-H"));
- menuFile->Append(FoldPanelBarTest_Vertical, _T("&Vertical\tAlt-V"));
- menuFile->AppendSeparator();
- menuFile->Append(FoldPanelBarTest_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
-
- wxMenu *helpMenu = new wxMenu;
- helpMenu->Append(FoldPanelBarTest_About, _T("&About...\tF1"), _T("Show about dialog"));
-
- wxMenuBar *value = new wxMenuBar();
- value->Append(menuFile, _T("&File"));
- value->Append(helpMenu, _T("&Help"));
-
- return value;
-}
-
-void MyAppFrame::CreateFoldBar(bool vertical)
-{
- if (vertical)
- SetSize(200,500);
- else
- SetSize(900,200);
-
- wxFoldPanelBar *bar = new wxFoldPanelBar(this,
- wxID_ANY,
- wxDefaultPosition,
- wxDefaultSize,
- wxFPB_DEFAULT_STYLE | ( vertical ? wxFPB_VERTICAL : wxFPB_HORIZONTAL ) ,
- wxFPB_COLLAPSE_TO_BOTTOM);
-
- wxFoldPanel item = bar->AddFoldPanel(_T("Test me"), false);
- bar->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_COLLAPSEME, _T("Collapse Me")));
-
- item = bar->AddFoldPanel(_T("Test me too!"), true);
- bar->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_EXPANDME, _T("Expand first one")));
- bar->AddFoldPanelSeperator(item);
- bar->AddFoldPanelWindow(item, new FoldTestPanel(item.GetParent(), wxID_ANY));
-
- bar->AddFoldPanelSeperator(item);
-
- bar->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, _T("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 20);
-
- item = bar->AddFoldPanel(_T("Some opinions ..."), false);
- bar->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("I like this")));
- if( vertical)
- {
- // do not add this for horizontal for better presentation
- bar->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("And also this")));
- bar->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("And gimme this too")));
- }
-
- bar->AddFoldPanelSeperator(item);
-
- bar->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("Check this too if you like")));
- if( vertical)
- {
- // do not add this for horizontal for better presentation
- bar->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("What about this")));
- }
-
- item = bar->AddFoldPanel(_T("Choose one ..."), false);
- bar->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), wxID_ANY, _T("Enter your comment")));
- bar->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, _T("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 20);
-
- if (m_pnl) m_pnl->Destroy();
-
- m_pnl = bar;
-
- wxSize size = GetClientSize();
- m_pnl->SetSize( 0, 0, size.GetWidth(), size.GetHeight() );
-}
-
-void MyAppFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
- // true is to force the frame to close
- Close(true);
-}
-
-void MyAppFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
- wxString msg;
- msg.Printf( _T("This is the About dialog of the FoldPanelBarTest application.\n")
- _T("Welcome to %s"), wxVERSION_STRING);
-
- wxMessageBox(msg, _T("About FoldPanelBarTest"), wxOK | wxICON_INFORMATION, this);
-}
-
-void MyAppFrame::OnOrientation(wxCommandEvent& event)
-{
- CreateFoldBar(event.GetId()==FoldPanelBarTest_Vertical);
-}
-
-void MyAppFrame::OnCollapseMe(wxCommandEvent &WXUNUSED(event))
-{
- wxFoldPanel item = m_pnl->Item(0);
- m_pnl->Collapse(item);
-}
-
-void MyAppFrame::OnExpandMe(wxCommandEvent &WXUNUSED(event))
-{
- m_pnl->Expand(m_pnl->Item(0));
- m_pnl->Collapse(m_pnl->Item(1));
-}
diff --git a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc b/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/contrib/samples/foldbar/foldpanelbar/foldtest.bkl b/contrib/samples/foldbar/foldpanelbar/foldtest.bkl
deleted file mode 100644
index 5498b90463..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldtest.bkl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- $(SRCDIR)/../../../include
-
-
- foldpanelbartest.cpp
- foldtestpanel.cpp
- layouttest.cpp
- test.cpp
-
- foldbar
- core
- base
- foldpanelbartest.rc
-
-
-
diff --git a/contrib/samples/foldbar/foldpanelbar/foldtest.dsp b/contrib/samples/foldbar/foldpanelbar/foldtest.dsp
deleted file mode 100644
index 1911213eea..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldtest.dsp
+++ /dev/null
@@ -1,492 +0,0 @@
-# Microsoft Developer Studio Project File - Name="foldtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=foldtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "foldtest.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "foldtest.mak" CFG="foldtest - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "foldtest - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "foldtest - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_foldbar.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_foldbar.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_foldbar.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_foldbar.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_foldbar.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_foldbar.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_foldbar.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_foldbar.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\foldtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_foldbar.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_foldbar.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "foldtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\foldtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_foldbar.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_foldbar.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "foldtest - Win32 DLL Universal Unicode Release"
-# Name "foldtest - Win32 DLL Universal Unicode Debug"
-# Name "foldtest - Win32 DLL Universal Release"
-# Name "foldtest - Win32 DLL Universal Debug"
-# Name "foldtest - Win32 DLL Unicode Release"
-# Name "foldtest - Win32 DLL Unicode Debug"
-# Name "foldtest - Win32 DLL Release"
-# Name "foldtest - Win32 DLL Debug"
-# Name "foldtest - Win32 Universal Unicode Release"
-# Name "foldtest - Win32 Universal Unicode Debug"
-# Name "foldtest - Win32 Universal Release"
-# Name "foldtest - Win32 Universal Debug"
-# Name "foldtest - Win32 Unicode Release"
-# Name "foldtest - Win32 Unicode Debug"
-# Name "foldtest - Win32 Release"
-# Name "foldtest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\foldpanelbartest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\foldpanelbartest.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\foldtestpanel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\layouttest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\test.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp b/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp
deleted file mode 100644
index 0da5fcabc2..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: foldtestpanel.cpp
-// Purpose:
-// Author: Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-// : wxWidgets coding standards
-// Created: 18/06/2004
-// RCS-ID: $Id$
-// Copyright: (c) Jorgen Bodde
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-////@end includes
-
-#include "foldtestpanel.h"
-
-
-////@begin XPM images
-////@end XPM images
-
-/*!
- * FoldTestPanel type definition
- */
-
-IMPLEMENT_CLASS( FoldTestPanel, wxPanel )
-
-/*!
- * FoldTestPanel event table definition
- */
-BEGIN_EVENT_TABLE( FoldTestPanel, wxPanel )
-
-////@begin FoldTestPanel event table entries
-////@end FoldTestPanel event table entries
-
- //EVT_CAPTIONBAR(wxID_ANY, FoldTestPanel::OnCaptionPanel)
- EVT_CAPTIONBAR(wxID_ANY, FoldTestPanel::OnCaptionPanel)
-
-
-END_EVENT_TABLE()
-
-/*!
- * FoldTestPanel constructors
- */
-
-FoldTestPanel::FoldTestPanel( )
-{
- delete m_images;
-}
-
-FoldTestPanel::FoldTestPanel( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
- Create(parent, id, caption, pos, size, style);
-}
-
-/*!
- * FoldTestPanel creator
- */
-
-bool FoldTestPanel::Create( wxWindow* parent, wxWindowID id, const wxString& WXUNUSED(caption), const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin FoldTestPanel member initialisation
- blaat = NULL;
-////@end FoldTestPanel member initialisation
-
-////@begin FoldTestPanel creation
- SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
- wxPanel::Create( parent, id, pos, size, style );
-
- CreateControls();
- GetSizer()->Fit(this);
- GetSizer()->SetSizeHints(this);
- Centre();
-////@end FoldTestPanel creation
- return true;
-}
-
-/*!
- * Control creation for FoldTestPanel
- */
-
-void FoldTestPanel::CreateControls()
-{
-
-////@begin FoldTestPanel content construction
-
- FoldTestPanel* item1 = this;
-
- wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
- blaat = item2;
- item1->SetSizer(item2);
- item1->SetAutoLayout(true);
- /* wxPanel* item3 = new wxPanel( item1, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL ); */
- wxPanel* item3 = new wxPanel( item1, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL );
- item2->Add(item3, 1, wxGROW|wxADJUST_MINSIZE, 5);
- wxBoxSizer* item4 = new wxBoxSizer(wxVERTICAL);
- item3->SetSizer(item4);
- item3->SetAutoLayout(true);
- wxString item5Strings[] = {
- _("One"),
- _("Two"),
- _("Three")
- };
- wxChoice* item5 = new wxChoice( item3, ID_CHOICE, wxDefaultPosition, wxDefaultSize, 3, item5Strings, 0 );
- item4->Add(item5, 0, wxGROW|wxALL, 5);
- wxTextCtrl* item6 = new wxTextCtrl( item3, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
- item4->Add(item6, 1, wxGROW|wxALL, 5);
- wxRadioButton* item7 = new wxRadioButton( item3, ID_RADIOBUTTON, _("I like this"), wxDefaultPosition, wxDefaultSize, 0 );
- item7->SetValue(true);
- item4->Add(item7, 0, wxALIGN_LEFT|wxALL, 5);
- wxRadioButton* item8 = new wxRadioButton( item3, ID_RADIOBUTTON1, _("I hate it"), wxDefaultPosition, wxDefaultSize, 0 );
- item8->SetValue(false);
- item4->Add(item8, 0, wxALIGN_LEFT|wxALL, 5);
-////@end FoldTestPanel content construction
-}
-
-void FoldTestPanel::OnCaptionPanel(wxCaptionBarEvent &WXUNUSED(event))
-{
- // TODO: What else
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool FoldTestPanel::ShowToolTips()
-{
- return true;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap FoldTestPanel::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
- // Bitmap retrieval
-////@begin FoldTestPanel bitmap retrieval
- return wxNullBitmap;
-////@end FoldTestPanel bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon FoldTestPanel::GetIconResource( const wxString& WXUNUSED(name) )
-{
- // Icon retrieval
-////@begin FoldTestPanel icon retrieval
- return wxNullIcon;
-////@end FoldTestPanel icon retrieval
-}
-
diff --git a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.h b/contrib/samples/foldbar/foldpanelbar/foldtestpanel.h
deleted file mode 100644
index 8fc1de6699..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: foldtestpanel.h
-// Purpose:
-// Author: Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-// : wxWidgets coding standards
-// Created: 18/06/2004
-// RCS-ID: $Id$
-// Copyright: (c) Jorgen Bodde
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _FOLDTESTPANEL_H_
-#define _FOLDTESTPANEL_H_
-
-/*!
- * Includes
- */
-
-#include "wx/foldbar/foldpanelbar.h"
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxBoxSizer;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_TESTPANEL 10000
-#define SYMBOL_FOLDTESTPANEL_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_FOLDTESTPANEL_TITLE _("FoldTestPanel")
-#define SYMBOL_FOLDTESTPANEL_IDNAME ID_TESTPANEL
-#define SYMBOL_FOLDTESTPANEL_SIZE wxSize(400, 300)
-#define SYMBOL_FOLDTESTPANEL_POSITION wxDefaultPosition
-#define ID_PANEL 10002
-#define ID_CHOICE 10003
-#define ID_TEXTCTRL 10016
-#define ID_RADIOBUTTON 10004
-#define ID_RADIOBUTTON1 10005
-////@end control identifiers
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-#ifndef wxFIXED_MINSIZE
-#define wxFIXED_MINSIZE 0
-#endif
-
-/*!
- * FoldTestPanel class declaration
- */
-
-class FoldTestPanel: public wxPanel
-{
- DECLARE_CLASS( FoldTestPanel )
- DECLARE_EVENT_TABLE()
-
-private:
- wxImageList *m_images;
- wxRect m_oldsize;
-
- void OnCaptionPanel(wxCaptionBarEvent &event);
-
-public:
- /// Constructors
- FoldTestPanel( );
- FoldTestPanel( wxWindow* parent, wxWindowID id = SYMBOL_FOLDTESTPANEL_IDNAME, const wxString& caption = SYMBOL_FOLDTESTPANEL_TITLE, const wxPoint& pos = SYMBOL_FOLDTESTPANEL_POSITION, const wxSize& size = SYMBOL_FOLDTESTPANEL_SIZE, long style = SYMBOL_FOLDTESTPANEL_STYLE );
-
- /// Creation
- bool Create( wxWindow* parent, wxWindowID id = SYMBOL_FOLDTESTPANEL_IDNAME, const wxString& caption = SYMBOL_FOLDTESTPANEL_TITLE, const wxPoint& pos = SYMBOL_FOLDTESTPANEL_POSITION, const wxSize& size = SYMBOL_FOLDTESTPANEL_SIZE, long style = SYMBOL_FOLDTESTPANEL_STYLE );
-
- /// Creates the controls and sizers
- void CreateControls();
-
-////@begin FoldTestPanel event handler declarations
-
-////@end FoldTestPanel event handler declarations
-
-////@begin FoldTestPanel member function declarations
-
-
- /// Retrieves bitmap resources
- wxBitmap GetBitmapResource( const wxString& name );
-
- /// Retrieves icon resources
- wxIcon GetIconResource( const wxString& name );
-////@end FoldTestPanel member function declarations
-
- /// Should we show tooltips?
- static bool ShowToolTips();
-
-////@begin FoldTestPanel member variables
- wxBoxSizer* blaat;
-////@end FoldTestPanel member variables
-};
-
-#endif
- // _FOLDTESTPANEL_H_
diff --git a/contrib/samples/foldbar/foldpanelbar/layouttest.cpp b/contrib/samples/foldbar/foldpanelbar/layouttest.cpp
deleted file mode 100644
index b9d6814cd8..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/layouttest.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: layouttest.cpp
-// Purpose:
-// Author: Jorgen Bodde
-// Modified by:
-// Created: 25/06/2004
-// RCS-ID: $Id$
-// Copyright: (c) Jorgen Bodde
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-////@end includes
-
-#include "layouttest.h"
-
-////@begin XPM images
-////@end XPM images
-
-/*!
- * LayoutTest type definition
- */
-
-IMPLEMENT_CLASS( LayoutTest, wxPanel )
-
-/*!
- * LayoutTest event table definition
- */
-
-BEGIN_EVENT_TABLE( LayoutTest, wxPanel )
-
-////@begin LayoutTest event table entries
-////@end LayoutTest event table entries
-
-END_EVENT_TABLE()
-
-/*!
- * LayoutTest constructors
- */
-
-LayoutTest::LayoutTest( )
-{
-}
-
-LayoutTest::LayoutTest( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
- Create(parent, id, caption, pos, size, style);
-}
-
-/*!
- * LayoutTest creator
- */
-
-bool LayoutTest::Create( wxWindow* parent, wxWindowID id, const wxString& WXUNUSED(caption), const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin LayoutTest member initialisation
-////@end LayoutTest member initialisation
-
-////@begin LayoutTest creation
- SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
- wxPanel::Create( parent, id, pos, size, style );
-
- CreateControls();
- GetSizer()->Fit(this);
- GetSizer()->SetSizeHints(this);
- Centre();
-////@end LayoutTest creation
- return true;
-}
-
-/*!
- * Control creation for LayoutTest
- */
-
-void LayoutTest::CreateControls()
-{
-////@begin LayoutTest content construction
-
- LayoutTest* item1 = this;
-
- wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
- item1->SetSizer(item2);
- item1->SetAutoLayout(true);
- wxStaticText* item3 = new wxStaticText( item1, wxID_STATIC, _("lbaaaaaa"), wxDefaultPosition, wxDefaultSize, 0 );
- item3->SetBackgroundColour(wxColour(139, 139, 139));
- item2->Add(item3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
- wxPanel* item4 = new wxPanel( item1, ID_PANEL1, wxDefaultPosition, wxSize(100, 80), wxTAB_TRAVERSAL );
- item2->Add(item4, 0, wxGROW, 5);
- wxBoxSizer* item5 = new wxBoxSizer(wxVERTICAL);
- item4->SetSizer(item5);
- item4->SetAutoLayout(true);
- wxStaticText* item6 = new wxStaticText( item4, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
- item5->Add(item6, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
- wxButton* item7 = new wxButton( item4, ID_BUTTON, _("Button"), wxDefaultPosition, wxDefaultSize, 0 );
- item5->Add(item7, 0, wxALIGN_LEFT|wxALL, 5);
-////@end LayoutTest content construction
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool LayoutTest::ShowToolTips()
-{
- return true;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap LayoutTest::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
- // Bitmap retrieval
-////@begin LayoutTest bitmap retrieval
- return wxNullBitmap;
-////@end LayoutTest bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon LayoutTest::GetIconResource( const wxString& WXUNUSED(name) )
-{
- // Icon retrieval
-////@begin LayoutTest icon retrieval
- return wxNullIcon;
-////@end LayoutTest icon retrieval
-}
diff --git a/contrib/samples/foldbar/foldpanelbar/layouttest.h b/contrib/samples/foldbar/foldpanelbar/layouttest.h
deleted file mode 100644
index 6e80fe6e9f..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/layouttest.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: layouttest.h
-// Purpose:
-// Author: Jorgen Bodde
-// Modified by:
-// Created: 25/06/2004
-// RCS-ID: $Id$
-// Copyright: (c) Jorgen Bodde
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _LAYOUTTEST_H_
-#define _LAYOUTTEST_H_
-
-/*!
- * Includes
- */
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_DIALOG 10001
-#define SYMBOL_LAYOUTTEST_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_LAYOUTTEST_TITLE _("Layout Test")
-#define SYMBOL_LAYOUTTEST_IDNAME ID_DIALOG
-#define SYMBOL_LAYOUTTEST_SIZE wxSize(400, 300)
-#define SYMBOL_LAYOUTTEST_POSITION wxDefaultPosition
-#define ID_PANEL1 10006
-#define ID_BUTTON 10007
-////@end control identifiers
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-#ifndef wxFIXED_MINSIZE
-#define wxFIXED_MINSIZE 0
-#endif
-
-/*!
- * LayoutTest class declaration
- */
-
-class LayoutTest: public wxPanel
-{
- DECLARE_CLASS( LayoutTest )
- DECLARE_EVENT_TABLE()
-
-public:
- /// Constructors
- LayoutTest( );
- LayoutTest( wxWindow* parent, wxWindowID id = SYMBOL_LAYOUTTEST_IDNAME, const wxString& caption = SYMBOL_LAYOUTTEST_TITLE, const wxPoint& pos = SYMBOL_LAYOUTTEST_POSITION, const wxSize& size = SYMBOL_LAYOUTTEST_SIZE, long style = SYMBOL_LAYOUTTEST_STYLE );
-
- /// Creation
- bool Create( wxWindow* parent, wxWindowID id = SYMBOL_LAYOUTTEST_IDNAME, const wxString& caption = SYMBOL_LAYOUTTEST_TITLE, const wxPoint& pos = SYMBOL_LAYOUTTEST_POSITION, const wxSize& size = SYMBOL_LAYOUTTEST_SIZE, long style = SYMBOL_LAYOUTTEST_STYLE );
-
- /// Creates the controls and sizers
- void CreateControls();
-
-////@begin LayoutTest event handler declarations
-
-////@end LayoutTest event handler declarations
-
-////@begin LayoutTest member function declarations
-
-
- /// Retrieves bitmap resources
- wxBitmap GetBitmapResource( const wxString& name );
-
- /// Retrieves icon resources
- wxIcon GetIconResource( const wxString& name );
-////@end LayoutTest member function declarations
-
- /// Should we show tooltips?
- static bool ShowToolTips();
-
-////@begin LayoutTest member variables
-////@end LayoutTest member variables
-};
-
-#endif
- // _LAYOUTTEST_H_
diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.bcc b/contrib/samples/foldbar/foldpanelbar/makefile.bcc
deleted file mode 100644
index fd522d80cd..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/makefile.bcc
+++ /dev/null
@@ -1,247 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(CPPFLAGS) $(CXXFLAGS)
-FOLDTEST_OBJECTS = \
- $(OBJS)\foldtest_foldpanelbartest.obj \
- $(OBJS)\foldtest_foldtestpanel.obj \
- $(OBJS)\foldtest_layouttest.obj \
- $(OBJS)\foldtest_test.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\foldtest.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\foldtest.exe del $(OBJS)\foldtest.exe
- -if exist $(OBJS)\foldtest.tds del $(OBJS)\foldtest.tds
- -if exist $(OBJS)\foldtest.ilc del $(OBJS)\foldtest.ilc
- -if exist $(OBJS)\foldtest.ild del $(OBJS)\foldtest.ild
- -if exist $(OBJS)\foldtest.ilf del $(OBJS)\foldtest.ilf
- -if exist $(OBJS)\foldtest.ils del $(OBJS)\foldtest.ils
-
-$(OBJS)\foldtest.exe: $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(FOLDTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\foldtest_foldpanelbartest.res
-|
-
-$(OBJS)\foldtest_foldpanelbartest.obj: .\foldpanelbartest.cpp
- $(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldtestpanel.obj: .\foldtestpanel.cpp
- $(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_layouttest.obj: .\layouttest.cpp
- $(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_test.obj: .\test.cpp
- $(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldpanelbartest.res: .\foldpanelbartest.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.gcc b/contrib/samples/foldbar/foldpanelbar/makefile.gcc
deleted file mode 100644
index b7ef62fd90..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/makefile.gcc
+++ /dev/null
@@ -1,245 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-FOLDTEST_OBJECTS = \
- $(OBJS)\foldtest_foldpanelbartest.o \
- $(OBJS)\foldtest_foldtestpanel.o \
- $(OBJS)\foldtest_layouttest.o \
- $(OBJS)\foldtest_test.o \
- $(OBJS)\foldtest_foldpanelbartest_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\foldtest.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\foldtest.exe del $(OBJS)\foldtest.exe
-
-$(OBJS)\foldtest.exe: $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest_rc.o
- $(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\foldtest_foldpanelbartest.o: ./foldpanelbartest.cpp
- $(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldtest_foldtestpanel.o: ./foldtestpanel.cpp
- $(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldtest_layouttest.o: ./layouttest.cpp
- $(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldtest_test.o: ./test.cpp
- $(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldtest_foldpanelbartest_rc.o: ./foldpanelbartest.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.vc b/contrib/samples/foldbar/foldpanelbar/makefile.vc
deleted file mode 100644
index c018f10a61..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/makefile.vc
+++ /dev/null
@@ -1,322 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\foldtest.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /DNOPCH \
- /I.\..\..\..\include $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
- $(CXXFLAGS)
-FOLDTEST_OBJECTS = \
- $(OBJS)\foldtest_foldpanelbartest.obj \
- $(OBJS)\foldtest_foldtestpanel.obj \
- $(OBJS)\foldtest_layouttest.obj \
- $(OBJS)\foldtest_test.obj \
- $(OBJS)\foldtest_foldpanelbartest.res
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\foldtest.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\foldtest.exe del $(OBJS)\foldtest.exe
- -if exist $(OBJS)\foldtest.ilk del $(OBJS)\foldtest.ilk
- -if exist $(OBJS)\foldtest.pdb del $(OBJS)\foldtest.pdb
-
-$(OBJS)\foldtest.exe: $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(FOLDTEST_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\foldtest_foldpanelbartest.obj: .\foldpanelbartest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldtestpanel.obj: .\foldtestpanel.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_layouttest.obj: .\layouttest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_test.obj: .\test.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldpanelbartest.res: .\foldpanelbartest.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.wat b/contrib/samples/foldbar/foldpanelbar/makefile.wat
deleted file mode 100644
index 7ab47b2fbc..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/makefile.wat
+++ /dev/null
@@ -1,274 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-FOLDTEST_OBJECTS = &
- $(OBJS)\foldtest_foldpanelbartest.obj &
- $(OBJS)\foldtest_foldtestpanel.obj &
- $(OBJS)\foldtest_layouttest.obj &
- $(OBJS)\foldtest_test.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\foldtest.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\foldtest.exe del $(OBJS)\foldtest.exe
-
-$(OBJS)\foldtest.exe : $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest.res
- @%create $(OBJS)\foldtest.lbc
- @%append $(OBJS)\foldtest.lbc option quiet
- @%append $(OBJS)\foldtest.lbc name $^@
- @%append $(OBJS)\foldtest.lbc option caseexact
- @%append $(OBJS)\foldtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(FOLDTEST_OBJECTS)) do @%append $(OBJS)\foldtest.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\foldtest.lbc library %i
- @%append $(OBJS)\foldtest.lbc option resource=$(OBJS)\foldtest_foldpanelbartest.res
- @for %i in () do @%append $(OBJS)\foldtest.lbc option stack=%i
- wlink @$(OBJS)\foldtest.lbc
-
-$(OBJS)\foldtest_foldpanelbartest.obj : .AUTODEPEND .\foldpanelbartest.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_foldtestpanel.obj : .AUTODEPEND .\foldtestpanel.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_layouttest.obj : .AUTODEPEND .\layouttest.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_test.obj : .AUTODEPEND .\test.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_foldpanelbartest.res : .AUTODEPEND .\foldpanelbartest.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/foldbar/foldpanelbar/test.cpp b/contrib/samples/foldbar/foldpanelbar/test.cpp
deleted file mode 100644
index 28eff21b5d..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/test.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: test.cpp
-// Purpose:
-// Author: Jorgen Bodde
-// Modified by:
-// Created: 27/06/2004
-// RCS-ID: $Id$
-// Copyright: (c) Jorgen Bodde
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-////@end includes
-
-#include "test.h"
-
-////@begin XPM images
-////@end XPM images
-
-/*!
- * TestTest type definition
- */
-
-IMPLEMENT_CLASS( TestTest, wxDialog )
-
-/*!
- * TestTest event table definition
- */
-
-BEGIN_EVENT_TABLE( TestTest, wxDialog )
-
-////@begin TestTest event table entries
-////@end TestTest event table entries
-
-END_EVENT_TABLE()
-
-/*!
- * TestTest constructors
- */
-
-TestTest::TestTest( )
-{
-}
-
-TestTest::TestTest( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
- Create(parent, id, caption, pos, size, style);
-}
-
-/*!
- * TestTest creator
- */
-
-bool TestTest::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin TestTest member initialisation
- blaat = NULL;
- blaat = NULL;
-////@end TestTest member initialisation
-
-////@begin TestTest creation
- SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
- wxDialog::Create( parent, id, caption, pos, size, style );
-
- CreateControls();
- GetSizer()->Fit(this);
- GetSizer()->SetSizeHints(this);
- Centre();
-////@end TestTest creation
- return true;
-}
-
-/*!
- * Control creation for TestTest
- */
-
-void TestTest::CreateControls()
-{
-////@begin TestTest content construction
-
- TestTest* item1 = this;
-
- wxFlexGridSizer* item2 = new wxFlexGridSizer(2, 1, 0, 0);
- item2->AddGrowableRow(0);
- item2->AddGrowableCol(0);
- item1->SetSizer(item2);
- item1->SetAutoLayout(true);
- wxPanel* item3 = new wxPanel( item1, ID_PANEL7, wxDefaultPosition, wxSize(100, 50), wxNO_BORDER|wxTAB_TRAVERSAL );
- item2->Add(item3, 1, wxGROW|wxGROW|wxADJUST_MINSIZE, 5);
- wxBoxSizer* item4 = new wxBoxSizer(wxVERTICAL);
- item3->SetSizer(item4);
- item3->SetAutoLayout(true);
- wxPanel* item5 = new wxPanel( item3, ID_PANEL6, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
- item4->Add(item5, 1, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
- wxFlexGridSizer* item6 = new wxFlexGridSizer(2, 1, 0, 0);
- item6->AddGrowableRow(1);
- item6->AddGrowableCol(0);
- item5->SetSizer(item6);
- item5->SetAutoLayout(true);
- wxStaticText* item7 = new wxStaticText( item5, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
- item6->Add(item7, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW|wxALL|wxADJUST_MINSIZE, 5);
- wxPanel* item8 = new wxPanel( item5, ID_PANEL3, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
- item6->Add(item8, 1, wxGROW|wxGROW|wxALL, 5);
- wxBoxSizer* item9 = new wxBoxSizer(wxVERTICAL);
- blaat = item9;
- item8->SetSizer(item9);
- item8->SetAutoLayout(true);
- wxPanel* item10 = new wxPanel( item8, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
- item9->Add(item10, 1, wxGROW, 5);
- wxBoxSizer* item11 = new wxBoxSizer(wxVERTICAL);
- item10->SetSizer(item11);
- item10->SetAutoLayout(true);
- wxString item12Strings[] = {
- _("One"),
- _("Two"),
- _("Three")
- };
- wxChoice* item12 = new wxChoice( item10, ID_CHOICE, wxDefaultPosition, wxDefaultSize, 3, item12Strings, 0 );
- item11->Add(item12, 0, wxGROW|wxALL, 5);
- wxRadioButton* item13 = new wxRadioButton( item10, ID_RADIOBUTTON, _("I like this"), wxDefaultPosition, wxDefaultSize, 0 );
- item13->SetValue(true);
- item11->Add(item13, 0, wxALIGN_LEFT|wxALL, 5);
- wxRadioButton* item14 = new wxRadioButton( item10, ID_RADIOBUTTON1, _("I hate it"), wxDefaultPosition, wxDefaultSize, 0 );
- item14->SetValue(false);
- item11->Add(item14, 0, wxALIGN_LEFT|wxALL, 5);
- wxPanel* item15 = new wxPanel( item3, ID_PANEL2, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
- item4->Add(item15, 1, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
- wxFlexGridSizer* item16 = new wxFlexGridSizer(2, 1, 0, 0);
- item16->AddGrowableRow(1);
- item16->AddGrowableCol(0);
- item15->SetSizer(item16);
- item15->SetAutoLayout(true);
- wxStaticText* item17 = new wxStaticText( item15, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
- item16->Add(item17, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW|wxALL|wxADJUST_MINSIZE|wxFIXED_MINSIZE, 5);
- wxPanel* item18 = new wxPanel( item15, ID_PANEL4, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
- item16->Add(item18, 0, wxGROW|wxGROW|wxALL, 5);
- wxBoxSizer* item19 = new wxBoxSizer(wxVERTICAL);
- blaat = item19;
- item18->SetSizer(item19);
- item18->SetAutoLayout(true);
- wxPanel* item20 = new wxPanel( item18, ID_PANEL5, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
- item19->Add(item20, 1, wxGROW, 5);
- wxBoxSizer* item21 = new wxBoxSizer(wxVERTICAL);
- item20->SetSizer(item21);
- item20->SetAutoLayout(true);
- wxString item22Strings[] = {
- _("One"),
- _("Two"),
- _("Three")
- };
- wxChoice* item22 = new wxChoice( item20, ID_CHOICE1, wxDefaultPosition, wxDefaultSize, 3, item22Strings, 0 );
- item21->Add(item22, 0, wxGROW|wxALL, 5);
- wxRadioButton* item23 = new wxRadioButton( item20, ID_RADIOBUTTON2, _("I like this"), wxDefaultPosition, wxDefaultSize, 0 );
- item23->SetValue(true);
- item21->Add(item23, 0, wxALIGN_LEFT|wxALL, 5);
- wxRadioButton* item24 = new wxRadioButton( item20, ID_RADIOBUTTON3, _("I hate it"), wxDefaultPosition, wxDefaultSize, 0 );
- item24->SetValue(false);
- item21->Add(item24, 0, wxALIGN_LEFT|wxALL, 5);
- wxPanel* item25 = new wxPanel( item1, ID_PANEL1, wxDefaultPosition, wxSize(100, 20), wxNO_BORDER|wxTAB_TRAVERSAL );
- item25->SetBackgroundColour(wxColour(98, 98, 98));
- item2->Add(item25, 0, wxGROW|wxGROW|wxFIXED_MINSIZE, 5);
-////@end TestTest content construction
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool TestTest::ShowToolTips()
-{
- return true;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap TestTest::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
- // Bitmap retrieval
-////@begin TestTest bitmap retrieval
- return wxNullBitmap;
-////@end TestTest bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon TestTest::GetIconResource( const wxString& WXUNUSED(name) )
-{
- // Icon retrieval
-////@begin TestTest icon retrieval
- return wxNullIcon;
-////@end TestTest icon retrieval
-}
diff --git a/contrib/samples/foldbar/foldpanelbar/test.h b/contrib/samples/foldbar/foldpanelbar/test.h
deleted file mode 100644
index d2ea1075fc..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/test.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: test.h
-// Purpose:
-// Author: Jorgen Bodde
-// Modified by:
-// Created: 27/06/2004
-// RCS-ID: $Id$
-// Copyright: (c) Jorgen Bodde
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _TEST_H_
-#define _TEST_H_
-
-/*!
- * Includes
- */
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxBoxSizer;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_DIALOG 10001
-#define SYMBOL_TESTTEST_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_TESTTEST_TITLE _("Test Me")
-#define SYMBOL_TESTTEST_IDNAME ID_DIALOG
-#define SYMBOL_TESTTEST_SIZE wxSize(400, 200)
-#define SYMBOL_TESTTEST_POSITION wxDefaultPosition
-#define ID_PANEL7 10015
-#define ID_PANEL6 10014
-#define ID_PANEL3 10008
-#define ID_PANEL 10002
-#define ID_CHOICE 10003
-#define ID_RADIOBUTTON 10004
-#define ID_RADIOBUTTON1 10005
-#define ID_PANEL2 10007
-#define ID_PANEL4 10009
-#define ID_PANEL5 10010
-#define ID_CHOICE1 10011
-#define ID_RADIOBUTTON2 10012
-#define ID_RADIOBUTTON3 10013
-#define ID_PANEL1 10006
-////@end control identifiers
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-#ifndef wxFIXED_MINSIZE
-#define wxFIXED_MINSIZE 0
-#endif
-
-/*!
- * TestTest class declaration
- */
-
-class TestTest: public wxDialog
-{
- DECLARE_CLASS( TestTest )
- DECLARE_EVENT_TABLE()
-
-public:
- /// Constructors
- TestTest( );
- TestTest( wxWindow* parent, wxWindowID id = SYMBOL_TESTTEST_IDNAME, const wxString& caption = SYMBOL_TESTTEST_TITLE, const wxPoint& pos = SYMBOL_TESTTEST_POSITION, const wxSize& size = SYMBOL_TESTTEST_SIZE, long style = SYMBOL_TESTTEST_STYLE );
-
- /// Creation
- bool Create( wxWindow* parent, wxWindowID id = SYMBOL_TESTTEST_IDNAME, const wxString& caption = SYMBOL_TESTTEST_TITLE, const wxPoint& pos = SYMBOL_TESTTEST_POSITION, const wxSize& size = SYMBOL_TESTTEST_SIZE, long style = SYMBOL_TESTTEST_STYLE );
-
- /// Creates the controls and sizers
- void CreateControls();
-
-////@begin TestTest event handler declarations
-
-////@end TestTest event handler declarations
-
-////@begin TestTest member function declarations
-
-
- /// Retrieves bitmap resources
- wxBitmap GetBitmapResource( const wxString& name );
-
- /// Retrieves icon resources
- wxIcon GetIconResource( const wxString& name );
-////@end TestTest member function declarations
-
- /// Should we show tooltips?
- static bool ShowToolTips();
-
-////@begin TestTest member variables
- wxBoxSizer* blaat;
-////@end TestTest member variables
-};
-
-#endif
- // _TEST_H_
diff --git a/contrib/samples/gizmos/Makefile.in b/contrib/samples/gizmos/Makefile.in
deleted file mode 100644
index 25e545a2a9..0000000000
--- a/contrib/samples/gizmos/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# $Id$
-
-CONTRIB_SAMPLES=editlbox dynsash dynsash_switch multicell splittree led
-
-all:
- @for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
-
-clean:
- @for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE) clean); done
-
diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in
deleted file mode 100644
index 313cbc05db..0000000000
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ /dev/null
@@ -1,198 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_HTML = @EXTRALIBS_HTML@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
- -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-DYNSASH_OBJECTS = \
- $(__dynsash___win32rc) \
- $(__dynsash_os2_lib_res) \
- dynsash_dynsash.o
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__dynsash___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dynsash$(EXEEXT)
-@COND_PLATFORM_MAC_1@__dynsash___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___dynsash___os2_emxbindcmd = $(NM) dynsash$(EXEEXT) | if \
- grep -q pmwin.763 ; then emxbind -ep dynsash$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__dynsash___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dynsash___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__dynsash___win32rc = dynsash_sample_rc.o
-@COND_PLATFORM_OS2_1@__dynsash_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__dynsash_bundle___depname = dynsash_bundle
-@COND_TOOLKIT_COCOA@____dynsash_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@ dynsash.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____dynsash_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@ dynsash.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_HTML_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../../include -o dynsash$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: dynsash$(EXEEXT) $(__dynsash_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f dynsash$(EXEEXT)
- rm -rf dynsash.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
- $(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__dynsash___mac_rezcmd)
- $(__dynsash___mac_setfilecmd)
- $(__dynsash___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p dynsash.app/Contents
- mkdir -p dynsash.app/Contents/MacOS
- mkdir -p dynsash.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/dynsash/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >dynsash.app/Contents/Info.plist
-
-
- echo -n "APPL????" >dynsash.app/Contents/PkgInfo
-
-
- ln -f dynsash$(EXEEXT) dynsash.app/Contents/MacOS/dynsash
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynsash.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@dynsash_bundle: $(____dynsash_BUNDLE_TGT_REF_DEP)
-
-dynsash_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
-dynsash_dynsash.o: $(srcdir)/dynsash.cpp
- $(CXXC) -c -o $@ $(DYNSASH_CXXFLAGS) $(srcdir)/dynsash.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean dynsash_bundle
diff --git a/contrib/samples/gizmos/dynsash/dynsash.bkl b/contrib/samples/gizmos/dynsash/dynsash.bkl
deleted file mode 100644
index c4c2618ab1..0000000000
--- a/contrib/samples/gizmos/dynsash/dynsash.bkl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- $(SRCDIR)/../../../include
-
-
- dynsash.cpp
-
- gizmos
- html
- core
- base
-
-
-
diff --git a/contrib/samples/gizmos/dynsash/dynsash.cpp b/contrib/samples/gizmos/dynsash/dynsash.cpp
deleted file mode 100644
index e24229b4c3..0000000000
--- a/contrib/samples/gizmos/dynsash/dynsash.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: dynsash.cpp
-// Purpose: Test the wxDynamicSash class by creating a dynamic sash which
-// contains an HTML view
-// Author: Matt Kimball
-// Modified by:
-// Created: 7/15/2001
-// RCS-ID: $Id$
-// Copyright: (c) 2001 Matt Kimball
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers)
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/app.h"
-#include "wx/frame.h"
-#include "wx/gizmos/dynamicsash.h"
-#include "wx/html/htmlwin.h"
-#include "wx/image.h"
-#include "wx/cmdline.h"
-
-class Demo : public wxApp
-{
-public:
- bool OnInit();
-};
-
-class SashHtmlWindow : public wxHtmlWindow
-{
-public:
- SashHtmlWindow(wxWindow *parent, wxWindowID id = wxID_ANY,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxHW_SCROLLBAR_NEVER,
- const wxString& name = wxT("sashHtmlWindow"));
-
- wxSize DoGetBestSize() const;
-
-private:
- void OnSplit(wxDynamicSashSplitEvent& event);
-
- wxWindow *m_dyn_sash;
-};
-
-IMPLEMENT_APP(Demo)
-
-const wxChar *HTML_content =
-wxT("
wxDynamicSashWindow demo ")
-wxT("Here is an example of how you can use wxDynamicSashWindow to allow your users to ")
-wxT("dynamically split and unify the views of your windows. Try dragging out a few splits ")
-wxT("and then reunifying the window.")
-wxT("
Also, see the dynsash_switch sample for an example of an application which ")
-wxT("manages the scrollbars provided by wxDynamicSashWindow itself.");
-
-bool Demo::OnInit()
-{
- wxInitAllImageHandlers();
-
- wxFrame *frame = new wxFrame(NULL, wxID_ANY, wxT("Dynamic Sash Demo"));
- frame->SetSize(480, 480);
-
- wxDynamicSashWindow *sash = new wxDynamicSashWindow(frame, wxID_ANY);
- wxHtmlWindow *html = new SashHtmlWindow(sash, wxID_ANY);
- html->SetPage(HTML_content);
-
- frame->Show();
-
- return true;
-}
-
-
-SashHtmlWindow::SashHtmlWindow(wxWindow *parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
- : wxHtmlWindow(parent, id, pos, size, style, name)
-{
- Connect(wxEVT_DYNAMIC_SASH_SPLIT,
- wxDynamicSashSplitEventHandler(SashHtmlWindow::OnSplit));
-
- m_dyn_sash = parent;
-}
-
-wxSize SashHtmlWindow::DoGetBestSize() const
-{
- wxHtmlContainerCell *cell = GetInternalRepresentation();
- wxSize size = GetSize();
-
- if (cell)
- {
- cell->Layout(size.GetWidth());
- return wxSize(cell->GetWidth(), cell->GetHeight());
- }
-
- return wxHtmlWindow::GetBestSize();
-}
-
-void SashHtmlWindow::OnSplit(wxDynamicSashSplitEvent& WXUNUSED(event))
-{
- wxHtmlWindow *html = new SashHtmlWindow(m_dyn_sash, wxID_ANY);
- html->SetPage(HTML_content);
-}
diff --git a/contrib/samples/gizmos/dynsash/dynsash.dsp b/contrib/samples/gizmos/dynsash/dynsash.dsp
deleted file mode 100644
index 81fff5672b..0000000000
--- a/contrib/samples/gizmos/dynsash/dynsash.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dynsash" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=dynsash - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "dynsash.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "dynsash.mak" CFG="dynsash - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "dynsash - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "dynsash - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_html.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_html.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_html.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_html.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_html.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_html.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_html.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_html.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_html.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_html.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_html.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_html.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\dynsash.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_html.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_html.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_html.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_html.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "dynsash - Win32 DLL Universal Unicode Release"
-# Name "dynsash - Win32 DLL Universal Unicode Debug"
-# Name "dynsash - Win32 DLL Universal Release"
-# Name "dynsash - Win32 DLL Universal Debug"
-# Name "dynsash - Win32 DLL Unicode Release"
-# Name "dynsash - Win32 DLL Unicode Debug"
-# Name "dynsash - Win32 DLL Release"
-# Name "dynsash - Win32 DLL Debug"
-# Name "dynsash - Win32 Universal Unicode Release"
-# Name "dynsash - Win32 Universal Unicode Debug"
-# Name "dynsash - Win32 Universal Release"
-# Name "dynsash - Win32 Universal Debug"
-# Name "dynsash - Win32 Unicode Release"
-# Name "dynsash - Win32 Unicode Debug"
-# Name "dynsash - Win32 Release"
-# Name "dynsash - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\dynsash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/dynsash/makefile.bcc b/contrib/samples/gizmos/dynsash/makefile.bcc
deleted file mode 100644
index 15ebb15822..0000000000
--- a/contrib/samples/gizmos/dynsash/makefile.bcc
+++ /dev/null
@@ -1,239 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(CPPFLAGS) $(CXXFLAGS)
-DYNSASH_OBJECTS = \
- $(OBJS)\dynsash_dynsash.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\dynsash.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\dynsash.exe del $(OBJS)\dynsash.exe
- -if exist $(OBJS)\dynsash.tds del $(OBJS)\dynsash.tds
- -if exist $(OBJS)\dynsash.ilc del $(OBJS)\dynsash.ilc
- -if exist $(OBJS)\dynsash.ild del $(OBJS)\dynsash.ild
- -if exist $(OBJS)\dynsash.ilf del $(OBJS)\dynsash.ilf
- -if exist $(OBJS)\dynsash.ils del $(OBJS)\dynsash.ils
-
-$(OBJS)\dynsash.exe: $(DYNSASH_OBJECTS) $(OBJS)\dynsash_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(DYNSASH_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dynsash_sample.res
-|
-
-$(OBJS)\dynsash_sample.res: .\..\..\..\..\samples\sample.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples $**
-
-$(OBJS)\dynsash_dynsash.obj: .\dynsash.cpp
- $(CXX) -q -c -P -o$@ $(DYNSASH_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/dynsash/makefile.gcc b/contrib/samples/gizmos/dynsash/makefile.gcc
deleted file mode 100644
index 7518273716..0000000000
--- a/contrib/samples/gizmos/dynsash/makefile.gcc
+++ /dev/null
@@ -1,237 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-DYNSASH_OBJECTS = \
- $(OBJS)\dynsash_sample_rc.o \
- $(OBJS)\dynsash_dynsash.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\dynsash.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\dynsash.exe del $(OBJS)\dynsash.exe
-
-$(OBJS)\dynsash.exe: $(DYNSASH_OBJECTS) $(OBJS)\dynsash_sample_rc.o
- $(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\dynsash_sample_rc.o: ./../../../../samples/sample.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples
-
-$(OBJS)\dynsash_dynsash.o: ./dynsash.cpp
- $(CXX) -c -o $@ $(DYNSASH_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/dynsash/makefile.vc b/contrib/samples/gizmos/dynsash/makefile.vc
deleted file mode 100644
index 40a6ad9553..0000000000
--- a/contrib/samples/gizmos/dynsash/makefile.vc
+++ /dev/null
@@ -1,314 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\dynsash.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /DNOPCH \
- /I.\..\..\..\include $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
- $(CXXFLAGS)
-DYNSASH_OBJECTS = \
- $(OBJS)\dynsash_sample.res \
- $(OBJS)\dynsash_dynsash.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\dynsash.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\dynsash.exe del $(OBJS)\dynsash.exe
- -if exist $(OBJS)\dynsash.ilk del $(OBJS)\dynsash.ilk
- -if exist $(OBJS)\dynsash.pdb del $(OBJS)\dynsash.pdb
-
-$(OBJS)\dynsash.exe: $(DYNSASH_OBJECTS) $(OBJS)\dynsash_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(DYNSASH_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\dynsash_sample.res: .\..\..\..\..\samples\sample.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples $**
-
-$(OBJS)\dynsash_dynsash.obj: .\dynsash.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(DYNSASH_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/dynsash/makefile.wat b/contrib/samples/gizmos/dynsash/makefile.wat
deleted file mode 100644
index 2517cb0499..0000000000
--- a/contrib/samples/gizmos/dynsash/makefile.wat
+++ /dev/null
@@ -1,267 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_HTML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_HTML_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-DYNSASH_OBJECTS = &
- $(OBJS)\dynsash_dynsash.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\dynsash.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\dynsash.exe del $(OBJS)\dynsash.exe
-
-$(OBJS)\dynsash.exe : $(DYNSASH_OBJECTS) $(OBJS)\dynsash_sample.res
- @%create $(OBJS)\dynsash.lbc
- @%append $(OBJS)\dynsash.lbc option quiet
- @%append $(OBJS)\dynsash.lbc name $^@
- @%append $(OBJS)\dynsash.lbc option caseexact
- @%append $(OBJS)\dynsash.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(DYNSASH_OBJECTS)) do @%append $(OBJS)\dynsash.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dynsash.lbc library %i
- @%append $(OBJS)\dynsash.lbc option resource=$(OBJS)\dynsash_sample.res
- @for %i in () do @%append $(OBJS)\dynsash.lbc option stack=%i
- wlink @$(OBJS)\dynsash.lbc
-
-$(OBJS)\dynsash_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples $<
-
-$(OBJS)\dynsash_dynsash.obj : .AUTODEPEND .\dynsash.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(DYNSASH_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in
deleted file mode 100644
index f4ac584a38..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ /dev/null
@@ -1,198 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-DYNSASH_SWITCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
- -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-DYNSASH_SWITCH_OBJECTS = \
- $(__dynsash_switch___win32rc) \
- $(__dynsash_switch_os2_lib_res) \
- dynsash_switch_dynsash_switch.o
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__dynsash_switch___mac_setfilecmd \
-@COND_PLATFORM_MAC_1@ = $(SETFILE) -a C dynsash_switch$(EXEEXT)
-@COND_PLATFORM_MAC_1@__dynsash_switch___mac_rezcmd = \
-@COND_PLATFORM_MAC_1@ $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___dynsash_switch___os2_emxbindcmd = $(NM) \
- dynsash_switch$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
- dynsash_switch$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__dynsash_switch___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dynsash_switch___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__dynsash_switch___win32rc = \
-@COND_PLATFORM_WIN32_1@ dynsash_switch_sample_rc.o
-@COND_PLATFORM_OS2_1@__dynsash_switch_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__dynsash_switch_bundle___depname \
-@COND_PLATFORM_MACOSX_1@ = dynsash_switch_bundle
-@COND_TOOLKIT_COCOA@____dynsash_switch_BUNDLE_TGT_REF_DEP \
-@COND_TOOLKIT_COCOA@ = dynsash_switch.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____dynsash_switch_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@ dynsash_switch.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../../include -o dynsash_switch$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: dynsash_switch$(EXEEXT) $(__dynsash_switch_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f dynsash_switch$(EXEEXT)
- rm -rf dynsash_switch.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc)
- $(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__dynsash_switch___mac_rezcmd)
- $(__dynsash_switch___mac_setfilecmd)
- $(__dynsash_switch___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p dynsash_switch.app/Contents
- mkdir -p dynsash_switch.app/Contents/MacOS
- mkdir -p dynsash_switch.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/dynsash_switch/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >dynsash_switch.app/Contents/Info.plist
-
-
- echo -n "APPL????" >dynsash_switch.app/Contents/PkgInfo
-
-
- ln -f dynsash_switch$(EXEEXT) dynsash_switch.app/Contents/MacOS/dynsash_switch
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynsash_switch.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@dynsash_switch_bundle: $(____dynsash_switch_BUNDLE_TGT_REF_DEP)
-
-dynsash_switch_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
-dynsash_switch_dynsash_switch.o: $(srcdir)/dynsash_switch.cpp
- $(CXXC) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $(srcdir)/dynsash_switch.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean dynsash_switch_bundle
diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
deleted file mode 100644
index 4843a97f3a..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- $(SRCDIR)/../../../include
-
-
- dynsash_switch.cpp
-
- gizmos
- core
- base
-
-
-
diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
deleted file mode 100644
index cfc5fba0b9..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
-// Purpose: Test custom scrollbar handling of wxDynamicSashWindow by
-// creating a dynamic sash window where the client scrolls a
-// a subwindow of the client window by responding to scroll
-// events itself
-// Author: Matt Kimball
-// Modified by:
-// Created: 7/15/2001
-// RCS-ID: $Id$
-// Copyright: (c) 2001 Matt Kimball
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers)
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/app.h"
-#include "wx/frame.h"
-#include "wx/choice.h"
-#include "wx/dcclient.h"
-#include "wx/gizmos/dynamicsash.h"
-#include "wx/layout.h"
-#include "wx/scrolbar.h"
-
-class SwitchDemo : public wxApp {
-public:
- bool OnInit();
-};
-
-
-class SwitchView : public wxWindow {
-public:
- SwitchView(wxDynamicSashWindow *parent);
-
- wxSize DoGetBestSize() const;
-
-private:
- void OnSize(wxSizeEvent& event);
- void OnPaint(wxPaintEvent& event);
- void OnChoice(wxCommandEvent& event);
- void OnScroll(wxScrollEvent& event);
- void OnFocus(wxFocusEvent& event);
- void OnErase(wxEraseEvent& event);
- void OnSplit(wxDynamicSashSplitEvent& event);
- void OnUnify(wxDynamicSashUnifyEvent& event);
-
- wxDynamicSashWindow *m_dyn_sash;
- wxWindow *m_bar;
- wxChoice *m_choice;
- wxWindow *m_view;
-};
-
-IMPLEMENT_APP(SwitchDemo)
-
-
-SwitchView::SwitchView(wxDynamicSashWindow *win) {
- Create(win, wxID_ANY);
-
- m_dyn_sash = win;
-
- m_bar = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER, wxT("bar"));
- m_choice = new wxChoice(m_bar, wxID_ANY);
- m_choice->SetEventHandler(this);
- m_view = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, wxT("view"));
- m_view->SetBackgroundColour(*wxWHITE);
- m_view->SetEventHandler(this);
-
- m_choice->Append(wxT("Triangle"));
- m_choice->Append(wxT("Square"));
- m_choice->SetSelection(0);
-
- wxLayoutConstraints *layout;
-
- layout = new wxLayoutConstraints();
- layout->left.Absolute(0);
- layout->top.Absolute(0);
- layout->height.Absolute(36);
- layout->width.SameAs(this, wxWidth);
- m_bar->SetConstraints(layout);
-
- layout = new wxLayoutConstraints();
- layout->left.Absolute(3);
- layout->width.AsIs();
- layout->height.AsIs();
- layout->top.Absolute(3);
- m_choice->SetConstraints(layout);
-
- layout = new wxLayoutConstraints();
- layout->left.Absolute(0);
- layout->width.SameAs(this, wxWidth);
- layout->top.Below(m_bar);
- layout->bottom.SameAs(this, wxBottom);
- m_view->SetConstraints(layout);
-
- wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
- wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
- hscroll->SetEventHandler(this);
- vscroll->SetEventHandler(this);
-
- Connect(GetId(), wxEVT_SIZE, (wxObjectEventFunction)
- (wxEventFunction)
- (wxSizeEventFunction)&SwitchView::OnSize);
- Connect(m_choice->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, (wxObjectEventFunction)
- (wxEventFunction)
- (wxCommandEventFunction)&SwitchView::OnChoice);
- Connect(m_view->GetId(), wxEVT_PAINT, (wxObjectEventFunction)
- (wxEventFunction)
- (wxPaintEventFunction)&SwitchView::OnPaint);
-
- Connect(wxID_ANY, wxEVT_SET_FOCUS, (wxObjectEventFunction)
- (wxEventFunction)
- (wxFocusEventFunction)&SwitchView::OnFocus);
- Connect(wxID_ANY, wxEVT_SCROLL_TOP, (wxObjectEventFunction)
- (wxEventFunction)
- (wxScrollEventFunction)&SwitchView::OnScroll);
- Connect(wxID_ANY, wxEVT_SCROLL_BOTTOM, (wxObjectEventFunction)
- (wxEventFunction)
- (wxScrollEventFunction)&SwitchView::OnScroll);
- Connect(wxID_ANY, wxEVT_SCROLL_LINEUP, (wxObjectEventFunction)
- (wxEventFunction)
- (wxScrollEventFunction)&SwitchView::OnScroll);
- Connect(wxID_ANY, wxEVT_SCROLL_LINEDOWN, (wxObjectEventFunction)
- (wxEventFunction)
- (wxScrollEventFunction)&SwitchView::OnScroll);
- Connect(wxID_ANY, wxEVT_SCROLL_PAGEUP, (wxObjectEventFunction)
- (wxEventFunction)
- (wxScrollEventFunction)&SwitchView::OnScroll);
- Connect(wxID_ANY, wxEVT_SCROLL_PAGEDOWN, (wxObjectEventFunction)
- (wxEventFunction)
- (wxScrollEventFunction)&SwitchView::OnScroll);
- Connect(wxID_ANY, wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)
- (wxEventFunction)
- (wxScrollEventFunction)&SwitchView::OnScroll);
- Connect(wxID_ANY, wxEVT_SCROLL_THUMBRELEASE, (wxObjectEventFunction)
- (wxEventFunction)
- (wxScrollEventFunction)&SwitchView::OnScroll);
- Connect(wxID_ANY, wxEVT_ERASE_BACKGROUND, (wxObjectEventFunction)
- (wxEventFunction)
- (wxEraseEventFunction)&SwitchView::OnErase);
-
- Connect(wxID_ANY, wxEVT_DYNAMIC_SASH_SPLIT, (wxObjectEventFunction)
- (wxEventFunction)
- (wxDynamicSashSplitEventFunction)&SwitchView::OnSplit);
- Connect(wxID_ANY, wxEVT_DYNAMIC_SASH_UNIFY, (wxObjectEventFunction)
- (wxEventFunction)
- (wxDynamicSashUnifyEventFunction)&SwitchView::OnUnify);
-}
-
-wxSize SwitchView::DoGetBestSize() const {
- return wxSize(64, 64);
-}
-
-void SwitchView::OnSize(wxSizeEvent& WXUNUSED(event)) {
- Layout();
-
- wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
- wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
- if (hscroll && vscroll) {
- int hpos = hscroll->GetThumbPosition();
- int vpos = vscroll->GetThumbPosition();
-
- wxSize size = m_view->GetSize();
- if (hpos + size.GetWidth() > 300)
- hpos = 300 - size.GetWidth();
- if (vpos + size.GetHeight() > 300)
- vpos = 300 - size.GetHeight();
-
- hscroll->SetScrollbar(hpos, size.GetWidth(), 300, size.GetWidth());
- vscroll->SetScrollbar(vpos, size.GetHeight(), 300, size.GetHeight());
- }
-}
-
-void SwitchView::OnPaint(wxPaintEvent& WXUNUSED(event)) {
- wxPaintDC dc(m_view);
-
- wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
- wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
- dc.Clear();
- dc.SetDeviceOrigin(-hscroll->GetThumbPosition(), -vscroll->GetThumbPosition());
-
- if (m_choice->GetSelection()) {
- dc.DrawLine(20, 20, 280, 20);
- dc.DrawLine(280, 20, 280, 280);
- dc.DrawLine(280, 280, 20, 280);
- dc.DrawLine(20, 280, 20, 20);
- } else {
- dc.DrawLine(150, 20, 280, 280);
- dc.DrawLine(280, 280, 20, 280);
- dc.DrawLine(20, 280, 150, 20);
- }
-}
-
-void SwitchView::OnErase(wxEraseEvent& WXUNUSED(event)) {
- // Do nothing
-}
-
-void SwitchView::OnSplit(wxDynamicSashSplitEvent& WXUNUSED(event)) {
- SwitchView *view = new SwitchView(m_dyn_sash);
- view->m_choice->SetSelection(m_choice->GetSelection());
-
- wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
- wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
- hscroll->SetEventHandler(this);
- vscroll->SetEventHandler(this);
-}
-
-void SwitchView::OnUnify(wxDynamicSashUnifyEvent& WXUNUSED(event)) {
- wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
- wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
- hscroll->SetEventHandler(this);
- vscroll->SetEventHandler(this);
-}
-
-void SwitchView::OnChoice(wxCommandEvent& WXUNUSED(event)) {
- m_view->Refresh();
-}
-
-void SwitchView::OnScroll(wxScrollEvent& WXUNUSED(event)) {
- m_view->Refresh();
-}
-
-void SwitchView::OnFocus(wxFocusEvent& event) {
- wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
- wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
- if (event.GetEventObject() == hscroll || event.GetEventObject() == vscroll) {
- m_view->SetFocus();
- } else {
- event.Skip();
- }
-}
-
-
-
-bool SwitchDemo::OnInit() {
- wxFrame *frame;
- wxDynamicSashWindow *dyn;
-
- frame = new wxFrame(NULL, wxID_ANY, wxT("Dynamic Sash Window Switch Demo"));
- dyn = new wxDynamicSashWindow(frame, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN);
- new SwitchView(dyn);
-
- frame->SetSize(480, 480);
- frame->Show();
-
- return true;
-}
diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
deleted file mode 100644
index b5a8b0eb23..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dynsash_switch" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=dynsash_switch - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "dynsash_switch.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "dynsash_switch.mak" CFG="dynsash_switch - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "dynsash_switch - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "dynsash_switch - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\dynsash_switch.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "dynsash_switch - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash_switch.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "dynsash_switch - Win32 DLL Universal Unicode Release"
-# Name "dynsash_switch - Win32 DLL Universal Unicode Debug"
-# Name "dynsash_switch - Win32 DLL Universal Release"
-# Name "dynsash_switch - Win32 DLL Universal Debug"
-# Name "dynsash_switch - Win32 DLL Unicode Release"
-# Name "dynsash_switch - Win32 DLL Unicode Debug"
-# Name "dynsash_switch - Win32 DLL Release"
-# Name "dynsash_switch - Win32 DLL Debug"
-# Name "dynsash_switch - Win32 Universal Unicode Release"
-# Name "dynsash_switch - Win32 Universal Unicode Debug"
-# Name "dynsash_switch - Win32 Universal Release"
-# Name "dynsash_switch - Win32 Universal Debug"
-# Name "dynsash_switch - Win32 Unicode Release"
-# Name "dynsash_switch - Win32 Unicode Debug"
-# Name "dynsash_switch - Win32 Release"
-# Name "dynsash_switch - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\dynsash_switch.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.bcc b/contrib/samples/gizmos/dynsash_switch/makefile.bcc
deleted file mode 100644
index a0a7a036ca..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/makefile.bcc
+++ /dev/null
@@ -1,235 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_SWITCH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include \
- $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ \
- $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
- $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
- $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) \
- -I.\..\..\..\..\include -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH \
- -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS)
-DYNSASH_SWITCH_OBJECTS = \
- $(OBJS)\dynsash_switch_dynsash_switch.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\dynsash_switch.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\dynsash_switch.exe del $(OBJS)\dynsash_switch.exe
- -if exist $(OBJS)\dynsash_switch.tds del $(OBJS)\dynsash_switch.tds
- -if exist $(OBJS)\dynsash_switch.ilc del $(OBJS)\dynsash_switch.ilc
- -if exist $(OBJS)\dynsash_switch.ild del $(OBJS)\dynsash_switch.ild
- -if exist $(OBJS)\dynsash_switch.ilf del $(OBJS)\dynsash_switch.ilf
- -if exist $(OBJS)\dynsash_switch.ils del $(OBJS)\dynsash_switch.ils
-
-$(OBJS)\dynsash_switch.exe: $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(DYNSASH_SWITCH_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dynsash_switch_sample.res
-|
-
-$(OBJS)\dynsash_switch_sample.res: .\..\..\..\..\samples\sample.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples $**
-
-$(OBJS)\dynsash_switch_dynsash_switch.obj: .\dynsash_switch.cpp
- $(CXX) -q -c -P -o$@ $(DYNSASH_SWITCH_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.gcc b/contrib/samples/gizmos/dynsash_switch/makefile.gcc
deleted file mode 100644
index caab328485..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/makefile.gcc
+++ /dev/null
@@ -1,233 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_SWITCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-DYNSASH_SWITCH_OBJECTS = \
- $(OBJS)\dynsash_switch_sample_rc.o \
- $(OBJS)\dynsash_switch_dynsash_switch.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\dynsash_switch.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\dynsash_switch.exe del $(OBJS)\dynsash_switch.exe
-
-$(OBJS)\dynsash_switch.exe: $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_sample_rc.o
- $(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\dynsash_switch_sample_rc.o: ./../../../../samples/sample.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples
-
-$(OBJS)\dynsash_switch_dynsash_switch.o: ./dynsash_switch.cpp
- $(CXX) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.vc b/contrib/samples/gizmos/dynsash_switch/makefile.vc
deleted file mode 100644
index b90988dd2d..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/makefile.vc
+++ /dev/null
@@ -1,310 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_SWITCH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\dynsash_switch.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /DNOPCH \
- /I.\..\..\..\include $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
- $(CXXFLAGS)
-DYNSASH_SWITCH_OBJECTS = \
- $(OBJS)\dynsash_switch_sample.res \
- $(OBJS)\dynsash_switch_dynsash_switch.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\dynsash_switch.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\dynsash_switch.exe del $(OBJS)\dynsash_switch.exe
- -if exist $(OBJS)\dynsash_switch.ilk del $(OBJS)\dynsash_switch.ilk
- -if exist $(OBJS)\dynsash_switch.pdb del $(OBJS)\dynsash_switch.pdb
-
-$(OBJS)\dynsash_switch.exe: $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(DYNSASH_SWITCH_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\dynsash_switch_sample.res: .\..\..\..\..\samples\sample.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples $**
-
-$(OBJS)\dynsash_switch_dynsash_switch.obj: .\dynsash_switch.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(DYNSASH_SWITCH_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.wat b/contrib/samples/gizmos/dynsash_switch/makefile.wat
deleted file mode 100644
index c0f715b7d6..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/makefile.wat
+++ /dev/null
@@ -1,263 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_SWITCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) &
- $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) &
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
- -i=$(SETUPHDIR) -i=.\..\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 &
- -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH &
- -i=.\..\..\..\include $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
- $(CXXFLAGS)
-DYNSASH_SWITCH_OBJECTS = &
- $(OBJS)\dynsash_switch_dynsash_switch.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\dynsash_switch.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\dynsash_switch.exe del $(OBJS)\dynsash_switch.exe
-
-$(OBJS)\dynsash_switch.exe : $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_sample.res
- @%create $(OBJS)\dynsash_switch.lbc
- @%append $(OBJS)\dynsash_switch.lbc option quiet
- @%append $(OBJS)\dynsash_switch.lbc name $^@
- @%append $(OBJS)\dynsash_switch.lbc option caseexact
- @%append $(OBJS)\dynsash_switch.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(DYNSASH_SWITCH_OBJECTS)) do @%append $(OBJS)\dynsash_switch.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\dynsash_switch.lbc library %i
- @%append $(OBJS)\dynsash_switch.lbc option resource=$(OBJS)\dynsash_switch_sample.res
- @for %i in () do @%append $(OBJS)\dynsash_switch.lbc option stack=%i
- wlink @$(OBJS)\dynsash_switch.lbc
-
-$(OBJS)\dynsash_switch_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples $<
-
-$(OBJS)\dynsash_switch_dynsash_switch.obj : .AUTODEPEND .\dynsash_switch.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(DYNSASH_SWITCH_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in
deleted file mode 100644
index 7a85fea7da..0000000000
--- a/contrib/samples/gizmos/editlbox/Makefile.in
+++ /dev/null
@@ -1,192 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
- -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-TEST_OBJECTS = \
- $(__test___win32rc) \
- $(__test_os2_lib_res) \
- test_test.o
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C test$(EXEEXT)
-@COND_PLATFORM_MAC_1@__test___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \
- pmwin.763 ; then emxbind -ep test$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__test___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___test___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__test___win32rc = test_sample_rc.o
-@COND_PLATFORM_OS2_1@__test_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle
-@COND_TOOLKIT_COCOA@____test_BUNDLE_TGT_REF_DEP = test.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____test_BUNDLE_TGT_REF_DEP = test.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../../include -o test$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: test$(EXEEXT) $(__test_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f test$(EXEEXT)
- rm -rf test.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
- $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__test___mac_rezcmd)
- $(__test___mac_setfilecmd)
- $(__test___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p test.app/Contents
- mkdir -p test.app/Contents/MacOS
- mkdir -p test.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/test/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >test.app/Contents/Info.plist
-
-
- echo -n "APPL????" >test.app/Contents/PkgInfo
-
-
- ln -f test$(EXEEXT) test.app/Contents/MacOS/test
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP)
-
-test_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
-test_test.o: $(srcdir)/test.cpp
- $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean test_bundle
diff --git a/contrib/samples/gizmos/editlbox/editlbox.bkl b/contrib/samples/gizmos/editlbox/editlbox.bkl
deleted file mode 100644
index 0df2855ab2..0000000000
--- a/contrib/samples/gizmos/editlbox/editlbox.bkl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- $(SRCDIR)/../../../include
-
-
- test.cpp
-
- gizmos
- core
- base
-
-
-
diff --git a/contrib/samples/gizmos/editlbox/editlbox.dsp b/contrib/samples/gizmos/editlbox/editlbox.dsp
deleted file mode 100644
index 8972db87fe..0000000000
--- a/contrib/samples/gizmos/editlbox/editlbox.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="editlbox" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "editlbox.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "editlbox.mak" CFG="test - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\test.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\test.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "test - Win32 DLL Universal Unicode Release"
-# Name "test - Win32 DLL Universal Unicode Debug"
-# Name "test - Win32 DLL Universal Release"
-# Name "test - Win32 DLL Universal Debug"
-# Name "test - Win32 DLL Unicode Release"
-# Name "test - Win32 DLL Unicode Debug"
-# Name "test - Win32 DLL Release"
-# Name "test - Win32 DLL Debug"
-# Name "test - Win32 Universal Unicode Release"
-# Name "test - Win32 Universal Unicode Debug"
-# Name "test - Win32 Universal Release"
-# Name "test - Win32 Universal Debug"
-# Name "test - Win32 Unicode Release"
-# Name "test - Win32 Unicode Debug"
-# Name "test - Win32 Release"
-# Name "test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\test.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/editlbox/makefile.bcc b/contrib/samples/gizmos/editlbox/makefile.bcc
deleted file mode 100644
index 593177b41c..0000000000
--- a/contrib/samples/gizmos/editlbox/makefile.bcc
+++ /dev/null
@@ -1,235 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(CPPFLAGS) $(CXXFLAGS)
-TEST_OBJECTS = \
- $(OBJS)\test_test.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\test.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
- -if exist $(OBJS)\test.tds del $(OBJS)\test.tds
- -if exist $(OBJS)\test.ilc del $(OBJS)\test.ilc
- -if exist $(OBJS)\test.ild del $(OBJS)\test.ild
- -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf
- -if exist $(OBJS)\test.ils del $(OBJS)\test.ils
-
-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(TEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\test_sample.res
-|
-
-$(OBJS)\test_sample.res: .\..\..\..\..\samples\sample.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples $**
-
-$(OBJS)\test_test.obj: .\test.cpp
- $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/editlbox/makefile.gcc b/contrib/samples/gizmos/editlbox/makefile.gcc
deleted file mode 100644
index a1365246a1..0000000000
--- a/contrib/samples/gizmos/editlbox/makefile.gcc
+++ /dev/null
@@ -1,232 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
- -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \
- -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include $(__RTTIFLAG_5) \
- $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-TEST_OBJECTS = \
- $(OBJS)\test_sample_rc.o \
- $(OBJS)\test_test.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\test.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-
-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample_rc.o
- $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\test_sample_rc.o: ./../../../../samples/sample.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples
-
-$(OBJS)\test_test.o: ./test.cpp
- $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/editlbox/makefile.vc b/contrib/samples/gizmos/editlbox/makefile.vc
deleted file mode 100644
index 29327ea5d8..0000000000
--- a/contrib/samples/gizmos/editlbox/makefile.vc
+++ /dev/null
@@ -1,310 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /DNOPCH \
- /I.\..\..\..\include $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
- $(CXXFLAGS)
-TEST_OBJECTS = \
- $(OBJS)\test_sample.res \
- $(OBJS)\test_test.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\test.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
- -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk
- -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb
-
-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(TEST_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\test_sample.res: .\..\..\..\..\samples\sample.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples $**
-
-$(OBJS)\test_test.obj: .\test.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/editlbox/makefile.wat b/contrib/samples/gizmos/editlbox/makefile.wat
deleted file mode 100644
index 86d9878c1f..0000000000
--- a/contrib/samples/gizmos/editlbox/makefile.wat
+++ /dev/null
@@ -1,262 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-TEST_OBJECTS = &
- $(OBJS)\test_test.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\test.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-
-$(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_sample.res
- @%create $(OBJS)\test.lbc
- @%append $(OBJS)\test.lbc option quiet
- @%append $(OBJS)\test.lbc name $^@
- @%append $(OBJS)\test.lbc option caseexact
- @%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\test.lbc library %i
- @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_sample.res
- @for %i in () do @%append $(OBJS)\test.lbc option stack=%i
- wlink @$(OBJS)\test.lbc
-
-$(OBJS)\test_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples $<
-
-$(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/editlbox/test.cpp b/contrib/samples/gizmos/editlbox/test.cpp
deleted file mode 100644
index 3620a451de..0000000000
--- a/contrib/samples/gizmos/editlbox/test.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers)
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/gizmos/editlbox.h"
-#include "wx/sizer.h"
-
-class MyApp : public wxApp
-{
-public:
- virtual bool OnInit();
-};
-
-IMPLEMENT_APP(MyApp)
-
-
-bool MyApp::OnInit()
-{
- wxDialog dlg(NULL, wxID_ANY, _("Test dialog"), wxDefaultPosition, wxDefaultSize,
- wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
-
- wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
- sizer->Add(new wxEditableListBox(&dlg, wxID_ANY, _("Match these wildcards:"),
- wxDefaultPosition,wxSize(300,200)),
- 1, wxEXPAND|wxALL, 10);
-
- sizer->Add(5,5);
-
- wxEditableListBox *lb = new wxEditableListBox(&dlg, wxID_ANY, _("Except:"),
- wxDefaultPosition,wxSize(300,200));
- wxArrayString ar;
- ar.Add(_T("*.cpp"));
- ar.Add(_T("*.h"));
- ar.Add(_T("*.c"));
- lb->SetStrings(ar);
-
- sizer->Add(lb, 1, wxEXPAND|wxALL, 10);
-
- sizer->Add(5,5);
-
- sizer->Add(new wxButton(&dlg, wxID_OK, _("OK")), 0, wxALIGN_RIGHT | wxALL, 10);
- dlg.SetSizer(sizer);
- sizer->Fit(&dlg);
- dlg.Centre();
-
- dlg.ShowModal();
-
- wxString res = _("'Except' contains these strings:\n\n");
- lb->GetStrings(ar);
- for (size_t i = 0; i < ar.GetCount(); i++)
- res << ar[i] << _T("\n");
- wxMessageBox(res);
-
- return false;
-}
diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in
deleted file mode 100644
index 75e9855cca..0000000000
--- a/contrib/samples/gizmos/led/Makefile.in
+++ /dev/null
@@ -1,191 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-LED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
- -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-LED_OBJECTS = \
- $(__led___win32rc) \
- $(__led_os2_lib_res) \
- led_led.o
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__led___mac_setfilecmd = $(SETFILE) -a C led$(EXEEXT)
-@COND_PLATFORM_MAC_1@__led___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___led___os2_emxbindcmd = $(NM) led$(EXEEXT) | if grep -q \
- pmwin.763 ; then emxbind -ep led$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__led___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___led___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__led___win32rc = led_sample_rc.o
-@COND_PLATFORM_OS2_1@__led_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__led_bundle___depname = led_bundle
-@COND_TOOLKIT_COCOA@____led_BUNDLE_TGT_REF_DEP = led.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____led_BUNDLE_TGT_REF_DEP = led.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../../include -o led$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: led$(EXEEXT) $(__led_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f led$(EXEEXT)
- rm -rf led.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-led$(EXEEXT): $(LED_OBJECTS) $(__led___win32rc)
- $(CXX) -o $@ $(LED_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__led___mac_rezcmd)
- $(__led___mac_setfilecmd)
- $(__led___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-led.app/Contents/PkgInfo: led$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p led.app/Contents
- mkdir -p led.app/Contents/MacOS
- mkdir -p led.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/led/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >led.app/Contents/Info.plist
-
-
- echo -n "APPL????" >led.app/Contents/PkgInfo
-
-
- ln -f led$(EXEEXT) led.app/Contents/MacOS/led
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns led.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@led_bundle: $(____led_BUNDLE_TGT_REF_DEP)
-
-led_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
-led_led.o: $(srcdir)/led.cpp
- $(CXXC) -c -o $@ $(LED_CXXFLAGS) $(srcdir)/led.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean led_bundle
diff --git a/contrib/samples/gizmos/led/led.bkl b/contrib/samples/gizmos/led/led.bkl
deleted file mode 100644
index 8a41662be1..0000000000
--- a/contrib/samples/gizmos/led/led.bkl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- $(SRCDIR)/../../../include
-
-
- led.cpp
-
- gizmos
- core
- base
-
-
-
diff --git a/contrib/samples/gizmos/led/led.cpp b/contrib/samples/gizmos/led/led.cpp
deleted file mode 100644
index 5de6f0f513..0000000000
--- a/contrib/samples/gizmos/led/led.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: led.cpp
-// Purpose: LED sample
-// Author: Julian Smart
-// Modified by:
-// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers)
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/gizmos/ledctrl.h"
-#include "wx/sizer.h"
-#include "wx/panel.h"
-#include "wx/numdlg.h"
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class MyPanel : public wxPanel
-{
-public:
- MyPanel(wxFrame *frame);
-
- void OnIncrement();
- void OnDecrement();
- void OnSmallIncrement();
- void OnSmallDecrement();
- void OnSetValue();
- void OnAlignLeft();
- void OnAlignCenter();
- void OnAlignRight();
- void OnDrawFaded();
-
-private:
- wxLEDNumberCtrl *m_led;
- wxBoxSizer *m_sizer;
-};
-
-// Define a new application type, each program should derive a class from wxApp
-class MyApp : public wxApp
-{
-public:
- // override base class virtuals
- // ----------------------------
-
- // this one is called on application startup and is a good place for the app
- // initialization (doing it here and not in the ctor allows to have an error
- // return: if OnInit() returns false, the application terminates)
- virtual bool OnInit();
-};
-
-// Define a new frame type: this is going to be our main frame
-class MyFrame : public wxFrame
-{
-public:
- // ctor(s)
- MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
- long style = wxDEFAULT_FRAME_STYLE);
-
- // event handlers (these functions should _not_ be virtual)
- void OnQuit(wxCommandEvent& event);
- void OnIncrement(wxCommandEvent& event);
- void OnDecrement(wxCommandEvent& event);
- void OnSmallIncrement(wxCommandEvent& event);
- void OnSmallDecrement(wxCommandEvent& event);
- void OnSetValue(wxCommandEvent& event);
- void OnAlignLeft(wxCommandEvent& event);
- void OnAlignCenter(wxCommandEvent& event);
- void OnAlignRight(wxCommandEvent& event);
- void OnDrawFaded(wxCommandEvent& event);
- void OnAbout(wxCommandEvent& event);
-
-private:
- MyPanel *m_panel;
-
- // any class wishing to process wxWidgets events must use this macro
- DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// IDs for the controls and the menu commands
-enum
-{
- // menu items
- LED_Quit = wxID_EXIT,
-
- LED_Edit_Increment = wxID_HIGHEST + 1,
- LED_Edit_Decrement,
- LED_Edit_Small_Increment,
- LED_Edit_Small_Decrement,
- LED_Edit_SetValue,
- LED_Edit_AlignLeft,
- LED_Edit_AlignCenter,
- LED_Edit_AlignRight,
- LED_Edit_DrawFaded,
-
- // it is important for the id corresponding to the "About" command to have
- // this standard value as otherwise it won't be handled properly under Mac
- // (where it is special and put into the "Apple" menu)
- LED_About = wxID_ABOUT
-};
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWidgets
-// ----------------------------------------------------------------------------
-
-// the event tables connect the wxWidgets events with the functions (event
-// handlers) which process them. It can be also done at run-time, but for the
-// simple menu events like this the static method is much simpler.
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
- EVT_MENU(LED_Quit, MyFrame::OnQuit)
- EVT_MENU(LED_Edit_Increment, MyFrame::OnIncrement)
- EVT_MENU(LED_Edit_Decrement, MyFrame::OnDecrement)
- EVT_MENU(LED_Edit_Small_Increment, MyFrame::OnSmallIncrement)
- EVT_MENU(LED_Edit_Small_Decrement, MyFrame::OnSmallDecrement)
- EVT_MENU(LED_Edit_SetValue, MyFrame::OnSetValue)
- EVT_MENU(LED_Edit_AlignLeft, MyFrame::OnAlignLeft)
- EVT_MENU(LED_Edit_AlignCenter, MyFrame::OnAlignCenter)
- EVT_MENU(LED_Edit_AlignRight, MyFrame::OnAlignRight)
- EVT_MENU(LED_Edit_DrawFaded, MyFrame::OnDrawFaded)
- EVT_MENU(LED_About, MyFrame::OnAbout)
-END_EVENT_TABLE()
-
-// Create a new application object: this macro will allow wxWidgets to create
-// the application object during program execution (it's better than using a
-// static object for many reasons) and also declares the accessor function
-// wxGetApp() which will return the reference of the right type (i.e. MyApp and
-// not wxApp)
-IMPLEMENT_APP(MyApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// the application class
-// ----------------------------------------------------------------------------
-
-// 'Main program' equivalent: the program execution "starts" here
-bool MyApp::OnInit()
-{
- // create the main application window
- MyFrame *frame = new MyFrame(_T("LED App"),
- wxDefaultPosition, wxSize(450, 120));
-
- // and show it (the frames, unlike simple controls, are not shown when
- // created initially)
- frame->Show(true);
-
- // success: wxApp::OnRun() will be called which will enter the main message
- // loop and the application will run. If we returned false here, the
- // application would exit immediately.
- return true;
-}
-
-// ----------------------------------------------------------------------------
-// main frame
-// ----------------------------------------------------------------------------
-
-// frame constructor
-MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
- : wxFrame(NULL, wxID_ANY, title, pos, size, style)
-{
-#if wxUSE_MENUS
- // create a menu bar
- wxMenu *menuFile = new wxMenu;
-
- // the "About" item should be in the help menu
- wxMenu *helpMenu = new wxMenu;
- helpMenu->Append(LED_About, _T("&About...\tF1"), _T("Show about dialog"));
-
- menuFile->Append(LED_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
-
- wxMenu *editMenu = new wxMenu;
- editMenu->Append(LED_Edit_Increment, _T("&Increment LED (1)\tCtrl-I"));
- editMenu->Append(LED_Edit_Small_Increment, _T("&Increment LED (0.01)\tAlt-I"));
- editMenu->Append(LED_Edit_Decrement, _T("&Decrement LED (1)\tCtrl-D"));
- editMenu->Append(LED_Edit_Small_Decrement, _T("&Decrement LED (0.01)\tAlt-D"));
- editMenu->Append(LED_Edit_SetValue, _T("&Set LED Value...\tCtrl-S"));
- editMenu->AppendSeparator();
- editMenu->AppendRadioItem(LED_Edit_AlignLeft, _T("Align &Left"));
- editMenu->AppendRadioItem(LED_Edit_AlignCenter, _T("Align &Center"));
- editMenu->AppendRadioItem(LED_Edit_AlignRight, _T("Align &Right"));
- editMenu->AppendSeparator();
- editMenu->AppendCheckItem(LED_Edit_DrawFaded, _T("Draw &Faded\tCtrl-F"));
-
- editMenu->Check(LED_Edit_DrawFaded, true);
-
- // now append the freshly created menu to the menu bar...
- wxMenuBar *menuBar = new wxMenuBar();
- menuBar->Append(menuFile, _T("&File"));
- menuBar->Append(editMenu, _T("&Edit"));
- menuBar->Append(helpMenu, _T("&Help"));
-
- // ... and attach this menu bar to the frame
- SetMenuBar(menuBar);
-#endif // wxUSE_MENUS
-
- m_panel = new MyPanel(this);
-}
-
-
-// event handlers
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
- // true is to force the frame to close
- Close(true);
-}
-
-void MyFrame::OnIncrement(wxCommandEvent& WXUNUSED(event))
-{
- m_panel->OnIncrement();
-}
-
-void MyFrame::OnDecrement(wxCommandEvent& WXUNUSED(event))
-{
- m_panel->OnDecrement();
-}
-
-void MyFrame::OnSmallIncrement(wxCommandEvent& WXUNUSED(event))
-{
- m_panel->OnSmallIncrement();
-}
-
-void MyFrame::OnSmallDecrement(wxCommandEvent& WXUNUSED(event))
-{
- m_panel->OnSmallDecrement();
-}
-
-void MyFrame::OnSetValue(wxCommandEvent& WXUNUSED(event))
-{
- m_panel->OnSetValue();
-}
-
-void MyFrame::OnAlignLeft(wxCommandEvent& WXUNUSED(event))
-{
- m_panel->OnAlignLeft();
-}
-
-void MyFrame::OnAlignCenter(wxCommandEvent& WXUNUSED(event))
-{
- m_panel->OnAlignCenter();
-}
-
-void MyFrame::OnAlignRight(wxCommandEvent& WXUNUSED(event))
-{
- m_panel->OnAlignRight();
-}
-
-void MyFrame::OnDrawFaded(wxCommandEvent& WXUNUSED(event))
-{
- m_panel->OnDrawFaded();
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
- wxString msg;
- msg.Printf( _T("This is the About dialog of the LED sample.\n")
- _T("Welcome to %s"), wxVERSION_STRING);
-
- wxMessageBox(msg, _T("About LED"), wxOK | wxICON_INFORMATION, this);
-}
-
-// --------------------------------------------------------------------------
-// MyPanel
-// --------------------------------------------------------------------------
-
-MyPanel::MyPanel(wxFrame *frame)
- : wxPanel(frame, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN)
-{
- m_led = new wxLEDNumberCtrl(this, wxID_ANY,
- wxDefaultPosition, wxDefaultSize,
- wxLED_ALIGN_LEFT|wxLED_DRAW_FADED|wxFULL_REPAINT_ON_RESIZE);
-
- m_led->SetValue(_T("01.23 7-8-9"));
-
- m_sizer = new wxBoxSizer(wxVERTICAL);
- m_sizer->Add(m_led, 1, wxEXPAND|wxALL, 10);
- m_sizer->Fit(this);
-
- SetSizer(m_sizer);
- SetAutoLayout(true);
-}
-
-void MyPanel::OnIncrement()
-{
- wxString strValue = m_led->GetValue();
-
- double dValue;
- strValue.ToDouble(&dValue);
- dValue += 1.0;
- m_led->SetValue(wxString::Format(_T("%.2f"), dValue));
-}
-
-void MyPanel::OnDecrement()
-{
- wxString strValue = m_led->GetValue();
-
- double dValue;
- strValue.ToDouble(&dValue);
- dValue -= 1.0;
- m_led->SetValue(wxString::Format(_T("%.2f"), dValue));
-}
-
-void MyPanel::OnSmallIncrement()
-{
- wxString strValue = m_led->GetValue();
-
- double dValue;
- strValue.ToDouble(&dValue);
- dValue += 0.01;
- m_led->SetValue(wxString::Format(_T("%.2f"), dValue));
-}
-
-void MyPanel::OnSmallDecrement()
-{
- wxString strValue = m_led->GetValue();
-
- double dValue;
- strValue.ToDouble(&dValue);
- dValue -= 0.01;
- m_led->SetValue(wxString::Format(_T("%.2f"), dValue));
-}
-
-void MyPanel::OnSetValue()
-{
- wxString strValue = m_led->GetValue();
-
- strValue = ::wxGetTextFromUser(_T("Please enter a number for LED display"), _T("Please enter a number"), strValue, this);
-
- if (strValue != _T(""))
- m_led->SetValue(strValue);
-}
-
-void MyPanel::OnAlignLeft()
-{
- m_led->SetAlignment(wxLED_ALIGN_LEFT);
-}
-
-void MyPanel::OnAlignCenter()
-{
- m_led->SetAlignment(wxLED_ALIGN_CENTER);
-}
-
-void MyPanel::OnAlignRight()
-{
- m_led->SetAlignment(wxLED_ALIGN_RIGHT);
-}
-
-void MyPanel::OnDrawFaded()
-{
- m_led->SetDrawFaded(!(m_led->GetDrawFaded()));
-}
diff --git a/contrib/samples/gizmos/led/led.dsp b/contrib/samples/gizmos/led/led.dsp
deleted file mode 100644
index 5a575e7c31..0000000000
--- a/contrib/samples/gizmos/led/led.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="led" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=led - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "led.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "led.mak" CFG="led - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "led - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "led - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\led.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "led - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\led.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "led - Win32 DLL Universal Unicode Release"
-# Name "led - Win32 DLL Universal Unicode Debug"
-# Name "led - Win32 DLL Universal Release"
-# Name "led - Win32 DLL Universal Debug"
-# Name "led - Win32 DLL Unicode Release"
-# Name "led - Win32 DLL Unicode Debug"
-# Name "led - Win32 DLL Release"
-# Name "led - Win32 DLL Debug"
-# Name "led - Win32 Universal Unicode Release"
-# Name "led - Win32 Universal Unicode Debug"
-# Name "led - Win32 Universal Release"
-# Name "led - Win32 Universal Debug"
-# Name "led - Win32 Unicode Release"
-# Name "led - Win32 Unicode Debug"
-# Name "led - Win32 Release"
-# Name "led - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\led.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/led/makefile.bcc b/contrib/samples/gizmos/led/makefile.bcc
deleted file mode 100644
index f1e00d6bd2..0000000000
--- a/contrib/samples/gizmos/led/makefile.bcc
+++ /dev/null
@@ -1,235 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-LED_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(CPPFLAGS) $(CXXFLAGS)
-LED_OBJECTS = \
- $(OBJS)\led_led.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\led.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\led.exe del $(OBJS)\led.exe
- -if exist $(OBJS)\led.tds del $(OBJS)\led.tds
- -if exist $(OBJS)\led.ilc del $(OBJS)\led.ilc
- -if exist $(OBJS)\led.ild del $(OBJS)\led.ild
- -if exist $(OBJS)\led.ilf del $(OBJS)\led.ilf
- -if exist $(OBJS)\led.ils del $(OBJS)\led.ils
-
-$(OBJS)\led.exe: $(LED_OBJECTS) $(OBJS)\led_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(LED_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\led_sample.res
-|
-
-$(OBJS)\led_sample.res: .\..\..\..\..\samples\sample.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples $**
-
-$(OBJS)\led_led.obj: .\led.cpp
- $(CXX) -q -c -P -o$@ $(LED_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/led/makefile.gcc b/contrib/samples/gizmos/led/makefile.gcc
deleted file mode 100644
index 5e7cade5ae..0000000000
--- a/contrib/samples/gizmos/led/makefile.gcc
+++ /dev/null
@@ -1,232 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-LED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
- -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \
- -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include $(__RTTIFLAG_5) \
- $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-LED_OBJECTS = \
- $(OBJS)\led_sample_rc.o \
- $(OBJS)\led_led.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\led.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\led.exe del $(OBJS)\led.exe
-
-$(OBJS)\led.exe: $(LED_OBJECTS) $(OBJS)\led_sample_rc.o
- $(CXX) -o $@ $(LED_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\led_sample_rc.o: ./../../../../samples/sample.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples
-
-$(OBJS)\led_led.o: ./led.cpp
- $(CXX) -c -o $@ $(LED_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/led/makefile.vc b/contrib/samples/gizmos/led/makefile.vc
deleted file mode 100644
index 68874befd7..0000000000
--- a/contrib/samples/gizmos/led/makefile.vc
+++ /dev/null
@@ -1,310 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-LED_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\led.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /DNOPCH \
- /I.\..\..\..\include $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
- $(CXXFLAGS)
-LED_OBJECTS = \
- $(OBJS)\led_sample.res \
- $(OBJS)\led_led.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\led.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\led.exe del $(OBJS)\led.exe
- -if exist $(OBJS)\led.ilk del $(OBJS)\led.ilk
- -if exist $(OBJS)\led.pdb del $(OBJS)\led.pdb
-
-$(OBJS)\led.exe: $(LED_OBJECTS) $(OBJS)\led_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(LED_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\led_sample.res: .\..\..\..\..\samples\sample.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples $**
-
-$(OBJS)\led_led.obj: .\led.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(LED_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/led/makefile.wat b/contrib/samples/gizmos/led/makefile.wat
deleted file mode 100644
index 88648d3bf7..0000000000
--- a/contrib/samples/gizmos/led/makefile.wat
+++ /dev/null
@@ -1,262 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-LED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-LED_OBJECTS = &
- $(OBJS)\led_led.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\led.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\led.exe del $(OBJS)\led.exe
-
-$(OBJS)\led.exe : $(LED_OBJECTS) $(OBJS)\led_sample.res
- @%create $(OBJS)\led.lbc
- @%append $(OBJS)\led.lbc option quiet
- @%append $(OBJS)\led.lbc name $^@
- @%append $(OBJS)\led.lbc option caseexact
- @%append $(OBJS)\led.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(LED_OBJECTS)) do @%append $(OBJS)\led.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\led.lbc library %i
- @%append $(OBJS)\led.lbc option resource=$(OBJS)\led_sample.res
- @for %i in () do @%append $(OBJS)\led.lbc option stack=%i
- wlink @$(OBJS)\led.lbc
-
-$(OBJS)\led_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples $<
-
-$(OBJS)\led_led.obj : .AUTODEPEND .\led.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(LED_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in
deleted file mode 100644
index 13b35e51c1..0000000000
--- a/contrib/samples/gizmos/multicell/Makefile.in
+++ /dev/null
@@ -1,193 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-MTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
- -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-MTEST_OBJECTS = \
- $(__mtest___win32rc) \
- $(__mtest_os2_lib_res) \
- mtest_mtest.o
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__mtest___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C mtest$(EXEEXT)
-@COND_PLATFORM_MAC_1@__mtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___mtest___os2_emxbindcmd = $(NM) mtest$(EXEEXT) | if grep -q \
- pmwin.763 ; then emxbind -ep mtest$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__mtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mtest___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__mtest___win32rc = mtest_sample_rc.o
-@COND_PLATFORM_OS2_1@__mtest_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__mtest_bundle___depname = mtest_bundle
-@COND_TOOLKIT_COCOA@____mtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@ mtest.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____mtest_BUNDLE_TGT_REF_DEP = mtest.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../../include -o mtest$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: mtest$(EXEEXT) $(__mtest_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f mtest$(EXEEXT)
- rm -rf mtest.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc)
- $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__mtest___mac_rezcmd)
- $(__mtest___mac_setfilecmd)
- $(__mtest___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p mtest.app/Contents
- mkdir -p mtest.app/Contents/MacOS
- mkdir -p mtest.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/mtest/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >mtest.app/Contents/Info.plist
-
-
- echo -n "APPL????" >mtest.app/Contents/PkgInfo
-
-
- ln -f mtest$(EXEEXT) mtest.app/Contents/MacOS/mtest
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mtest.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@mtest_bundle: $(____mtest_BUNDLE_TGT_REF_DEP)
-
-mtest_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
-mtest_mtest.o: $(srcdir)/mtest.cpp
- $(CXXC) -c -o $@ $(MTEST_CXXFLAGS) $(srcdir)/mtest.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean mtest_bundle
diff --git a/contrib/samples/gizmos/multicell/makefile.bcc b/contrib/samples/gizmos/multicell/makefile.bcc
deleted file mode 100644
index bf0dd1ddce..0000000000
--- a/contrib/samples/gizmos/multicell/makefile.bcc
+++ /dev/null
@@ -1,235 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(CPPFLAGS) $(CXXFLAGS)
-MTEST_OBJECTS = \
- $(OBJS)\mtest_mtest.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\mtest.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\mtest.exe del $(OBJS)\mtest.exe
- -if exist $(OBJS)\mtest.tds del $(OBJS)\mtest.tds
- -if exist $(OBJS)\mtest.ilc del $(OBJS)\mtest.ilc
- -if exist $(OBJS)\mtest.ild del $(OBJS)\mtest.ild
- -if exist $(OBJS)\mtest.ilf del $(OBJS)\mtest.ilf
- -if exist $(OBJS)\mtest.ils del $(OBJS)\mtest.ils
-
-$(OBJS)\mtest.exe: $(MTEST_OBJECTS) $(OBJS)\mtest_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(MTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mtest_sample.res
-|
-
-$(OBJS)\mtest_sample.res: .\..\..\..\..\samples\sample.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples $**
-
-$(OBJS)\mtest_mtest.obj: .\mtest.cpp
- $(CXX) -q -c -P -o$@ $(MTEST_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/multicell/makefile.gcc b/contrib/samples/gizmos/multicell/makefile.gcc
deleted file mode 100644
index 7e34182f12..0000000000
--- a/contrib/samples/gizmos/multicell/makefile.gcc
+++ /dev/null
@@ -1,233 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-MTEST_OBJECTS = \
- $(OBJS)\mtest_sample_rc.o \
- $(OBJS)\mtest_mtest.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\mtest.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\mtest.exe del $(OBJS)\mtest.exe
-
-$(OBJS)\mtest.exe: $(MTEST_OBJECTS) $(OBJS)\mtest_sample_rc.o
- $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\mtest_sample_rc.o: ./../../../../samples/sample.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples
-
-$(OBJS)\mtest_mtest.o: ./mtest.cpp
- $(CXX) -c -o $@ $(MTEST_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/multicell/makefile.sl b/contrib/samples/gizmos/multicell/makefile.sl
deleted file mode 100644
index 15fbe57196..0000000000
--- a/contrib/samples/gizmos/multicell/makefile.sl
+++ /dev/null
@@ -1,15 +0,0 @@
-# Purpose: makefile for multicell example (Salford C++)
-# Created 2000-07-28
-
-PROGRAM = mtest
-OBJECTS = $(PROGRAM).obj ..\src\multicell.obj
-EXTRAINC=-I..\include
-
-include ..\..\src\makeprog.sl
-
-all: wx $(TARGET)
-
-wx:
- cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all
- cd $(WXDIR)\samples\notebook
-
diff --git a/contrib/samples/gizmos/multicell/makefile.unx b/contrib/samples/gizmos/multicell/makefile.unx
deleted file mode 100644
index 27d3b2952c..0000000000
--- a/contrib/samples/gizmos/multicell/makefile.unx
+++ /dev/null
@@ -1,24 +0,0 @@
-# Purpose: makefile for multicell example (Unix)
-# Created 2000-07-28
-
-CXX = $(shell wx-config --cxx)
-
-PROGRAM = mtest
-
-OBJECTS = $(PROGRAM).o ../src/multicell.o
-EXTRAINC=-I../include
-
-# implementation
-
-.SUFFIXES: .o .cpp
-
-.cpp.o :
- $(CXX) -c `wx-config --cxxflags` -o $@ $<
-
-all: $(PROGRAM)
-
-$(PROGRAM): $(OBJECTS)
- $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
-
-clean:
- rm -f *.o $(PROGRAM)
diff --git a/contrib/samples/gizmos/multicell/makefile.vc b/contrib/samples/gizmos/multicell/makefile.vc
deleted file mode 100644
index 3fec2f7737..0000000000
--- a/contrib/samples/gizmos/multicell/makefile.vc
+++ /dev/null
@@ -1,310 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\mtest.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /DNOPCH \
- /I.\..\..\..\include $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
- $(CXXFLAGS)
-MTEST_OBJECTS = \
- $(OBJS)\mtest_sample.res \
- $(OBJS)\mtest_mtest.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\mtest.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\mtest.exe del $(OBJS)\mtest.exe
- -if exist $(OBJS)\mtest.ilk del $(OBJS)\mtest.ilk
- -if exist $(OBJS)\mtest.pdb del $(OBJS)\mtest.pdb
-
-$(OBJS)\mtest.exe: $(MTEST_OBJECTS) $(OBJS)\mtest_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(MTEST_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\mtest_sample.res: .\..\..\..\..\samples\sample.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples $**
-
-$(OBJS)\mtest_mtest.obj: .\mtest.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MTEST_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/multicell/makefile.wat b/contrib/samples/gizmos/multicell/makefile.wat
deleted file mode 100644
index f35791d3ce..0000000000
--- a/contrib/samples/gizmos/multicell/makefile.wat
+++ /dev/null
@@ -1,262 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-MTEST_OBJECTS = &
- $(OBJS)\mtest_mtest.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\mtest.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\mtest.exe del $(OBJS)\mtest.exe
-
-$(OBJS)\mtest.exe : $(MTEST_OBJECTS) $(OBJS)\mtest_sample.res
- @%create $(OBJS)\mtest.lbc
- @%append $(OBJS)\mtest.lbc option quiet
- @%append $(OBJS)\mtest.lbc name $^@
- @%append $(OBJS)\mtest.lbc option caseexact
- @%append $(OBJS)\mtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(MTEST_OBJECTS)) do @%append $(OBJS)\mtest.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\mtest.lbc library %i
- @%append $(OBJS)\mtest.lbc option resource=$(OBJS)\mtest_sample.res
- @for %i in () do @%append $(OBJS)\mtest.lbc option stack=%i
- wlink @$(OBJS)\mtest.lbc
-
-$(OBJS)\mtest_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples $<
-
-$(OBJS)\mtest_mtest.obj : .AUTODEPEND .\mtest.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MTEST_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/multicell/mtest.cpp b/contrib/samples/gizmos/multicell/mtest.cpp
deleted file mode 100644
index 4c57adec8d..0000000000
--- a/contrib/samples/gizmos/multicell/mtest.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * File: mtest.cpp
- * Purpose: wxMultiCellSizer and wxMultiCellCanvas test
- * Author: Alex Andruschak
- * Created: 2000
- * Updated:
- * Copyright:
- * License: wxWindows licence
- */
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/gizmos/multicell.h"
-
-class MyApp: public wxApp
-{public:
- bool OnInit(void);
-};
-
-class MyFrame: public wxFrame
-{
-
-public:
- MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
-
- void OnCloseWindow(wxCloseEvent& event);
- void OnPaint(wxPaintEvent& event);
- wxMultiCellSizer *sizer;
-
- DECLARE_EVENT_TABLE()
-};
-
-IMPLEMENT_APP(MyApp)
-
-bool MyApp::OnInit(void)
-{
- MyFrame *frame = new MyFrame(1, (wxFrame *) NULL, wxT("wxMultiCellSizer Sample"), wxPoint(50, 50), wxDefaultSize); //, wxSize(600, 500));
-
- frame->Show(true);
-
- SetTopWindow(frame);
- frame = new MyFrame(2, (wxFrame *) NULL, wxT("wxMultiCellCanvas Sample"), wxPoint(100, 100), wxSize(600, 500));
-
- frame->Show(true);
-
- SetTopWindow(frame);
- return true;
-}
-
-
-
-MyFrame::MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
-wxFrame(frame, wxID_ANY, title, pos, size, wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL)
-{
-#if wxUSE_STATUSBAR
- CreateStatusBar(1);
-#endif // wxUSE_STATUSBAR
- sizer = NULL;
- if (type == 1)
- {
- // create sizer 4 columns 5 rows
- wxSize aa(4,9);
- sizer = new wxMultiCellSizer(aa);
- sizer->SetDefaultCellSize(wxSize(15,15));
- sizer->SetRowHeight(7,5,true);
- sizer->SetRowHeight(8,5,false);
- // add first row
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT( "B1 - 0,0, horizontal resizable")),
- 0, 0, 0, new wxMultiCellItemHandle(0,0,1,1, wxDefaultSize, wxHORIZONTAL_RESIZABLE, wxSize(2,2)));
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B2 - 0,1, vertical resizable")),
- 0, 0, 0, new wxMultiCellItemHandle(0,1,1,1, wxDefaultSize, wxVERTICAL_RESIZABLE, wxSize(2, 2)));
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B3 - 0,2")),
- 0, 0, 0, new wxMultiCellItemHandle(0,2,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_CENTER_HORIZONTAL)); //, wxALIGN_CENTER));
- sizer->Add(
- new wxStaticText(this, wxID_ANY, wxT("jbb 0,3, lower-right")),
- 0, 0, 0, new wxMultiCellItemHandle(0,3,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_BOTTOM | wxALIGN_RIGHT));
-
- // add button for secord row
- sizer->Add(
- new wxTextCtrl(this, wxID_ANY, wxT("Text control - 1,0, 4 cols wide")),
- 0, 0, 0, new wxMultiCellItemHandle(1,0,1,4));
-
- // add buttons for next row
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B6 - 2,0, 2 cols wide")),
- 0, 0, 0, new wxMultiCellItemHandle(2,0,1,2));
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B7 - 2,3")),
- 0, 0, 0, new wxMultiCellItemHandle(2,3,1,1));
-
- // and last additions
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B8 - 3,0, 4 rows high, vert resizable")),
- 0, 0, 0, new wxMultiCellItemHandle(3,0,4,1,wxDefaultSize, wxVERTICAL_RESIZABLE));
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B9 - 3,2, 2 cols wide, vert resizable")),
- 0, 0, 0, new wxMultiCellItemHandle(3,2,1,2,wxDefaultSize, wxVERTICAL_RESIZABLE));
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B10 - 4,1, 3 cols wide, vert resizable")),
- 0, 0, 0, new wxMultiCellItemHandle(4,1,1,3,wxDefaultSize, wxVERTICAL_RESIZABLE));
-
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B11 - 5,1, 3 cols wide")),
- 0, 0, 0, new wxMultiCellItemHandle(5,1,1,3));
-
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B12 - 6,1, 3 cols wide")),
- 0, 0, 0, new wxMultiCellItemHandle(6,1,1,3));
-
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B13 - 7,1, 2 cols wide")),
- 0, 0, 0, new wxMultiCellItemHandle(7,1,1,2));
-
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("B14 - 8,1, 3 cols wide")),
- 0, 0, 0, new wxMultiCellItemHandle(8,1,1,3));
-
- SetAutoLayout( true );
-// sizer->SetMinSize(sizer->CalcMin());
- SetSizer( sizer );
- wxSize s = sizer->CalcMin();
- wxSize c = GetSize() - GetClientSize();
- SetSizeHints(s.GetWidth() + c.GetWidth() , s.GetHeight() + c.GetHeight());
- sizer->EnableGridLines(this);
- }
- else
- {
- // create sizer 4 columns 5 rows
- wxMultiCellCanvas *sizer = new wxMultiCellCanvas(this, 5,5);
-
- // add first row
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("Button 1")),
- 0, 0);
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("Button 2")),
- 0, 1);
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("Button 3")),
- 0, 2);
- sizer->Add(
- new wxStaticText(this, wxID_ANY, wxT("jbb test")),
- 0, 3);
-
- sizer->Add(
- new wxStaticText(this, wxID_ANY, wxT("jbb test 2")),
- 0, 4);
-
- // add button for secord row
- sizer->Add(
- new wxTextCtrl(this, wxID_ANY, wxT("Text control")),
- 1, 0);
-
- // add buttons for next row
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("Button 6")),
- 2, 0);
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("Button 7")),
- 2, 3);
-
- // and last additions
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("Button 8")),
- 3, 0);
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("Button 9")),
- 3, 1);
- sizer->Add(
- new wxButton( this, wxID_ANY, wxT("Button 10")),
- 4, 1);
-
- sizer->CalculateConstraints();
- SetSizer( sizer );
- SetAutoLayout( true );
- }
-}
-// Define the repainting behaviour
-
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
- EVT_PAINT(MyFrame::OnPaint)
- EVT_CLOSE(MyFrame::OnCloseWindow)
- END_EVENT_TABLE()
-
-void MyFrame::OnPaint(wxPaintEvent& WXUNUSED(event) )
-{
- wxPaintDC dc(this);
-
- if (sizer)
- {
- sizer->OnPaint(dc);
- }
-}
-
-void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
- Destroy();
-}
-
diff --git a/contrib/samples/gizmos/multicell/multicell.bkl b/contrib/samples/gizmos/multicell/multicell.bkl
deleted file mode 100644
index e59e4d9311..0000000000
--- a/contrib/samples/gizmos/multicell/multicell.bkl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- $(SRCDIR)/../../../include
-
-
- mtest.cpp
-
- gizmos
- core
- base
-
-
-
diff --git a/contrib/samples/gizmos/multicell/multicell.dsp b/contrib/samples/gizmos/multicell/multicell.dsp
deleted file mode 100644
index cdf4e252d9..0000000000
--- a/contrib/samples/gizmos/multicell/multicell.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="multicell" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=mtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "multicell.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "multicell.mak" CFG="mtest - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mtest - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mtest - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\mtest.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\mtest.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "mtest - Win32 DLL Universal Unicode Release"
-# Name "mtest - Win32 DLL Universal Unicode Debug"
-# Name "mtest - Win32 DLL Universal Release"
-# Name "mtest - Win32 DLL Universal Debug"
-# Name "mtest - Win32 DLL Unicode Release"
-# Name "mtest - Win32 DLL Unicode Debug"
-# Name "mtest - Win32 DLL Release"
-# Name "mtest - Win32 DLL Debug"
-# Name "mtest - Win32 Universal Unicode Release"
-# Name "mtest - Win32 Universal Unicode Debug"
-# Name "mtest - Win32 Universal Release"
-# Name "mtest - Win32 Universal Debug"
-# Name "mtest - Win32 Unicode Release"
-# Name "mtest - Win32 Unicode Debug"
-# Name "mtest - Win32 Release"
-# Name "mtest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\mtest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/multicell/multicell.vpj b/contrib/samples/gizmos/multicell/multicell.vpj
deleted file mode 100644
index 450b7bd12c..0000000000
--- a/contrib/samples/gizmos/multicell/multicell.vpj
+++ /dev/null
@@ -1,18 +0,0 @@
-[COMPILER]
-version=5.0b
-compile=concur|capture|:Compile:&Compile,gcc
-make=concur|capture|:Build:&Build,make
-rebuild=concur|capture|:Rebuild:&Rebuild,
-debug=:Debug:&Debug,gdb
-execute=:Execute:E&xecute,
-user1=hide|:User 1:User 1,
-user2=hide|:User 2:User 2,
-workingdir=.
-includedirs=
-reffile=
-MACRO=\n
-[FILES]
-mtest.cpp
-multicell.cpp
-multicell.h
-[ASSOCIATION]
diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in
deleted file mode 100644
index 6f1edf98d7..0000000000
--- a/contrib/samples/gizmos/splittree/Makefile.in
+++ /dev/null
@@ -1,194 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-SPLITTREE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
- -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-SPLITTREE_OBJECTS = \
- $(__splittree___win32rc) \
- $(__splittree_os2_lib_res) \
- splittree_tree.o
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__splittree___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C splittree$(EXEEXT)
-@COND_PLATFORM_MAC_1@__splittree___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___splittree___os2_emxbindcmd = $(NM) splittree$(EXEEXT) | \
- if grep -q pmwin.763 ; then emxbind -ep splittree$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__splittree___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___splittree___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__splittree___win32rc = splittree_sample_rc.o
-@COND_PLATFORM_OS2_1@__splittree_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__splittree_bundle___depname = splittree_bundle
-@COND_TOOLKIT_COCOA@____splittree_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@ splittree.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____splittree_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@ splittree.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../../include -o splittree$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: splittree$(EXEEXT) $(__splittree_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f splittree$(EXEEXT)
- rm -rf splittree.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc)
- $(CXX) -o $@ $(SPLITTREE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__splittree___mac_rezcmd)
- $(__splittree___mac_setfilecmd)
- $(__splittree___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p splittree.app/Contents
- mkdir -p splittree.app/Contents/MacOS
- mkdir -p splittree.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/splittree/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >splittree.app/Contents/Info.plist
-
-
- echo -n "APPL????" >splittree.app/Contents/PkgInfo
-
-
- ln -f splittree$(EXEEXT) splittree.app/Contents/MacOS/splittree
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splittree.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@splittree_bundle: $(____splittree_BUNDLE_TGT_REF_DEP)
-
-splittree_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
-splittree_tree.o: $(srcdir)/tree.cpp
- $(CXXC) -c -o $@ $(SPLITTREE_CXXFLAGS) $(srcdir)/tree.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean splittree_bundle
diff --git a/contrib/samples/gizmos/splittree/makefile.bcc b/contrib/samples/gizmos/splittree/makefile.bcc
deleted file mode 100644
index 180e20a9d1..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.bcc
+++ /dev/null
@@ -1,235 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SPLITTREE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(CPPFLAGS) $(CXXFLAGS)
-SPLITTREE_OBJECTS = \
- $(OBJS)\splittree_tree.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\splittree.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\splittree.exe del $(OBJS)\splittree.exe
- -if exist $(OBJS)\splittree.tds del $(OBJS)\splittree.tds
- -if exist $(OBJS)\splittree.ilc del $(OBJS)\splittree.ilc
- -if exist $(OBJS)\splittree.ild del $(OBJS)\splittree.ild
- -if exist $(OBJS)\splittree.ilf del $(OBJS)\splittree.ilf
- -if exist $(OBJS)\splittree.ils del $(OBJS)\splittree.ils
-
-$(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(SPLITTREE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splittree_sample.res
-|
-
-$(OBJS)\splittree_sample.res: .\..\..\..\..\samples\sample.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples $**
-
-$(OBJS)\splittree_tree.obj: .\tree.cpp
- $(CXX) -q -c -P -o$@ $(SPLITTREE_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/splittree/makefile.gcc b/contrib/samples/gizmos/splittree/makefile.gcc
deleted file mode 100644
index 3860d0040d..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.gcc
+++ /dev/null
@@ -1,233 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SPLITTREE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-SPLITTREE_OBJECTS = \
- $(OBJS)\splittree_sample_rc.o \
- $(OBJS)\splittree_tree.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\splittree.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\splittree.exe del $(OBJS)\splittree.exe
-
-$(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample_rc.o
- $(CXX) -o $@ $(SPLITTREE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\splittree_sample_rc.o: ./../../../../samples/sample.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples
-
-$(OBJS)\splittree_tree.o: ./tree.cpp
- $(CXX) -c -o $@ $(SPLITTREE_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/splittree/makefile.sl b/contrib/samples/gizmos/splittree/makefile.sl
deleted file mode 100644
index 7dd9a0b6a6..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.sl
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# File: makefile.sl
-# Author: Julian Smart
-# Created: 1998
-#
-# Makefile : Builds a wxWindows sample for Salford C++, WIN32
-
-PROGRAM = minimal
-OBJECTS = $(PROGRAM).obj
-
-include ..\..\src\makeprog.sl
-
-all: wx $(TARGET)
-
-wx:
- cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all
- cd $(WXDIR)\samples\minimal
-
diff --git a/contrib/samples/gizmos/splittree/makefile.unx b/contrib/samples/gizmos/splittree/makefile.unx
deleted file mode 100644
index ab2ced9e76..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.unx
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# File: Makefile for samples
-# Author: Robert Roebling
-# Created: 1999
-# Updated:
-# Copyright: (c) 1998 Robert Roebling
-#
-# This makefile requires a Unix version of wxWindows
-# to be installed on your system. This is most often
-# done typing "make install" when using the complete
-# sources of wxWindows or by installing the two
-# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
-# under Linux.
-#
-
-CXX = $(shell wx-config --cxx)
-
-PROGRAM = minimal
-
-OBJECTS = $(PROGRAM).o
-
-# implementation
-
-.SUFFIXES: .o .cpp
-
-.cpp.o :
- $(CXX) -c `wx-config --cxxflags` -o $@ $<
-
-all: $(PROGRAM)
-
-$(PROGRAM): $(OBJECTS)
- $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
-
-clean:
- rm -f *.o $(PROGRAM)
diff --git a/contrib/samples/gizmos/splittree/makefile.va b/contrib/samples/gizmos/splittree/makefile.va
deleted file mode 100644
index e30e89c264..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.va
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# File: makefile.va
-# Author: David Webster
-# Created: 1999
-# Updated:
-# Copyright: (c) David Webster
-# License: wxWindows licence
-#
-# Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
-
-# Set WXDIR for your system
-WXDIR = $(WXWIN)
-
-WXUSINGDLL=0
-
-!include $(WXDIR)\src\makeva.env
-
-PROGRAM=$D\minimal
-OBJECTS = $(PROGRAM).obj
-
-!if [md $D]
-!endif
-
-!include $(WXDIR)\src\makeprog.va
-
diff --git a/contrib/samples/gizmos/splittree/makefile.vc b/contrib/samples/gizmos/splittree/makefile.vc
deleted file mode 100644
index 94b5bafd0e..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.vc
+++ /dev/null
@@ -1,310 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SPLITTREE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\splittree.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /DNOPCH \
- /I.\..\..\..\include $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
- $(CXXFLAGS)
-SPLITTREE_OBJECTS = \
- $(OBJS)\splittree_sample.res \
- $(OBJS)\splittree_tree.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\splittree.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\splittree.exe del $(OBJS)\splittree.exe
- -if exist $(OBJS)\splittree.ilk del $(OBJS)\splittree.ilk
- -if exist $(OBJS)\splittree.pdb del $(OBJS)\splittree.pdb
-
-$(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(SPLITTREE_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\splittree_sample.res: .\..\..\..\..\samples\sample.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples $**
-
-$(OBJS)\splittree_tree.obj: .\tree.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(SPLITTREE_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/splittree/makefile.wat b/contrib/samples/gizmos/splittree/makefile.wat
deleted file mode 100644
index 935dcd3e1d..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.wat
+++ /dev/null
@@ -1,262 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SPLITTREE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-SPLITTREE_OBJECTS = &
- $(OBJS)\splittree_tree.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\splittree.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\splittree.exe del $(OBJS)\splittree.exe
-
-$(OBJS)\splittree.exe : $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample.res
- @%create $(OBJS)\splittree.lbc
- @%append $(OBJS)\splittree.lbc option quiet
- @%append $(OBJS)\splittree.lbc name $^@
- @%append $(OBJS)\splittree.lbc option caseexact
- @%append $(OBJS)\splittree.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(SPLITTREE_OBJECTS)) do @%append $(OBJS)\splittree.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\splittree.lbc library %i
- @%append $(OBJS)\splittree.lbc option resource=$(OBJS)\splittree_sample.res
- @for %i in () do @%append $(OBJS)\splittree.lbc option stack=%i
- wlink @$(OBJS)\splittree.lbc
-
-$(OBJS)\splittree_sample.res : .AUTODEPEND .\..\..\..\..\samples\sample.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples $<
-
-$(OBJS)\splittree_tree.obj : .AUTODEPEND .\tree.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(SPLITTREE_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/splittree/mondrian.ico b/contrib/samples/gizmos/splittree/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/contrib/samples/gizmos/splittree/mondrian.ico and /dev/null differ
diff --git a/contrib/samples/gizmos/splittree/mondrian.xpm b/contrib/samples/gizmos/splittree/mondrian.xpm
deleted file mode 100644
index 409f27a843..0000000000
--- a/contrib/samples/gizmos/splittree/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/contrib/samples/gizmos/splittree/splittree.bkl b/contrib/samples/gizmos/splittree/splittree.bkl
deleted file mode 100644
index 87d3a66639..0000000000
--- a/contrib/samples/gizmos/splittree/splittree.bkl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- $(SRCDIR)/../../../include
-
-
- tree.cpp
-
- gizmos
- core
- base
-
-
-
diff --git a/contrib/samples/gizmos/splittree/splittree.dsp b/contrib/samples/gizmos/splittree/splittree.dsp
deleted file mode 100644
index 96caa4e337..0000000000
--- a/contrib/samples/gizmos/splittree/splittree.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="splittree" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=splittree - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "splittree.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "splittree.mak" CFG="splittree - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "splittree - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "splittree - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\splittree.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "splittree - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\splittree.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "splittree - Win32 DLL Universal Unicode Release"
-# Name "splittree - Win32 DLL Universal Unicode Debug"
-# Name "splittree - Win32 DLL Universal Release"
-# Name "splittree - Win32 DLL Universal Debug"
-# Name "splittree - Win32 DLL Unicode Release"
-# Name "splittree - Win32 DLL Unicode Debug"
-# Name "splittree - Win32 DLL Release"
-# Name "splittree - Win32 DLL Debug"
-# Name "splittree - Win32 Universal Unicode Release"
-# Name "splittree - Win32 Universal Unicode Debug"
-# Name "splittree - Win32 Universal Release"
-# Name "splittree - Win32 Universal Debug"
-# Name "splittree - Win32 Unicode Release"
-# Name "splittree - Win32 Unicode Debug"
-# Name "splittree - Win32 Release"
-# Name "splittree - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\tree.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/splittree/tree.cpp b/contrib/samples/gizmos/splittree/tree.cpp
deleted file mode 100644
index e5aa658f1f..0000000000
--- a/contrib/samples/gizmos/splittree/tree.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: tree.cpp
-// Purpose: Minimal wxWidgets sample
-// Author: Julian Smart
-// Modified by:
-// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers)
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW
-/* Closed folder */
-static char * icon1_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-" s None c None",
-". c #000000",
-"+ c #c0c0c0",
-"@ c #808080",
-"# c #ffff00",
-"$ c #ffffff",
-/* pixels */
-" ",
-" @@@@@ ",
-" @#+#+#@ ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-" ..............",
-" ",
-" "};
-
-/* File */
-static char * icon2_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 3 1",
-/* colors */
-" s None c None",
-". c #000000",
-"+ c #ffffff",
-/* pixels */
-" ",
-" ........ ",
-" .++++++.. ",
-" .+.+.++.+. ",
-" .++++++.... ",
-" .+.+.+++++. ",
-" .+++++++++. ",
-" .+.+.+.+.+. ",
-" .+++++++++. ",
-" .+.+.+.+.+. ",
-" .+++++++++. ",
-" .+.+.+.+.+. ",
-" .+++++++++. ",
-" ........... ",
-" ",
-" "};
-#endif
-
-#include "wx/imaglist.h"
-#include "tree.h"
-
-// ----------------------------------------------------------------------------
-// resources
-// ----------------------------------------------------------------------------
-// the application icon
-#ifndef __WXMSW__
- #include "mondrian.xpm"
-#endif
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWidgets
-// ----------------------------------------------------------------------------
-
-// the event tables connect the wxWidgets events with the functions (event
-// handlers) which process them. It can be also done at run-time, but for the
-// simple menu events like this the static method is much simpler.
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
- EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
- EVT_MENU(Minimal_About, MyFrame::OnAbout)
-END_EVENT_TABLE()
-
-// Create a new application object: this macro will allow wxWidgets to create
-// the application object during program execution (it's better than using a
-// static object for many reasons) and also declares the accessor function
-// wxGetApp() which will return the reference of the right type (i.e. MyApp and
-// not wxApp)
-IMPLEMENT_APP(MyApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// the application class
-// ----------------------------------------------------------------------------
-
-// 'Main program' equivalent: the program execution "starts" here
-bool MyApp::OnInit()
-{
- // create the main application window
- MyFrame *frame = new MyFrame(wxT("Tree Testing"),
- wxPoint(50, 50), wxSize(450, 340));
-
- // and show it (the frames, unlike simple controls, are not shown when
- // created initially)
- frame->Show(true);
-
- // success: wxApp::OnRun() will be called which will enter the main message
- // loop and the application will run. If we returned false here, the
- // application would exit immediately.
- return true;
-}
-
-// ----------------------------------------------------------------------------
-// main frame
-// ----------------------------------------------------------------------------
-
-// frame constructor
-MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
- : wxFrame((wxFrame *)NULL, idMAIN_FRAME, title, pos, size)
-{
- m_splitter = NULL;
- m_scrolledWindow = NULL;
- m_tree = NULL;
- m_valueWindow = NULL;
-#ifdef __WXMAC__
- // we need this in order to allow the about menu relocation, since ABOUT is
- // not the default id of the about menu
- wxApp::s_macAboutMenuItemId = Minimal_About;
-#endif
-
- m_scrolledWindow = new wxSplitterScrolledWindow(this, idSCROLLED_WINDOW, wxDefaultPosition,
- wxSize(300, 400), wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL);
- m_splitter = new wxThinSplitterWindow(m_scrolledWindow, idSPLITTER_WINDOW, wxDefaultPosition,
- wxDefaultSize, wxSP_3DBORDER | wxCLIP_CHILDREN /* | wxSP_LIVE_UPDATE */);
- m_splitter->SetSashSize(2);
-
- /* Note the wxTR_ROW_LINES style: draws horizontal lines between items */
- m_tree = new TestTree(m_splitter , idTREE_CTRL, wxDefaultPosition,
- wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER | wxTR_ROW_LINES );
- m_valueWindow = new TestValueWindow(m_splitter, idVALUE_WINDOW, wxDefaultPosition,
- wxDefaultSize, wxNO_BORDER);
- m_splitter->SplitVertically(m_tree, m_valueWindow);
- //m_splitter->AdjustScrollbars();
- m_splitter->SetSashPosition(200);
- m_scrolledWindow->SetTargetWindow(m_tree);
-
- m_scrolledWindow->EnableScrolling(false, false);
-
- // Let the two controls know about each other
- m_valueWindow->SetTreeCtrl(m_tree);
- m_tree->SetCompanionWindow(m_valueWindow);
-
- // set the frame icon
- SetIcon(wxICON(mondrian));
-
- // create a menu bar
- wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
-
- // the "About" item should be in the help menu
- wxMenu *helpMenu = new wxMenu;
- helpMenu->Append(Minimal_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
-
- menuFile->Append(Minimal_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
-
- // now append the freshly created menu to the menu bar...
- wxMenuBar *menuBar = new wxMenuBar();
- menuBar->Append(menuFile, wxT("&File"));
- menuBar->Append(helpMenu, wxT("&Help"));
-
- // ... and attach this menu bar to the frame
- SetMenuBar(menuBar);
-}
-
-
-// event handlers
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
- // true is to force the frame to close
- Close(true);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
- wxString msg;
- msg.Printf( wxT("This is the about dialog of splittree sample.\n")
- wxT("Welcome to %s"), wxVERSION_STRING);
-
- wxMessageBox(msg, wxT("About Tree Test"), wxOK | wxICON_INFORMATION, this);
-}
-
-/*
- * TesTree
- */
-
-IMPLEMENT_CLASS(TestTree, wxRemotelyScrolledTreeCtrl)
-
-BEGIN_EVENT_TABLE(TestTree, wxRemotelyScrolledTreeCtrl)
-END_EVENT_TABLE()
-
-TestTree::TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt,
- const wxSize& sz, long style):
- wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style)
-{
- m_imageList = new wxImageList(16, 16, true);
-#if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW
- m_imageList->Add(wxIcon(icon1_xpm));
- m_imageList->Add(wxIcon(icon2_xpm));
-#elif defined(__WXMSW__)
- m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CLOSED_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE));
- m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE));
-#else
-#error "Sorry, we don't have icons available for this platforms."
-#endif
- SetImageList(m_imageList);
-
-
- // Add some dummy items
- wxTreeItemId rootId = AddRoot(_("Root"), -1, -1);
- int i;
- for (i = 1; i <= 20; i++)
- {
- wxString label;
- label.Printf(wxT("Item %d"), i);
- wxTreeItemId id = AppendItem(rootId, label, 0);
- //SetItemImage( id, 1, wxTreeItemIcon_Expanded );
-
- int j;
- for (j = 0; j < 10; j++)
- AppendItem(id, _("Child"), 1);
- }
- Expand(rootId);
-}
-
-TestTree::~TestTree()
-{
- SetImageList(NULL);
- delete m_imageList;
-}
-
-/*
- * TestValueWindow
- */
-
-//IMPLEMENT_CLASS(TestValueWindow, wxWindow)
-
-BEGIN_EVENT_TABLE(TestValueWindow, wxTreeCompanionWindow)
-END_EVENT_TABLE()
-
-TestValueWindow::TestValueWindow(wxWindow* parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& sz,
- long style):
- wxTreeCompanionWindow(parent, id, pos, sz, style)
-{
- SetBackgroundColour(* wxWHITE);
-}
diff --git a/contrib/samples/gizmos/splittree/tree.h b/contrib/samples/gizmos/splittree/tree.h
deleted file mode 100644
index 8110e00ae5..0000000000
--- a/contrib/samples/gizmos/splittree/tree.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: tree.h
-// Purpose: Testing tree functionality
-// Author: Julian Smart
-// Modified by:
-// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _TREE_H_
-#define _TREE_H_
-
-#include "wx/wx.h"
-#include "wx/gizmos/splittree.h"
-
-class TestValueWindow;
-
-// Define a new application type, each program should derive a class from wxApp
-class MyApp : public wxApp
-{
-public:
- // override base class virtuals
- // ----------------------------
-
- // this one is called on application startup and is a good place for the app
- // initialization (doing it here and not in the ctor allows to have an error
- // return: if OnInit() returns false, the application terminates)
- virtual bool OnInit();
-};
-
-// Define a new frame type: this is going to be our main frame
-class MyFrame : public wxFrame
-{
-public:
- // ctor(s)
- MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
-
- // event handlers (these functions should _not_ be virtual)
- void OnQuit(wxCommandEvent& event);
- void OnAbout(wxCommandEvent& event);
-
-protected:
- wxRemotelyScrolledTreeCtrl* m_tree;
- wxThinSplitterWindow* m_splitter;
- wxSplitterScrolledWindow* m_scrolledWindow;
- //wxScrolledWindow* m_scrolledWindow;
- TestValueWindow* m_valueWindow;
-
-private:
- // any class wishing to process wxWidgets events must use this macro
- DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// IDs for the controls and the menu commands
-enum
-{
- // menu items
- Minimal_Quit = 100,
- Minimal_About
-};
-
-#define idTREE_CTRL 2000
-#define idSPLITTER_WINDOW 2001
-#define idVALUE_WINDOW 2002
-#define idMAIN_FRAME 2003
-#define idSCROLLED_WINDOW 2004
-
-class TestTree: public wxRemotelyScrolledTreeCtrl
-{
- DECLARE_CLASS(TestTree)
-public:
- TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition,
- const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);
- ~TestTree();
-
- DECLARE_EVENT_TABLE()
-protected:
- wxImageList* m_imageList;
-};
-
-class TestValueWindow: public wxTreeCompanionWindow
-{
-public:
- TestValueWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& sz = wxDefaultSize,
- long style = 0);
-
-//// Overrides
-
-//// Events
-
-//// Data members
-protected:
-
- DECLARE_EVENT_TABLE()
-};
-
-
-
-#endif
- // _TREE_H_
diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in
deleted file mode 100644
index f913a6cf66..0000000000
--- a/contrib/samples/mmedia/Makefile.in
+++ /dev/null
@@ -1,199 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-EXTRALIBS_ESD = @EXTRALIBS_ESD@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-MMBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
- -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-MMBOARD_OBJECTS = \
- $(__mmboard_os2_lib_res) \
- mmboard_mmboard.o \
- mmboard_mmbman.o \
- $(__mmboard___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__mmboard___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C mmboard$(EXEEXT)
-@COND_PLATFORM_MAC_1@__mmboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___mmboard___os2_emxbindcmd = $(NM) mmboard$(EXEEXT) | if \
- grep -q pmwin.763 ; then emxbind -ep mmboard$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__mmboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mmboard___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__mmboard_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__mmboard_bundle___depname = mmboard_bundle
-@COND_TOOLKIT_COCOA@____mmboard_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@ mmboard.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____mmboard_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@ mmboard.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__mmboard___win32rc = mmboard_mmboard_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../include -o mmboard$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: mmboard$(EXEEXT) $(__mmboard_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f mmboard$(EXEEXT)
- rm -rf mmboard.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
- $(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_ESD) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__mmboard___mac_rezcmd)
- $(__mmboard___mac_setfilecmd)
- $(__mmboard___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p mmboard.app/Contents
- mkdir -p mmboard.app/Contents/MacOS
- mkdir -p mmboard.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/mmboard/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >mmboard.app/Contents/Info.plist
-
-
- echo -n "APPL????" >mmboard.app/Contents/PkgInfo
-
-
- ln -f mmboard$(EXEEXT) mmboard.app/Contents/MacOS/mmboard
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mmboard.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@mmboard_bundle: $(____mmboard_BUNDLE_TGT_REF_DEP)
-
-mmboard_mmboard.o: $(srcdir)/mmboard.cpp
- $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $(srcdir)/mmboard.cpp
-
-mmboard_mmbman.o: $(srcdir)/mmbman.cpp
- $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $(srcdir)/mmbman.cpp
-
-mmboard_mmboard_rc.o: $(srcdir)/mmboard.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean mmboard_bundle
diff --git a/contrib/samples/mmedia/descrip.mms b/contrib/samples/mmedia/descrip.mms
deleted file mode 100644
index d7e86d2e6a..0000000000
--- a/contrib/samples/mmedia/descrip.mms
+++ /dev/null
@@ -1,30 +0,0 @@
-#*****************************************************************************
-# *
-# Make file for VMS *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) *
-# Date : 10 November 1999 *
-# *
-#*****************************************************************************
-.first
- define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)
-.else
-CXX_DEFINE =
-.endif
-
-.suffixes : .cpp
-
-.cpp.obj :
- cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-
-all :
- $(MMS)$(MMSQUALIFIERS) minimal.exe
-
-minimal.exe : minimal.obj
-.ifdef __WXMOTIF__
- cxxlink minimal,[--.lib]vms/opt
-.endif
-
-minimal.obj : minimal.cpp
diff --git a/contrib/samples/mmedia/eject.xpm b/contrib/samples/mmedia/eject.xpm
deleted file mode 100644
index 890cc6b53b..0000000000
--- a/contrib/samples/mmedia/eject.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * eject_xpm[] = {
-"15 16 5 1",
-" c None",
-". c #949594",
-"+ c #000000",
-"@ c #FFFFFF",
-"# c #8E8E8E",
-" . ",
-" .+@ ",
-" .+++@ ",
-" .+++++@ ",
-" .+++++++@ ",
-" .+++++++++@ ",
-" .+++++++++++@ ",
-".+############@",
-".@@@@@@@@@@@@@@",
-" ",
-"...............",
-".++++++++++++#@",
-".++++++++++++#@",
-".++++++++++++#@",
-".+############@",
-".@@@@@@@@@@@@@@"};
diff --git a/contrib/samples/mmedia/makefile.bcc b/contrib/samples/mmedia/makefile.bcc
deleted file mode 100644
index 1525be11b1..0000000000
--- a/contrib/samples/mmedia/makefile.bcc
+++ /dev/null
@@ -1,238 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMBOARD_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
- -I.\..\..\..\samples -DNOPCH -I.\..\..\include $(CPPFLAGS) $(CXXFLAGS)
-MMBOARD_OBJECTS = \
- $(OBJS)\mmboard_mmboard.obj \
- $(OBJS)\mmboard_mmbman.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\mmboard.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\mmboard.exe del $(OBJS)\mmboard.exe
- -if exist $(OBJS)\mmboard.tds del $(OBJS)\mmboard.tds
- -if exist $(OBJS)\mmboard.ilc del $(OBJS)\mmboard.ilc
- -if exist $(OBJS)\mmboard.ild del $(OBJS)\mmboard.ild
- -if exist $(OBJS)\mmboard.ilf del $(OBJS)\mmboard.ilf
- -if exist $(OBJS)\mmboard.ils del $(OBJS)\mmboard.ils
-
-$(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(MMBOARD_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mmboard_mmboard.res
-|
-
-$(OBJS)\mmboard_mmboard.obj: .\mmboard.cpp
- $(CXX) -q -c -P -o$@ $(MMBOARD_CXXFLAGS) $**
-
-$(OBJS)\mmboard_mmbman.obj: .\mmbman.cpp
- $(CXX) -q -c -P -o$@ $(MMBOARD_CXXFLAGS) $**
-
-$(OBJS)\mmboard_mmboard.res: .\mmboard.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH -i.\..\..\include $**
-
diff --git a/contrib/samples/mmedia/makefile.gcc b/contrib/samples/mmedia/makefile.gcc
deleted file mode 100644
index 88fbb8e576..0000000000
--- a/contrib/samples/mmedia/makefile.gcc
+++ /dev/null
@@ -1,237 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH -I.\..\..\include \
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-MMBOARD_OBJECTS = \
- $(OBJS)\mmboard_mmboard.o \
- $(OBJS)\mmboard_mmbman.o \
- $(OBJS)\mmboard_mmboard_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\mmboard.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\mmboard.exe del $(OBJS)\mmboard.exe
-
-$(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard_rc.o
- $(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\mmboard_mmboard.o: ./mmboard.cpp
- $(CXX) -c -o $@ $(MMBOARD_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmboard_mmbman.o: ./mmbman.cpp
- $(CXX) -c -o $@ $(MMBOARD_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmboard_mmboard_rc.o: ./mmboard.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/mmedia/makefile.vc b/contrib/samples/mmedia/makefile.vc
deleted file mode 100644
index c577e10df7..0000000000
--- a/contrib/samples/mmedia/makefile.vc
+++ /dev/null
@@ -1,313 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\mmboard.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH /I.\..\..\include \
- $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)
-MMBOARD_OBJECTS = \
- $(OBJS)\mmboard_mmboard.obj \
- $(OBJS)\mmboard_mmbman.obj \
- $(OBJS)\mmboard_mmboard.res
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\mmboard.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\mmboard.exe del $(OBJS)\mmboard.exe
- -if exist $(OBJS)\mmboard.ilk del $(OBJS)\mmboard.ilk
- -if exist $(OBJS)\mmboard.pdb del $(OBJS)\mmboard.pdb
-
-$(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(MMBOARD_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\mmboard_mmboard.obj: .\mmboard.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MMBOARD_CXXFLAGS) $**
-
-$(OBJS)\mmboard_mmbman.obj: .\mmbman.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MMBOARD_CXXFLAGS) $**
-
-$(OBJS)\mmboard_mmboard.res: .\mmboard.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include $**
-
diff --git a/contrib/samples/mmedia/makefile.wat b/contrib/samples/mmedia/makefile.wat
deleted file mode 100644
index 6740808dd4..0000000000
--- a/contrib/samples/mmedia/makefile.wat
+++ /dev/null
@@ -1,266 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-MMBOARD_OBJECTS = &
- $(OBJS)\mmboard_mmboard.obj &
- $(OBJS)\mmboard_mmbman.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\mmboard.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\mmboard.exe del $(OBJS)\mmboard.exe
-
-$(OBJS)\mmboard.exe : $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard.res
- @%create $(OBJS)\mmboard.lbc
- @%append $(OBJS)\mmboard.lbc option quiet
- @%append $(OBJS)\mmboard.lbc name $^@
- @%append $(OBJS)\mmboard.lbc option caseexact
- @%append $(OBJS)\mmboard.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(MMBOARD_OBJECTS)) do @%append $(OBJS)\mmboard.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\mmboard.lbc library %i
- @%append $(OBJS)\mmboard.lbc option resource=$(OBJS)\mmboard_mmboard.res
- @for %i in () do @%append $(OBJS)\mmboard.lbc option stack=%i
- wlink @$(OBJS)\mmboard.lbc
-
-$(OBJS)\mmboard_mmboard.obj : .AUTODEPEND .\mmboard.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MMBOARD_CXXFLAGS) $<
-
-$(OBJS)\mmboard_mmbman.obj : .AUTODEPEND .\mmbman.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MMBOARD_CXXFLAGS) $<
-
-$(OBJS)\mmboard_mmboard.res : .AUTODEPEND .\mmboard.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $<
-
diff --git a/contrib/samples/mmedia/mmbman.cpp b/contrib/samples/mmedia/mmbman.cpp
deleted file mode 100644
index 3014ef2a1a..0000000000
--- a/contrib/samples/mmedia/mmbman.cpp
+++ /dev/null
@@ -1,531 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: mmbman.cpp
-// Purpose: Multimedia Board manager
-// Author: Guilhem Lavaux,
-// Modified by:
-// Created: 13/02/2000
-// RCS-ID: $Id$
-// Copyright: (c) 2000, Guilhem Lavaux
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-// Personal headers
-
-#include "wx/stream.h"
-#include "wx/wfstream.h"
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndwav.h"
-#include "wx/mmedia/sndaiff.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndulaw.h"
-#include "wx/mmedia/sndmsad.h"
-
-#ifdef __UNIX__
-#include "wx/mmedia/sndoss.h"
-#include "wx/mmedia/sndesd.h"
-#endif
-
-#ifdef __WIN32__
-#include "wx/mmedia/sndwin.h"
-#endif
-
-#include "wx/mmedia/vidbase.h"
-#ifdef __UNIX__
-#include "wx/mmedia/vidxanm.h"
-#endif
-
-#ifdef __WIN32__
-#include "wx/mmedia/vidwin.h"
-#endif
-
-#include "mmboard.h"
-#include "mmbman.h"
-
-// ----------------------------------------------------------------------------
-// Private class definitions
-// ----------------------------------------------------------------------------
-
-class MMBoardSoundFile: public MMBoardFile {
-public:
- MMBoardSoundFile(const wxString& filename);
- ~MMBoardSoundFile();
-
- bool NeedWindow();
-
- void SetWindow(wxWindow *window);
-
- void Play();
- void Pause();
- void Resume();
- void Stop();
-
- MMBoardTime GetPosition();
- MMBoardTime GetLength();
- void SetPosition(MMBoardTime btime);
-
- bool IsStopped();
- bool IsPaused();
-
- wxString GetStringType();
- wxString GetStringInformation();
-
-protected:
- wxSoundFileStream *GetDecoder();
-
- wxSoundStream *m_output_stream;
- wxInputStream *m_input_stream;
- wxSoundFileStream *m_file_stream;
-
- MMBoardTime m_length;
- wxUint8 m_file_type;
-};
-
-class MMBoardVideoFile: public MMBoardFile {
-public:
- MMBoardVideoFile(const wxString& filename);
- ~MMBoardVideoFile();
-
- bool NeedWindow();
-
- void SetWindow(wxWindow *window);
-
- void Play();
- void Pause();
- void Resume();
- void Stop();
-
- MMBoardTime GetPosition();
- MMBoardTime GetLength();
- void SetPosition(MMBoardTime btime);
-
- bool IsStopped();
- bool IsPaused();
-
- wxString GetStringType();
- wxString GetStringInformation();
-
-protected:
- wxWindow *m_output_window;
- wxVideoBaseDriver *m_video_driver;
-};
-
-// ----------------------------------------------------------------------------
-// Implementation
-// ----------------------------------------------------------------------------
-
-#define MMBoard_UNKNOWNTYPE 0
-#define MMBoard_WAVE 1
-#define MMBoard_AIFF 2
-
-// ----------------------------------------------------------------------------
-// MMBoardSoundFile
-
-MMBoardSoundFile::MMBoardSoundFile(const wxString& filename)
- : MMBoardFile()
-{
- m_input_stream = new wxFileInputStream(filename);
- m_output_stream = MMBoardManager::OpenSoundStream();
-
- m_file_stream = GetDecoder();
-
- if (!m_file_stream) {
- SetError(MMBoard_UnknownFile);
- return;
- }
-
- // Compute length
- wxUint32 length, seconds;
-
- length = m_file_stream->GetLength();
- seconds = m_file_stream->GetSoundFormat().GetTimeFromBytes(length);
- m_length.seconds = seconds % 60;
- m_length.minutes = (seconds / 60) % 60;
- m_length.hours = seconds / 3600;
-}
-
-MMBoardSoundFile::~MMBoardSoundFile()
-{
- if (m_file_stream)
- delete m_file_stream;
- MMBoardManager::UnrefSoundStream(m_output_stream);
- delete m_input_stream;
-}
-
-wxSoundFileStream *MMBoardSoundFile::GetDecoder()
-{
- wxSoundFileStream *f_stream;
-
- // First, we try a Wave decoder
- f_stream = new wxSoundWave(*m_input_stream, *m_output_stream);
- m_file_type = MMBoard_WAVE;
- if (f_stream->CanRead())
- return f_stream;
- delete f_stream;
-
- // Then, a AIFF decoder
- f_stream = new wxSoundAiff(*m_input_stream, *m_output_stream);
- m_file_type = MMBoard_AIFF;
- if (f_stream->CanRead())
- return f_stream;
- delete f_stream;
-
- m_file_type = MMBoard_UNKNOWNTYPE;
-
- // TODO: automate
-
- return NULL;
-}
-
-MMBoardTime MMBoardSoundFile::GetLength()
-{
- return m_length;
-}
-
-bool MMBoardSoundFile::IsStopped()
-{
- return m_file_stream->IsStopped();
-}
-
-bool MMBoardSoundFile::IsPaused()
-{
- return m_file_stream->IsPaused();
-}
-
-MMBoardTime MMBoardSoundFile::GetPosition()
-{
- wxUint32 length, seconds;
- MMBoardTime file_time;
-
- file_time.seconds = file_time.minutes = file_time.hours = 0;
- if (m_file_stream->IsStopped())
- return file_time;
-
- length = m_file_stream->GetPosition();
- seconds = m_file_stream->GetSoundFormat().GetTimeFromBytes(length);
- file_time.seconds = seconds % 60;
- file_time.minutes = (seconds / 60) % 60;
- file_time.hours = seconds / 3600;
-
- return file_time;
-}
-
-void MMBoardSoundFile::SetPosition(MMBoardTime btime)
-{
- wxUint32 itime;
-
- itime = btime.seconds + btime.minutes * 60 + btime.hours;
-
- m_file_stream->SetPosition(
- m_file_stream->GetSoundFormat().GetBytesFromTime(itime)
- );
-}
-
-bool MMBoardSoundFile::NeedWindow()
-{
- return false;
-}
-
-void MMBoardSoundFile::SetWindow(wxWindow *WXUNUSED(window))
-{
-}
-
-void MMBoardSoundFile::Play()
-{
- m_file_stream->Play();
-}
-
-void MMBoardSoundFile::Pause()
-{
- m_file_stream->Pause();
-}
-
-void MMBoardSoundFile::Resume()
-{
- m_file_stream->Resume();
-}
-
-void MMBoardSoundFile::Stop()
-{
- m_file_stream->Stop();
-}
-
-wxString MMBoardSoundFile::GetStringType()
-{
- switch (m_file_type) {
- case MMBoard_WAVE:
- return wxString(wxT("WAVE file"));
- #if 0
- // break is not reachable after return
- break;
- #endif
- case MMBoard_AIFF:
- return wxString(wxT("AIFF file"));
- #if 0
- // break is not reachable after return
- break;
- #endif
- #if 0
- // default moved outside switch for those compilers
- // which complain about lack of return in function
- default:
- return wxString(wxT("Unknown file"));
- break;
- #endif
- }
- return wxString(wxT("Unknown file"));
-}
-
-wxString MMBoardSoundFile::GetStringInformation()
-{
- wxString info;
- wxSoundFormatBase *format;
-
- format = &(m_file_stream->GetSoundFormat());
-
- info = wxT("Data encoding: ");
- switch (format->GetType()) {
- case wxSOUND_PCM: {
- wxSoundFormatPcm *pcm_format = (wxSoundFormatPcm *)format;
-
- info += wxString::Format(wxT("PCM %s %s\n"),
- pcm_format->Signed() ? wxT("signed") : wxT("unsigned"),
- pcm_format->GetOrder() == wxLITTLE_ENDIAN ? wxT("little endian") : wxT("big endian"));
- info += wxString::Format(wxT("Sampling rate: %d\n")
- wxT("Bits per sample: %d\n")
- wxT("Number of channels: %d\n"),
- pcm_format->GetSampleRate(),
- pcm_format->GetBPS(),
- pcm_format->GetChannels());
-
- break;
- }
- case wxSOUND_MSADPCM: {
- wxSoundFormatMSAdpcm *adpcm_format = (wxSoundFormatMSAdpcm *)format;
-
- info += wxString::Format(wxT("Microsoft ADPCM\n"));
- info += wxString::Format(wxT("Sampling Rate: %d\n")
- wxT("Number of channels: %d\n"),
- adpcm_format->GetSampleRate(),
- adpcm_format->GetChannels());
- break;
- }
- case wxSOUND_ULAW: {
- wxSoundFormatUlaw *ulaw_format = (wxSoundFormatUlaw *)format;
- info += wxT("ULAW\n");
- info += wxString::Format(wxT("Sampling rate: %d\n"), ulaw_format->GetSampleRate());
- break;
- }
- default:
- info += wxT("Unknown");
- break;
- }
- return info;
-}
-
-// ----------------------------------------------------------------------------
-
-
-// ----------------------------------------------------------------------------
-// MMBoardVideoFile
-
-MMBoardVideoFile::MMBoardVideoFile(const wxString& filename)
-{
- m_output_window = NULL;
-
-#if defined(__UNIX__) && !defined(__CYGWIN__)
- m_video_driver = new wxVideoXANIM(filename);
-#elif defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__) && !defined(__CYGWIN__)
- // versions of Open Watcom and MinGW tested against this source does not
- // deliver "digitalv.h" required in this feature
- m_video_driver = new wxVideoWindows(filename);
-#else
- wxUnusedVar(filename);
- m_video_driver = NULL;
- SetError(MMBoard_UnknownFile);
-#endif
-}
-
-MMBoardVideoFile::~MMBoardVideoFile()
-{
- if (m_video_driver)
- delete m_video_driver;
-}
-
-bool MMBoardVideoFile::NeedWindow()
-{
- return true;
-}
-
-void MMBoardVideoFile::SetWindow(wxWindow *window)
-{
- m_output_window = window;
- m_video_driver->AttachOutput(*window);
-
- wxSize size;
- m_video_driver->GetSize(size);
- window->SetSize(size);
- // BAD BAD
- // and we remove
- // window->GetParent()->GetSizer()->Fit(window->GetParent());
-}
-
-void MMBoardVideoFile::Play()
-{
- m_video_driver->Play();
-}
-
-void MMBoardVideoFile::Pause()
-{
- m_video_driver->Pause();
-}
-
-void MMBoardVideoFile::Resume()
-{
- m_video_driver->Resume();
-}
-
-void MMBoardVideoFile::Stop()
-{
- m_video_driver->Stop();
-}
-
-MMBoardTime MMBoardVideoFile::GetPosition()
-{
- MMBoardTime btime;
-
- btime.seconds = btime.minutes = btime.hours = 0;
- return btime;
-}
-
-MMBoardTime MMBoardVideoFile::GetLength()
-{
- MMBoardTime btime;
- int frameTime;
-
- frameTime = (int)( m_video_driver->GetNbFrames() / m_video_driver->GetFrameRate());
-
- btime.seconds = frameTime % 60;
- btime.minutes = (frameTime / 60) % 60;
- btime.hours = frameTime / 3600;
- return btime;
-}
-
-void MMBoardVideoFile::SetPosition(MMBoardTime WXUNUSED(btime))
-{
-}
-
-bool MMBoardVideoFile::IsStopped()
-{
- return m_video_driver->IsStopped();
-}
-
-bool MMBoardVideoFile::IsPaused()
-{
- return m_video_driver->IsPaused();
-}
-
-wxString MMBoardVideoFile::GetStringType()
-{
- return wxString(wxT("Video XANIM"));
-}
-
-wxString MMBoardVideoFile::GetStringInformation()
-{
- wxString info;
-
- info = wxT("Video codec: ");
- info += m_video_driver->GetMovieCodec() + _T("\n");
- info += wxT("Audio codec: ");
- info += m_video_driver->GetAudioCodec();
- info += wxString::Format(_T(" Sample rate: %d Channels: %d\n"), m_video_driver->GetSampleRate(),
- m_video_driver->GetBPS());
- info += wxString::Format(_T(" Frame rate: %.01f"), m_video_driver->GetFrameRate());
- return info;
-}
-
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// MMBoardFile
-
-MMBoardFile::MMBoardFile()
-{
- m_error = 0;
-}
-
-MMBoardFile::~MMBoardFile()
-{
-}
-
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// MMBoardManager
-
-MMBoardFile *MMBoardManager::Open(const wxString& filename)
-{
- MMBoardFile *file;
-
- // Test the audio codec
- file = new MMBoardSoundFile(filename);
- if (!file->GetError())
- return file;
- delete file;
-
- // Test the video codec
- file = new MMBoardVideoFile(filename);
- if (!file->GetError())
- return file;
- delete file;
-
- // Arrrgh, we just could not see what is that file ...
- return NULL;
-}
-
-DECLARE_APP(MMBoardApp)
-
-wxSoundStream *MMBoardManager::OpenSoundStream()
-{
-#ifdef __WIN32__
- if ((wxGetApp().m_caps & MM_SOUND_WIN) != 0)
- return new wxSoundStreamWin();
-#elif __UNIX__
- if ((wxGetApp().m_caps & MM_SOUND_ESD) != 0)
- return new wxSoundStreamESD();
-
- if ((wxGetApp().m_caps & MM_SOUND_OSS) != 0)
- return new wxSoundStreamOSS();
-#endif
-
- wxMessageBox(_T("You are trying to open a multimedia but you have not devices"), _T("Error"), wxOK | wxICON_ERROR, NULL);
-
- return NULL;
-}
-
-void MMBoardManager::UnrefSoundStream(wxSoundStream *stream)
-{
- delete stream;
-}
-
-// ----------------------------------------------------------------------------
-
diff --git a/contrib/samples/mmedia/mmbman.h b/contrib/samples/mmedia/mmbman.h
deleted file mode 100644
index e4f7b5e7f6..0000000000
--- a/contrib/samples/mmedia/mmbman.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: mmbman.h
-// Purpose: Multimedia Board manager
-// Author: Guilhem Lavaux,
-// Modified by:
-// Created: 13/02/2000
-// RCS-ID: $Id$
-// Copyright: (c) 2000, Guilhem Lavaux
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MMBMAN_APP_H_
-#define _MMBMAN_APP_H_
-
-#include "wx/stream.h"
-#include "wx/mmedia/sndbase.h"
-
-// -------------------------------------------------------------------------
-// Base structure definitions
-// -------------------------------------------------------------------------
-
-typedef struct {
- wxUint8 seconds, minutes, hours;
-} MMBoardTime;
-
-// -------------------------------------------------------------------------
-// Constants
-// -------------------------------------------------------------------------
-
-#define MMBoard_NoError 0
-#define MMBoard_UnknownFile 1
-
-// -------------------------------------------------------------------------
-// Interface definition: MMBoardFile
-// -------------------------------------------------------------------------
-
-class MMBoardFile {
- public:
- MMBoardFile();
- virtual ~MMBoardFile();
-
- virtual bool NeedWindow() = 0;
-
- virtual void SetWindow(wxWindow *window) = 0;
-
- virtual void Play() = 0;
- virtual void Pause() = 0;
- virtual void Resume() = 0;
- virtual void Stop() = 0;
-
- virtual MMBoardTime GetPosition() = 0;
- virtual MMBoardTime GetLength() = 0;
- virtual void SetPosition(MMBoardTime btime) = 0;
-
- virtual bool IsStopped() = 0;
- virtual bool IsPaused() = 0;
-
- virtual wxString GetStringType() = 0;
- virtual wxString GetStringInformation() = 0;
-
- void SetError(wxUint8 error) { m_error = error; }
- wxUint8 GetError() const { return m_error; }
-
- protected:
- wxUint8 m_error;
-};
-
-// -------------------------------------------------------------------------
-// Main manager
-// -------------------------------------------------------------------------
-
-class MMBoardManager {
- public:
- static MMBoardFile *Open(const wxString& filename);
-
- static wxSoundStream *OpenSoundStream();
- static void UnrefSoundStream(wxSoundStream *stream);
-};
-
-#endif
diff --git a/contrib/samples/mmedia/mmboard.bkl b/contrib/samples/mmedia/mmboard.bkl
deleted file mode 100644
index 4b1c94cad1..0000000000
--- a/contrib/samples/mmedia/mmboard.bkl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
- mmboard.cpp
- mmbman.cpp
-
- mmedia
- $(EXTRALIBS_ESD)
- core
- base
- mmboard.rc
-
-
-
diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
deleted file mode 100644
index 62bf71c08c..0000000000
--- a/contrib/samples/mmedia/mmboard.cpp
+++ /dev/null
@@ -1,592 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: mmboard.cpp
-// Purpose: Multimedia Library sample
-// Author: Guilhem Lavaux (created from minimal by J. Smart)
-// Modified by:
-// Created: 13/02/2000
-// RCS-ID: $Id$
-// Copyright: (c) Guilhem Lavaux
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// ressources
-// ----------------------------------------------------------------------------
-
-// the application icon
-#if !defined(__WXMSW__) && !defined(__WXPM__)
- #include "mondrian.xpm"
-#endif
-
-// include multimedia classes
-#include "wx/mmedia/sndbase.h"
-#ifdef __WIN32__
- #include "wx/mmedia/sndwin.h"
-#endif
-#ifdef __UNIX__
- #include "wx/mmedia/sndoss.h"
- #include "wx/mmedia/sndesd.h"
-#endif
-
-#include "wx/statline.h"
-#include "wx/stattext.h"
-
-// include personnal classes
-#include "mmboard.h"
-#include "mmbman.h"
-
-#include "play.xpm"
-#include "stop.xpm"
-#include "eject.xpm"
-#include "pause.xpm"
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// Main Multimedia Board frame
-class MMBoardFrame : public wxFrame
-{
-public:
- // ctor(s)
- MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
- // dtor
- ~MMBoardFrame();
-
- // event handlers
- void OnQuit(wxCommandEvent& event);
- void OnAbout(wxCommandEvent& event);
- void OnOpen(wxCommandEvent& event);
- void OnPlay(wxCommandEvent& event);
- void OnStop(wxCommandEvent& event);
- void OnPause(wxCommandEvent& event);
- void OnEject(wxCommandEvent& event);
- void OnRefreshInfo(wxEvent& event);
- void OnSetPosition(wxCommandEvent& event);
-
- void OpenVideoWindow();
- void CloseVideoWindow();
-
-private:
- // any class wishing to process wxWidgets events must use this macro
- DECLARE_EVENT_TABLE()
-
-private:
- void UpdateMMedInfo();
- void UpdateInfoText();
-
- MMBoardFile *m_opened_file;
-
- wxSlider *m_positionSlider;
- wxBitmapButton *m_playButton, *m_pauseButton, *m_stopButton, *m_ejectButton;
- wxStaticText *m_fileType, *m_infoText;
- wxWindow *m_video_window;
-
- wxPanel *m_panel;
- wxSizer *m_sizer;
-
- wxTimer *m_refreshTimer;
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// IDs for the controls and the menu commands
-enum
-{
- // menu items
- MMBoard_Quit = 1,
- MMBoard_Open,
- MMBoard_About,
- MMBoard_PositionSlider,
- MMBoard_PlayButton,
- MMBoard_PauseButton,
- MMBoard_ResumeButton,
- MMBoard_StopButton,
- MMBoard_EjectButton,
- MMBoard_RefreshInfo
-};
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWidgets
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(MMBoardFrame, wxFrame)
- EVT_MENU(MMBoard_Quit, MMBoardFrame::OnQuit)
- EVT_MENU(MMBoard_About, MMBoardFrame::OnAbout)
- EVT_MENU(MMBoard_Open, MMBoardFrame::OnOpen)
- EVT_BUTTON(MMBoard_PlayButton, MMBoardFrame::OnPlay)
- EVT_BUTTON(MMBoard_StopButton, MMBoardFrame::OnStop)
- EVT_BUTTON(MMBoard_PauseButton, MMBoardFrame::OnPause)
- EVT_BUTTON(MMBoard_EjectButton, MMBoardFrame::OnEject)
- EVT_SLIDER(MMBoard_PositionSlider, MMBoardFrame::OnSetPosition)
- EVT_CUSTOM(wxEVT_TIMER, MMBoard_RefreshInfo, MMBoardFrame::OnRefreshInfo)
-END_EVENT_TABLE()
-
-// ---------------------------------------------------------------------------
-// Main board application launcher
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_APP(MMBoardApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// the application class
-// ----------------------------------------------------------------------------
-
-bool MMBoardApp::OnInit()
-{
- // create the main application window
- MMBoardFrame *frame = new MMBoardFrame(_T("Multimedia Board"),
- wxPoint(50, 50), wxSize(450, 340));
-
- // and show it (the frames, unlike simple controls, are not shown when
- // created initially)
- frame->Show();
-
- m_caps = TestMultimediaCaps();
-
- if (!m_caps) {
- wxMessageBox(_T("Your system has no multimedia capabilities. We are exiting now."), _T("Major error !"), wxOK | wxICON_ERROR, NULL);
- return false;
- }
-
- wxString msg;
- msg.Printf(_T("Detected : %s%s%s"), (m_caps & MM_SOUND_OSS) ? _T("OSS ") : _T(""),
- (m_caps & MM_SOUND_ESD) ? _T("ESD ") : _T(""),
- (m_caps & MM_SOUND_WIN) ? _T("WIN") : _T(""));
-
- wxMessageBox(msg, _T("Good !"), wxOK | wxICON_INFORMATION, NULL);
-
- // success: wxApp::OnRun() will be called which will enter the main message
- // loop and the application will run. If we returned false here, the
- // application would exit immediately.
- return true;
-}
-
-wxUint8 MMBoardApp::TestMultimediaCaps()
-{
- wxSoundStream *dev;
- wxUint8 caps;
-
- caps = 0;
-
-#ifdef __WIN32__
- // We test the Windows sound support.
-
- dev = new wxSoundStreamWin();
- if (dev->GetError() == wxSOUND_NOERROR)
- caps |= MM_SOUND_WIN;
- delete dev;
-
-#elif defined __UNIX__
- // We now test the ESD support
-
- dev = new wxSoundStreamESD();
- if (dev->GetError() == wxSOUND_NOERROR)
- caps |= MM_SOUND_ESD;
- delete dev;
-
- // We test the OSS (Open Sound System) support.
- // WARNING: There is a conflict between ESD and ALSA. We may be interrested
- // in disabling the auto detection of OSS is ESD has been detected.
-#if 1
- if (!(caps & MM_SOUND_ESD)) {
-#endif
-
- dev = new wxSoundStreamOSS();
- if (dev->GetError() == wxSOUND_NOERROR)
- caps |= MM_SOUND_OSS;
- delete dev;
-#if 1
- }
-#endif
-
-#endif
-
- return caps;
-}
-
-// ----------------------------------------------------------------------------
-// main frame
-// ----------------------------------------------------------------------------
-
-// frame constructor
-MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
- : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
-{
-#ifdef __WXMAC__
- // we need this in order to allow the about menu relocation, since ABOUT is
- // not the default id of the about menu
- wxApp::s_macAboutMenuItemId = MMBoard_About;
-#endif
-
- // set the frame icon
- SetIcon(wxICON(mondrian));
-
- // create a menu bar
- wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
-
- // the "About" item should be in the help menu
- wxMenu *helpMenu = new wxMenu;
- helpMenu->Append(MMBoard_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
-
- menuFile->Append(MMBoard_Open, wxT("&Open\tAlt-O"), wxT("Open file"));
- menuFile->AppendSeparator();
- menuFile->Append(MMBoard_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
-
- // now append the freshly created menu to the menu bar...
- wxMenuBar *menuBar = new wxMenuBar();
- menuBar->Append(menuFile, wxT("&File"));
- menuBar->Append(helpMenu, wxT("&Help"));
-
- // ... and attach this menu bar to the frame
- SetMenuBar(menuBar);
-
-#if wxUSE_STATUSBAR
- // create a status bar just for fun (by default with 1 pane only)
- CreateStatusBar(3);
- SetStatusText(wxT("Welcome to wxWidgets!"));
-#endif // wxUSE_STATUSBAR
-
- // Misc variables
- m_opened_file = NULL;
-
- m_panel = new wxPanel(this, wxID_ANY);
-
- // Initialize main slider
- m_positionSlider = new wxSlider( m_panel, MMBoard_PositionSlider, 0, 0, 60,
- wxDefaultPosition, wxSize(300, wxDefaultCoord),
- wxSL_HORIZONTAL | wxSL_AUTOTICKS);
- m_positionSlider->SetPageSize(60); // 60 secs
- m_positionSlider->Disable();
-
- // Initialize info panel
- wxPanel *infoPanel = new wxPanel( m_panel, wxID_ANY);
- infoPanel->SetBackgroundColour(*wxBLACK);
- infoPanel->SetForegroundColour(*wxWHITE);
-
- wxBoxSizer *infoSizer = new wxBoxSizer(wxVERTICAL);
-
- m_fileType = new wxStaticText(infoPanel, wxID_ANY, wxEmptyString);
-#if wxUSE_STATLINE
- wxStaticLine *line = new wxStaticLine(infoPanel, wxID_ANY);
-#endif // wxUSE_STATLINE
- m_infoText = new wxStaticText(infoPanel, wxID_ANY, wxEmptyString);
-
- UpdateInfoText();
-
- infoSizer->Add(m_fileType, 0, wxGROW | wxALL, 1);
-#if wxUSE_STATLINE
- infoSizer->Add(line, 0, wxGROW | wxCENTRE, 20);
-#endif // wxUSE_STATLINE
- infoSizer->Add(m_infoText, 0, wxGROW | wxALL, 1);
-
- infoPanel->SetSizer(infoSizer);
-
- // Bitmap button panel
- wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
-
- wxBitmap play_bmp(play_back_xpm);
- wxBitmap stop_bmp(stop_back_xpm);
- wxBitmap eject_bmp(eject_xpm);
- wxBitmap pause_bmp(pause_xpm);
-
- m_playButton = new wxBitmapButton(m_panel, MMBoard_PlayButton, play_bmp);
- m_playButton->Disable();
- m_pauseButton = new wxBitmapButton(m_panel, MMBoard_PauseButton, pause_bmp);
- m_pauseButton->Disable();
- m_stopButton = new wxBitmapButton(m_panel, MMBoard_StopButton, stop_bmp);
- m_stopButton->Disable();
- m_ejectButton = new wxBitmapButton(m_panel, MMBoard_EjectButton, eject_bmp);
- m_ejectButton->Disable();
-
- buttonSizer->Add(m_playButton, 0, wxALL, 2);
- buttonSizer->Add(m_pauseButton, 0, wxALL, 2);
- buttonSizer->Add(m_stopButton, 0, wxALL, 2);
- buttonSizer->Add(m_ejectButton, 0, wxALL, 2);
-
- // Top sizer
- m_sizer = new wxBoxSizer(wxVERTICAL);
-#if wxUSE_STATLINE
- m_sizer->Add(new wxStaticLine(m_panel, wxID_ANY), 0, wxGROW | wxCENTRE, 0);
-#endif // wxUSE_STATLINE
- m_sizer->Add(m_positionSlider, 0, wxCENTRE | wxGROW | wxALL, 2);
-#if wxUSE_STATLINE
- m_sizer->Add(new wxStaticLine(m_panel, wxID_ANY), 0, wxGROW | wxCENTRE, 0);
-#endif // wxUSE_STATLINE
- m_sizer->Add(buttonSizer, 0, wxALL, 0);
-#if wxUSE_STATLINE
- m_sizer->Add(new wxStaticLine(m_panel, wxID_ANY), 0, wxGROW | wxCENTRE, 0);
-#endif // wxUSE_STATLINE
- m_sizer->Add(infoPanel, 1, wxCENTRE | wxGROW, 0);
-
- m_panel->SetSizer(m_sizer);
- m_sizer->Fit(this);
- m_sizer->SetSizeHints(this);
-
- // Timer
- m_refreshTimer = new wxTimer(this, MMBoard_RefreshInfo);
-
- // Video window
- m_video_window = NULL;
-
- // Multimedia file
- m_opened_file = NULL;
-}
-
-MMBoardFrame::~MMBoardFrame()
-{
- if (m_opened_file)
- delete m_opened_file;
-
- delete m_refreshTimer;
-}
-
-void MMBoardFrame::OpenVideoWindow()
-{
- if (m_video_window)
- return;
-
- m_video_window = new wxWindow(m_panel, wxID_ANY, wxDefaultPosition, wxSize(200, 200));
- m_video_window->SetBackgroundColour(*wxBLACK);
- m_sizer->Prepend(m_video_window, 2, wxGROW | wxSHRINK | wxCENTRE, 1);
-
- m_sizer->Fit(this);
-}
-
-void MMBoardFrame::CloseVideoWindow()
-{
- if (!m_video_window)
- return;
-
- m_sizer->Detach( m_video_window );
- delete m_video_window;
- m_video_window = NULL;
-
- m_sizer->Fit(this);
-}
-
-// event handlers
-
-void MMBoardFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
- // true is to force the frame to close
- Close(true);
-}
-
-void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
- wxString msg;
- msg.Printf( wxT("wxWidgets Multimedia board v1.0a, wxMMedia v2.0a:\n")
- wxT("an example of the capabilities of the wxWidgets multimedia classes.\n")
- wxT("Copyright 1999, 2000, Guilhem Lavaux.\n"));
-
- wxMessageBox(msg, _T("About MMBoard"), wxOK | wxICON_INFORMATION, this);
-}
-
-void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
-{
- wxString selected_file;
-
- if (m_opened_file) {
- if (!m_opened_file->IsStopped()) {
- wxCommandEvent event2;
- OnStop(event2);
- }
- delete m_opened_file;
- }
-
- // select a file to be opened
-#if wxUSE_FILEDLG
- selected_file = wxLoadFileSelector(_T("multimedia"), _T("*"), NULL, this);
-#endif // wxUSE_FILEDLG
- if (selected_file.empty())
- return;
-
- m_opened_file = MMBoardManager::Open(selected_file);
-
- // Change the range values of the slider.
- MMBoardTime length;
-
- length = m_opened_file->GetLength();
- m_positionSlider->SetRange(0, length.hours * 3600 + length.minutes * 60 + length.seconds);
-
- // Update misc info
- UpdateMMedInfo();
-
-#if wxUSE_STATUSBAR
- SetStatusText(selected_file, 2);
-#endif // wxUSE_STATUSBAR
-
- // Update info text
- UpdateInfoText();
-
- // Enable a few buttons
- m_playButton->Enable();
- m_ejectButton->Enable();
- m_positionSlider->Enable();
-
- if (m_opened_file->NeedWindow()) {
- OpenVideoWindow();
- m_opened_file->SetWindow(m_video_window);
- } else
- CloseVideoWindow();
-}
-
-void MMBoardFrame::UpdateInfoText()
-{
- wxString infotext1, infotext2;
-
- if (m_opened_file) {
- infotext1 = wxT("File type:\n\t");
- infotext1 += m_opened_file->GetStringType() + wxT("\n");
-
- infotext2 = wxT("File informations:\n\n");
- infotext2 += m_opened_file->GetStringInformation();
- } else {
- infotext1 = wxT("File type: \n\tNo file opened");
- infotext2 = wxT("File informations:\nNo information\n\n\n\n\n");
- }
-
- m_fileType->SetLabel(infotext1);
- m_infoText->SetLabel(infotext2);
-}
-
-void MMBoardFrame::UpdateMMedInfo()
-{
- MMBoardTime current, length;
-
- if (m_opened_file) {
- current = m_opened_file->GetPosition();
- length = m_opened_file->GetLength();
- } else {
- current.hours = current.minutes = current.seconds = 0;
- length = current;
- }
-
-#if wxUSE_STATUSBAR
- // We refresh the status bar
- wxString temp_string;
- temp_string.Printf(wxT("%02d:%02d / %02d:%02d"), current.hours * 60 + current.minutes,
- current.seconds, length.hours * 60 + length.minutes, length.seconds);
- SetStatusText(temp_string, 1);
-#else
- wxUnusedVar(length);
-#endif // wxUSE_STATUSBAR
-
- // We set the slider position
- m_positionSlider->SetValue(current.hours * 3600 + current.minutes * 60 + current.seconds);
-}
-
-// ----------------------------------------------------------------------------
-// Playing management, refreshers, ...
-
-void MMBoardFrame::OnRefreshInfo(wxEvent& WXUNUSED(event))
-{
- UpdateMMedInfo();
-
- if (m_opened_file->IsStopped())
- {
- m_refreshTimer->Stop();
- m_playButton->Enable();
- m_stopButton->Disable();
- m_pauseButton->Disable();
- }
-}
-
-void MMBoardFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
-{
- m_stopButton->Enable();
- m_pauseButton->Enable();
- m_playButton->Disable();
-
- if (m_opened_file->IsPaused())
- {
- m_opened_file->Resume();
- return;
- }
-
- m_refreshTimer->Start(1000, false);
-
- m_opened_file->Play();
-
- m_stopButton->Enable();
- m_pauseButton->Enable();
- m_playButton->Disable();
-}
-
-void MMBoardFrame::OnStop(wxCommandEvent& WXUNUSED(event))
-{
- m_opened_file->Stop();
- m_refreshTimer->Stop();
-
- m_stopButton->Disable();
- m_playButton->Enable();
-
- UpdateMMedInfo();
-}
-
-void MMBoardFrame::OnPause(wxCommandEvent& WXUNUSED(event))
-{
- m_opened_file->Pause();
-
- m_playButton->Enable();
- m_pauseButton->Disable();
-}
-
-void MMBoardFrame::OnEject(wxCommandEvent& WXUNUSED(event))
-{
- m_opened_file->Stop();
-
- delete m_opened_file;
- m_opened_file = NULL;
-
- m_playButton->Disable();
- m_pauseButton->Disable();
- m_stopButton->Disable();
- m_ejectButton->Disable();
- m_positionSlider->Disable();
-
- UpdateInfoText();
- UpdateMMedInfo();
-}
-
-void MMBoardFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event))
-{
- wxUint32 itime;
- MMBoardTime btime;
-
- itime = m_positionSlider->GetValue();
- btime.seconds = itime % 60;
- btime.minutes = (itime / 60) % 60;
- btime.hours = itime / 3600;
- m_opened_file->SetPosition(btime);
-
- UpdateMMedInfo();
-}
diff --git a/contrib/samples/mmedia/mmboard.dsp b/contrib/samples/mmedia/mmboard.dsp
deleted file mode 100644
index 87157327e2..0000000000
--- a/contrib/samples/mmedia/mmboard.dsp
+++ /dev/null
@@ -1,484 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mmboard" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=mmboard - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mmboard.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mmboard.mak" CFG="mmboard - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mmboard - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mmboard - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_mmedia.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_mmedia.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_mmedia.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_mmedia.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_mmedia.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_mmedia.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_mmedia.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_mmedia.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_mmedia.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_mmedia.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_mmedia.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_mmedia.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_mmedia.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_mmedia.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_mmedia.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_mmedia.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_mmedia.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_mmedia.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_mmedia.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_mmedia.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_mmedia.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_mmedia.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_mmedia.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_mmedia.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_mmedia.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_mmedia.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_mmedia.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_mmedia.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\mmboard.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_mmedia.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_mmedia.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "mmboard - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\mmboard.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_mmedia.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_mmedia.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "mmboard - Win32 DLL Universal Unicode Release"
-# Name "mmboard - Win32 DLL Universal Unicode Debug"
-# Name "mmboard - Win32 DLL Universal Release"
-# Name "mmboard - Win32 DLL Universal Debug"
-# Name "mmboard - Win32 DLL Unicode Release"
-# Name "mmboard - Win32 DLL Unicode Debug"
-# Name "mmboard - Win32 DLL Release"
-# Name "mmboard - Win32 DLL Debug"
-# Name "mmboard - Win32 Universal Unicode Release"
-# Name "mmboard - Win32 Universal Unicode Debug"
-# Name "mmboard - Win32 Universal Release"
-# Name "mmboard - Win32 Universal Debug"
-# Name "mmboard - Win32 Unicode Release"
-# Name "mmboard - Win32 Unicode Debug"
-# Name "mmboard - Win32 Release"
-# Name "mmboard - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\mmbman.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmboard.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmboard.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/mmedia/mmboard.h b/contrib/samples/mmedia/mmboard.h
deleted file mode 100644
index e66596cbe0..0000000000
--- a/contrib/samples/mmedia/mmboard.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: mmboard.h
-// Purpose: Multimedia Board header
-// Author: Guilhem Lavaux,
-// Modified by:
-// Created: 13/02/2000
-// RCS-ID: $Id$
-// Copyright: (c) 2000, Guilhem Lavaux
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MMBOARD_APP_H_
-#define _MMBOARD_APP_H_
-
-// for compilers that support precompilation, includes "wx/wx.h"
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-// --------------------------------------------------------------------------
-// constants
-// --------------------------------------------------------------------------
-
-#define MM_SOUND_OSS 0x01
-#define MM_SOUND_ESD 0x02
-#define MM_SOUND_WIN 0x04
-
-// --------------------------------------------------------------------------
-// Class definitions
-// --------------------------------------------------------------------------
-
-// Define a new application type, each program should derive a class from wxApp
-class MMBoardApp : public wxApp
-{
-public:
- wxUint8 m_caps;
-
- // override base class virtuals
- // ----------------------------
-
- virtual bool OnInit();
-
- wxUint8 TestMultimediaCaps();
-};
-
-#endif
diff --git a/contrib/samples/mmedia/mmboard.rc b/contrib/samples/mmedia/mmboard.rc
deleted file mode 100644
index 3bf71d6da0..0000000000
--- a/contrib/samples/mmedia/mmboard.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
-#define MINIMAL_QUIT 1
-#define MINIMAL_ABOUT 102
-
diff --git a/contrib/samples/mmedia/mmboard.rc0 b/contrib/samples/mmedia/mmboard.rc0
deleted file mode 100644
index 96d3b9cc7b..0000000000
--- a/contrib/samples/mmedia/mmboard.rc0
+++ /dev/null
@@ -1,6 +0,0 @@
-ICON 1 PRELOAD "mondros2.ico"
-#include "H:\DEV\WX2\wxWindows\include\wx\os2\wx.rc"
-
-#define MINIMAL_QUIT 1
-#define MINIMAL_ABOUT 102
-
diff --git a/contrib/samples/mmedia/mondrian.ico b/contrib/samples/mmedia/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/contrib/samples/mmedia/mondrian.ico and /dev/null differ
diff --git a/contrib/samples/mmedia/mondrian.xpm b/contrib/samples/mmedia/mondrian.xpm
deleted file mode 100644
index 409f27a843..0000000000
--- a/contrib/samples/mmedia/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/contrib/samples/mmedia/mondros2.ico b/contrib/samples/mmedia/mondros2.ico
deleted file mode 100644
index 8b0e58c0d7..0000000000
Binary files a/contrib/samples/mmedia/mondros2.ico and /dev/null differ
diff --git a/contrib/samples/mmedia/pause.xpm b/contrib/samples/mmedia/pause.xpm
deleted file mode 100644
index 2283f242ab..0000000000
--- a/contrib/samples/mmedia/pause.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * pause_xpm[] = {
-"13 15 5 1",
-" c None",
-". c #949594",
-"+ c #000000",
-"@ c #8E8E8E",
-"# c #FFFFFF",
-"...... ......",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+@@@# .+@@@#",
-".##### .#####"};
diff --git a/contrib/samples/mmedia/play.xpm b/contrib/samples/mmedia/play.xpm
deleted file mode 100644
index 5b7db49baf..0000000000
--- a/contrib/samples/mmedia/play.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * play_back_xpm[] = {
-"13 15 5 1",
-" c None",
-". c #949594",
-"+ c #000000",
-"@ c #8E8E8E",
-"# c #FFFFFF",
-"...... ",
-".+++++. ",
-".++++++. ",
-".+++++++. ",
-".++++++++. ",
-".+++++++++. ",
-".++++++++++. ",
-".++++++++++@#",
-".+++++++++@# ",
-".++++++++@# ",
-".+++++++@# ",
-".++++++@# ",
-".+++++@# ",
-".+@@@@# ",
-".##### "};
diff --git a/contrib/samples/mmedia/stop.xpm b/contrib/samples/mmedia/stop.xpm
deleted file mode 100644
index 2d159d0376..0000000000
--- a/contrib/samples/mmedia/stop.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * stop_back_xpm[] = {
-"13 15 5 1",
-" c None",
-". c #949594",
-"+ c #000000",
-"@ c #8E8E8E",
-"# c #FFFFFF",
-".............",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".+@@@@@@@@@@#",
-".############"};
diff --git a/contrib/samples/ogl/Makefile.in b/contrib/samples/ogl/Makefile.in
deleted file mode 100644
index e53c85784e..0000000000
--- a/contrib/samples/ogl/Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile : Builds wxWindows utils for Unix.
-#
-
-OGL_SAMPLES=ogledit studio
-
-all:
- @for d in $(OGL_SAMPLES); do (cd $$d && $(MAKE)); done
-
-clean:
- @for d in $(OGL_SAMPLES); do (cd $$d && $(MAKE) clean); done
-
diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in
deleted file mode 100644
index d09c377523..0000000000
--- a/contrib/samples/ogl/ogledit/Makefile.in
+++ /dev/null
@@ -1,206 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-OGLEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
- -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-OGLEDIT_OBJECTS = \
- $(__ogledit_os2_lib_res) \
- ogledit_ogledit.o \
- ogledit_doc.o \
- ogledit_view.o \
- ogledit_palette.o \
- $(__ogledit___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__ogledit___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C ogledit$(EXEEXT)
-@COND_PLATFORM_MAC_1@__ogledit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___ogledit___os2_emxbindcmd = $(NM) ogledit$(EXEEXT) | if \
- grep -q pmwin.763 ; then emxbind -ep ogledit$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__ogledit___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ogledit___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__ogledit_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__ogledit_bundle___depname = ogledit_bundle
-@COND_TOOLKIT_COCOA@____ogledit_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@ ogledit.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____ogledit_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@ ogledit.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__ogledit___win32rc = ogledit_ogledit_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: ogledit$(EXEEXT) $(__ogledit_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f ogledit$(EXEEXT)
- rm -rf ogledit.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
- $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__ogledit___mac_rezcmd)
- $(__ogledit___mac_setfilecmd)
- $(__ogledit___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p ogledit.app/Contents
- mkdir -p ogledit.app/Contents/MacOS
- mkdir -p ogledit.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/ogledit/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >ogledit.app/Contents/Info.plist
-
-
- echo -n "APPL????" >ogledit.app/Contents/PkgInfo
-
-
- ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@ogledit_bundle: $(____ogledit_BUNDLE_TGT_REF_DEP)
-
-ogledit_ogledit.o: $(srcdir)/ogledit.cpp
- $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $(srcdir)/ogledit.cpp
-
-ogledit_doc.o: $(srcdir)/doc.cpp
- $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $(srcdir)/doc.cpp
-
-ogledit_view.o: $(srcdir)/view.cpp
- $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $(srcdir)/view.cpp
-
-ogledit_palette.o: $(srcdir)/palette.cpp
- $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $(srcdir)/palette.cpp
-
-ogledit_ogledit_rc.o: $(srcdir)/ogledit.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean ogledit_bundle
diff --git a/contrib/samples/ogl/ogledit/bitmaps/arrow.xpm b/contrib/samples/ogl/ogledit/bitmaps/arrow.xpm
deleted file mode 100644
index d3807cbf4e..0000000000
--- a/contrib/samples/ogl/ogledit/bitmaps/arrow.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *arrow_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 16 1",
-" c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c #c0c0c0",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"######################",
-"######################",
-"######################",
-"######################",
-"######################",
-"####### ##############",
-"####### #############",
-"####### ############",
-"####### ###########",
-"####### ##########",
-"####### #########",
-"####### ########",
-"####### #######",
-"####### ##########",
-"####### # ##########",
-"####### ### #########",
-"########### #########",
-"############ ########",
-"############ ########",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool1.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool1.xpm
deleted file mode 100644
index 89a313d94c..0000000000
--- a/contrib/samples/ogl/ogledit/bitmaps/tool1.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *tool1_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 16 1",
-" c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c #c0c0c0",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"######################",
-"######################",
-"# ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ##",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool2.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool2.xpm
deleted file mode 100644
index 612dbf01bb..0000000000
--- a/contrib/samples/ogl/ogledit/bitmaps/tool2.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *tool2_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 16 1",
-" c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c #c0c0c0",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"######################",
-"######################",
-"#### #####",
-"### ::::::::::::: ####",
-"## ::::::::::::::: ###",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"## ::::::::::::::: ###",
-"### ::::::::::::: ####",
-"#### #####",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool3.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool3.xpm
deleted file mode 100644
index 7ba078573c..0000000000
--- a/contrib/samples/ogl/ogledit/bitmaps/tool3.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *tool3_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 16 1",
-" c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c #c0c0c0",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"######################",
-"######################",
-"######################",
-"######################",
-"####### ########",
-"#### ::::::: #####",
-"### ::::::::::::: ####",
-"## ::::::::::::::: ###",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"## ::::::::::::::: ###",
-"### ::::::::::::: ####",
-"#### ::::::: #####",
-"###### ########",
-"######################",
-"######################",
-"######################",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool4.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool4.xpm
deleted file mode 100644
index 154e93b832..0000000000
--- a/contrib/samples/ogl/ogledit/bitmaps/tool4.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *tool4_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 16 1",
-" c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c #c0c0c0",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"######################",
-"######################",
-"######################",
-"########## ##########",
-"######### :: #########",
-"######## :::: ########",
-"####### :::::: #######",
-"###### :::::::: ######",
-"##### :::::::::: #####",
-"#### :::::::::::: ####",
-"### :::::::::::::: ###",
-"### :::::::::::::: ###",
-"#### :::::::::::: ####",
-"##### :::::::::: #####",
-"###### :::::::: ######",
-"####### :::::: #######",
-"######## :::: ########",
-"######### :: #########",
-"########## ##########",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/ogledit/doc.cpp b/contrib/samples/ogl/ogledit/doc.cpp
deleted file mode 100644
index 9133a0844d..0000000000
--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ /dev/null
@@ -1,622 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/ogledit/doc.cpp
-// Purpose: Implements document functionality in OGLEdit
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/ioswrap.h"
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
-#endif
-
-#include "ogledit.h"
-#include "doc.h"
-#include "view.h"
-
-IMPLEMENT_DYNAMIC_CLASS(DiagramDocument, wxDocument)
-
-DiagramDocument::DiagramDocument(void)
-{
-}
-
-DiagramDocument::~DiagramDocument(void)
-{
-}
-
-bool DiagramDocument::OnCloseDocument(void)
-{
- diagram.DeleteAllShapes();
- return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
-{
-#if wxUSE_PROLOGIO
-
- wxDocument::SaveObject(stream);
-
- char buf[400];
- (void) wxGetTempFileName("diag", buf);
-
- diagram.SaveFile(buf);
- wxTransferFileToStream(buf, stream);
-
- wxRemoveFile(buf);
-
-#endif
-
- return stream;
-}
-
-wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream)
-{
-#if wxUSE_PROLOGIO
-
- wxDocument::LoadObject(stream);
-
- char buf[400];
- (void) wxGetTempFileName("diag", buf);
-
- wxTransferStreamToFile(stream, buf);
-
- diagram.DeleteAllShapes();
- diagram.LoadFile(buf);
- wxRemoveFile(buf);
-
-#endif
-
- return stream;
-}
-#else
-
-wxOutputStream& DiagramDocument::SaveObject(wxOutputStream& stream)
-{
-#if wxUSE_PROLOGIO
-
- wxDocument::SaveObject(stream);
- wxChar buf[400];
- (void) wxGetTempFileName(_T("diag"), buf);
-
- diagram.SaveFile(buf);
-
- wxTransferFileToStream(buf, stream);
-
- wxRemoveFile(buf);
-
-#endif
-
- return stream;
-}
-
-wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
-{
-#if wxUSE_PROLOGIO
- wxDocument::LoadObject(stream);
-
- wxChar buf[400];
- (void) wxGetTempFileName(_T("diag"), buf);
-
- wxTransferStreamToFile(stream, buf);
-
- diagram.DeleteAllShapes();
- diagram.LoadFile(buf);
- wxRemoveFile(buf);
-#endif
-
- return stream;
-}
-
-#endif
-
-/*
- * Implementation of drawing command
- */
-
-DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxClassInfo *info, double xx, double yy,
- bool sel, wxShape *theShape, wxShape *fs, wxShape *ts)
- :wxCommand(true, name)
-{
- doc = ddoc;
- cmd = command;
- shape = theShape;
- fromShape = fs;
- toShape = ts;
- shapeInfo = info;
- shapeBrush = NULL;
- shapePen = NULL;
- x = xx;
- y = yy;
- selected = sel;
- deleteShape = false;
-}
-
-DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape)
- :wxCommand(true, name)
-{
- doc = ddoc;
- cmd = command;
- shape = theShape;
- fromShape = NULL;
- toShape = NULL;
- shapeInfo = NULL;
- x = 0.0;
- y = 0.0;
- selected = false;
- deleteShape = false;
- shapeBrush = backgroundColour;
- shapePen = NULL;
-}
-
-DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape)
- :wxCommand(true, name)
-{
- doc = ddoc;
- cmd = command;
- shape = theShape;
- fromShape = NULL;
- toShape = NULL;
- shapeInfo = NULL;
- x = 0.0;
- y = 0.0;
- selected = false;
- deleteShape = false;
- shapeBrush = NULL;
- shapePen = NULL;
- shapeLabel = lab;
-}
-
-DiagramCommand::~DiagramCommand(void)
-{
- if (shape && deleteShape)
- {
- shape->SetCanvas(NULL);
- delete shape;
- }
-}
-
-bool DiagramCommand::Do(void)
-{
- switch (cmd)
- {
- case wxID_CUT:
- {
- if (shape)
- {
- deleteShape = true;
-
- shape->Select(false);
-
- // Generate commands to explicitly remove each connected line.
- RemoveLines(shape);
-
- doc->GetDiagram()->RemoveShape(shape);
- if (shape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- wxLineShape *lineShape = (wxLineShape *)shape;
- fromShape = lineShape->GetFrom();
- toShape = lineShape->GetTo();
- }
- shape->Unlink();
-
- doc->Modify(true);
- doc->UpdateAllViews();
- }
-
- break;
- }
- case OGLEDIT_ADD_SHAPE:
- {
- wxShape *theShape;
- if (shape)
- theShape = shape; // Saved from undoing the shape
- else
- {
- theShape = (wxShape *)shapeInfo->CreateObject();
- theShape->AssignNewIds();
- theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString));
- theShape->SetCentreResize(false);
- theShape->SetPen(wxBLACK_PEN);
- theShape->SetBrush(wxCYAN_BRUSH);
-
- theShape->SetSize(60, 60);
- }
- doc->GetDiagram()->AddShape(theShape);
- theShape->Show(true);
-
- wxClientDC dc(theShape->GetCanvas());
- theShape->GetCanvas()->PrepareDC(dc);
-
- theShape->Move(dc, x, y);
-
- shape = theShape;
- deleteShape = false;
-
- doc->Modify(true);
- doc->UpdateAllViews();
- break;
- }
- case OGLEDIT_ADD_LINE:
- {
- wxShape *theShape;
- if (shape)
- theShape = shape; // Saved from undoing the line
- else
- {
- theShape = (wxShape *)shapeInfo->CreateObject();
- theShape->AssignNewIds();
- theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString));
- theShape->SetPen(wxBLACK_PEN);
- theShape->SetBrush(wxRED_BRUSH);
-
- wxLineShape *lineShape = (wxLineShape *)theShape;
-
- // Yes, you can have more than 2 control points, in which case
- // it becomes a multi-segment line.
- lineShape->MakeLineControlPoints(2);
- lineShape->AddArrow(ARROW_ARROW, ARROW_POSITION_END, 10.0, 0.0, _T("Normal arrowhead"));
- }
-
- doc->GetDiagram()->AddShape(theShape);
-
- fromShape->AddLine((wxLineShape *)theShape, toShape);
-
- theShape->Show(true);
-
- wxClientDC dc(theShape->GetCanvas());
- theShape->GetCanvas()->PrepareDC(dc);
-
- // It won't get drawn properly unless you move both
- // connected images
- fromShape->Move(dc, fromShape->GetX(), fromShape->GetY());
- toShape->Move(dc, toShape->GetX(), toShape->GetY());
-
- shape = theShape;
- deleteShape = false;
-
- doc->Modify(true);
- doc->UpdateAllViews();
- break;
- }
- case OGLEDIT_CHANGE_BACKGROUND_COLOUR:
- {
- if (shape)
- {
- wxClientDC dc(shape->GetCanvas());
- shape->GetCanvas()->PrepareDC(dc);
-
- const wxBrush *oldBrush = shape->GetBrush();
- shape->SetBrush(shapeBrush);
- shapeBrush = oldBrush;
- shape->Draw(dc);
-
- doc->Modify(true);
- doc->UpdateAllViews();
- }
-
- break;
- }
- case OGLEDIT_EDIT_LABEL:
- {
- if (shape)
- {
- MyEvtHandler *myHandler = (MyEvtHandler *)shape->GetEventHandler();
- wxString oldLabel(myHandler->label);
- myHandler->label = shapeLabel;
- shapeLabel = oldLabel;
-
- wxClientDC dc(shape->GetCanvas());
- shape->GetCanvas()->PrepareDC(dc);
-
- shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
- shape->Draw(dc);
-
- doc->Modify(true);
- doc->UpdateAllViews();
- }
-
- break;
- }
- }
- return true;
-}
-
-bool DiagramCommand::Undo(void)
-{
- switch (cmd)
- {
- case wxID_CUT:
- {
- if (shape)
- {
- doc->GetDiagram()->AddShape(shape);
- shape->Show(true);
-
- if (shape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- wxLineShape *lineShape = (wxLineShape *)shape;
-
- fromShape->AddLine(lineShape, toShape);
- }
- if (selected)
- shape->Select(true);
-
- deleteShape = false;
- }
- doc->Modify(true);
- doc->UpdateAllViews();
- break;
- }
- case OGLEDIT_ADD_SHAPE:
- case OGLEDIT_ADD_LINE:
- {
- if (shape)
- {
- wxClientDC dc(shape->GetCanvas());
- shape->GetCanvas()->PrepareDC(dc);
-
- shape->Select(false, &dc);
- doc->GetDiagram()->RemoveShape(shape);
- shape->Unlink();
- deleteShape = true;
- }
- doc->Modify(true);
- doc->UpdateAllViews();
- break;
- }
- case OGLEDIT_CHANGE_BACKGROUND_COLOUR:
- {
- if (shape)
- {
- wxClientDC dc(shape->GetCanvas());
- shape->GetCanvas()->PrepareDC(dc);
-
- const wxBrush *oldBrush = shape->GetBrush();
- shape->SetBrush(shapeBrush);
- shapeBrush = oldBrush;
- shape->Draw(dc);
-
- doc->Modify(true);
- doc->UpdateAllViews();
- }
- break;
- }
- case OGLEDIT_EDIT_LABEL:
- {
- if (shape)
- {
- MyEvtHandler *myHandler = (MyEvtHandler *)shape->GetEventHandler();
- wxString oldLabel(myHandler->label);
- myHandler->label = shapeLabel;
- shapeLabel = oldLabel;
-
- wxClientDC dc(shape->GetCanvas());
- shape->GetCanvas()->PrepareDC(dc);
-
- shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
- shape->Draw(dc);
-
- doc->Modify(true);
- doc->UpdateAllViews();
- }
-
- break;
- }
- }
- return true;
-}
-
-// Remove each individual line connected to a shape by sending a command.
-void DiagramCommand::RemoveLines(wxShape *shape)
-{
- wxObjectList::compatibility_iterator node = shape->GetLines().GetFirst();
- while (node)
- {
- wxLineShape *line = (wxLineShape *)node->GetData();
- doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), wxID_CUT, doc, NULL, 0.0, 0.0, line->Selected(), line));
-
- node = shape->GetLines().GetFirst();
- }
-}
-
-/*
- * MyEvtHandler: an event handler class for all shapes
- */
-
-void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys, int WXUNUSED(attachment))
-{
- wxClientDC dc(GetShape()->GetCanvas());
- GetShape()->GetCanvas()->PrepareDC(dc);
-
- if (keys == 0)
- {
- // Selection is a concept the library knows about
- if (GetShape()->Selected())
- {
- GetShape()->Select(false, &dc);
- GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be are missing
- }
- else
- {
- // Ensure no other shape is selected, to simplify Undo/Redo code
- bool redraw = false;
- wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
- while (node)
- {
- wxShape *eachShape = (wxShape *)node->GetData();
- if (eachShape->GetParent() == NULL)
- {
- if (eachShape->Selected())
- {
- eachShape->Select(false, &dc);
- redraw = true;
- }
- }
- node = node->GetNext();
- }
- GetShape()->Select(true, &dc);
- if (redraw)
- GetShape()->GetCanvas()->Redraw(dc);
- }
- }
- else if (keys & KEY_CTRL)
- {
- // Do something for CONTROL
- }
- else
- {
-#if wxUSE_STATUSBAR
- wxGetApp().frame->SetStatusText(label);
-#endif // wxUSE_STATUSBAR
- }
-}
-
-/*
- * Implement connection of two shapes by right-dragging between them.
- */
-
-void MyEvtHandler::OnBeginDragRight(double x, double y, int WXUNUSED(keys), int attachment)
-{
- // Force attachment to be zero for now. Eventually we can deal with
- // the actual attachment point, e.g. a rectangle side if attachment mode is on.
- attachment = 0;
-
- wxClientDC dc(GetShape()->GetCanvas());
- GetShape()->GetCanvas()->PrepareDC(dc);
-
- wxPen dottedPen(*wxBLACK, 1, wxDOT);
- dc.SetLogicalFunction(OGLRBLF);
- dc.SetPen(dottedPen);
- double xp, yp;
- GetShape()->GetAttachmentPosition(attachment, &xp, &yp);
- dc.DrawLine((long) xp, (long) yp, (long) x, (long) y);
- GetShape()->GetCanvas()->CaptureMouse();
-}
-
-void MyEvtHandler::OnDragRight(bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys), int attachment)
-{
- // Force attachment to be zero for now
- attachment = 0;
-
- wxClientDC dc(GetShape()->GetCanvas());
- GetShape()->GetCanvas()->PrepareDC(dc);
-
- wxPen dottedPen(*wxBLACK, 1, wxDOT);
- dc.SetLogicalFunction(OGLRBLF);
- dc.SetPen(dottedPen);
- double xp, yp;
- GetShape()->GetAttachmentPosition(attachment, &xp, &yp);
- dc.DrawLine((long) xp, (long) yp, (long) x, (long) y);
-}
-
-void MyEvtHandler::OnEndDragRight(double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
- GetShape()->GetCanvas()->ReleaseMouse();
- MyCanvas *canvas = (MyCanvas *)GetShape()->GetCanvas();
-
- // Check if we're on an object
- int new_attachment;
- wxShape *otherShape = canvas->FindFirstSensitiveShape(x, y, &new_attachment, OP_DRAG_RIGHT);
-
- if (otherShape && !otherShape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- canvas->view->GetDocument()->GetCommandProcessor()->Submit(
- new DiagramCommand(_T("wxLineShape"), OGLEDIT_ADD_LINE, (DiagramDocument *)canvas->view->GetDocument(), CLASSINFO(wxLineShape),
- 0.0, 0.0, false, NULL, GetShape(), otherShape));
- }
-}
-
-void MyEvtHandler::OnEndSize(double WXUNUSED(x), double WXUNUSED(y))
-{
- wxClientDC dc(GetShape()->GetCanvas());
- GetShape()->GetCanvas()->PrepareDC(dc);
-
- GetShape()->FormatText(dc, /* (char*) (const char*) */ label);
-}
-
-/*
- * Diagram
- */
-
-#if wxUSE_PROLOGIO
-
-bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
-{
- wxDiagram::OnShapeSave(db, shape, expr);
- MyEvtHandler *handler = (MyEvtHandler *)shape.GetEventHandler();
- expr.AddAttributeValueString(_T("label"), handler->label);
- return true;
-}
-
-bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
-{
- wxDiagram::OnShapeLoad(db, shape, expr);
- wxChar *label = NULL;
- expr.AssignAttributeValue(_T("label"), &label);
- MyEvtHandler *handler = new MyEvtHandler(&shape, &shape, wxString(label));
- shape.SetEventHandler(handler);
-
- if (label)
- delete[] label;
- return true;
-}
-
-#endif
-
-/*
- * New shapes
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxRoundedRectangleShape, wxRectangleShape)
-
-wxRoundedRectangleShape::wxRoundedRectangleShape(double w, double h):
- wxRectangleShape(w, h)
-{
- // 0.3 of the smaller rectangle dimension
- SetCornerRadius((double) -0.3);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDiamondShape, wxPolygonShape)
-
-wxDiamondShape::wxDiamondShape(double w, double h):
- wxPolygonShape()
-{
- // wxPolygonShape::SetSize relies on the shape having non-zero
- // size initially.
- if (w == 0.0)
- w = 60.0;
- if (h == 0.0)
- h = 60.0;
-
- wxList *thePoints = new wxList;
- wxRealPoint *point = new wxRealPoint(0.0, (-h/2.0));
- thePoints->Append((wxObject*) point);
-
- point = new wxRealPoint((w/2.0), 0.0);
- thePoints->Append((wxObject*) point);
-
- point = new wxRealPoint(0.0, (h/2.0));
- thePoints->Append((wxObject*) point);
-
- point = new wxRealPoint((-w/2.0), 0.0);
- thePoints->Append((wxObject*) point);
-
- Create(thePoints);
-}
diff --git a/contrib/samples/ogl/ogledit/doc.h b/contrib/samples/ogl/ogledit/doc.h
deleted file mode 100644
index 741d4c7062..0000000000
--- a/contrib/samples/ogl/ogledit/doc.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/ogledit/doc.h
-// Purpose: Document classes
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGLSAMPLE_DOC_H_
-#define _OGLSAMPLE_DOC_H_
-
-#include "wx/docview.h"
-#include "wx/cmdproc.h"
-#include "wx/string.h"
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#include "wx/ogl/ogl.h"
-
-#if wxUSE_STD_IOSTREAM
- #include
-#endif
-
-/*
- * Override a few members for this application
- */
-
-class MyDiagram: public wxDiagram
-{
- public:
- MyDiagram(void) {}
-#if wxUSE_PROLOGIO
- bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
- bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-#endif
-};
-
-/*
- * A few new shape classes so we have a 1:1 mapping
- * between palette symbol and unique class
- */
-
-class wxRoundedRectangleShape: public wxRectangleShape
-{
- DECLARE_DYNAMIC_CLASS(wxRoundedRectangleShape)
- private:
- public:
- wxRoundedRectangleShape(double w = 0.0, double h = 0.0);
-};
-
-class wxDiamondShape: public wxPolygonShape
-{
- DECLARE_DYNAMIC_CLASS(wxDiamondShape)
- private:
- public:
- wxDiamondShape(double w = 0.0, double h = 0.0);
-};
-
-/*
- * All shape event behaviour is routed through this handler, so we don't
- * have to derive from each shape class. We plug this in to each shape.
- */
-
-class MyEvtHandler: public wxShapeEvtHandler
-{
- public:
- wxString label;
- MyEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = wxEmptyString):wxShapeEvtHandler(prev, shape)
- {
- label = lab;
- }
- ~MyEvtHandler(void)
- {
- }
- void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
- void OnBeginDragRight(double x, double y, int keys = 0, int attachment = 0);
- void OnDragRight(bool draw, double x, double y, int keys = 0, int attachment = 0);
- void OnEndDragRight(double x, double y, int keys = 0, int attachment = 0);
- void OnEndSize(double x, double y);
-};
-
-/*
- * A diagram document, which contains a diagram.
- */
-
-class DiagramDocument: public wxDocument
-{
- DECLARE_DYNAMIC_CLASS(DiagramDocument)
- private:
- public:
- MyDiagram diagram;
-
- DiagramDocument(void);
- ~DiagramDocument(void);
-
-#if wxUSE_STD_IOSTREAM
- virtual wxSTD ostream& SaveObject(wxSTD ostream& stream);
- virtual wxSTD istream& LoadObject(wxSTD istream& stream);
-#else
- virtual wxOutputStream& SaveObject(wxOutputStream& stream);
- virtual wxInputStream& LoadObject(wxInputStream& stream);
-#endif
-
- inline wxDiagram *GetDiagram() { return &diagram; }
-
- bool OnCloseDocument(void);
-};
-
-/*
- * Most user interface commands are routed through this, to give us the
- * Undo/Redo mechanism. If you add more commands, such as changing the shape colour,
- * you will need to add members to 'remember' what the user applied (for 'Do') and what the
- * previous state was (for 'Undo').
- * You can have one member for each property to be changed. Assume we also have
- * a pointer member wxShape *shape, which is set to the shape being changed.
- * Let's assume we're changing the shape colour. Our member for this is shapeColour.
- *
- * - In 'Do':
- * o Set a temporary variable 'temp' to the current colour for 'shape'.
- * o Change the colour to the new colour.
- * o Set shapeColour to the _old_ colour, 'temp'.
- * - In 'Undo':
- * o Set a temporary variable 'temp' to the current colour for 'shape'.
- * o Change the colour to shapeColour (the old colour).
- * o Set shapeColour to 'temp'.
- *
- * So, as long as we have a pointer to the shape being changed,
- * we only need one member variable for each property.
- *
- * PROBLEM: when an Add shape command is redone, the 'shape' pointer changes.
- * Assume, as here, that we keep a pointer to the old shape so we reuse it
- * when we recreate.
- */
-
-class DiagramCommand: public wxCommand
-{
- protected:
- DiagramDocument *doc;
- int cmd;
- wxShape *shape; // Pointer to the shape we're acting on
- wxShape *fromShape;
- wxShape *toShape;
- wxClassInfo *shapeInfo;
- double x;
- double y;
- bool selected;
- bool deleteShape;
-
- // Storage for property commands
- const wxBrush *shapeBrush;
- wxPen *shapePen;
- wxString shapeLabel;
- public:
- // Multi-purpose constructor for creating, deleting shapes
- DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxClassInfo *shapeInfo = NULL,
- double x = 0.0, double y = 0.0, bool sel = false, wxShape *theShape = NULL, wxShape *fs = NULL, wxShape *ts = NULL);
-
- // Property-changing command constructors
- DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape);
- DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape);
-
- ~DiagramCommand(void);
-
- bool Do(void);
- bool Undo(void);
-
- inline void SetShape(wxShape *s) { shape = s; }
- inline wxShape *GetShape(void) { return shape; }
- inline wxShape *GetFromShape(void) { return fromShape; }
- inline wxShape *GetToShape(void) { return toShape; }
- inline wxClassInfo *GetShapeInfo(void) { return shapeInfo; }
- inline bool GetSelected(void) { return selected; }
-
- void RemoveLines(wxShape *shape);
-};
-
-#endif
- // _OGLSAMPLE_DOC_H_
diff --git a/contrib/samples/ogl/ogledit/makefile.bcc b/contrib/samples/ogl/ogledit/makefile.bcc
deleted file mode 100644
index c8a8166d75..0000000000
--- a/contrib/samples/ogl/ogledit/makefile.bcc
+++ /dev/null
@@ -1,247 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLEDIT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(CPPFLAGS) $(CXXFLAGS)
-OGLEDIT_OBJECTS = \
- $(OBJS)\ogledit_ogledit.obj \
- $(OBJS)\ogledit_doc.obj \
- $(OBJS)\ogledit_view.obj \
- $(OBJS)\ogledit_palette.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\ogledit.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
- -if exist $(OBJS)\ogledit.tds del $(OBJS)\ogledit.tds
- -if exist $(OBJS)\ogledit.ilc del $(OBJS)\ogledit.ilc
- -if exist $(OBJS)\ogledit.ild del $(OBJS)\ogledit.ild
- -if exist $(OBJS)\ogledit.ilf del $(OBJS)\ogledit.ilf
- -if exist $(OBJS)\ogledit.ils del $(OBJS)\ogledit.ils
-
-$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(OGLEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\ogledit_ogledit.res
-|
-
-$(OBJS)\ogledit_ogledit.obj: .\ogledit.cpp
- $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_doc.obj: .\doc.cpp
- $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_view.obj: .\view.cpp
- $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_palette.obj: .\palette.cpp
- $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_ogledit.res: .\ogledit.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/ogl/ogledit/makefile.gcc b/contrib/samples/ogl/ogledit/makefile.gcc
deleted file mode 100644
index 2c84c8a9f4..0000000000
--- a/contrib/samples/ogl/ogledit/makefile.gcc
+++ /dev/null
@@ -1,245 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLEDIT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-OGLEDIT_OBJECTS = \
- $(OBJS)\ogledit_ogledit.o \
- $(OBJS)\ogledit_doc.o \
- $(OBJS)\ogledit_view.o \
- $(OBJS)\ogledit_palette.o \
- $(OBJS)\ogledit_ogledit_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\ogledit.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
-
-$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit_rc.o
- $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\ogledit_ogledit.o: ./ogledit.cpp
- $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogledit_doc.o: ./doc.cpp
- $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogledit_view.o: ./view.cpp
- $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogledit_palette.o: ./palette.cpp
- $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogledit_ogledit_rc.o: ./ogledit.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/ogl/ogledit/makefile.unx b/contrib/samples/ogl/ogledit/makefile.unx
deleted file mode 100644
index 9972f16aee..0000000000
--- a/contrib/samples/ogl/ogledit/makefile.unx
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# File: Makefile
-# Author: Julian Smart
-# Created: 1999
-# Updated:
-# Copyright: (c) 2000 Julian Smart
-#
-# Makefile for OGL demo (GTK version)
-#
-# This makefile requires wxWindows/GTK to be
-# installed (possibly using "make install")
-# on your system.
-#
-
-CXX = $(shell wx-config --cxx)
-WXCONFIG=../../../../wx-config
-WXINCLUDE=-I../../../../include -I../../../include
-WXLIB=-L../../../../lib -L../../../src/ogl
-
-OBJECTS=ogledit.o palette.o doc.o view.o
-
-ogledit: $(OBJECTS)
- $(CXX) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
-
-ogledit.o: ogledit.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c ogledit.cpp
-
-palette.o: palette.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c palette.cpp
-
-doc.o: doc.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
-
-view.o: view.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
-
-clean:
- rm -f *.o ogledit
diff --git a/contrib/samples/ogl/ogledit/makefile.vc b/contrib/samples/ogl/ogledit/makefile.vc
deleted file mode 100644
index 6f31f424f0..0000000000
--- a/contrib/samples/ogl/ogledit/makefile.vc
+++ /dev/null
@@ -1,322 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\ogledit.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /DNOPCH \
- /I.\..\..\..\include $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
- $(CXXFLAGS)
-OGLEDIT_OBJECTS = \
- $(OBJS)\ogledit_ogledit.obj \
- $(OBJS)\ogledit_doc.obj \
- $(OBJS)\ogledit_view.obj \
- $(OBJS)\ogledit_palette.obj \
- $(OBJS)\ogledit_ogledit.res
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\ogledit.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
- -if exist $(OBJS)\ogledit.ilk del $(OBJS)\ogledit.ilk
- -if exist $(OBJS)\ogledit.pdb del $(OBJS)\ogledit.pdb
-
-$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(OGLEDIT_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\ogledit_ogledit.obj: .\ogledit.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_doc.obj: .\doc.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_view.obj: .\view.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_palette.obj: .\palette.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_ogledit.res: .\ogledit.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/ogl/ogledit/makefile.vms b/contrib/samples/ogl/ogledit/makefile.vms
deleted file mode 100644
index 1a64fc7f30..0000000000
--- a/contrib/samples/ogl/ogledit/makefile.vms
+++ /dev/null
@@ -1,44 +0,0 @@
-#************************************************************************
-# Makefile for DOCVIEW under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 09.06.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS =
-APPDEFS =
-APPINCS =
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = docview
-
-# Object modules of the application.
-OBJS = docview.obj view.obj doc.obj
-OBJLIST =docview.obj,view.obj,doc.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
- $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
- - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
-docview.$(OBJSUFF) : docview.$(SRCSUFF) docview.h doc.h view.h
-
-doc.$(OBJSUFF) : doc.$(SRCSUFF) doc.h
-
-view.$(OBJSUFF) : view.$(SRCSUFF) view.h
-
diff --git a/contrib/samples/ogl/ogledit/makefile.wat b/contrib/samples/ogl/ogledit/makefile.wat
deleted file mode 100644
index 729e27c800..0000000000
--- a/contrib/samples/ogl/ogledit/makefile.wat
+++ /dev/null
@@ -1,274 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLEDIT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-OGLEDIT_OBJECTS = &
- $(OBJS)\ogledit_ogledit.obj &
- $(OBJS)\ogledit_doc.obj &
- $(OBJS)\ogledit_view.obj &
- $(OBJS)\ogledit_palette.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\ogledit.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
-
-$(OBJS)\ogledit.exe : $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit.res
- @%create $(OBJS)\ogledit.lbc
- @%append $(OBJS)\ogledit.lbc option quiet
- @%append $(OBJS)\ogledit.lbc name $^@
- @%append $(OBJS)\ogledit.lbc option caseexact
- @%append $(OBJS)\ogledit.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(OGLEDIT_OBJECTS)) do @%append $(OBJS)\ogledit.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\ogledit.lbc library %i
- @%append $(OBJS)\ogledit.lbc option resource=$(OBJS)\ogledit_ogledit.res
- @for %i in () do @%append $(OBJS)\ogledit.lbc option stack=%i
- wlink @$(OBJS)\ogledit.lbc
-
-$(OBJS)\ogledit_ogledit.obj : .AUTODEPEND .\ogledit.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
-
-$(OBJS)\ogledit_doc.obj : .AUTODEPEND .\doc.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
-
-$(OBJS)\ogledit_view.obj : .AUTODEPEND .\view.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
-
-$(OBJS)\ogledit_palette.obj : .AUTODEPEND .\palette.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
-
-$(OBJS)\ogledit_ogledit.res : .AUTODEPEND .\ogledit.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/ogl/ogledit/ogl.ico b/contrib/samples/ogl/ogledit/ogl.ico
deleted file mode 100644
index 7cb092e04c..0000000000
Binary files a/contrib/samples/ogl/ogledit/ogl.ico and /dev/null differ
diff --git a/contrib/samples/ogl/ogledit/ogl.xpm b/contrib/samples/ogl/ogledit/ogl.xpm
deleted file mode 100644
index 2a8c61e578..0000000000
--- a/contrib/samples/ogl/ogledit/ogl.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * ogl_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"32 32 7 1",
-/* colors */
-" s None c None",
-". c #000000",
-"+ c #000080",
-"@ c #ff0000",
-"# c #00ff00",
-"$ c #00ffff",
-"% c #ffffff",
-/* pixels */
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"%............%%%%%%........%%%%%",
-"%.@@@@@@@@@@.%%%%..$$$$$$$$..%%%",
-"%.@@@@@@@@@@.%%%.$$$$$$$$$$$$.%%",
-"%.@@@@@@@@@@.+++.$$$$$$$$$$$$.%%",
-"%.@@@@@@@@@@.+++.$$$$$$$$$$$$.%%",
-"%.@@@@@@@@@@.%%%.$$$$$$$$$$$$.%%",
-"%.@@@@@@@@@@.%%%%..$$$$$$$$..%%%",
-"%............%%%%%.........%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%+.%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%.+.%%%%%%%%%%%%.++..%%%%%%",
-"%%%%%.+++.%%%%%%%%%..#####..%%%%",
-"%%%%.+++++.%%%%%%%.#########.%%%",
-"%%%.+++++++.%%%%%%.#########.%%%",
-"%%.+++++++++.%%%%.###########.%%",
-"%.+++++++++++.++++###########.%%",
-"%%.+++++++++.+++++###########.%%",
-"%%%.+++++++.%%%%%%.#########.%%%",
-"%%%%.+++++.%%%%%%%.#########.%%%",
-"%%%%%.+++.%%%%%%%%%..#####..%%%%",
-"%%%%%%.+.%%%%%%%%%%%%.....%%%%%%",
-"%%%%%%%.%%%%%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"};
diff --git a/contrib/samples/ogl/ogledit/ogledit.bkl b/contrib/samples/ogl/ogledit/ogledit.bkl
deleted file mode 100644
index 4b72d1cb63..0000000000
--- a/contrib/samples/ogl/ogledit/ogledit.bkl
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- $(SRCDIR)/../../../include
-
-
- ogledit.cpp
- doc.cpp
- view.cpp
- palette.cpp
-
- ogl
- deprecated
- core
- base
- ogledit.rc
-
-
-
diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp
deleted file mode 100644
index 8c0263ed09..0000000000
--- a/contrib/samples/ogl/ogledit/ogledit.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/ogledit/ogledit.cpp
-// Purpose: OGLEdit sample app
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
-#endif
-
-#include "ogledit.h"
-#include "palette.h"
-#include "doc.h"
-#include "view.h"
-
-#ifndef __WXMSW__
- #include "ogl.xpm"
-#endif
-
-// A macro needed for some compilers (AIX) that need 'main' to be defined
-// in the application itself.
-IMPLEMENT_APP(MyApp)
-
-MyApp::MyApp(void)
-{
- frame = NULL;
- myDocManager= NULL;
-}
-
-// The `main program' equivalent, creating the windows and returning the
-// main frame
-bool MyApp::OnInit(void)
-{
- wxOGLInitialize();
-
- //// Create a document manager
- myDocManager = new wxDocManager;
-
- //// Create a template relating drawing documents to their views
- (void) new wxDocTemplate(myDocManager, _T("Diagram"), _T("*.dia"), wxEmptyString, _T("dia"), _T("Diagram Doc"), _T("Diagram View"),
- CLASSINFO(DiagramDocument), CLASSINFO(DiagramView));
-
- // If we've only got one window, we only get to edit
- // one document at a time.
- myDocManager->SetMaxDocsOpen(1);
-
- //// Create the main frame window
- frame = new MyFrame(myDocManager, NULL, _T("OGLEdit Demo"), wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
-
- //// Give it an icon
- frame->SetIcon(wxICON(ogl));
-
- //// Make a menubar
- wxMenu *file_menu = new wxMenu;
-
- file_menu->Append(wxID_NEW, _T("&New..."));
- file_menu->Append(wxID_OPEN, _T("&Open..."));
-
- file_menu->Append(wxID_CLOSE, _T("&Close"));
- file_menu->Append(wxID_SAVE, _T("&Save"));
- file_menu->Append(wxID_SAVEAS, _T("Save &As..."));
- file_menu->AppendSeparator();
- file_menu->Append(wxID_PRINT, _T("&Print..."));
- file_menu->Append(wxID_PRINT_SETUP, _T("Print &Setup..."));
- file_menu->Append(wxID_PREVIEW, _T("Print Pre&view"));
-
- wxMenu *edit_menu = new wxMenu;
- edit_menu->Append(wxID_UNDO, _T("&Undo"));
- edit_menu->Append(wxID_REDO, _T("&Redo"));
- edit_menu->AppendSeparator();
- edit_menu->Append(wxID_CUT, _T("&Cut"));
- edit_menu->AppendSeparator();
- edit_menu->Append(OGLEDIT_CHANGE_BACKGROUND_COLOUR, _T("Change &background colour"));
- edit_menu->Append(OGLEDIT_EDIT_LABEL, _T("Edit &label"));
-
- frame->editMenu = edit_menu;
-
- file_menu->AppendSeparator();
- file_menu->Append(wxID_EXIT, _T("E&xit"));
-
- // A nice touch: a history of files visited. Use this menu.
- myDocManager->FileHistoryUseMenu(file_menu);
-
- wxMenu *help_menu = new wxMenu;
- help_menu->Append(OGLEDIT_ABOUT, _T("&About"));
-
- wxMenuBar *menu_bar = new wxMenuBar;
-
- menu_bar->Append(file_menu, _T("&File"));
- if (edit_menu)
- menu_bar->Append(edit_menu, _T("&Edit"));
- menu_bar->Append(help_menu, _T("&Help"));
-
- frame->canvas = frame->CreateCanvas(NULL, frame);
- frame->palette = wxGetApp().CreatePalette(frame);
- myDocManager->CreateDocument(wxEmptyString, wxDOC_NEW);
-
- //// Associate the menu bar with the frame
- frame->SetMenuBar(menu_bar);
-
-#if wxUSE_STATUSBAR
- frame->CreateStatusBar(1);
-#endif // wxUSE_STATUSBAR
-
- frame->Centre(wxBOTH);
- frame->Show(true);
-
- return true;
-}
-
-int MyApp::OnExit(void)
-{
- wxOGLCleanUp();
- delete myDocManager;
- return 0;
-}
-
-/*
- * This is the top-level window of the application.
- */
-
-IMPLEMENT_CLASS(MyFrame, wxDocParentFrame)
-
-BEGIN_EVENT_TABLE(MyFrame, wxDocParentFrame)
- EVT_MENU(OGLEDIT_ABOUT, MyFrame::OnAbout)
- EVT_SIZE(MyFrame::OnSize)
- EVT_CLOSE(MyFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
- const wxPoint& pos, const wxSize& size, long type):
- wxDocParentFrame(manager, frame, wxID_ANY, title, pos, size, type)
-{
- canvas = NULL;
- palette = NULL;
- editMenu = NULL;
-}
-
-void MyFrame::OnSize(wxSizeEvent& event)
-{
- if (canvas && palette)
- {
- int cw, ch;
- GetClientSize(&cw, &ch);
- int paletteX = 0;
- int paletteY = 0;
- int paletteW = 30;
- int paletteH = ch;
- int canvasX = paletteX + paletteW;
- int canvasY = 0;
- int canvasW = cw - paletteW;
- int canvasH = ch;
-
- palette->SetSize(paletteX, paletteY, paletteW, paletteH);
- canvas->SetSize(canvasX, canvasY, canvasW, canvasH);
- }
- event.Skip();
-}
-
-void MyFrame::OnCloseWindow(wxCloseEvent& event)
-{
- wxDocParentFrame::OnCloseWindow(event);
- if (!event.GetVeto())
- {
- wxOGLCleanUp();
- }
-}
-
-// Intercept menu commands
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
- (void)wxMessageBox(_T("OGLEdit Demo\nTo draw a shape, select a shape on the toolbar and left-click on the canvas.\nTo draw a line, right-drag between shapes.\nFor further details, see the OGL manual.\n (c) Julian Smart 1996"), _T("About OGLEdit"));
-}
-
-// Creates a canvas. Called by OnInit as a child of the main window
-MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent)
-{
- int width, height;
- parent->GetClientSize(&width, &height);
-
- // Non-retained canvas
- MyCanvas *canvas = new MyCanvas(view, parent, wxID_ANY, wxPoint(0, 0), wxSize(width, height), 0);
- canvas->SetCursor(wxCursor(wxCURSOR_HAND));
-
- // Give it scrollbars
- canvas->SetScrollbars(20, 20, 50, 50);
-
- return canvas;
-}
-
-MyFrame *GetMainFrame(void)
-{
- return wxGetApp().frame;
-}
diff --git a/contrib/samples/ogl/ogledit/ogledit.dsp b/contrib/samples/ogl/ogledit/ogledit.dsp
deleted file mode 100644
index 834e5388af..0000000000
--- a/contrib/samples/ogl/ogledit/ogledit.dsp
+++ /dev/null
@@ -1,492 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ogledit" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=ogledit - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "ogledit.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ogledit.mak" CFG="ogledit - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ogledit - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ogledit - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\ogledit.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "ogledit - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\ogledit.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "ogledit - Win32 DLL Universal Unicode Release"
-# Name "ogledit - Win32 DLL Universal Unicode Debug"
-# Name "ogledit - Win32 DLL Universal Release"
-# Name "ogledit - Win32 DLL Universal Debug"
-# Name "ogledit - Win32 DLL Unicode Release"
-# Name "ogledit - Win32 DLL Unicode Debug"
-# Name "ogledit - Win32 DLL Release"
-# Name "ogledit - Win32 DLL Debug"
-# Name "ogledit - Win32 Universal Unicode Release"
-# Name "ogledit - Win32 Universal Unicode Debug"
-# Name "ogledit - Win32 Universal Release"
-# Name "ogledit - Win32 Universal Debug"
-# Name "ogledit - Win32 Unicode Release"
-# Name "ogledit - Win32 Unicode Debug"
-# Name "ogledit - Win32 Release"
-# Name "ogledit - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\doc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ogledit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ogledit.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\palette.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/ogl/ogledit/ogledit.h b/contrib/samples/ogl/ogledit/ogledit.h
deleted file mode 100644
index 804ba67e4f..0000000000
--- a/contrib/samples/ogl/ogledit/ogledit.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/ogledit/ogledit.h
-// Purpose: OGL sample
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGLSAMPLE_OGLEDIT_H_
-#define _OGLSAMPLE_OGLEDIT_H_
-
-#include "wx/docview.h"
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-// Define a new application
-class MyFrame;
-class EditorToolPalette;
-class MyApp: public wxApp
-{
- public:
- MyFrame *frame;
- wxDocManager* myDocManager;
-
- MyApp(void);
- bool OnInit(void);
- int OnExit(void);
-
- // Palette stuff
- EditorToolPalette *CreatePalette(wxFrame *parent);
-};
-
-DECLARE_APP(MyApp)
-
-// Define a new frame
-class MyCanvas;
-class MyFrame: public wxDocParentFrame
-{
- DECLARE_CLASS(MyFrame)
-public:
- wxMenu *editMenu;
-
- MyCanvas *canvas;
- EditorToolPalette *palette;
-
- MyFrame(wxDocManager *manager, wxFrame *parent, const wxString& title,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxDEFAULT_FRAME_STYLE);
-
- MyCanvas *CreateCanvas(wxView *view, wxFrame *parent);
- void OnSize(wxSizeEvent& event);
- void OnCloseWindow(wxCloseEvent& event);
- void OnAbout(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-extern MyFrame *GetMainFrame(void);
-
-// Menu/undo/redo commands
-
-enum
-{
- OGLEDIT_ADD_SHAPE = wxID_HIGHEST,
- OGLEDIT_ADD_LINE,
- OGLEDIT_EDIT_LABEL,
- OGLEDIT_CHANGE_BACKGROUND_COLOUR,
- OGLEDIT_ABOUT = wxID_ABOUT
-};
-
-#endif
- // _OGLSAMPLE_OGLEDIT_H_
diff --git a/contrib/samples/ogl/ogledit/ogledit.rc b/contrib/samples/ogl/ogledit/ogledit.rc
deleted file mode 100644
index fe1ac37f07..0000000000
--- a/contrib/samples/ogl/ogledit/ogledit.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-ogl ICON ogl.ico
-
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/ogl/ogledit/palette.cpp b/contrib/samples/ogl/ogledit/palette.cpp
deleted file mode 100644
index 30adc96717..0000000000
--- a/contrib/samples/ogl/ogledit/palette.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: samples/ogl/ogledit/palette.cpp
-// Purpose: OGLEdit palette
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/toolbar.h"
-
-#include
-#include
-#include
-
-#include "doc.h"
-#include "view.h"
-#include "ogledit.h"
-#include "palette.h"
-
-// Include pixmaps
-#include "bitmaps/arrow.xpm"
-#include "bitmaps/tool1.xpm"
-#include "bitmaps/tool2.xpm"
-#include "bitmaps/tool3.xpm"
-#include "bitmaps/tool4.xpm"
-
-/*
- * Object editor tool palette
- *
- */
-
-EditorToolPalette::EditorToolPalette(wxWindow* parent, const wxPoint& pos, const wxSize& size,
- long style):
- TOOLPALETTECLASS(parent, wxID_ANY, pos, size, style)
-{
- currentlySelected = -1;
-}
-
-bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
-{
- // BEGIN mutual exclusivity code
- if (toggled && (currentlySelected != -1) && (toolIndex != currentlySelected))
- ToggleTool(currentlySelected, false);
-
- if (toggled)
- currentlySelected = toolIndex;
- else if (currentlySelected == toolIndex)
- currentlySelected = -1;
- // END mutual exclusivity code
-
- return true;
-}
-
-void EditorToolPalette::OnMouseEnter(int WXUNUSED(toolIndex))
-{
-}
-
-void EditorToolPalette::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
- TOOLPALETTECLASS::SetSize(x, y, width, height, sizeFlags);
-}
-
-EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
-{
- // Load palette bitmaps.
- wxBitmap PaletteTool1(tool1_xpm);
- wxBitmap PaletteTool2(tool2_xpm);
- wxBitmap PaletteTool3(tool3_xpm);
- wxBitmap PaletteTool4(tool4_xpm);
- wxBitmap PaletteArrow(arrow_xpm);
-
- EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxDefaultSize,
- wxTB_VERTICAL);
-
- palette->SetMargins(2, 2);
- palette->SetToolBitmapSize(wxSize(22, 22));
-
- palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Pointer"));
- palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 1"));
- palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 2"));
- palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 3"));
- palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 4"));
-
- palette->Realize();
-
- palette->ToggleTool(PALETTE_ARROW, true);
- palette->currentlySelected = PALETTE_ARROW;
- return palette;
-}
diff --git a/contrib/samples/ogl/ogledit/palette.h b/contrib/samples/ogl/ogledit/palette.h
deleted file mode 100644
index a65c2b8627..0000000000
--- a/contrib/samples/ogl/ogledit/palette.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/ogledit/palette.h
-// Purpose: OGL sample palette
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGLSAMPLE_PALETTE_H_
-#define _OGLSAMPLE_PALETTE_H_
-
-#include "wx/wx.h"
-#include "wx/string.h"
-#include "wx/deprecated/setup.h"
-#include "wx/deprecated/tbarsmpl.h"
-
-/*
- * Object editor tool palette
- *
- */
-
-// TODO for wxWin: wxToolBar95 cannot be moved to a non-0,0 position!
-// Needs to have a parent window...
-// So use a simple toolbar at present.
-// ABX: Simple toolbar is not available in default compilation
-// so I use wxToolBar anyway
-// #if 0 // def __WXGTK__
-// #define TOOLPALETTECLASS wxToolBar
-// #else
-// #define TOOLPALETTECLASS wxToolBarSimple
-// #endif
-#define TOOLPALETTECLASS wxToolBar
-
-class EditorToolPalette: public TOOLPALETTECLASS
-{
- public:
- int currentlySelected;
-
- EditorToolPalette(wxWindow *parent, const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxTB_VERTICAL);
- bool OnLeftClick(int toolIndex, bool toggled);
- void OnMouseEnter(int toolIndex);
- void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-};
-
-#define PALETTE_TOOL1 1
-#define PALETTE_TOOL2 2
-#define PALETTE_TOOL3 3
-#define PALETTE_TOOL4 4
-#define PALETTE_TOOL5 5
-#define PALETTE_TOOL6 6
-#define PALETTE_TOOL7 7
-#define PALETTE_TOOL8 8
-#define PALETTE_TOOL9 9
-#define PALETTE_ARROW 10
-
-#endif
- // _OGLSAMPLE_PALETTE_H_
diff --git a/contrib/samples/ogl/ogledit/view.cpp b/contrib/samples/ogl/ogledit/view.cpp
deleted file mode 100644
index c8661fc380..0000000000
--- a/contrib/samples/ogl/ogledit/view.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/ogledit/view.cpp
-// Purpose: Implements view functionality in OGLEdit
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/colordlg.h"
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
-#endif
-
-#include "ogledit.h"
-#include "doc.h"
-#include "view.h"
-#include "palette.h"
-
-IMPLEMENT_DYNAMIC_CLASS(DiagramView, wxView)
-
-BEGIN_EVENT_TABLE(DiagramView, wxView)
- EVT_MENU(wxID_CUT, DiagramView::OnCut)
- EVT_MENU(OGLEDIT_CHANGE_BACKGROUND_COLOUR, DiagramView::OnChangeBackgroundColour)
- EVT_MENU(OGLEDIT_EDIT_LABEL, DiagramView::OnEditLabel)
-END_EVENT_TABLE()
-
-// What to do when a view is created. Creates actual
-// windows for displaying the view.
-bool DiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
-{
- frame = GetMainFrame();
- canvas = GetMainFrame()->canvas;
- canvas->view = this;
-
- SetFrame(frame);
- Activate(true);
-
- // Initialize the edit menu Undo and Redo items
- doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu);
- doc->GetCommandProcessor()->Initialize();
-
- wxShapeCanvas *shapeCanvas = (wxShapeCanvas *)canvas;
- DiagramDocument *diagramDoc = (DiagramDocument *)doc;
- shapeCanvas->SetDiagram(diagramDoc->GetDiagram());
- diagramDoc->GetDiagram()->SetCanvas(shapeCanvas);
-
- return true;
-}
-
-#define CENTER false // Place the drawing to the center of the page
-
-
-// Sneakily gets used for default print/preview
-// as well as drawing on the screen.
-void DiagramView::OnDraw(wxDC *dc)
-{
-
- /* You might use THIS code if you were scaling
- * graphics of known size to fit on the page.
- */
- int w, h;
-
- // We need to adjust for the graphic size, a formula will be added
- float maxX = 900;
- float maxY = 700;
- // A better way of find the maxium values would be to search through
- // the linked list
-
- // Let's have at least 10 device units margin
- float marginX = 10;
- float marginY = 10;
-
- // Add the margin to the graphic size
- maxX += (2 * marginX);
- maxY += (2 * marginY);
-
- // Get the size of the DC in pixels
- dc->GetSize (&w, &h);
-
- // Calculate a suitable scaling factor
- float scaleX = (float) (w / maxX);
- float scaleY = (float) (h / maxY);
-
- // Use x or y scaling factor, whichever fits on the DC
- float actualScale = wxMin (scaleX, scaleY);
-
- float posX, posY;
- // Calculate the position on the DC for centring the graphic
- #if 0
- // center the drawing
- posX = (float) ((w - (200 * actualScale)) / 2.0);
- posY = (float) ((h - (200 * actualScale)) / 2.0);
- #else
- // Use defined presets
- posX = 10;
- posY = 35;
- #endif
-
-
- // Set the scale and origin
- dc->SetUserScale (actualScale, actualScale);
- dc->SetDeviceOrigin ((long) posX, (long) posY);
-
- // This part was added to preform the print preview and printing functions
-
- wxDiagram *diagram_p=((DiagramDocument*)GetDocument())->GetDiagram(); // Get the current diagram
- if (diagram_p->GetShapeList())
- {
- /* wxCursor *old_cursor = NULL; */
- wxObjectList::compatibility_iterator current = diagram_p->GetShapeList()->GetFirst();
-
- while (current) // Loop through the entire list of shapes
- {
- wxShape *object = (wxShape *)current->GetData();
- if (!object->GetParent())
- {
- object->Draw(* dc); // Draw the shape onto our printing dc
- }
- current = current->GetNext(); // Procede to the next shape in the list
- }
- }
-}
-
-void DiagramView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
-{
- if (canvas)
- canvas->Refresh();
-}
-
-// Clean up windows used for displaying the view.
-bool DiagramView::OnClose(bool WXUNUSED(deleteWindow))
-{
- if (!GetDocument()->Close())
- return false;
-
- DiagramDocument *diagramDoc = (DiagramDocument *)GetDocument();
- diagramDoc->GetDiagram()->SetCanvas(NULL);
-
- canvas->ClearBackground();
- canvas->SetDiagram(NULL);
- canvas->view = NULL;
- canvas = NULL;
-
- wxString s = wxTheApp->GetAppName();
- if (frame)
- frame->SetTitle(s);
-
- SetFrame(NULL);
-
- Activate(false);
-
- return true;
-}
-
-wxShape *DiagramView::FindSelectedShape(void)
-{
- DiagramDocument *doc = (DiagramDocument *)GetDocument();
- wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
- while (node)
- {
- wxShape *eachShape = (wxShape *)node->GetData();
- if ((eachShape->GetParent() == NULL) && eachShape->Selected())
- {
- return eachShape;
- }
- else node = node->GetNext();
- }
- return NULL;
-}
-
-void DiagramView::OnCut(wxCommandEvent& WXUNUSED(event))
-{
- DiagramDocument *doc = (DiagramDocument *)GetDocument();
-
- wxShape *theShape = FindSelectedShape();
- if (theShape)
- doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), wxID_CUT, doc, NULL, 0.0, 0.0, true, theShape));
-}
-
-void DiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
-{
- DiagramDocument *doc = (DiagramDocument *)GetDocument();
-
- wxShape *theShape = FindSelectedShape();
- if (theShape)
- {
- wxColourData data;
- data.SetChooseFull(true);
- data.SetColour(theShape->GetBrush()->GetColour());
-
- wxColourDialog *dialog = new wxColourDialog(frame, &data);
- wxBrush *theBrush = NULL;
- if (dialog->ShowModal() == wxID_OK)
- {
- wxColourData retData = dialog->GetColourData();
- wxColour col = retData.GetColour();
- theBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID);
- }
- dialog->Close();
-
- if (theBrush)
- doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Change colour"), OGLEDIT_CHANGE_BACKGROUND_COLOUR, doc,
- theBrush, theShape));
- }
-}
-
-void DiagramView::OnEditLabel(wxCommandEvent& WXUNUSED(event))
-{
- wxShape *theShape = FindSelectedShape();
- if (theShape)
- {
- wxString newLabel = wxGetTextFromUser(_T("Enter new label"), _T("Shape Label"), ((MyEvtHandler *)theShape->GetEventHandler())->label);
- GetDocument()->GetCommandProcessor()->Submit(new DiagramCommand(_T("Edit label"), OGLEDIT_EDIT_LABEL, (DiagramDocument*) GetDocument(), newLabel, theShape));
- }
-}
-
-
-/*
- * Window implementations
- */
-
-BEGIN_EVENT_TABLE(MyCanvas, wxShapeCanvas)
- EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
- EVT_PAINT(MyCanvas::OnPaint)
-END_EVENT_TABLE()
-
-// Define a constructor for my canvas
-MyCanvas::MyCanvas(wxView *v, wxWindow *parent, wxWindowID id, const wxPoint& pos,
- const wxSize& size, long style):
- wxShapeCanvas(parent, id, pos, size, style)
-{
- SetBackgroundColour(*wxWHITE);
- view = v;
-}
-
-MyCanvas::~MyCanvas(void)
-{
-}
-
-void MyCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
-{
- EditorToolPalette *palette = wxGetApp().frame->palette;
- wxClassInfo *info = NULL;
- switch (palette->currentlySelected)
- {
- case PALETTE_TOOL1:
- {
- info = CLASSINFO(wxRectangleShape);
- break;
- }
- case PALETTE_TOOL2:
- {
- info = CLASSINFO(wxRoundedRectangleShape);
- break;
- }
- case PALETTE_TOOL3:
- {
- info = CLASSINFO(wxEllipseShape);
- break;
- }
- case PALETTE_TOOL4:
- {
- info = CLASSINFO(wxDiamondShape);
- break;
- }
- default:
- break;
- }
- if (info)
- {
- view->GetDocument()->GetCommandProcessor()->Submit(
- new DiagramCommand( info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
- x, y));
- }
-}
-
-void MyCanvas::OnRightClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnDragLeft(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnBeginDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnEndDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnDragRight(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnBeginDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnEndDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnMouseEvent(wxMouseEvent& event)
-{
- wxShapeCanvas::OnMouseEvent(event);
-}
-
-void MyCanvas::OnPaint(wxPaintEvent& event)
-{
-// if (GetDiagram())
- wxShapeCanvas::OnPaint(event);
-}
diff --git a/contrib/samples/ogl/ogledit/view.h b/contrib/samples/ogl/ogledit/view.h
deleted file mode 100644
index 363696eb0e..0000000000
--- a/contrib/samples/ogl/ogledit/view.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/ogledit/view.h
-// Purpose: View-related classes
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGLSAMPLE_VIEW_H_
-#define _OGLSAMPLE_VIEW_H_
-
-#include "doc.h"
-#include "wx/ogl/ogl.h"
-
-class MyCanvas: public wxShapeCanvas
-{
-// DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
- protected:
- public:
- wxView *view;
-
- MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
- const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- long style = wxRETAINED);
- ~MyCanvas(void);
-
- void OnMouseEvent(wxMouseEvent& event);
- void OnPaint(wxPaintEvent& event);
-
- virtual void OnLeftClick(double x, double y, int keys = 0);
- virtual void OnRightClick(double x, double y, int keys = 0);
-
- virtual void OnDragLeft(bool draw, double x, double y, int keys=0); // Erase if draw false
- virtual void OnBeginDragLeft(double x, double y, int keys=0);
- virtual void OnEndDragLeft(double x, double y, int keys=0);
-
- virtual void OnDragRight(bool draw, double x, double y, int keys=0); // Erase if draw false
- virtual void OnBeginDragRight(double x, double y, int keys=0);
- virtual void OnEndDragRight(double x, double y, int keys=0);
-
-DECLARE_EVENT_TABLE()
-};
-
-class DiagramView: public wxView
-{
- DECLARE_DYNAMIC_CLASS(DiagramView)
- private:
- public:
- wxFrame *frame;
- MyCanvas *canvas;
-
- DiagramView(void) { canvas = NULL; frame = NULL; };
- ~DiagramView(void) {};
-
- bool OnCreate(wxDocument *doc, long flags);
- void OnDraw(wxDC *dc);
- void OnUpdate(wxView *sender, wxObject *hint = NULL);
- bool OnClose(bool deleteWindow = true);
-
- wxShape *FindSelectedShape(void);
-
- void OnCut(wxCommandEvent& event);
- void OnChangeBackgroundColour(wxCommandEvent& event);
- void OnEditLabel(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
- // _OGLSAMPLE_VIEW_H_
diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
deleted file mode 100644
index 1480961c40..0000000000
--- a/contrib/samples/ogl/studio/Makefile.in
+++ /dev/null
@@ -1,255 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_XML = @EXTRALIBS_XML@
-EXTRALIBS_HTML = @EXTRALIBS_HTML@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-EXTRALIBS_SDL = @EXTRALIBS_SDL@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
- -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
-STUDIO_OBJECTS = \
- $(__studio_os2_lib_res) \
- studio_studio.o \
- studio_doc.o \
- studio_shapes.o \
- studio_symbols.o \
- studio_view.o \
- studio_cspalette.o \
- studio_mainfrm.o \
- studio_project.o \
- studio_dialogs.o \
- studio_csprint.o \
- $(__studio___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C studio$(EXEEXT)
-@COND_PLATFORM_MAC_1@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___studio___os2_emxbindcmd = $(NM) studio$(EXEEXT) | if grep \
- -q pmwin.763 ; then emxbind -ep studio$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__studio___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___studio___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__studio_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__studio_bundle___depname = studio_bundle
-@COND_TOOLKIT_COCOA@____studio_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@ studio.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____studio_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@ studio.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_ADV_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
-COND_MONOLITHIC_0___WXLIB_HTML_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
-COND_MONOLITHIC_0___WXLIB_XML_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__studio___win32rc = studio_studio_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: studio$(EXEEXT) $(__studio_bundle___depname) data
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f studio$(EXEEXT)
- rm -rf studio.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
- $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__studio___mac_rezcmd)
- $(__studio___mac_setfilecmd)
- $(__studio___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p studio.app/Contents
- mkdir -p studio.app/Contents/MacOS
- mkdir -p studio.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/studio/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >studio.app/Contents/Info.plist
-
-
- echo -n "APPL????" >studio.app/Contents/PkgInfo
-
-
- ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns studio.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@studio_bundle: $(____studio_BUNDLE_TGT_REF_DEP)
-
-data:
- @mkdir -p .
- @for f in studio_resources.wxr; do \
- if test ! -f ./$$f -a ! -d ./$$f ; \
- then x=yep ; \
- else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
- fi; \
- case "$$x" in ?*) \
- cp -pRf $(srcdir)/$$f . ;; \
- esac; \
- done
-
-studio_studio.o: $(srcdir)/studio.cpp
- $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/studio.cpp
-
-studio_doc.o: $(srcdir)/doc.cpp
- $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/doc.cpp
-
-studio_shapes.o: $(srcdir)/shapes.cpp
- $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/shapes.cpp
-
-studio_symbols.o: $(srcdir)/symbols.cpp
- $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/symbols.cpp
-
-studio_view.o: $(srcdir)/view.cpp
- $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/view.cpp
-
-studio_cspalette.o: $(srcdir)/cspalette.cpp
- $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/cspalette.cpp
-
-studio_mainfrm.o: $(srcdir)/mainfrm.cpp
- $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/mainfrm.cpp
-
-studio_project.o: $(srcdir)/project.cpp
- $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/project.cpp
-
-studio_dialogs.o: $(srcdir)/dialogs.cpp
- $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/dialogs.cpp
-
-studio_csprint.o: $(srcdir)/csprint.cpp
- $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/csprint.cpp
-
-studio_studio_rc.o: $(srcdir)/studio.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean studio_bundle data
diff --git a/contrib/samples/ogl/studio/bitmaps/alignb.xpm b/contrib/samples/ogl/studio/bitmaps/alignb.xpm
deleted file mode 100644
index c3b57a5869..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/alignb.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *alignb_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-" c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-" ",
-" ........",
-" .XXXXXX.",
-" .XXXXXX.",
-" .XXXXXX.",
-" .XXXXXX.",
-" .XXXXXX.",
-" ..... .XXXXXX.",
-" .XXX. .XXXXXX.",
-" .XXX. .XXXXXX.",
-" .XXX. .XXXXXX.",
-" .XXX. .XXXXXX.",
-" ..... ........",
-" ",
-" "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/alignl.xpm b/contrib/samples/ogl/studio/bitmaps/alignl.xpm
deleted file mode 100644
index 6d7def92fb..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/alignl.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *alignl_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-" c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-" ",
-" ...... ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" ...... ",
-" ",
-" ",
-" ........... ",
-" .XXXXXXXXX. ",
-" .XXXXXXXXX. ",
-" .XXXXXXXXX. ",
-" .XXXXXXXXX. ",
-" ........... ",
-" "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/alignr.xpm b/contrib/samples/ogl/studio/bitmaps/alignr.xpm
deleted file mode 100644
index 3f873eed4e..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/alignr.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *alignr_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-" c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-" ",
-" ...... ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" ...... ",
-" ",
-" ",
-" ........... ",
-" .XXXXXXXXX. ",
-" .XXXXXXXXX. ",
-" .XXXXXXXXX. ",
-" .XXXXXXXXX. ",
-" ........... ",
-" "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/alignt.xpm b/contrib/samples/ogl/studio/bitmaps/alignt.xpm
deleted file mode 100644
index 65fc1b5ccb..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/alignt.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *alignt_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-" c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-" ",
-" ..... ........",
-" .XXX. .XXXXXX.",
-" .XXX. .XXXXXX.",
-" .XXX. .XXXXXX.",
-" .XXX. .XXXXXX.",
-" ..... .XXXXXX.",
-" .XXXXXX.",
-" .XXXXXX.",
-" .XXXXXX.",
-" .XXXXXX.",
-" .XXXXXX.",
-" ........",
-" ",
-" "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/arrow.bmp b/contrib/samples/ogl/studio/bitmaps/arrow.bmp
deleted file mode 100644
index d406ceb64f..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/arrow.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/arrow.xpm b/contrib/samples/ogl/studio/bitmaps/arrow.xpm
deleted file mode 100644
index e7cab6ae18..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/arrow.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char *arrow_xpm[] = {
-/* width height num_colors chars_per_pixel */
-" 22 22 2 1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-/* pixels */
-"######################",
-"######################",
-"######################",
-"######################",
-"######################",
-"#######.##############",
-"#######..#############",
-"#######...############",
-"#######....###########",
-"#######.....##########",
-"#######......#########",
-"#######.......########",
-"#######........#######",
-"#######.....##########",
-"#######..#..##########",
-"#######.###..#########",
-"###########..#########",
-"############..########",
-"############..########",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/copy.xpm b/contrib/samples/ogl/studio/bitmaps/copy.xpm
deleted file mode 100644
index 00ae82e213..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/copy.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *copy_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 23 1",
-"+ c #769CDA",
-": c #DCE6F6",
-"X c #3365B7",
-"* c #FFFFFF",
-"o c #9AB6E4",
-"< c #EAF0FA",
-"# c #B1C7EB",
-". c #6992D7",
-"3 c #F7F9FD",
-", c #F0F5FC",
-"$ c #A8C0E8",
-" c None",
-"- c #FDFEFF",
-"& c #C4D5F0",
-"1 c #E2EAF8",
-"O c #89A9DF",
-"= c #D2DFF4",
-"4 c #FAFCFE",
-"2 c #F5F8FD",
-"; c #DFE8F7",
-"% c #B8CCEC",
-"> c #E5EDF9",
-"@ c #648FD6",
-/* pixels */
-" .....XX ",
-" .oO+@X#X ",
-" .$oO+X##X ",
-" .%$o........ ",
-" .&%$.*=&#o.-. ",
-" .=&%.*;=&#.--. ",
-" .:=&.*>;=&.... ",
-" .>:=.*,>;=&#o. ",
-" .<1:.*2,>:=&#. ",
-" .2<1.*32,>:=&. ",
-" .32<.*432,>:=. ",
-" .32<.*-432,>:. ",
-" .....**-432,>. ",
-" .***-432,. ",
-" .......... "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/copysize.xpm b/contrib/samples/ogl/studio/bitmaps/copysize.xpm
deleted file mode 100644
index 4694bd4083..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/copysize.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *copysize_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-" c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-" ",
-".......... ... ",
-".XXXXXXXX. . ",
-".XXXXXXXX. . ",
-".XXXXXXXX. .....",
-".XXXXXXXX. ... ",
-".......... . ",
-" ",
-" . . . . . . ",
-" ",
-" . ...... . ",
-" .XXXX. ",
-" . ...... . ",
-" ",
-" . . . . . . "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/cut.xpm b/contrib/samples/ogl/studio/bitmaps/cut.xpm
deleted file mode 100644
index 8afa8f6d15..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/cut.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static char *cut_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 25 1",
-"6 c #D8BDC0",
-": c #C3C3C4",
-"- c #FFFFFF",
-". c #6C6D70",
-"2 c #AD3A45",
-"o c #DBDBDB",
-"# c #939495",
-"< c #E42234",
-"& c #C3C5C8",
-"; c #C6CCD3",
-"% c #B7B7B8",
-" c None",
-"* c #DFE0E2",
-"5 c #B69596",
-"3 c #9C2A35",
-"1 c #CFCFD0",
-", c #AB5C64",
-"+ c #D2D3D4",
-"$ c #BCBDBE",
-"@ c #C6C8CA",
-"> c #CDC0C1",
-"O c #826F72",
-"X c #979BA0",
-"4 c #9B8687",
-"= c #9FA0A0",
-/* pixels */
-" .X .o ",
-" O.+ @. ",
-" O. .. ",
-" O#$ %.& ",
-" O.*.. ",
-" #%#.. ",
-" O=-.. ",
-" #%#;. ",
-" OO:=O ",
-" >,,<, ,<,,1 ",
-" ><23<1 1<32<1 ",
-" ,2 4< <5 2, ",
-" <, ,2 2, ,< ",
-" 23,<5 5<,32 ",
-" 6225 522> "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/cutpoint.xpm b/contrib/samples/ogl/studio/bitmaps/cutpoint.xpm
deleted file mode 100644
index 597b6b01ee..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/cutpoint.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char *cutpoint_xpm[] = {
-/* width height num_colors chars_per_pixel */
-" 16 15 3 1",
-/* colors */
-". c #000000",
-"# c #800000",
-"a c #c0c0c0",
-/* pixels */
-"aaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaa",
-"aa#aaaaaaaaa#aaa",
-"aaa#aaaaaaa#aaaa",
-"aaaa#aaaaa#aaaaa",
-"aaaaa#...#aaaaaa",
-"aaaaaa#.#.aaaaaa",
-".......#........",
-"aaaaaa#.#.aaaaaa",
-"aaaaa#...#aaaaaa",
-"aaaa#aaaaa#aaaaa",
-"aaa#aaaaaaa#aaaa",
-"aa#aaaaaaaaa#aaa",
-"aaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaa"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/file1.ico b/contrib/samples/ogl/studio/bitmaps/file1.ico
deleted file mode 100644
index 497f7321bf..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/file1.ico and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/folder1.ico b/contrib/samples/ogl/studio/bitmaps/folder1.ico
deleted file mode 100644
index 806b900a30..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/folder1.ico and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/help.xpm b/contrib/samples/ogl/studio/bitmaps/help.xpm
deleted file mode 100644
index 161b6b2658..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/help.xpm
+++ /dev/null
@@ -1,71 +0,0 @@
-/* XPM */
-static char *help_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 50 1",
-"j c #4E7FD0",
-"8 c #EDF2FB",
-", c #7198D9",
-"e c #DCE6F6",
-"y c #FFFFFF",
-"5 c #95B2E3",
-"$ c #9AB6E4",
-"g c #EAF0FA",
-"1 c #2D59A3",
-"@ c #B1C7EB",
-"> c #6992D7",
-"a c #D9E4F5",
-"r c #356AC1",
-"6 c #9BB7E5",
-"= c #F7F9FD",
-"+ c #BED0EE",
-"z c #F0F5FC",
-"f c #ADC4E9",
-"# c #A8C0E8",
-"7 c #CBD9F1",
-"u c #366BC2",
-" c None",
-"c c #FDFEFF",
-"w c #274D8D",
-"t c #C4D5F0",
-"% c #7CA0DC",
-"h c #E2EAF8",
-"p c #487BCE",
-"o c #4377CD",
-"4 c #2A549A",
-"< c #254A87",
-"O c #CCDAF2",
-"& c #89A9DF",
-"9 c #2B559B",
-"* c #D2DFF4",
-". c #3366BB",
-": c #2E5CA8",
-"x c #FAFCFE",
-"l c #F5F8FD",
-"2 c #799EDB",
-"d c #DFE8F7",
-"; c #A6BFE8",
-"3 c #638ED5",
-"- c #5282D0",
-"X c #2A5398",
-"0 c #B8CCEC",
-"s c #376EC9",
-"q c #2D5AA5",
-"i c #285092",
-"k c #8CACE0",
-/* pixels */
-" .......Xo ",
-" .O+@#$%.&o ",
-" .*O+@#$.=&- ",
-" ;:::>#@#.==&: ",
-" ,<1234<>@....: ",
-"5 c #3366BB",
-"$ c #2E5CA8",
-"9 c #FAFCFE",
-"4 c #F5F8FD",
-"q c #638ED5",
-"o c #5282D0",
-"& c #B8CCEC",
-"X c #376EC9",
-"< c #ACE95B",
-/* pixels */
-" .XoO+@#$. ",
-" .%%&*=-O;: ",
-" >>>>%&*=O,=o ",
-" ><<>%%&*O,,=o",
-">>><<>>>%&OOo+@",
-"><<<<<<>1%&*=-@",
-"><<<<<<>21%&*=@",
-">>><<>>>321%&*+",
-" ><<>456321%&O",
-" >>>>7456321%o",
-" .,8974563210",
-" .,,897456320",
-" .,,,8974563q",
-" .,,,,897456w",
-" ............"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/newpoint.xpm b/contrib/samples/ogl/studio/bitmaps/newpoint.xpm
deleted file mode 100644
index c1d9fefcce..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/newpoint.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char *newpoint_xpm[] = {
-/* width height num_colors chars_per_pixel */
-" 16 15 3 1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-"a c #ffff00",
-/* pixels */
-"#######a########",
-"###a###a###a####",
-"####a##a##a#####",
-"#####a#a#a######",
-"################",
-"##aaa#....#aaa##",
-"######....######",
-"................",
-"######....######",
-"######....######",
-"################",
-"################",
-"################",
-"################",
-"################"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/open.xpm b/contrib/samples/ogl/studio/bitmaps/open.xpm
deleted file mode 100644
index 36e058fc8e..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/open.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char *open_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 36 1",
-", c #AAC1E8",
-"1 c #9AEA53",
-"q c #DCE6F6",
-". c #295193",
-"; c #A9D066",
-"r c #C6D6F0",
-"$ c #4A7CCE",
-"9 c #779DDB",
-"8 c #EAF0FA",
-"O c #6E96D8",
-"X c #214279",
-"e c #BED0EE",
-"6 c #85A7DF",
-"5 c #F0F5FC",
-"t c #ADC4E9",
-": c #3161B1",
-" c None",
-"u c #274D8B",
-"& c #BFDC9B",
-"> c #9FB9E5",
-"y c #5584D1",
-"w c #3569BF",
-"% c #3A70CA",
-"+ c #305FAC",
-"3 c #5D89D3",
-"0 c #D2DFF4",
-"@ c #CAE2AA",
-"= c #B2D58C",
-"2 c #FAFCFE",
-"# c #638ED5",
-"* c #CEDCF2",
-"4 c #90AFE2",
-"< c #B3C8EB",
-"7 c #E5EDF9",
-"- c #A2BCE6",
-"o c #DFF0D0",
-/* pixels */
-" ",
-" .... ",
-"XXXXX .oo. ",
-"XOOOO+ .@o. ",
-"XOOOO#$%.&*XXX ",
-"XOOOOOOO.=*X-X ",
-"XOXXXX...;*XXXX:",
-"XOX>,<.11111*X2:",
-"X3X4>,<.111*X5-:",
-"XX#64>,,.1*X78: ",
-"XXO964>,,.X0q7: ",
-"Xw3O964>,,er0t: ",
-"X%y3O964>, c #FEE3D7",
-"O c #FFFFFF",
-"o c #7B767D",
-"% c #F79586",
-"& c #CAE1F3",
-"@ c #F08B62",
-"# c #FCCBB8",
-"- c #FDD8C9",
-"4 c #FFF8F4",
-"5 c #FFF5F0",
-" c None",
-"$ c #F8AA8F",
-", c #EFF6FC",
-"1 c #F7FBFD",
-"2 c #FAFCFE",
-"; c #DAEAF7",
-": c #E9F3FA",
-"6 c #FFFAF8",
-". c #3C78A6",
-"3 c #FFF1ED",
-"X c #9B8687",
-"+ c #FBBCA4",
-"* c #B6D5EE",
-"= c #F4F9FD",
-/* pixels */
-" ...... ",
-" .XoOOOOoo. ",
-".+XOOOOOOX@. ",
-".+XXXXXXXX@. ",
-".#++$$%@..... ",
-".##++$$%.&*.=. ",
-".-##++$$.;&.==. ",
-".--##++$.:;.... ",
-".>--##++.,:;&*. ",
-".<>--##+.1,:;&. ",
-".<<>--##.21,:;. ",
-".3<<>--#.O21=:. ",
-".45<<>--....... ",
-".6453<>----. ",
-"............ "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/preview.xpm b/contrib/samples/ogl/studio/bitmaps/preview.xpm
deleted file mode 100644
index d0176b3546..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/preview.xpm
+++ /dev/null
@@ -1,51 +0,0 @@
-/* XPM */
-static char *preview_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 30 1",
-"1 c Black",
-"= c #97C4E7",
-"< c #FFFFFF",
-", c #69A1CF",
-". c #5A89A6",
-"# c #3A749C",
-"+ c #538BB1",
-"> c #D1E5F5",
-"o c #6792AE",
-"% c #C3DDF1",
-"8 c #749BB5",
-"; c #619BC4",
-"X c #6B97B6",
-"@ c #4B82A8",
-" c None",
-"O c #5F8FB0",
-"q c #84A5BB",
-": c #71A8D1",
-"- c #85BBE2",
-"9 c #EFF6FC",
-"7 c #F7FBFD",
-"6 c #FAFCFE",
-"2 c #7FA6C0",
-"5 c #C00000",
-"0 c #FDFDFE",
-"3 c #E2EFF8",
-"$ c #8EA9BC",
-"& c #B6D5EE",
-"* c #A5CCEA",
-"4 c #F4F9FD",
-/* pixels */
-" ..XoO+@#$ ",
-" .%%&*=-;:; ",
-" .>>%&*=,<=X ",
-" $%%%1112<<=X ",
-" $3-1<<<1oXO+ ",
-" $314<<<<1=-+ ",
-" $31<<<<<1-=+ ",
-" $31<<<<<1&*O ",
-" $3-1<<<51>%X ",
-" $367111551>8 ",
-" $3-----95518 ",
-" $3<067466551 ",
-" $3--------551 ",
-" $3<<<0666<<55 ",
-" $$$$$$$$$$q$ "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/print.xpm b/contrib/samples/ogl/studio/bitmaps/print.xpm
deleted file mode 100644
index fae8103a9a..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/print.xpm
+++ /dev/null
@@ -1,56 +0,0 @@
-/* XPM */
-static char *print_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 35 1",
-"y c #EDF2FB",
-"9 c #4E7FD0",
-"> c #B9CDED",
-"# c #3365B7",
-"r c #FFFFFF",
-"8 c #2C58A0",
-"X c #779DDB",
-"7 c #7FA2DD",
-"t c #3263B4",
-"q c #6E96D8",
-"= c #6992D7",
-"* c #D9E4F5",
-"0 c #356AC1",
-"& c #CBD9F1",
-"; c #97B4E3",
-"e c #3161B1",
-" c None",
-"1 c #B5C9EB",
-", c #7CA0DC",
-"4 c #487BCE",
-"- c #4377CD",
-". c #5584D1",
-"6 c #3A70CA",
-"2 c #305FAC",
-"< c #5685D2",
-"w c #4075CC",
-"5 c #638ED5",
-"3 c #3467BC",
-"% c #2F5DA9",
-"o c #ECF1FA",
-": c #D6E1F4",
-"@ c #376EC9",
-"$ c #2D5AA5",
-"+ c #A2BCE6",
-"O c #CFDDF3",
-/* pixels */
-" .XXXXXXXX ",
-" .oooooooX ",
-" .OOOOOOOX ",
-" .+++++++X ",
-" @@#$%%%%%$%@@ ",
-"#&*=-=;:>,<#*&# ",
-".11.2345.63#11. ",
-"4;;;;;;;;;;;;;4 ",
-"677588888889776 ",
-"0qq60wwwwwweqq0 ",
-"3553rrrrrrr$553 ",
-"3< c #3A70CA",
-"- c #3569BF",
-"& c #305FAC",
-"1 c #5D89D3",
-"= c #3366B9",
-"9 c #2E5CA8",
-"< c #638ED5",
-"4 c #3467BC",
-"X c #2F5DA9",
-"# c #2A5398",
-"$ c #376EC9",
-"* c #2D5AA5",
-"; c #8CACE0",
-/* pixels */
-" .XoooO+ ",
-" @o#####o$ @ ",
-"%#&&*#*&&*# @o ",
-"X=-#@;@#=-:#$*# ",
-"#>-@ #->-=># ",
-"*,>% #>,,,# ",
-"*<1X X,<<<* ",
-"@234; #13333* ",
-" X56X $#7O155X ",
-" O2869 .0$*o ",
-" :qwe9 ",
-" 9.rt9 ",
-" 9+y@u ",
-" i$$ ",
-" "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/save.xpm b/contrib/samples/ogl/studio/bitmaps/save.xpm
deleted file mode 100644
index accf1f9eb2..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/save.xpm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* XPM */
-static char *save_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 21 1",
-": c #AAC1E8",
-"1 c #B9CDED",
-"O c #FFFFFF",
-" c #2C58A0",
-"* c #B0C6EA",
-"; c #2D59A3",
-"X c #1C3866",
-"= c #C3D4EF",
-"2 c #CBD9F1",
-"- c #DAE5F6",
-"# c #97B4E3",
-". c None",
-"$ c #274D8B",
-"& c #9FB9E5",
-"@ c #5584D1",
-"% c #82A5DE",
-"o c #3A70CA",
-"< c #A5BEE7",
-", c #D2DFF4",
-"+ c #3467BC",
-"> c #C0D1EE",
-/* pixels */
-" .",
-" XoOOOOOOOOO+X .",
-" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
-" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
-" @@+++++++++@@ .",
-" @@@@@@@@@@@@@ .",
-" @@@$$$$$$$$@@ .",
-" @@$%%%&*=-O$@ .",
-" @@$%X;;*=-O$@ .",
-" @@$%X;;:>,O$@ .",
-" @@$%X;;<12O$@ .",
-" @@$<<2OOOOO$@ .",
-". .."
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/straight.xpm b/contrib/samples/ogl/studio/bitmaps/straight.xpm
deleted file mode 100644
index 12563b4703..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/straight.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *straight_xpm[] = {
-/* width height num_colors chars_per_pixel */
-" 16 15 2 1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-/* pixels */
-"################",
-".........#######",
-".........#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######.........",
-"#######.........",
-"################"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/texttool.bmp b/contrib/samples/ogl/studio/bitmaps/texttool.bmp
deleted file mode 100644
index 09c989aac1..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/texttool.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/texttool.xpm b/contrib/samples/ogl/studio/bitmaps/texttool.xpm
deleted file mode 100644
index db6308fcef..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/texttool.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char *texttool_xpm[] = {
-/* width height num_colors chars_per_pixel */
-" 22 22 2 1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-/* pixels */
-"######################",
-"######################",
-"######################",
-"######################",
-"##########..##########",
-"##########..##########",
-"#########....#########",
-"#########....#########",
-"########.....#########",
-"########..#...########",
-"#######..##...########",
-"#######..###...#######",
-"######.........#######",
-"######..####...#######",
-"######.######...######",
-"#####..######...######",
-"####....####......####",
-"######################",
-"######################",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/tick.bmp b/contrib/samples/ogl/studio/bitmaps/tick.bmp
deleted file mode 100644
index c0d66c9460..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/tick.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/tick.xpm b/contrib/samples/ogl/studio/bitmaps/tick.xpm
deleted file mode 100644
index 6099b2b8b3..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/tick.xpm and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/undo.xpm b/contrib/samples/ogl/studio/bitmaps/undo.xpm
deleted file mode 100644
index 9266cb0e12..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/undo.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char *undo_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 37 1",
-"4 c #4E7FD0",
-"i c #3365B7",
-"q c #8DADE1",
-"= c #3162B3",
-", c #4A7CCE",
-"* c #779DDB",
-"7 c #7FA2DD",
-"8 c #6992D7",
-"2 c #6E96D8",
-"6 c #356AC1",
-"+ c #9BB7E5",
-"@ c #5886D2",
-"y c #BED0EE",
-"t c #C3D4EF",
-"5 c #85A7DF",
-". c #ADC4E9",
-"u c #DAE5F6",
-" c None",
-"X c #487BCE",
-"r c #9FB9E5",
-"o c #254A87",
-"w c #AEC5EA",
-"e c #89A9DF",
-"0 c #98B5E4",
-"> c #3A70CA",
-"- c #3569BF",
-"& c #305FAC",
-"1 c #5D89D3",
-"; c #3366B9",
-"9 c #2E5CA8",
-"< c #638ED5",
-"3 c #3467BC",
-"O c #2F5DA9",
-"$ c #2A5398",
-"# c #376EC9",
-"% c #2D5AA5",
-": c #8CACE0",
-/* pixels */
-" .XoooO+ ",
-"@ #o$$$$$o@ ",
-"o@ $%&&%$%&&$* ",
-"$%#$=-;$@:@$-;O ",
-"$>;->-$ @->$ ",
-"$,,,>$ *>,% ",
-"%<<<,O O1<% ",
-"%22221$ :324@ ",
-"O551X6$# O75O ",
-"o%#8+ 9704X ",
-" 9qwe= ",
-" 9rt+9 ",
-" y@u.9 ",
-" ##i ",
-" "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/vert.xpm b/contrib/samples/ogl/studio/bitmaps/vert.xpm
deleted file mode 100644
index 0f85e23920..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/vert.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *vert_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-" c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-" ",
-" ........",
-" .XXXXXX.",
-" .XXXXXX.",
-" ..... .XXXXXX.",
-" .XXX. .XXXXXX.",
-" .XXX. .XXXXXX.",
-" .XXX. .XXXXXX.",
-" .XXX. .XXXXXX.",
-" ..... .XXXXXX.",
-" .XXXXXX.",
-" .XXXXXX.",
-" ........",
-" ",
-" "
-};
diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp
deleted file mode 100644
index 3eb05d3b8a..0000000000
--- a/contrib/samples/ogl/studio/cspalette.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/cspalette.cpp
-// Purpose: OGLEdit palette
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/laywin.h"
-
-#include
-#include
-#include
-
-#include "doc.h"
-#include "view.h"
-#include "studio.h"
-#include "cspalette.h"
-#include "symbols.h"
-
-#ifndef __WXMSW__
-#include "bitmaps/arrow.xpm"
-#include "bitmaps/texttool.xpm"
-#endif
-
-/*
- * Object editor tool palette
- *
- */
-
-csEditorToolPalette::csEditorToolPalette(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
- long style):
- TOOLPALETTECLASS(parent, id, pos, size, style)
-{
- m_currentlySelected = -1;
-
- SetMaxRowsCols(1, 1000);
-}
-
-bool csEditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
-{
- // BEGIN mutual exclusivity code
- if (toggled && (m_currentlySelected != -1) && (toolIndex != m_currentlySelected))
- ToggleTool(m_currentlySelected, false);
-
- if (toggled)
- m_currentlySelected = toolIndex;
- else if (m_currentlySelected == toolIndex)
- m_currentlySelected = -1;
- // END mutual exclusivity code
-
- return true;
-}
-
-void csEditorToolPalette::OnMouseEnter(int toolIndex)
-{
-#if wxUSE_STATUSBAR
- wxString msg = wxEmptyString;
- if (toolIndex == PALETTE_ARROW)
- msg = _T("Pointer");
- else if (toolIndex != -1)
- {
- csSymbol* symbol = wxGetApp().GetSymbolDatabase()->FindSymbol(toolIndex);
- if (symbol)
- msg = symbol->GetName();
- }
- ((wxFrame*) wxGetApp().GetTopWindow())->SetStatusText(msg);
-#else
- wxUnusedVar(toolIndex);
-#endif // wxUSE_STATUSBAR
-}
-
-void csEditorToolPalette::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
- TOOLPALETTECLASS::SetSize(x, y, width, height, sizeFlags);
-}
-
-void csEditorToolPalette::SetSelection(int sel)
-{
- if ((sel != m_currentlySelected) && (m_currentlySelected != -1))
- {
- ToggleTool(m_currentlySelected, false);
- }
- m_currentlySelected = sel;
- ToggleTool(m_currentlySelected, true);
-}
-
-bool csApp::CreatePalette(wxFrame *parent)
-{
- // First create a layout window
- wxSashLayoutWindow* win = new wxSashLayoutWindow(parent, ID_LAYOUT_WINDOW_PALETTE, wxDefaultPosition, wxSize(200, 30), wxNO_BORDER|wxSW_3D|wxCLIP_CHILDREN);
- win->SetDefaultSize(wxSize(10000, 40));
- win->SetOrientation(wxLAYOUT_HORIZONTAL);
- win->SetAlignment(wxLAYOUT_TOP);
- win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
- win->SetSashVisible(wxSASH_BOTTOM, true);
-
- m_diagramPaletteSashWindow = win;
-
- m_diagramPaletteSashWindow->Show(false);
-
- // Load palette bitmaps
-#ifdef __WXMSW__
- wxBitmap PaletteArrow(_T("arrowtool"));
- wxBitmap TextTool(_T("texttool"));
- wxSize toolBitmapSize(32, 32);
-#else // !__WXMSW__
- wxBitmap PaletteArrow(arrow_xpm);
- wxBitmap TextTool(texttool_xpm);
- wxSize toolBitmapSize(22, 22);
-#endif
-
- csEditorToolPalette *palette = new csEditorToolPalette(m_diagramPaletteSashWindow, ID_DIAGRAM_PALETTE, wxPoint(0, 0), wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER);
-
- palette->SetMargins(2, 2);
-
- palette->SetToolBitmapSize(toolBitmapSize);
-
- palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Pointer"));
- palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Text"));
-
- wxChar** symbols = new wxChar*[20];
- int noSymbols = 0;
-
- symbols[noSymbols] = _T("Wide Rectangle");
- noSymbols ++;
-
- symbols[noSymbols] = _T("Thin Rectangle");
- noSymbols ++;
-
- symbols[noSymbols] = _T("Triangle");
- noSymbols ++;
-
- symbols[noSymbols] = _T("Octagon");
- noSymbols ++;
-
- // For some reason, we're getting Gdk errors with
- // some shapes, such as ones that use DrawEllipse.
-#ifndef __WXGTK__
- symbols[noSymbols] = _T("Group");
- noSymbols ++;
-
- symbols[noSymbols] = _T("Circle");
- noSymbols ++;
-
- symbols[noSymbols] = _T("Circle shadow");
- noSymbols ++;
-
- symbols[noSymbols] = _T("SemiCircle");
- noSymbols ++;
-#endif
-
- int i;
- for (i = 0; i < noSymbols; i++)
- {
- csSymbol* symbol = GetSymbolDatabase()->FindSymbol(symbols[i]);
- if (symbol)
- {
- wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
- palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultCoord, NULL, symbol->GetName());
-
- delete bitmap;
- }
- }
- delete[] symbols;
-
-#if 0
- wxNode* node = GetSymbolDatabase()->GetSymbols().First();
- while (node)
- {
- csSymbol* symbol = (csSymbol*) node->Data();
-
- wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
- palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultCoord, NULL, symbol->GetName());
-
- delete bitmap;
-
- node = node->Next();
- }
-#endif
-
- palette->Realize();
-
- palette->SetSelection(PALETTE_ARROW);
- m_diagramPalette = palette;
-
- return true;
-}
diff --git a/contrib/samples/ogl/studio/cspalette.h b/contrib/samples/ogl/studio/cspalette.h
deleted file mode 100644
index 15f34157bd..0000000000
--- a/contrib/samples/ogl/studio/cspalette.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/cspalette.h
-// Purpose: OGL sample palette
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_CSPALETTE_H_
-#define _STUDIO_CSPALETTE_H_
-
-#include "wx/wx.h"
-#include "wx/string.h"
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-/*
- * Object editor tool palette
- *
- */
-
-#define TOOLPALETTECLASS wxToolBar
-
-class csEditorToolPalette: public TOOLPALETTECLASS
-{
-public:
-
- csEditorToolPalette(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxTB_VERTICAL);
-
- bool OnLeftClick(int toolIndex, bool toggled);
- void OnMouseEnter(int toolIndex);
-
- inline int GetSelection() const { return m_currentlySelected; }
- void SetSelection(int sel);
-
- void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-
-protected:
- int m_currentlySelected;
-};
-
-#define PALETTE_ARROW 200
-#define PALETTE_TEXT_TOOL 201
-
-#endif
- // _STUDIO_CSPALETTE_H_
diff --git a/contrib/samples/ogl/studio/csprint.cpp b/contrib/samples/ogl/studio/csprint.cpp
deleted file mode 100644
index 862d0deaba..0000000000
--- a/contrib/samples/ogl/studio/csprint.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/csprint.cpp
-// Purpose: Printing and clipboard functionality
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#include "wx/clipbrd.h"
-
-#ifdef __WXMSW__
-#include "wx/metafile.h"
-#endif
-
-#include "studio.h"
-#include "doc.h"
-#include "shapes.h"
-#include "view.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxDiagramClipboard, wxDiagram)
-
-// Copy selection
-bool wxDiagramClipboard::Copy(wxDiagram* diagram)
-{
- DeleteAllShapes();
-
- return DoCopy(diagram, this, false, NULL);
-}
-
-// Copy contents to the diagram, with new ids.
-
-bool wxDiagramClipboard::Paste(wxDiagram* diagram, wxDC* dc, int offsetX, int offsetY)
-{
- return DoCopy(this, diagram, true, dc, offsetX, offsetY);
-}
-
-// Universal copy function (to or from clipboard).
-// TODO:
-// Note that this only works for non-composites so far (nested shapes
-// don't have their old-to-new object mappings stored).
-// Also, lines don't yet get their attachment points moved to the new offset position
-// if they have more than 2 points.
-bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bool newIds,
- wxDC* dc, int offsetX, int offsetY)
-{
- OnStartCopy(diagramTo);
-
- wxHashTable mapping(wxKEY_INTEGER);
-
- // First copy all node shapes.
- wxList* shapeList = diagramFrom->GetShapeList();
- wxObjectList::compatibility_iterator node = shapeList->GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if (((diagramFrom == this) || shape->Selected()) && !shape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- wxShape* newShape = shape->CreateNewCopy();
- newShape->GetLines().Clear();
- if (newIds)
- {
- newShape->AssignNewIds();
- }
- mapping.Put((long) shape, (wxObject*) newShape);
-
- newShape->SetX(newShape->GetX() + offsetX);
- newShape->SetY(newShape->GetY() + offsetY);
-
- OnAddShape(diagramTo, newShape, dc);
-
- }
- node = node->GetNext();
- }
-
- node = shapeList->GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if (((diagramFrom == this) || shape->Selected()) && shape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- wxLineShape* lineShape = (wxLineShape*) shape;
- // Only copy a line if its ends are selected too.
- if ((diagramFrom == this) || (lineShape->GetTo()->Selected() && lineShape->GetFrom()->Selected()))
- {
- wxLineShape* newShape = (wxLineShape*) shape->CreateNewCopy();
- mapping.Put((long) shape, (wxObject*) newShape);
-
- if (newIds)
- newShape->AssignNewIds();
-
- wxShape* fromShape = (wxShape*) mapping.Get((long) lineShape->GetFrom());
- wxShape* toShape = (wxShape*) mapping.Get((long) lineShape->GetTo());
-
- wxASSERT_MSG( (fromShape != NULL), _T("Could not find 'from' shape"));
- wxASSERT_MSG( (toShape != NULL), _T("Could not find 'to' shape"));
-
- fromShape->AddLine(newShape, toShape, newShape->GetAttachmentFrom(),
- newShape->GetAttachmentTo());
-
- OnAddShape(diagramTo, newShape, dc);
-
- }
- }
- node = node->GetNext();
- }
-
- // Now make sure line ordering is correct
- node = shapeList->GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if (((diagramFrom == this) || shape->Selected()) && !shape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- wxShape* newShape = (wxShape*) mapping.Get((long) shape);
-
- // Make a list of all the new lines, in the same order as the old lines.
- // Then apply the list of new lines to the shape.
- wxList newLines;
- wxObjectList::compatibility_iterator lineNode = shape->GetLines().GetFirst();
- while (lineNode)
- {
- wxLineShape* lineShape = (wxLineShape*) lineNode->GetData();
- if ((diagramFrom == this) || (lineShape->GetTo()->Selected() && lineShape->GetFrom()->Selected()))
- {
- wxLineShape* newLineShape = (wxLineShape*) mapping.Get((long) lineShape);
-
- wxASSERT_MSG( (newLineShape != NULL), _T("Could not find new line shape"));
-
- newLines.Append(newLineShape);
- }
-
- lineNode = lineNode->GetNext();
- }
-
- if (newLines.GetCount() > 0)
- newShape->ApplyAttachmentOrdering(newLines);
- }
- node = node->GetNext();
- }
-
- OnEndCopy(diagramTo);
-
- return true;
-}
-
-#ifdef __WXMSW__
-// Draw contents to a Windows metafile device context and a bitmap, and copy
-// these to the Windows clipboard
-bool wxDiagramClipboard::CopyToClipboard(double scale)
-{
-#if wxUSE_METAFILE
- // Make a metafile DC
- wxMetaFileDC mfDC;
- if (mfDC.Ok())
- {
- mfDC.SetUserScale(scale, scale);
-
- // Draw on metafile DC
- Redraw(mfDC);
-
- // int printWidth = mfDC.MaxX() - mfDC.MinX();
- // int printHeight = mfDC.MaxY() - mfDC.MinY();
- int maxX = (int)mfDC.MaxX();
- int maxY = (int)mfDC.MaxY();
- wxMetaFile *mf = mfDC.Close();
-
- // Set to a bitmap memory DC
- wxBitmap *newBitmap = new wxBitmap((int)(maxX + 10), (int)(maxY + 10));
- if (!newBitmap->Ok())
- {
- delete newBitmap;
-
- wxChar buf[200];
- wxSprintf(buf, _T("Sorry, could not allocate clipboard bitmap (%dx%d)"), (maxX+10), (maxY+10));
- wxMessageBox(buf, _T("Clipboard copy problem"));
- return false;
- }
-
- wxMemoryDC memDC;
- memDC.SelectObject(*newBitmap);
- memDC.Clear();
-
- // Now draw on memory bitmap DC
- Redraw(memDC);
-
- memDC.SelectObject(wxNullBitmap);
-
- // Open clipboard and set the data
- if (wxOpenClipboard())
- {
- wxEmptyClipboard();
-
- // Copy the bitmap to the clipboard
- wxSetClipboardData(wxDF_BITMAP, newBitmap, 0, 0);
-
-#if 0 // TODO: replace this code (wxEnhMetaFile doesn't have SetClipboard)
- if (mf)
- {
- // Copy the metafile to the clipboard
- // Allow a small margin
- bool success = mf->SetClipboard((int)(mfDC.MaxX() + 15), (int)(mfDC.MaxY() + 15));
- }
-#endif
-
- // Close clipboard
- wxCloseClipboard();
- }
-
- delete newBitmap;
- delete mf;
-
- }
- return true;
-#else
- wxMessageBox("wxUSE_METAFILE in build required to use Clipboard", _T("Clipboard copy problem"));
- return false;
-#endif
-}
-#endif
- // __WXMSW__
-
-// Override this to e.g. have the shape added through a Do/Undo command system.
-// By default, we'll just add it directly to the destination diagram.
-bool wxDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc)
-{
- diagramTo->AddShape(newShape);
-
- if (dc && (diagramTo != this))
- {
- newShape->Select(true, dc);
- }
-
- return true;
-}
-
-/*
- * csDiagramClipboard
- */
-
-IMPLEMENT_DYNAMIC_CLASS(csDiagramClipboard, wxDiagramClipboard)
-
-// Start/end copying
-bool csDiagramClipboard::OnStartCopy(wxDiagram* diagramTo)
-{
- // Do nothing if copying to the clipboard
- if (diagramTo == this)
- return true;
-
- // Deselect all objects initially.
-
- csDiagram* diagram = (csDiagram*) diagramTo;
- csDiagramDocument* doc = diagram->GetDocument();
- ((csDiagramView*)doc->GetFirstView())->SelectAll(false);
-
- m_currentCmd = new csDiagramCommand(_T("Paste"), doc);
-
- return true;
-}
-
-bool csDiagramClipboard::OnEndCopy(wxDiagram* diagramTo)
-{
- // Do nothing if copying to the clipboard
- if (diagramTo == this)
- return true;
-
- csDiagram* diagram = (csDiagram*) diagramTo;
- csDiagramDocument* doc = diagram->GetDocument();
-
- if (m_currentCmd)
- {
- if (m_currentCmd->GetStates().GetCount() == 0)
- {
- delete m_currentCmd;
- }
- else
- {
- doc->GetCommandProcessor()->Submit(m_currentCmd);
- m_currentCmd = NULL;
- }
- }
- return true;
-}
-
-// Use the command framework to add the shapes, if we're copying to a diagram and
-// not the clipboard.
-bool csDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* WXUNUSED(dc))
-{
- if (diagramTo == this)
- {
- diagramTo->AddShape(newShape);
- }
- else
- {
- csDiagram* diagram = (csDiagram*) diagramTo;
- /* csDiagramDocument* doc = */ diagram->GetDocument();
-
- if (newShape->IsKindOf(CLASSINFO(wxLineShape)))
- m_currentCmd->AddState(new csCommandState(ID_CS_ADD_LINE_SELECT, newShape, NULL));
- else
- m_currentCmd->AddState(new csCommandState(ID_CS_ADD_SHAPE_SELECT, newShape, NULL));
- }
-
- return true;
-}
diff --git a/contrib/samples/ogl/studio/dialogs.cpp b/contrib/samples/ogl/studio/dialogs.cpp
deleted file mode 100644
index 8b61d315f3..0000000000
--- a/contrib/samples/ogl/studio/dialogs.cpp
+++ /dev/null
@@ -1,532 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/dialogs.cpp
-// Purpose: Implements Studio dialogs
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "dialogs.h"
-#include "doc.h"
-#include "view.h"
-#include "studio.h"
-#include "studio_resources.h"
-
-#if wxUSE_WX_RESOURCES
-
-IMPLEMENT_CLASS(csLabelEditingDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(csLabelEditingDialog, wxDialog)
- EVT_BUTTON(wxID_OK, csLabelEditingDialog::OnOK)
-END_EVENT_TABLE()
-
-csLabelEditingDialog::csLabelEditingDialog(wxWindow* parent)
-{
- wxLoadFromResource(this, parent, _T("shape_label_dialog"));
-
- // Accelerators
- wxAcceleratorEntry entries[1];
- entries[0].Set(wxACCEL_CTRL, WXK_RETURN, wxID_OK);
- wxAcceleratorTable accel(1, entries);
- SetAcceleratorTable(accel);
-
- Centre();
-
- wxTextCtrl* textCtrl = (wxTextCtrl*) FindWindow(ID_LABELTEXT);
- wxASSERT( (textCtrl != NULL) );
-
-// textCtrl->SetAcceleratorTable(accel);
-
- textCtrl->SetFocus();
-}
-
-void csLabelEditingDialog::OnOK(wxCommandEvent& event)
-{
- wxTextCtrl* textCtrl = (wxTextCtrl*) FindWindow(ID_LABELTEXT);
- wxASSERT( (textCtrl != NULL) );
-
- SetShapeLabel(textCtrl->GetValue());
-
- wxDialog::OnOK(event);
-}
-
-void csLabelEditingDialog::SetShapeLabel(const wxString& label)
-{
- wxTextCtrl* textCtrl = (wxTextCtrl*) FindWindow(ID_LABELTEXT);
- wxASSERT( (textCtrl != NULL) );
-
- m_label = label;
-
- textCtrl->SetValue(label);
-}
-
-IMPLEMENT_CLASS(csSettingsDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(csSettingsDialog, wxDialog)
- EVT_BUTTON(wxID_OK, csSettingsDialog::OnOK)
-END_EVENT_TABLE()
-
-#define PROPERTY_DIALOG_WIDTH 400
-#define PROPERTY_DIALOG_HEIGHT 400
-
-// For 400x400 settings dialog, size your panels to about 375x325 in dialog editor
-
-csSettingsDialog::csSettingsDialog(wxWindow* parent):
- wxDialog(parent, wxID_ANY, _T("Settings"), wxPoint(0, 0), wxSize(PROPERTY_DIALOG_WIDTH, PROPERTY_DIALOG_HEIGHT))
-{
- m_generalSettings = NULL;
- m_diagramSettings = NULL;
-
- m_notebook = new wxNotebook(this, ID_PROPERTY_NOTEBOOK,
- wxPoint(2, 2), wxSize(PROPERTY_DIALOG_WIDTH - 4, PROPERTY_DIALOG_HEIGHT - 4));
-
- m_generalSettings = new wxPanel;
-
- #ifdef __WXDEBUG__
- bool success =
- #endif
- wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog"));
- wxASSERT_MSG( (success), _T("Could not load general settings panel."));
- m_notebook->AddPage(m_generalSettings, _T("General"), true);
-
- m_diagramSettings = new wxPanel;
-
- #ifdef __WXDEBUG__
- success =
- #endif
- wxLoadFromResource(m_diagramSettings, m_notebook, _T("diagram_settings_dialog"));
- wxASSERT_MSG( (success), _T("Could not load diagram settings panel."));
- m_notebook->AddPage(m_diagramSettings, _T("Diagram"));
-
- int largeButtonWidth = 70;
- int largeButtonHeight = 22;
-
- wxButton* okButton = new wxButton(this, wxID_OK, _T("OK"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
- wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _T("Cancel"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
- wxButton* helpButton = new wxButton(this, wxID_HELP, _T("Help"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
-
- // Constraints for the notebook
- wxLayoutConstraints *c = new wxLayoutConstraints;
- c->top.SameAs (this, wxTop, 5);
- c->left.SameAs (this, wxLeft, 5);
- c->right.SameAs (this, wxRight, 5);
- c->bottom.SameAs (cancelButton, wxTop, 5);
- m_notebook->SetConstraints(c);
-
- // Constraints for the Help button
- c = new wxLayoutConstraints;
- c->width.AsIs();
- c->height.AsIs();
- c->right.SameAs (this, wxRight, 5);
- c->bottom.SameAs (this, wxBottom, 5);
- helpButton->SetConstraints(c);
-
- // Constraints for the Cancel button
- c = new wxLayoutConstraints;
- c->width.AsIs();
- c->height.AsIs();
- c->right.SameAs (helpButton, wxLeft, 5);
- c->bottom.SameAs (this, wxBottom, 5);
- cancelButton->SetConstraints(c);
-
- // Constraints for the OK button
- c = new wxLayoutConstraints;
- c->width.AsIs();
- c->height.AsIs();
- c->right.SameAs (cancelButton, wxLeft, 5);
- c->bottom.SameAs (this, wxBottom, 5);
- okButton->SetConstraints(c);
-
- okButton->SetDefault();
- okButton->SetFocus();
-
- Layout();
- Centre(wxBOTH);
-}
-
-void csSettingsDialog::OnOK(wxCommandEvent& event)
-{
- wxDialog::OnOK(event);
-}
-
-bool csSettingsDialog::TransferDataToWindow()
-{
- wxTextCtrl* gridSpacing = (wxTextCtrl*) m_diagramSettings->FindWindow(ID_GRID_SPACING);
- wxASSERT_MSG( (gridSpacing != (wxTextCtrl*) NULL), _T("Could not find grid spacing control."));
-
- wxChoice* gridStyle = (wxChoice*) m_diagramSettings->FindWindow(ID_GRID_STYLE);
- wxASSERT_MSG( (gridStyle != (wxChoice*) NULL), _T("Could not find grid style control."));
-
- gridStyle->SetSelection(wxGetApp().GetGridStyle());
-
- wxString str;
- str.Printf(_T("%d"), wxGetApp().GetGridSpacing());
- gridSpacing->SetValue(str);
-
- return true;
-}
-
-bool csSettingsDialog::TransferDataFromWindow()
-{
- wxTextCtrl* gridSpacing = (wxTextCtrl*) m_diagramSettings->FindWindow(ID_GRID_SPACING);
- wxASSERT_MSG( (gridSpacing != (wxTextCtrl*) NULL), _T("Could not find grid spacing control."));
-
- wxChoice* gridStyle = (wxChoice*) m_diagramSettings->FindWindow(ID_GRID_STYLE);
- wxASSERT_MSG( (gridStyle != (wxChoice*) NULL), _T("Could not find grid style control."));
-
- wxGetApp().SetGridStyle(gridStyle->GetSelection());
- wxString str = gridSpacing->GetValue();
- long grid_spacing;
- str.ToLong( &grid_spacing);
- wxGetApp().SetGridSpacing(grid_spacing);
-
- if (wxGetApp().GetGridStyle() == csGRID_STYLE_DOTTED)
- {
- wxMessageBox(_T("Dotted grid style not yet implemented."), _T("Studio"), wxICON_EXCLAMATION);
- return false;
- }
-
- // Apply settings to all open diagram documents
- wxObjectList::compatibility_iterator node = wxGetApp().GetDocManager()->GetDocuments().GetFirst();
- while (node)
- {
- wxDocument* doc = (wxDocument*) node->GetData();
- if (doc->IsKindOf(CLASSINFO(csDiagramDocument)))
- {
- csDiagramDocument* diagramDoc = (csDiagramDocument*) doc;
- wxDiagram* diagram = (wxDiagram*) diagramDoc->GetDiagram();
-
- diagram->SetGridSpacing((double) wxGetApp().GetGridSpacing());
- switch (wxGetApp().GetGridStyle())
- {
- case csGRID_STYLE_NONE:
- {
- diagram->SetSnapToGrid(false);
- break;
- }
- case csGRID_STYLE_INVISIBLE:
- {
- diagram->SetSnapToGrid(true);
- break;
- }
- case csGRID_STYLE_DOTTED:
- {
- // TODO (not implemented in OGL)
- break;
- }
- }
- }
- node = node->GetNext();
- }
-
- return true;
-}
-
-/*
- * Shape properties dialog (tabbed)
- */
-
-
-IMPLEMENT_CLASS(csShapePropertiesDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(csShapePropertiesDialog, wxDialog)
- EVT_BUTTON(wxID_OK, csShapePropertiesDialog::OnOK)
-END_EVENT_TABLE()
-
-#define SHAPE_PROPERTY_DIALOG_WIDTH 400
-#define SHAPE_PROPERTY_DIALOG_HEIGHT 400
-
-// For 400x400 settings dialog, size your panels to about 375x325 in dialog editor
-
-csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxString& title,
- wxPanel* attributeDialog, const wxString& attributeDialogName):
- wxDialog(parent, wxID_ANY, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT))
-{
- m_attributeDialog = attributeDialog;
- m_alternativeAttributeDialog = NULL;
- m_generalPropertiesDialog = NULL;
-
- m_notebook = new wxNotebook(this, ID_SHAPE_PROPERTY_NOTEBOOK,
- wxPoint(2, 2), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH - 4, SHAPE_PROPERTY_DIALOG_HEIGHT - 4));
-
- m_generalPropertiesDialog = new csGeneralShapePropertiesDialog;
- #ifdef __WXDEBUG__
- bool success =
- #endif
- wxLoadFromResource(m_generalPropertiesDialog, m_notebook, _T("general_shape_properties_dialog"));
- wxASSERT_MSG( (success), _T("Could not load general properties panel."));
- m_notebook->AddPage(m_generalPropertiesDialog, _T("General"));
-
- if (!wxLoadFromResource(m_attributeDialog, m_notebook, attributeDialogName))
- {
- wxMessageBox(_T("Could not load the attribute dialog for this shape."), _T("Studio"), wxICON_EXCLAMATION);
- delete m_attributeDialog;
- m_attributeDialog = NULL;
- }
- else
- {
- m_notebook->AddPage(m_attributeDialog, _T("Attributes"));
- }
-
- // Try the alternative dialog (test code)
- wxString str(attributeDialogName);
- str += _T("1");
- m_alternativeAttributeDialog = new wxPanel;
- if (wxLoadFromResource(m_alternativeAttributeDialog, m_notebook, str))
- {
- m_notebook->AddPage(m_alternativeAttributeDialog, _T("Attributes (alternative)"));
- }
- else
- {
- delete m_alternativeAttributeDialog;
- m_alternativeAttributeDialog = NULL;
- }
-
- int largeButtonWidth = 70;
- int largeButtonHeight = 22;
-
- wxButton* okButton = new wxButton(this, wxID_OK, _T("OK"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
- wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _T("Cancel"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
- wxButton* helpButton = new wxButton(this, wxID_HELP, _T("Help"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
-
- // Constraints for the notebook
- wxLayoutConstraints *c = new wxLayoutConstraints;
- c->top.SameAs (this, wxTop, 5);
- c->left.SameAs (this, wxLeft, 5);
- c->right.SameAs (this, wxRight, 5);
- c->bottom.SameAs (helpButton, wxTop, 5);
- m_notebook->SetConstraints(c);
-
- // Constraints for the Help button
- c = new wxLayoutConstraints;
- c->width.AsIs();
- c->height.AsIs();
- c->right.SameAs (this, wxRight, 5);
- c->bottom.SameAs (this, wxBottom, 5);
- helpButton->SetConstraints(c);
-
- // Constraints for the Cancel button
- c = new wxLayoutConstraints;
- c->width.AsIs();
- c->height.AsIs();
- c->right.SameAs (helpButton, wxLeft, 5);
- c->bottom.SameAs (this, wxBottom, 5);
- cancelButton->SetConstraints(c);
-
- // Constraints for the OK button
- c = new wxLayoutConstraints;
- c->width.AsIs();
- c->height.AsIs();
- c->right.SameAs (cancelButton, wxLeft, 5);
- c->bottom.SameAs (this, wxBottom, 5);
- okButton->SetConstraints(c);
-
- okButton->SetDefault();
- okButton->SetFocus();
-
- SetDefaults();
-
- Layout();
- Centre(wxBOTH);
-}
-
-void csShapePropertiesDialog::OnOK(wxCommandEvent& event)
-{
- wxTextCtrl* textCtrl = (wxTextCtrl*) m_generalPropertiesDialog->FindWindow(ID_LABELTEXT);
- wxASSERT( (textCtrl != NULL) );
-
- m_generalPropertiesDialog->SetShapeLabel(textCtrl->GetValue());
-
- wxDialog::OnOK(event);
-}
-
-// Set some suitable defaults in the attribute dialogs (in the first instance,
-// just set all wxChoices to the first element)
-void csShapePropertiesDialog::SetDefaults()
-{
- if (!m_attributeDialog)
- return;
-
- wxWindowList::compatibility_iterator node = m_attributeDialog->GetChildren().GetFirst();
- while (node)
- {
- wxWindow* child = (wxWindow*) node->GetData();
- if (child->IsKindOf(CLASSINFO(wxChoice)))
- {
- wxChoice* choice = (wxChoice*) child;
- choice->SetSelection(0);
- }
- node = node->GetNext();
- }
-
- if (!m_alternativeAttributeDialog)
- return;
-
- node = m_alternativeAttributeDialog->GetChildren().GetFirst();
- while (node)
- {
- wxWindow* child = (wxWindow*) node->GetData();
- if (child->IsKindOf(CLASSINFO(wxChoice)))
- {
- wxChoice* choice = (wxChoice*) child;
- choice->SetSelection(0);
- }
- node = node->GetNext();
- }
-}
-
-/*
- * csGeneralShapePropertiesDialog
- */
-
-IMPLEMENT_CLASS(csGeneralShapePropertiesDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csGeneralShapePropertiesDialog, wxPanel)
-END_EVENT_TABLE()
-
-csGeneralShapePropertiesDialog::csGeneralShapePropertiesDialog()
-{
-}
-
-void csGeneralShapePropertiesDialog::SetShapeLabel(const wxString& label)
-{
- wxTextCtrl* textCtrl = (wxTextCtrl*) FindWindow(ID_LABELTEXT);
- wxASSERT( (textCtrl != NULL) );
-
- m_label = label;
-
- textCtrl->SetValue(label);
-}
-
-#endif // wxUSE_WX_RESOURCES
-
-/*
- * csThinRectangleDialog
- */
-
-IMPLEMENT_CLASS(csThinRectangleDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csThinRectangleDialog, wxPanel)
-END_EVENT_TABLE()
-
-csThinRectangleDialog::csThinRectangleDialog()
-{
-}
-
-/*
- * csWideRectangleDialog
- */
-
-IMPLEMENT_CLASS(csWideRectangleDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csWideRectangleDialog, wxPanel)
-END_EVENT_TABLE()
-
-csWideRectangleDialog::csWideRectangleDialog()
-{
-}
-
-/*
- * csTriangleDialog
- */
-
-IMPLEMENT_CLASS(csTriangleDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csTriangleDialog, wxPanel)
-END_EVENT_TABLE()
-
-csTriangleDialog::csTriangleDialog()
-{
-}
-
-/*
- * csSemiCircleDialog
- */
-
-IMPLEMENT_CLASS(csSemiCircleDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csSemiCircleDialog, wxPanel)
-END_EVENT_TABLE()
-
-csSemiCircleDialog::csSemiCircleDialog()
-{
-}
-
-/*
- * csCircleDialog
- */
-
-IMPLEMENT_CLASS(csCircleDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csCircleDialog, wxPanel)
-END_EVENT_TABLE()
-
-csCircleDialog::csCircleDialog()
-{
-}
-
-/*
- * csCircleShadowDialog
- */
-
-IMPLEMENT_CLASS(csCircleShadowDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csCircleShadowDialog, wxPanel)
-END_EVENT_TABLE()
-
-csCircleShadowDialog::csCircleShadowDialog()
-{
-}
-
-/*
- * csOctagonDialog
- */
-
-IMPLEMENT_CLASS(csOctagonDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csOctagonDialog, wxPanel)
-END_EVENT_TABLE()
-
-csOctagonDialog::csOctagonDialog()
-{
-}
-
-/*
- * csGroupDialog
- */
-
-IMPLEMENT_CLASS(csGroupDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csGroupDialog, wxPanel)
-END_EVENT_TABLE()
-
-csGroupDialog::csGroupDialog()
-{
-}
-
-/*
- * csTextBoxDialog
- */
-
-IMPLEMENT_CLASS(csTextBoxDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csTextBoxDialog, wxPanel)
-END_EVENT_TABLE()
-
-csTextBoxDialog::csTextBoxDialog()
-{
-}
diff --git a/contrib/samples/ogl/studio/dialogs.h b/contrib/samples/ogl/studio/dialogs.h
deleted file mode 100644
index 10622f43a3..0000000000
--- a/contrib/samples/ogl/studio/dialogs.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/dialogs.h
-// Purpose: Miscellaneous dialogs
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_DIALOGS_H_
-#define _STUDIO_DIALOGS_H_
-
-#include "wx/wx.h"
-#include "wx/notebook.h"
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#if wxUSE_WX_RESOURCES
-
-/*
- * Label editing dialog (about to become obsolete)
- */
-
-class csLabelEditingDialog: public wxDialog
-{
-DECLARE_CLASS(csLabelEditingDialog)
-public:
- csLabelEditingDialog(wxWindow* parent);
-
- void SetShapeLabel(const wxString& label);
- inline wxString GetShapeLabel() const { return m_label; }
-
- void OnOK(wxCommandEvent& event);
-
-protected:
- wxString m_label;
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * Settings dialog (tabbed)
- */
-
-class csSettingsDialog: public wxDialog
-{
-DECLARE_CLASS(csSettingsDialog)
-public:
- csSettingsDialog(wxWindow* parent);
-
- void OnOK(wxCommandEvent& event);
-
- virtual bool TransferDataToWindow();
- virtual bool TransferDataFromWindow();
-
-protected:
-
- wxPanel* m_generalSettings;
- wxPanel* m_diagramSettings;
- wxNotebook* m_notebook;
-
-DECLARE_EVENT_TABLE()
-};
-
-#define ID_PROPERTY_NOTEBOOK 1000
-#define ID_GENERAL_SETTINGS 1002
-#define ID_DIAGRAM_SETTINGS 1003
-
-/*
- * csGeneralShapePropertiesDialog
- * Name, description etc.
- */
-
-class csGeneralShapePropertiesDialog: public wxPanel
-{
-DECLARE_CLASS(csGeneralShapePropertiesDialog)
-public:
- csGeneralShapePropertiesDialog();
-
- void SetShapeLabel(const wxString& label);
- inline wxString GetShapeLabel() const { return m_label; }
-
-protected:
- wxString m_label;
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * Shape properties dialog (tabbed)
- */
-
-class csShapePropertiesDialog: public wxDialog
-{
-DECLARE_CLASS(csShapePropertiesDialog)
-public:
- csShapePropertiesDialog(wxWindow* parent, const wxString& title, wxPanel* attributeDialog, const wxString& attributeDialogName);
-
- void OnOK(wxCommandEvent& event);
-
- // Set some suitable defaults in the attribute dialogs (in the first instance,
- // just set all wxChoices to the first element)
- void SetDefaults();
-
-// Accessors
- csGeneralShapePropertiesDialog* GetGeneralPropertiesDialog() const { return m_generalPropertiesDialog; }
-
-
-protected:
-
- // Attributes, specific to each shape
- wxPanel* m_attributeDialog;
- wxPanel* m_alternativeAttributeDialog;
-
- // General properties, same for each shape, e.g. name/description
- csGeneralShapePropertiesDialog* m_generalPropertiesDialog;
-
- wxNotebook* m_notebook;
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif // wxUSE_WX_RESOURCES
-
-#define ID_SHAPE_PROPERTY_NOTEBOOK 1000
-
-//// Specific attribute-editing panel classes below here
-
-/*
- * csThinRectangleDialog
- */
-
-class csThinRectangleDialog: public wxPanel
-{
-DECLARE_CLASS(csThinRectangleDialog)
-public:
- csThinRectangleDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csWideRectangleDialog
- */
-
-class csWideRectangleDialog: public wxPanel
-{
-DECLARE_CLASS(csWideRectangleDialog)
-public:
- csWideRectangleDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csTriangleDialog
- */
-
-class csTriangleDialog: public wxPanel
-{
-DECLARE_CLASS(csTriangleDialog)
-public:
- csTriangleDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csSemiCircleDialog
- */
-
-class csSemiCircleDialog: public wxPanel
-{
-DECLARE_CLASS(csSemiCircleDialog)
-public:
- csSemiCircleDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csCircleDialog
- */
-
-class csCircleDialog: public wxPanel
-{
-DECLARE_CLASS(csCircleDialog)
-public:
- csCircleDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csCircleShadowDialog
- */
-
-class csCircleShadowDialog: public wxPanel
-{
-DECLARE_CLASS(csCircleShadowDialog)
-public:
- csCircleShadowDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csOctagonDialog
- */
-
-class csOctagonDialog: public wxPanel
-{
-DECLARE_CLASS(csOctagonDialog)
-public:
- csOctagonDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csGroupDialog
- */
-
-class csGroupDialog: public wxPanel
-{
-DECLARE_CLASS(csGroupDialog)
-public:
- csGroupDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csTextBoxDialog
- */
-
-class csTextBoxDialog: public wxPanel
-{
-DECLARE_CLASS(csTextBoxDialog)
-public:
- csTextBoxDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
- // _STUDIO_DIALOGS_H_
diff --git a/contrib/samples/ogl/studio/doc.cpp b/contrib/samples/ogl/studio/doc.cpp
deleted file mode 100644
index ed0a3a88d8..0000000000
--- a/contrib/samples/ogl/studio/doc.cpp
+++ /dev/null
@@ -1,593 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/doc.cpp
-// Purpose: Implements document functionality
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "studio.h"
-#include "doc.h"
-#include "view.h"
-#include "wx/ogl/basicp.h"
-
-IMPLEMENT_DYNAMIC_CLASS(csDiagramDocument, wxDocument)
-
-#ifdef __VISUALC__
-#pragma warning(disable:4355)
-#endif
-
-csDiagramDocument::csDiagramDocument():m_diagram(this)
-{
-}
-
-#ifdef __VISUALC__
-#pragma warning(default:4355)
-#endif
-
-csDiagramDocument::~csDiagramDocument()
-{
-}
-
-bool csDiagramDocument::OnCloseDocument()
-{
- m_diagram.DeleteAllShapes();
- return true;
-}
-
-#if wxUSE_PROLOGIO
-bool csDiagramDocument::OnSaveDocument(const wxString& file)
-{
- if (file == wxEmptyString)
- return false;
-
- if (!m_diagram.SaveFile(file))
- {
- wxString msgTitle;
- if (wxTheApp->GetAppName() != wxEmptyString)
- msgTitle = wxTheApp->GetAppName();
- else
- msgTitle = wxString(_T("File error"));
-
- (void)wxMessageBox(_T("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
- GetDocumentWindow());
- return false;
- }
-
- Modify(false);
- SetFilename(file);
- return true;
-}
-
-bool csDiagramDocument::OnOpenDocument(const wxString& file)
-{
- if (!OnSaveModified())
- return false;
-
- wxString msgTitle;
- if (wxTheApp->GetAppName() != wxEmptyString)
- msgTitle = wxTheApp->GetAppName();
- else
- msgTitle = wxString(_T("File error"));
-
- m_diagram.DeleteAllShapes();
- if (!m_diagram.LoadFile(file))
- {
- (void)wxMessageBox(_T("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
- GetDocumentWindow());
- return false;
- }
- SetFilename(file, true);
- Modify(false);
- UpdateAllViews();
-
- return true;
-}
-#endif // wxUSE_PROLOGIO
-
-
-/*
- * Implementation of drawing command
- */
-
-csDiagramCommand::csDiagramCommand(const wxString& name, csDiagramDocument *doc,
- csCommandState* onlyState):
- wxCommand(true, name)
-{
- m_doc = doc;
-
- if (onlyState)
- {
- AddState(onlyState);
- }
-}
-
-csDiagramCommand::~csDiagramCommand()
-{
- wxObjectList::compatibility_iterator node = m_states.GetFirst();
- while (node)
- {
- csCommandState* state = (csCommandState*) node->GetData();
- delete state;
- node = node->GetNext();
- }
-}
-
-void csDiagramCommand::AddState(csCommandState* state)
-{
- state->m_doc = m_doc;
-// state->m_cmd = m_cmd;
- m_states.Append(state);
-}
-
-// Insert a state at the beginning of the list
-void csDiagramCommand::InsertState(csCommandState* state)
-{
- state->m_doc = m_doc;
-// state->m_cmd = m_cmd;
- m_states.Insert(state);
-}
-
-// Schedule all lines connected to the states to be cut.
-void csDiagramCommand::RemoveLines()
-{
- wxObjectList::compatibility_iterator node = m_states.GetFirst();
- while (node)
- {
- csCommandState* state = (csCommandState*) node->GetData();
- wxShape* shape = state->GetShapeOnCanvas();
- wxASSERT( (shape != NULL) );
-
- wxObjectList::compatibility_iterator node1 = shape->GetLines().GetFirst();
- while (node1)
- {
- wxLineShape *line = (wxLineShape *)node1->GetData();
- if (!FindStateByShape(line))
- {
- csCommandState* newState = new csCommandState(ID_CS_CUT, NULL, line);
- InsertState(newState);
- }
-
- node1 = node1->GetNext();
- }
- node = node->GetNext();
- }
-}
-
-csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
-{
- wxObjectList::compatibility_iterator node = m_states.GetFirst();
- while (node)
- {
- csCommandState* state = (csCommandState*) node->GetData();
- if (shape == state->GetShapeOnCanvas() || shape == state->GetSavedState())
- return state;
- node = node->GetNext();
- }
- return NULL;
-}
-
-bool csDiagramCommand::Do()
-{
- wxObjectList::compatibility_iterator node = m_states.GetFirst();
- while (node)
- {
- csCommandState* state = (csCommandState*) node->GetData();
- if (!state->Do())
- return false;
- node = node->GetNext();
- }
- return true;
-}
-
-bool csDiagramCommand::Undo()
-{
- // Undo in reverse order, so e.g. shapes get added
- // back before the lines do.
- wxObjectList::compatibility_iterator node = m_states.GetLast();
- while (node)
- {
- csCommandState* state = (csCommandState*) node->GetData();
- if (!state->Undo())
- return false;
- node = node->GetPrevious();
- }
- return true;
-}
-
-csCommandState::csCommandState(int cmd, wxShape* savedState, wxShape* shapeOnCanvas)
-{
- m_cmd = cmd;
- m_doc = NULL;
- m_savedState = savedState;
- m_shapeOnCanvas = shapeOnCanvas;
- m_linePositionFrom = 0;
- m_linePositionTo = 0;
-}
-
-csCommandState::~csCommandState()
-{
- if (m_savedState)
- {
- m_savedState->SetCanvas(NULL);
- delete m_savedState;
- }
-}
-
-bool csCommandState::Do()
-{
- switch (m_cmd)
- {
- case ID_CS_CUT:
- {
- // New state is 'nothing' - maybe pass shape ID to state so we know what
- // we're talking about.
- // Then save old shape in m_savedState (actually swap pointers)
-
- wxASSERT( (m_shapeOnCanvas != NULL) );
- wxASSERT( (m_savedState == NULL) ); // new state will be 'nothing'
- wxASSERT( (m_doc != NULL) );
-
- wxShapeCanvas* canvas = m_shapeOnCanvas->GetCanvas();
-
- // In case this is a line
- wxShape* lineFrom = NULL;
- wxShape* lineTo = NULL;
- int attachmentFrom = 0, attachmentTo = 0;
-
- if (m_shapeOnCanvas->IsKindOf(CLASSINFO(wxLineShape)))
- {
- // Store the from/to info to save in the line shape
- wxLineShape* lineShape = (wxLineShape*) m_shapeOnCanvas;
- lineFrom = lineShape->GetFrom();
- lineTo = lineShape->GetTo();
- attachmentFrom = lineShape->GetAttachmentFrom();
- attachmentTo = lineShape->GetAttachmentTo();
-
- m_linePositionFrom = lineFrom->GetLinePosition(lineShape);
- m_linePositionTo = lineTo->GetLinePosition(lineShape);
- }
-
- m_shapeOnCanvas->Select(false);
- ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
-
- m_shapeOnCanvas->Unlink();
-
- m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas);
-
- m_savedState = m_shapeOnCanvas;
-
- if (m_savedState->IsKindOf(CLASSINFO(wxLineShape)))
- {
- // Restore the from/to info for future reference
- wxLineShape* lineShape = (wxLineShape*) m_savedState;
- lineShape->SetFrom(lineFrom);
- lineShape->SetTo(lineTo);
- lineShape->SetAttachments(attachmentFrom, attachmentTo);
-
- wxClientDC dc(canvas);
- canvas->PrepareDC(dc);
-
- lineFrom->MoveLinks(dc);
- lineTo->MoveLinks(dc);
- }
-
- m_doc->Modify(true);
- m_doc->UpdateAllViews();
- break;
- }
- case ID_CS_ADD_SHAPE:
- case ID_CS_ADD_SHAPE_SELECT:
- {
- // The app has given the command state a new m_savedState
- // shape, which is the new shape to add to the canvas (but
- // not actually added until this point).
- // The new 'saved state' is therefore 'nothing' since there
- // was nothing there before.
-
- wxASSERT( (m_shapeOnCanvas == NULL) );
- wxASSERT( (m_savedState != NULL) );
- wxASSERT( (m_doc != NULL) );
-
- m_shapeOnCanvas = m_savedState;
- m_savedState = NULL;
-
- m_doc->GetDiagram()->AddShape(m_shapeOnCanvas);
- m_shapeOnCanvas->Show(true);
-
- wxClientDC dc(m_shapeOnCanvas->GetCanvas());
- m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
-
- csEvtHandler *handler = (csEvtHandler *)m_shapeOnCanvas->GetEventHandler();
- m_shapeOnCanvas->FormatText(dc, handler->m_label);
-
- m_shapeOnCanvas->Move(dc, m_shapeOnCanvas->GetX(), m_shapeOnCanvas->GetY());
-
- if (m_cmd == ID_CS_ADD_SHAPE_SELECT)
- {
- m_shapeOnCanvas->Select(true, &dc);
- ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, true);
- }
-
- m_doc->Modify(true);
- m_doc->UpdateAllViews();
- break;
- }
- case ID_CS_ADD_LINE:
- case ID_CS_ADD_LINE_SELECT:
- {
- wxASSERT( (m_shapeOnCanvas == NULL) );
- wxASSERT( (m_savedState != NULL) );
- wxASSERT( (m_doc != NULL) );
-
- wxLineShape *lineShape = (wxLineShape *)m_savedState;
- wxASSERT( (lineShape->GetFrom() != NULL) );
- wxASSERT( (lineShape->GetTo() != NULL) );
-
- m_shapeOnCanvas = m_savedState;
- m_savedState = NULL;
-
- m_doc->GetDiagram()->AddShape(lineShape);
-
- lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(),
- lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo());
-
- lineShape->Show(true);
-
- wxClientDC dc(lineShape->GetCanvas());
- lineShape->GetCanvas()->PrepareDC(dc);
-
- // It won't get drawn properly unless you move both
- // connected images
- lineShape->GetFrom()->Move(dc, lineShape->GetFrom()->GetX(), lineShape->GetFrom()->GetY());
- lineShape->GetTo()->Move(dc, lineShape->GetTo()->GetX(), lineShape->GetTo()->GetY());
-
- if (m_cmd == ID_CS_ADD_LINE_SELECT)
- {
- lineShape->Select(true, &dc);
- ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, true);
- }
-
- m_doc->Modify(true);
- m_doc->UpdateAllViews();
- break;
- }
- case ID_CS_CHANGE_BACKGROUND_COLOUR:
- case ID_CS_MOVE:
- case ID_CS_SIZE:
- case ID_CS_EDIT_PROPERTIES:
- case ID_CS_FONT_CHANGE:
- case ID_CS_ARROW_CHANGE:
- case ID_CS_ROTATE_CLOCKWISE:
- case ID_CS_ROTATE_ANTICLOCKWISE:
- case ID_CS_CHANGE_LINE_ORDERING:
- case ID_CS_CHANGE_LINE_ATTACHMENT:
- case ID_CS_ALIGN:
- case ID_CS_NEW_POINT:
- case ID_CS_CUT_POINT:
- case ID_CS_MOVE_LINE_POINT:
- case ID_CS_STRAIGHTEN:
- case ID_CS_MOVE_LABEL:
- {
- // At this point we have been given a new shape
- // just like the old one but with a changed colour.
- // It's now time to apply that change to the
- // shape on the canvas, saving the old state.
- // NOTE: this is general enough to work with MOST attribute
- // changes!
-
- wxASSERT( (m_shapeOnCanvas != NULL) );
- wxASSERT( (m_savedState != NULL) ); // This is the new shape with changed colour
- wxASSERT( (m_doc != NULL) );
-
- wxClientDC dc(m_shapeOnCanvas->GetCanvas());
- m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
-
- bool isSelected = m_shapeOnCanvas->Selected();
- if (isSelected)
- m_shapeOnCanvas->Select(false, & dc);
-
- if (m_cmd == ID_CS_SIZE || m_cmd == ID_CS_ROTATE_CLOCKWISE || m_cmd == ID_CS_ROTATE_ANTICLOCKWISE ||
- m_cmd == ID_CS_CHANGE_LINE_ORDERING || m_cmd == ID_CS_CHANGE_LINE_ATTACHMENT)
- {
- m_shapeOnCanvas->Erase(dc);
- }
-
- // TODO: make sure the ID is the same. Or, when applying the new state,
- // don't change the original ID.
- wxShape* tempShape = m_shapeOnCanvas->CreateNewCopy();
-
- // Apply the saved state to the shape on the canvas, by copying.
- m_savedState->CopyWithHandler(*m_shapeOnCanvas);
-
- // Delete this state now it's been used (m_shapeOnCanvas currently holds this state)
- delete m_savedState;
-
- // Remember the previous state
- m_savedState = tempShape;
-
- // Redraw the shape
-
- if (m_cmd == ID_CS_MOVE || m_cmd == ID_CS_ROTATE_CLOCKWISE || m_cmd == ID_CS_ROTATE_ANTICLOCKWISE ||
- m_cmd == ID_CS_ALIGN)
- {
- m_shapeOnCanvas->Move(dc, m_shapeOnCanvas->GetX(), m_shapeOnCanvas->GetY());
-
- csEvtHandler *handler = (csEvtHandler *)m_shapeOnCanvas->GetEventHandler();
- m_shapeOnCanvas->FormatText(dc, handler->m_label);
- m_shapeOnCanvas->Draw(dc);
- }
- else if (m_cmd == ID_CS_CHANGE_LINE_ORDERING)
- {
- m_shapeOnCanvas->MoveLinks(dc);
- }
- else if (m_cmd == ID_CS_CHANGE_LINE_ATTACHMENT)
- {
- wxLineShape *lineShape = (wxLineShape *)m_shapeOnCanvas;
-
- // Have to move both sets of links since we don't know which links
- // have been affected (unless we compared before and after states).
- lineShape->GetFrom()->MoveLinks(dc);
- lineShape->GetTo()->MoveLinks(dc);
- }
- else if (m_cmd == ID_CS_SIZE)
- {
- double width, height;
- m_shapeOnCanvas->GetBoundingBoxMax(&width, &height);
-
- m_shapeOnCanvas->SetSize(width, height);
- m_shapeOnCanvas->Move(dc, m_shapeOnCanvas->GetX(), m_shapeOnCanvas->GetY());
-
- m_shapeOnCanvas->Show(true);
-
- // Recursively redraw links if we have a composite.
- if (m_shapeOnCanvas->GetChildren().GetCount() > 0)
- m_shapeOnCanvas->DrawLinks(dc, -1, true);
-
- m_shapeOnCanvas->GetEventHandler()->OnEndSize(width, height);
- }
- else if (m_cmd == ID_CS_EDIT_PROPERTIES || m_cmd == ID_CS_FONT_CHANGE)
- {
- csEvtHandler *handler = (csEvtHandler *)m_shapeOnCanvas->GetEventHandler();
- m_shapeOnCanvas->FormatText(dc, handler->m_label);
- m_shapeOnCanvas->Draw(dc);
- }
- else
- {
- m_shapeOnCanvas->Draw(dc);
- }
-
- if (isSelected)
- m_shapeOnCanvas->Select(true, & dc);
-
- m_doc->Modify(true);
- m_doc->UpdateAllViews();
-
- break;
- }
- }
- return true;
-}
-
-bool csCommandState::Undo()
-{
- switch (m_cmd)
- {
- case ID_CS_CUT:
- {
- wxASSERT( (m_savedState != NULL) );
- wxASSERT( (m_doc != NULL) );
-
- m_doc->GetDiagram()->AddShape(m_savedState);
- m_shapeOnCanvas = m_savedState;
- m_savedState = NULL;
-
- if (m_shapeOnCanvas->IsKindOf(CLASSINFO(wxLineShape)))
- {
- wxLineShape* lineShape = (wxLineShape*) m_shapeOnCanvas;
- lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(),
- lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo(),
- m_linePositionFrom, m_linePositionTo);
-
- wxShapeCanvas* canvas = lineShape->GetFrom()->GetCanvas();
-
- wxClientDC dc(canvas);
- canvas->PrepareDC(dc);
-
- lineShape->GetFrom()->MoveLinks(dc);
- lineShape->GetTo()->MoveLinks(dc);
-
- }
- m_shapeOnCanvas->Show(true);
-
- m_doc->Modify(true);
- m_doc->UpdateAllViews();
- break;
- }
- case ID_CS_ADD_SHAPE:
- case ID_CS_ADD_LINE:
- case ID_CS_ADD_SHAPE_SELECT:
- case ID_CS_ADD_LINE_SELECT:
- {
- wxASSERT( (m_shapeOnCanvas != NULL) );
- wxASSERT( (m_savedState == NULL) );
- wxASSERT( (m_doc != NULL) );
-
- // In case this is a line
- wxShape* lineFrom = NULL;
- wxShape* lineTo = NULL;
- int attachmentFrom = 0, attachmentTo = 0;
-
- if (m_shapeOnCanvas->IsKindOf(CLASSINFO(wxLineShape)))
- {
- // Store the from/to info to save in the line shape
- wxLineShape* lineShape = (wxLineShape*) m_shapeOnCanvas;
- lineFrom = lineShape->GetFrom();
- lineTo = lineShape->GetTo();
- attachmentFrom = lineShape->GetAttachmentFrom();
- attachmentTo = lineShape->GetAttachmentTo();
- }
-
- wxClientDC dc(m_shapeOnCanvas->GetCanvas());
- m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
-
- m_shapeOnCanvas->Select(false, &dc);
- ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
- m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas);
- m_shapeOnCanvas->Unlink(); // Unlinks the line, if it is a line
-
- if (m_shapeOnCanvas->IsKindOf(CLASSINFO(wxLineShape)))
- {
- // Restore the from/to info for future reference
- wxLineShape* lineShape = (wxLineShape*) m_shapeOnCanvas;
- lineShape->SetFrom(lineFrom);
- lineShape->SetTo(lineTo);
- lineShape->SetAttachments(attachmentFrom, attachmentTo);
- }
-
- m_savedState = m_shapeOnCanvas;
- m_shapeOnCanvas = NULL;
-
- m_doc->Modify(true);
- m_doc->UpdateAllViews();
- break;
- }
- case ID_CS_CHANGE_BACKGROUND_COLOUR:
- case ID_CS_MOVE:
- case ID_CS_SIZE:
- case ID_CS_EDIT_PROPERTIES:
- case ID_CS_FONT_CHANGE:
- case ID_CS_ARROW_CHANGE:
- case ID_CS_ROTATE_CLOCKWISE:
- case ID_CS_ROTATE_ANTICLOCKWISE:
- case ID_CS_CHANGE_LINE_ORDERING:
- case ID_CS_CHANGE_LINE_ATTACHMENT:
- case ID_CS_ALIGN:
- case ID_CS_NEW_POINT:
- case ID_CS_CUT_POINT:
- case ID_CS_MOVE_LINE_POINT:
- case ID_CS_STRAIGHTEN:
- case ID_CS_MOVE_LABEL:
- {
- // Exactly like the Do case; we're just swapping states.
- Do();
- break;
- }
- }
-
- return true;
-}
diff --git a/contrib/samples/ogl/studio/doc.h b/contrib/samples/ogl/studio/doc.h
deleted file mode 100644
index 5cd29aecdf..0000000000
--- a/contrib/samples/ogl/studio/doc.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/doc.h
-// Purpose: Document classes
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_DOC_H_
-#define _STUDIO_DOC_H_
-
-#include "wx/docview.h"
-#include "wx/cmdproc.h"
-#include "wx/string.h"
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#include "shapes.h"
-
-/*
- * A diagram document, which contains a diagram.
- */
-
-class csDiagramDocument: public wxDocument
-{
- DECLARE_DYNAMIC_CLASS(csDiagramDocument)
-public:
- csDiagramDocument();
- ~csDiagramDocument();
-
-#if wxUSE_PROLOGIO
- bool OnSaveDocument(const wxString& file);
- bool OnOpenDocument(const wxString& file);
-#endif // wxUSE_PROLOGIO
-
- inline wxDiagram *GetDiagram() { return &m_diagram; }
-
- bool OnCloseDocument();
-
-protected:
- csDiagram m_diagram;
-};
-
-/*
- Do/Undo 30/7/98
-
- 1) We have a csCommandState, and in csDiagramCommand you have a list of
- these. This allows undo to work with several shapes at once.
-
- 2) Instead of storing info about each operation, e.g. separate pens, colours,
- etc., we simply use a copy of the shape.
- In csCommandState, we have a pointer to the actual shape in the canvas, m_currentShape.
- We also have wxShape* m_shapeState which stores the requested or previous state
- (depending on whether it's before the Do or after the Do.
-
- - In Do: save a temp copy of the old m_currentShape (i.e. the state just before it's changed).
- Change the data pointed to by m_currentShape to the new attributes stored in m_shapeState.
- Now assign the temp copy to m_shapeState, for use in Undo.
-
- wxShape* temp = m_currentShape->Copy(); // Take a copy of the current state
- m_currentShape->Set(m_shapeState); // Apply the new state (e.g. moving, changing colour etc.)
- delete m_shapeState; // Delete the previous 'old state'.
- m_shapeState = temp; // Remember the new 'old state'.
-
- */
-
-
-class csCommandState;
-class csDiagramCommand: public wxCommand
-{
- friend class csCommandState;
- public:
- // Multi-purpose constructor for creating, deleting shapes
- csDiagramCommand(const wxString& name, csDiagramDocument *doc,
- csCommandState* onlyState = NULL); // Allow for the common case of just one state to change
-
- ~csDiagramCommand();
-
- bool Do();
- bool Undo();
-
- // Add a state to the end of the list
- void AddState(csCommandState* state);
-
- // Insert a state at the beginning of the list
- void InsertState(csCommandState* state);
-
- // Schedule all lines connected to the states to be cut.
- void RemoveLines();
-
- // Find the state that refers to this shape
- csCommandState* FindStateByShape(wxShape* shape);
-
- wxList& GetStates() const { return (wxList&) m_states; }
-
- protected:
- csDiagramDocument* m_doc;
- wxList m_states;
-};
-
-class csCommandState: public wxObject
-{
- friend class csDiagramCommand;
-public:
- csCommandState(int cmd, wxShape* savedState, wxShape* shapeOnCanvas);
- ~csCommandState();
-
- bool Do();
- bool Undo();
-
- inline void SetSavedState(wxShape *s) { m_savedState = s; }
- inline wxShape *GetSavedState() const { return m_savedState; }
-
- inline void SetShapeOnCanvas(wxShape *s) { m_shapeOnCanvas = s; }
- inline wxShape *GetShapeOnCanvas() const { return m_shapeOnCanvas; }
-protected:
- wxShape* m_savedState; // Previous state, for restoring on Undo
- wxShape* m_shapeOnCanvas; // The actual shape on the canvas
- csDiagramDocument* m_doc;
- int m_cmd;
-
- // These store the line ordering for the shapes at either end,
- // so an un-cut line can restore the ordering properly. Otherwise
- // it just adds the line at an arbitrary position.
- int m_linePositionFrom;
- int m_linePositionTo;
-};
-
-#endif
- // _STUDIO_DOC_H_
diff --git a/contrib/samples/ogl/studio/mainfrm.cpp b/contrib/samples/ogl/studio/mainfrm.cpp
deleted file mode 100644
index e5f97fc674..0000000000
--- a/contrib/samples/ogl/studio/mainfrm.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: ogl/stufio/mainfrm.cpp
-// Purpose: Studio main frame
-// Author: Julian Smart
-// Modified by:
-// Created: 27/7/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#include "wx/mdi.h"
-#endif
-
-#include "wx/laywin.h"
-
-#include "studio.h"
-#include "view.h"
-#include "doc.h"
-#include "cspalette.h"
-#include "mainfrm.h"
-#include "dialogs.h"
-
-BEGIN_EVENT_TABLE(csFrame, wxDocMDIParentFrame)
- EVT_MENU(ID_CS_ABOUT, csFrame::OnAbout)
- EVT_MENU(wxID_EXIT, csFrame::OnQuit)
- EVT_MENU(wxID_HELP, csFrame::OnHelp)
- EVT_MENU(ID_CS_SETTINGS, csFrame::OnSettings)
- EVT_SIZE(csFrame::OnSize)
- EVT_SASH_DRAGGED(ID_LAYOUT_WINDOW_PALETTE, csFrame::OnSashDragPaletteWindow)
- EVT_SASH_DRAGGED(ID_LAYOUT_WINDOW_PROJECT, csFrame::OnSashDragProjectWindow)
- EVT_IDLE(csFrame::OnIdle)
- EVT_UPDATE_UI(wxID_PRINT, csFrame::OnUpdateDisable)
- EVT_UPDATE_UI(wxID_PREVIEW, csFrame::OnUpdateDisable)
- EVT_UPDATE_UI(wxID_SAVE, csFrame::OnSaveUpdate)
- EVT_UPDATE_UI(wxID_SAVEAS, csFrame::OnSaveUpdate)
- EVT_UPDATE_UI(wxID_UNDO, csFrame::OnUpdateDisable)
- EVT_UPDATE_UI(wxID_REDO, csFrame::OnUpdateDisable)
- EVT_UPDATE_UI(wxID_CUT, csFrame::OnUpdateDisable)
- EVT_UPDATE_UI(wxID_COPY, csFrame::OnUpdateDisable)
- EVT_UPDATE_UI(wxID_PASTE, csFrame::OnUpdateDisable)
- EVT_CLOSE(csFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-// Define my frame constructor
-csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
- wxDocMDIParentFrame(manager, parent, id, title, pos, size, style, _T("frame"))
-{
- CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
- wxGetApp().InitToolBar(GetToolBar());
-
- // Accelerators
- wxAcceleratorEntry entries[4];
-
- entries[0].Set(wxACCEL_NORMAL, WXK_F1, wxID_HELP);
- entries[1].Set(wxACCEL_CTRL, 'O', wxID_OPEN);
- entries[2].Set(wxACCEL_CTRL, 'N', wxID_NEW);
- entries[3].Set(wxACCEL_CTRL, 'P', wxID_PRINT);
-
- wxAcceleratorTable accel(4, entries);
- SetAcceleratorTable(accel);
-}
-
-void csFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
-{
- wxHelpControllerBase* help;
- help = wxGetApp().GetHelpController();
- if (help)
- help->DisplayContents();
-}
-
-void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
-{
-#if wxUSE_WX_RESOURCES
- csSettingsDialog* dialog = new csSettingsDialog(this);
- /* int ret = */ dialog->ShowModal();
- dialog->Destroy();
-#endif // wxUSE_WX_RESOURCES
-}
-
-void csFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
- Close(true);
-}
-
-void csFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
- (void)wxMessageBox(_T("OGL Studio\n(c) 1999, Julian Smart"), _T("About OGL Studio"), wxICON_INFORMATION);
-}
-
-void csFrame::OnSashDragPaletteWindow(wxSashEvent& event)
-{
- if (event.GetDragStatus() == wxSASH_STATUS_OUT_OF_RANGE)
- return;
-
- switch (event.GetId())
- {
- case ID_LAYOUT_WINDOW_PALETTE:
- {
- wxGetApp().GetDiagramPaletteSashWindow()->SetDefaultSize(wxSize(10000, event.GetDragRect().height));
- break;
- }
- }
- wxLayoutAlgorithm layout;
- layout.LayoutMDIFrame(this);
-}
-
-void csFrame::OnSashDragProjectWindow(wxSashEvent& event)
-{
- if (event.GetDragStatus() == wxSASH_STATUS_OUT_OF_RANGE)
- return;
-
- switch (event.GetId())
- {
- case ID_LAYOUT_WINDOW_PROJECT:
- {
- wxGetApp().GetProjectSashWindow()->SetDefaultSize(wxSize(event.GetDragRect().width, 10000));
- break;
- }
- }
- wxLayoutAlgorithm layout;
- layout.LayoutMDIFrame(this);
-}
-
-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-void csFrame::OnCloseWindow(wxCloseEvent& event)
-{
- int x, y;
- GetPosition(& x, & y);
- wxGetApp().m_mainFramePos = wxPoint(x, y);
-
- GetSize(& x, & y);
- wxGetApp().m_mainFrameSize = wxSize(x, y);
-
- wxDocMDIParentFrame::OnCloseWindow(event);
-}
-
-void csFrame::OnSize(wxSizeEvent& event)
-{
- wxLayoutAlgorithm layout;
- layout.LayoutMDIFrame(this);
- event.Skip();
-}
-
-// Make sure the correct toolbars are showing for the active view
-void csFrame::OnIdle(wxIdleEvent& event)
-{
- wxSashLayoutWindow* paletteWin = wxGetApp().GetDiagramPaletteSashWindow();
- wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow();
- if (!paletteWin || !diagramToolBarWin)
- return;
- bool doLayout = false;
- if (GetActiveChild())
- {
- if (!paletteWin->IsShown() || !diagramToolBarWin->IsShown())
- {
- paletteWin->Show(true);
- diagramToolBarWin->Show(true);
-
- doLayout = true;
- }
- }
- else
- {
- if (paletteWin->IsShown() || diagramToolBarWin->IsShown())
- {
- paletteWin->Show(false);
- diagramToolBarWin->Show(false);
- doLayout = true;
- }
- }
- if (doLayout)
- {
- wxLayoutAlgorithm layout;
- layout.LayoutMDIFrame(this);
-
-#if defined(__WXMSW__)
- // Need to do something else to get it to refresh properly
- // when a client frame is first displayed; moving the client
- // window doesn't cause the proper refresh. Just refreshing the
- // client doesn't work (presumably because it's clipping the
- // children).
- // FIXED in wxWidgets, by intercepting wxMDIClientWindow::DoSetSize
- // and checking if the position has changed, before redrawing the
- // child windows.
-#if 0
- wxMDIChildFrame* childFrame = GetActiveChild();
- if (childFrame)
- {
- HWND hWnd = (HWND) childFrame->GetHWND();
- ::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME|RDW_ALLCHILDREN|RDW_INVALIDATE );
-
- }
-#endif
-#endif // __WXMSW__
- }
- event.Skip();
-}
-
-// General handler for disabling items
-void csFrame::OnUpdateDisable(wxUpdateUIEvent& event)
-{
- event.Enable(false);
-}
-
-void csFrame::OnSaveUpdate(wxUpdateUIEvent& event)
-{
- event.Enable( (GetActiveChild() != NULL) );
-}
-
-/*
- * Child frame
- */
-
-BEGIN_EVENT_TABLE(csMDIChildFrame, wxDocMDIChildFrame)
- EVT_ACTIVATE(csMDIChildFrame::OnActivate)
-END_EVENT_TABLE()
-
-csMDIChildFrame::csMDIChildFrame(wxDocument* doc, wxView* view, wxMDIParentFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
- wxDocMDIChildFrame(doc, view, parent, id, title, pos, size, style)
-{
- // Accelerators
- wxAcceleratorEntry entries[18];
-
- // Usual editing functions
- entries[0].Set(wxACCEL_NORMAL, WXK_DELETE, wxID_CLEAR);
- entries[1].Set(wxACCEL_CTRL, 'X', wxID_CUT);
- entries[2].Set(wxACCEL_CTRL, 'C', wxID_COPY);
- entries[3].Set(wxACCEL_SHIFT, WXK_INSERT, wxID_PASTE);
- entries[4].Set(wxACCEL_CTRL, 'V', wxID_PASTE);
- entries[5].Set(wxACCEL_CTRL, 'A', ID_CS_SELECT_ALL);
-
- // Undo/redo
- entries[6].Set(wxACCEL_CTRL, 'Z', wxID_UNDO);
- entries[7].Set(wxACCEL_CTRL, 'Y', wxID_REDO);
-
- // Other
- entries[8].Set(wxACCEL_NORMAL, WXK_RETURN, ID_CS_EDIT_PROPERTIES);
- entries[9].Set(wxACCEL_ALT, WXK_RETURN, ID_CS_EDIT_PROPERTIES);
- entries[10].Set(wxACCEL_CTRL, 'D', wxID_DUPLICATE);
- entries[11].Set(wxACCEL_NORMAL, WXK_F1, wxID_HELP);
-
- // File handling
- entries[12].Set(wxACCEL_CTRL, 'S', wxID_SAVE);
- entries[13].Set(wxACCEL_NORMAL, WXK_F12, wxID_SAVEAS);
- entries[14].Set(wxACCEL_CTRL, 'O', wxID_OPEN);
- entries[15].Set(wxACCEL_CTRL, 'N', wxID_NEW);
- entries[16].Set(wxACCEL_CTRL, 'P', wxID_PRINT);
- entries[17].Set(wxACCEL_CTRL, 'W', wxID_CLOSE);
-
-
- wxAcceleratorTable accel(18, entries);
- SetAcceleratorTable(accel);
-}
-
-void csMDIChildFrame::OnActivate(wxActivateEvent& event)
-{
- wxDocMDIChildFrame::OnActivate(event);
-/*
- wxSashLayoutWindow* win = wxGetApp().GetDiagramPaletteSashWindow();
- if (!win)
- return;
-
- win->Show(event.GetActive());
-
- wxLayoutAlgorithm layout;
- layout.LayoutMDIFrame((wxMDIParentFrame*) GetParent());
-*/
-}
diff --git a/contrib/samples/ogl/studio/mainfrm.h b/contrib/samples/ogl/studio/mainfrm.h
deleted file mode 100644
index 3f4be7ec82..0000000000
--- a/contrib/samples/ogl/studio/mainfrm.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/mainfrm.h
-// Purpose: Studio main window class
-// Author: Julian Smart
-// Modified by:
-// Created: 27/7/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_MAINFRM_H_
-#define _STUDIO_MAINFRM_H_
-
-#include "wx/docmdi.h"
-
-class wxSashLayoutWindow;
-class wxSashEvent;
-
-class csFrame: public wxDocMDIParentFrame
-{
- public:
- csFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style);
-
- void OnCloseWindow(wxCloseEvent& event);
- void OnSize(wxSizeEvent& event);
- void OnAbout(wxCommandEvent& event);
- void OnNewWindow(wxCommandEvent& event);
- void OnQuit(wxCommandEvent& event);
- void OnSashDragPaletteWindow(wxSashEvent& event);
- void OnSashDragProjectWindow(wxSashEvent& event);
- void OnIdle(wxIdleEvent& event);
- void OnHelp(wxCommandEvent& event);
- void OnSettings(wxCommandEvent& event);
-
- // General handler for disabling items
- void OnUpdateDisable(wxUpdateUIEvent& event);
- void OnSaveUpdate(wxUpdateUIEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-class csMDIChildFrame: public wxDocMDIChildFrame
-{
- public:
- csMDIChildFrame(wxDocument* doc, wxView* view, wxMDIParentFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style);
-
- void OnActivate(wxActivateEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
- // _STUDIO_MAINFRM_H_
diff --git a/contrib/samples/ogl/studio/makefile.bcc b/contrib/samples/ogl/studio/makefile.bcc
deleted file mode 100644
index 92cfdfef9f..0000000000
--- a/contrib/samples/ogl/studio/makefile.bcc
+++ /dev/null
@@ -1,287 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STUDIO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(CPPFLAGS) $(CXXFLAGS)
-STUDIO_OBJECTS = \
- $(OBJS)\studio_studio.obj \
- $(OBJS)\studio_doc.obj \
- $(OBJS)\studio_shapes.obj \
- $(OBJS)\studio_symbols.obj \
- $(OBJS)\studio_view.obj \
- $(OBJS)\studio_cspalette.obj \
- $(OBJS)\studio_mainfrm.obj \
- $(OBJS)\studio_project.obj \
- $(OBJS)\studio_dialogs.obj \
- $(OBJS)\studio_csprint.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\studio.exe data
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe
- -if exist $(OBJS)\studio.tds del $(OBJS)\studio.tds
- -if exist $(OBJS)\studio.ilc del $(OBJS)\studio.ilc
- -if exist $(OBJS)\studio.ild del $(OBJS)\studio.ild
- -if exist $(OBJS)\studio.ilf del $(OBJS)\studio.ilf
- -if exist $(OBJS)\studio.ils del $(OBJS)\studio.ils
-
-$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(STUDIO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\studio_studio.res
-|
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\studio_studio.obj: .\studio.cpp
- $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_doc.obj: .\doc.cpp
- $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_shapes.obj: .\shapes.cpp
- $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_symbols.obj: .\symbols.cpp
- $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_view.obj: .\view.cpp
- $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_cspalette.obj: .\cspalette.cpp
- $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_mainfrm.obj: .\mainfrm.cpp
- $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_project.obj: .\project.cpp
- $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_dialogs.obj: .\dialogs.cpp
- $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_csprint.obj: .\csprint.cpp
- $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_studio.res: .\studio.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/ogl/studio/makefile.gcc b/contrib/samples/ogl/studio/makefile.gcc
deleted file mode 100644
index e781fd8394..0000000000
--- a/contrib/samples/ogl/studio/makefile.gcc
+++ /dev/null
@@ -1,285 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STUDIO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
- $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. \
- $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include \
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
- $(CXXFLAGS)
-STUDIO_OBJECTS = \
- $(OBJS)\studio_studio.o \
- $(OBJS)\studio_doc.o \
- $(OBJS)\studio_shapes.o \
- $(OBJS)\studio_symbols.o \
- $(OBJS)\studio_view.o \
- $(OBJS)\studio_cspalette.o \
- $(OBJS)\studio_mainfrm.o \
- $(OBJS)\studio_project.o \
- $(OBJS)\studio_dialogs.o \
- $(OBJS)\studio_csprint.o \
- $(OBJS)\studio_studio_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_ADV_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\studio.exe data
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe
-
-$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio_rc.o
- $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %%f in (studio_resources.wxr) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
-
-$(OBJS)\studio_studio.o: ./studio.cpp
- $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_doc.o: ./doc.cpp
- $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_shapes.o: ./shapes.cpp
- $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_symbols.o: ./symbols.cpp
- $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_view.o: ./view.cpp
- $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_cspalette.o: ./cspalette.cpp
- $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_mainfrm.o: ./mainfrm.cpp
- $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_project.o: ./project.cpp
- $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_dialogs.o: ./dialogs.cpp
- $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_csprint.o: ./csprint.cpp
- $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_studio_rc.o: ./studio.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean data
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/ogl/studio/makefile.unx b/contrib/samples/ogl/studio/makefile.unx
deleted file mode 100644
index 51a15a4d4f..0000000000
--- a/contrib/samples/ogl/studio/makefile.unx
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# File: Makefile
-# Author: Julian Smart
-# Created: 1999
-# Updated:
-# Copyright: (c) 2000 Julian Smart
-#
-# Makefile for OGL demo (GTK version)
-#
-# This makefile requires wxWindows/GTK to be
-# installed (possibly using "make install")
-# on your system.
-#
-
-CXX = $(shell wx-config --cxx)
-WXCONFIG=../../../../wx-config
-WXINCLUDE=-I../../../../include -I../../../include
-WXLIB=-L../../../../lib -L../../../src/ogl
-
-OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o
-
-studio: $(OBJECTS)
- $(CXX) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
-
-studio.o: studio.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c studio.cpp
-
-cspalette.o: cspalette.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
-
-doc.o: doc.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
-
-view.o: view.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
-
-dialogs.o: dialogs.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
-
-mainfrm.o: mainfrm.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
-
-project.o: project.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c project.cpp
-
-shapes.o: shapes.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c shapes.cpp
-
-symbols.o: symbols.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c symbols.cpp
-
-csprint.o: csprint.cpp
- $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c csprint.cpp
-
-clean:
- rm -f *.o studio
diff --git a/contrib/samples/ogl/studio/makefile.vc b/contrib/samples/ogl/studio/makefile.vc
deleted file mode 100644
index fe0352d110..0000000000
--- a/contrib/samples/ogl/studio/makefile.vc
+++ /dev/null
@@ -1,362 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STUDIO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\studio.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /DNOPCH \
- /I.\..\..\..\include $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
- $(CXXFLAGS)
-STUDIO_OBJECTS = \
- $(OBJS)\studio_studio.obj \
- $(OBJS)\studio_doc.obj \
- $(OBJS)\studio_shapes.obj \
- $(OBJS)\studio_symbols.obj \
- $(OBJS)\studio_view.obj \
- $(OBJS)\studio_cspalette.obj \
- $(OBJS)\studio_mainfrm.obj \
- $(OBJS)\studio_project.obj \
- $(OBJS)\studio_dialogs.obj \
- $(OBJS)\studio_csprint.obj \
- $(OBJS)\studio_studio.res
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\studio.exe data
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe
- -if exist $(OBJS)\studio.ilk del $(OBJS)\studio.ilk
- -if exist $(OBJS)\studio.pdb del $(OBJS)\studio.pdb
-
-$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(STUDIO_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-data:
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\studio_studio.obj: .\studio.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_doc.obj: .\doc.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_shapes.obj: .\shapes.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_symbols.obj: .\symbols.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_view.obj: .\view.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_cspalette.obj: .\cspalette.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_mainfrm.obj: .\mainfrm.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_project.obj: .\project.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_dialogs.obj: .\dialogs.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_csprint.obj: .\csprint.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_studio.res: .\studio.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/ogl/studio/makefile.wat b/contrib/samples/ogl/studio/makefile.wat
deleted file mode 100644
index 80a3abec47..0000000000
--- a/contrib/samples/ogl/studio/makefile.wat
+++ /dev/null
@@ -1,317 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_ADV_p =
-!ifeq MONOLITHIC 0
-__WXLIB_ADV_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-__WXLIB_HTML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_HTML_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-__WXLIB_XML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_XML_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STUDIO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-STUDIO_OBJECTS = &
- $(OBJS)\studio_studio.obj &
- $(OBJS)\studio_doc.obj &
- $(OBJS)\studio_shapes.obj &
- $(OBJS)\studio_symbols.obj &
- $(OBJS)\studio_view.obj &
- $(OBJS)\studio_cspalette.obj &
- $(OBJS)\studio_mainfrm.obj &
- $(OBJS)\studio_project.obj &
- $(OBJS)\studio_dialogs.obj &
- $(OBJS)\studio_csprint.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\studio.exe data
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe
-
-$(OBJS)\studio.exe : $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res
- @%create $(OBJS)\studio.lbc
- @%append $(OBJS)\studio.lbc option quiet
- @%append $(OBJS)\studio.lbc name $^@
- @%append $(OBJS)\studio.lbc option caseexact
- @%append $(OBJS)\studio.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(STUDIO_OBJECTS)) do @%append $(OBJS)\studio.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\studio.lbc library %i
- @%append $(OBJS)\studio.lbc option resource=$(OBJS)\studio_studio.res
- @for %i in () do @%append $(OBJS)\studio.lbc option stack=%i
- wlink @$(OBJS)\studio.lbc
-
-data : .SYMBOLIC
- if not exist $(OBJS) mkdir $(OBJS)
- for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\studio_studio.obj : .AUTODEPEND .\studio.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_doc.obj : .AUTODEPEND .\doc.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_shapes.obj : .AUTODEPEND .\shapes.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_symbols.obj : .AUTODEPEND .\symbols.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_view.obj : .AUTODEPEND .\view.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_cspalette.obj : .AUTODEPEND .\cspalette.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_mainfrm.obj : .AUTODEPEND .\mainfrm.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_project.obj : .AUTODEPEND .\project.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_dialogs.obj : .AUTODEPEND .\dialogs.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_csprint.obj : .AUTODEPEND .\csprint.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_studio.res : .AUTODEPEND .\studio.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/ogl/studio/manual/alignb.bmp b/contrib/samples/ogl/studio/manual/alignb.bmp
deleted file mode 100644
index 6cc2e1dee4..0000000000
Binary files a/contrib/samples/ogl/studio/manual/alignb.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/alignl.bmp b/contrib/samples/ogl/studio/manual/alignl.bmp
deleted file mode 100644
index 30471101b1..0000000000
Binary files a/contrib/samples/ogl/studio/manual/alignl.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/alignr.bmp b/contrib/samples/ogl/studio/manual/alignr.bmp
deleted file mode 100644
index 14a2f85241..0000000000
Binary files a/contrib/samples/ogl/studio/manual/alignr.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/alignt.bmp b/contrib/samples/ogl/studio/manual/alignt.bmp
deleted file mode 100644
index 4505cbab56..0000000000
Binary files a/contrib/samples/ogl/studio/manual/alignt.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/arrow.bmp b/contrib/samples/ogl/studio/manual/arrow.bmp
deleted file mode 100644
index d406ceb64f..0000000000
Binary files a/contrib/samples/ogl/studio/manual/arrow.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/back.gif b/contrib/samples/ogl/studio/manual/back.gif
deleted file mode 100644
index 8a61076d3b..0000000000
Binary files a/contrib/samples/ogl/studio/manual/back.gif and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/bullet.bmp b/contrib/samples/ogl/studio/manual/bullet.bmp
deleted file mode 100644
index aad8fc793e..0000000000
Binary files a/contrib/samples/ogl/studio/manual/bullet.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/contents.gif b/contrib/samples/ogl/studio/manual/contents.gif
deleted file mode 100644
index da92528ddd..0000000000
Binary files a/contrib/samples/ogl/studio/manual/contents.gif and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/copy.bmp b/contrib/samples/ogl/studio/manual/copy.bmp
deleted file mode 100644
index 0a26d23ec3..0000000000
Binary files a/contrib/samples/ogl/studio/manual/copy.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/copysize.bmp b/contrib/samples/ogl/studio/manual/copysize.bmp
deleted file mode 100644
index 36060ad72b..0000000000
Binary files a/contrib/samples/ogl/studio/manual/copysize.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/cut.bmp b/contrib/samples/ogl/studio/manual/cut.bmp
deleted file mode 100644
index e0de76cf51..0000000000
Binary files a/contrib/samples/ogl/studio/manual/cut.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/cutpoint.bmp b/contrib/samples/ogl/studio/manual/cutpoint.bmp
deleted file mode 100644
index 2f7dc780a2..0000000000
Binary files a/contrib/samples/ogl/studio/manual/cutpoint.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/forward.gif b/contrib/samples/ogl/studio/manual/forward.gif
deleted file mode 100644
index 9c81e8c92f..0000000000
Binary files a/contrib/samples/ogl/studio/manual/forward.gif and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/help.bmp b/contrib/samples/ogl/studio/manual/help.bmp
deleted file mode 100644
index 1b5e0b9603..0000000000
Binary files a/contrib/samples/ogl/studio/manual/help.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/helpcs.bmp b/contrib/samples/ogl/studio/manual/helpcs.bmp
deleted file mode 100644
index d6413e1d75..0000000000
Binary files a/contrib/samples/ogl/studio/manual/helpcs.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/horiz.bmp b/contrib/samples/ogl/studio/manual/horiz.bmp
deleted file mode 100644
index 58af34a727..0000000000
Binary files a/contrib/samples/ogl/studio/manual/horiz.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/linearrow.bmp b/contrib/samples/ogl/studio/manual/linearrow.bmp
deleted file mode 100644
index 1fd21fb08a..0000000000
Binary files a/contrib/samples/ogl/studio/manual/linearrow.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/new.bmp b/contrib/samples/ogl/studio/manual/new.bmp
deleted file mode 100644
index c832e3e7d5..0000000000
Binary files a/contrib/samples/ogl/studio/manual/new.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/newpoint.bmp b/contrib/samples/ogl/studio/manual/newpoint.bmp
deleted file mode 100644
index cb4f267afc..0000000000
Binary files a/contrib/samples/ogl/studio/manual/newpoint.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/open.bmp b/contrib/samples/ogl/studio/manual/open.bmp
deleted file mode 100644
index cc9e2881cc..0000000000
Binary files a/contrib/samples/ogl/studio/manual/open.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/paste.bmp b/contrib/samples/ogl/studio/manual/paste.bmp
deleted file mode 100644
index fd48d66c49..0000000000
Binary files a/contrib/samples/ogl/studio/manual/paste.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/pointsize.bmp b/contrib/samples/ogl/studio/manual/pointsize.bmp
deleted file mode 100644
index 8a01c8a42c..0000000000
Binary files a/contrib/samples/ogl/studio/manual/pointsize.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/preview.bmp b/contrib/samples/ogl/studio/manual/preview.bmp
deleted file mode 100644
index a8bcdf5eff..0000000000
Binary files a/contrib/samples/ogl/studio/manual/preview.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/print.bmp b/contrib/samples/ogl/studio/manual/print.bmp
deleted file mode 100644
index 885d2e8d16..0000000000
Binary files a/contrib/samples/ogl/studio/manual/print.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/redo.bmp b/contrib/samples/ogl/studio/manual/redo.bmp
deleted file mode 100644
index 5e97912b9a..0000000000
Binary files a/contrib/samples/ogl/studio/manual/redo.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/save.bmp b/contrib/samples/ogl/studio/manual/save.bmp
deleted file mode 100644
index 0df022cbb7..0000000000
Binary files a/contrib/samples/ogl/studio/manual/save.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/straight.bmp b/contrib/samples/ogl/studio/manual/straight.bmp
deleted file mode 100644
index 529366590b..0000000000
Binary files a/contrib/samples/ogl/studio/manual/straight.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/studio.cnt b/contrib/samples/ogl/studio/manual/studio.cnt
deleted file mode 100644
index 5d0fe3d9e4..0000000000
--- a/contrib/samples/ogl/studio/manual/studio.cnt
+++ /dev/null
@@ -1,34 +0,0 @@
-:Base studio.hlp
-1 Welcome to OGL Studio
-2 Welcome to OGL Studio=topic0
-1 Read Me
-2 Read Me=readme
-2 Change log=topic1
-2 Bugs=topic2
-1 Working with the diagram window
-2 Working with the diagram window=schedule
-2 Creating a diagram=topic3
-2 Basic editing=topic4
-2 Adding text=topic5
-2 Aligning objects=topic6
-2 Adding segments to lines and straightening them=topic7
-2 Undo/Redo=topic8
-2 Loading and saving files=topic9
-2 Copy and paste=topic10
-2 Keyboard shortcuts=topic11
-1 Menu commands
-2 Menu commands=menucommands
-2 File=topic12
-2 Edit=topic13
-2 Window=topic14
-2 Help=topic15
-1 Toolbar commands
-2 Toolbar commands=toolbarcommands
-2 Main toolbar=maintoolbar
-2 Diagram formatting toolbar=diagramformattingtoolbar
-2 Diagram palette=diagrampalette
-1 Dialogs
-2 Dialogs=dialogs
-1 How To
-2 How To=howto
-2 Create a new object=topic16
diff --git a/contrib/samples/ogl/studio/manual/studio.hlp b/contrib/samples/ogl/studio/manual/studio.hlp
deleted file mode 100644
index 6ebce911d0..0000000000
Binary files a/contrib/samples/ogl/studio/manual/studio.hlp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/studio.hpj b/contrib/samples/ogl/studio/manual/studio.hpj
deleted file mode 100644
index 8e6d98315a..0000000000
--- a/contrib/samples/ogl/studio/manual/studio.hpj
+++ /dev/null
@@ -1,23 +0,0 @@
-[OPTIONS]
-BMROOT=. ; Assume that bitmaps are where the source is
-TITLE=OGL Studio
-CONTENTS=Contents
-; COMPRESS=12 Hall Zeck ; Max compression, but needs lots of memory
-COMPRESS=8 Zeck
-LCID=0x809 0x0 0x0 ;English (British)
-HLP=.\studio.hlp
-
-[WINDOWS]
-Main="",(553,102,400,600),20736,(r14876671),(r12632256),f3
-
-[FILES]
-studio.rtf
-
-[CONFIG]
-CreateButton("Up", "&Up", "JumpId(`studio.hlp', `Contents')")
-BrowseButtons()
-
-[MAP]
-
-[BITMAPS]
-
diff --git a/contrib/samples/ogl/studio/manual/studio.tex b/contrib/samples/ogl/studio/manual/studio.tex
deleted file mode 100644
index ab4d897258..0000000000
--- a/contrib/samples/ogl/studio/manual/studio.tex
+++ /dev/null
@@ -1,381 +0,0 @@
-\documentstyle[a4,makeidx,verbatim,texhelp,fancyhea,mysober,mytitle]{report}%
-\twocolwidtha{4cm}%
-\input{psbox.tex}
-\newcommand{\commandref}[2]{\helpref{{\tt $\backslash$#1}}{#2}}%
-\newcommand{\commandrefn}[2]{\helprefn{{\tt $\backslash$#1}}{#2}\index{#1}}%
-\newcommand{\commandpageref}[2]{\latexignore{\helprefn{{\tt $\backslash$#1}}{#2}}\latexonly{{\tt $\backslash$#1} {\it page \pageref{#2}}}\index{#1}}%
-\newcommand{\indexit}[1]{#1\index{#1}}%
-\newcommand{\inioption}[1]{{\tt #1}\index{#1}}%
-\parskip=10pt%
-\parindent=0pt%
-\title{Manual for OGL Studio}%
-\author{by Julian Smart}%
-\makeindex%
-\begin{document}%
-\maketitle%
-\pagestyle{fancyplain}%
-\bibliographystyle{plain}%
-\pagenumbering{arabic}%
-\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\tableofcontents%
-
-\chapter{Welcome to OGL Studio}%
-\setheader{{\it Welcome}}{}{}{}{}{{\it Welcome}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-Welcome to OGL Studio, an extended sample for the Object Graphics Library.
-
-For release information, please see the \helpref{Read Me}{readme} section.
-
-\chapter{Read Me}\label{readme}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\section{Change log}
-
-Version 1, February 7th, 1999
-
-\begin{itemize}\itemsep=0pt
-\item First release.
-\end{itemize}
-
-\section{Bugs}
-
-There are no known bugs.
-
-\begin{comment}
-\chapter{Getting Started}\label{gettingstarted}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\end{comment}
-
-\chapter{Working with the diagram window}\label{schedule}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-This section describes how you work in the diagram window.
-
-In addition, you may wish to refer to the following sections:
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{How To}{howto}
-%\item \helpref{Getting started}{gettingstarted}
-\item \helpref{Using Menu Commands}{menucommands}
-\item \helpref{Using Toolbar Commands}{toolbarcommands}
-\end{itemize}
-
-When you first run OGL Studio, there is a menubar, a single
-toolbar with commonly-used functionality such as loading and
-saving, a project window to the left, and an MDI (Multiple Document
-Interface) area to the right, which will contain documents.
-
-\section{Creating a diagram}
-
-To create a new diagram, click on "File|New" or the New tool.
-
-A blank document and two new toolbars will appear. The first
-new toolbar is the \helpref{diagramming formatting toolbar}{diagramformattingtoolbar}, and contains
-icons and controls for:
-
-\begin{itemize}\itemsep=0pt
-\item alignment and size cloning;
-\item arrow toggling;
-\item point size;
-\item zoom level.
-\end{itemize}
-
-The second new toolbar is called the \helpref{diagram palette}{diagrampalette} and contains:
-
-\begin{itemize}\itemsep=0pt
-\item a pointer tool used for selecting, moving and sizing objects;
-\item a text tool used for editing text or creating new text boxes;
-\item a tool for each of the symbols.
-\end{itemize}
-
-\section{Basic editing}
-
-To add a symbol, left-click on the symbol in the diagram palette,
-and then left-click on the document. The currently selected
-tool will revert to the pointer tool, so to add another object,
-click on the symbol again, then on the document.
-
-To draw a line between two objects, right-drag between the two
-objects, starting at the attachment point area you wish to start the
-line with, and ending at another appropriate attachment point
-area. The initial ordering of the lines may not be correct (lines
-may overlap, for example) so to reorder lines on a particular
-side of a object, select a line, then left-drag the desired end to a new
-position (tip: keep within the object perimeter). Left-dragging the
-line end can also be used to change the attachment point of that
-end of the line, to a new side or vertex (depending on the object).
-
-To select or deselect a object, left click the object. To select
-several objects at once, keep the shift key pressed down when
-left-clicking, or left-drag a 'lassoo' around several objects.
-
-To delete a object or line, select it and press the Delete key, or use
-"Edit|Clear", or right-click on the object to show a menu and choose
-the "Cut" item.
-
-If you are deleting a object which has one ore more lines
-attached, the lines are deleted prior to the object deletion.
-
-Shapes can be rotated by right-clicking and selecting "Rotate
-clockwise" or "Rotate anticlockwise".
-
-Line arrows can be added (pointing in the direction in which
-you created the line) by selecting the line and pressing the
-"Toggle arrow" tool on the formatting toolbar.
-
-\section{Adding text}
-
-Select the text tool (on the symbol palette) and left-click on
-a object. If you click outside a object on the document, you are
-prompted to add a new free-floating text box.
-
-Alternatively, you can select a object and press Return (or
-select the "Edit|Edit label" menu item); or right-click and
-select "Edit label" from the object menu.
-
-Change the point size using the combobox on the formatting
-toolbar.
-
-\section{Aligning objects}
-
-Select several objects and click on an alignment tool on
-the formatting toolbar. The alignment will be done with
-respect to the first object you select. You can also copy
-the size of a object to other objects with the "Copy size" tool.
-
-\section{Adding segments to lines and straightening them}
-
-To make a line have more than one segment, select the line,
-then press the "New line point" tool. Create as many new control points
-(and therefore segments) as you like. Then arrange the points
-into a rough approximation of how they should be laid out
-horizontally and vertically. Click on "Straighten lines" to
-tidy up the layout.
-
-To delete a line control point, select the line and click on
-"Cut line point" tool. An arbitrary point will be deleted.
-
-\section{Undo/Redo}
-
-Every operation can be undone, and then redone, back until
-the time at which you last saved your document. Use
-"Edit|Undo" and "Edit|Redo"; or the shortcuts Ctrl-Z and Ctrl-Y.
-
-\section{Loading and saving files}
-
-Load and save files using the main toolbar, or "File|Open...",
-"File|Save", "File|Save As..." menu items.
-
-\section{Copy and paste}
-
-OGL Studio has a diagram clipboard, into which you can copy selections. You can then
-paste the contents of clipboard into the same or another diagram window.
-
-Use "Edit|Copy" (or the toolbar copy button) to copy the selection. Use "Edit|Cut" (or the toolbar cut button) to
-copy and then delete the selection. Use "Edit|Paste" (or the toolbar paste button) to copy the selection to
-the current diagram window.
-
-Under Windows, copy and cutting also copies the selection to the Windows clipboard into metafile (vector)
-format, and Windows bitmap format. Note that not all Windows applications can accept the vector format.
-If the application seems to be pasting the wrong format into the document, try using that application's
-"Edit|Paste Special..." menu item, if one exists.
-
-\section{Keyboard shortcuts}
-
-The following keyboard shortcuts are available. {\bf Note:} The OGL Studio menus indicate which shortcuts are
-available.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{Delete}{Clear selected object(s)}
-\twocolitem{Enter}{Edit text for selected object}
-\twocolitem{Ctrl-A}{Select all}
-\twocolitem{Ctrl-C}{Copy the selection to the clipboard}
-\twocolitem{Ctrl-D}{Duplicate the selection}
-\twocolitem{Ctrl-O}{Open a diagram}
-\twocolitem{Ctrl-N}{Create a new diagram}
-\twocolitem{Ctrl-P}{Print (not implemented)}
-\twocolitem{Ctrl-S}{Save the diagram file without prompting}
-\twocolitem{Ctrl-V}{Paste the selection}
-\twocolitem{Ctrl-W}{Close the current window}
-\twocolitem{Ctrl-X}{Cut the selection}
-\twocolitem{Ctrl-Z}{Undo last action}
-\twocolitem{Ctrl-Y}{Redo current action on the undo stack}
-\twocolitem{Ctrl-Enter}{Confirm the label editing operation (dismisses the dialog)}
-\twocolitem{Esc}{Cancel the label editing dialog}
-\twocolitem{F1}{Invoke the manual}
-\twocolitem{F12}{Save the diagram file, prompting for a filename}
-\end{twocollist}
-
-\chapter{Menu commands}\label{menucommands}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-This section describes the menu commands.
-
-\section{File}
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf New...}}{Creates a new diagram window.}
-\twocolitem{{\bf Open...}}{Opens a diagram file.}
-\twocolitem{{\bf Close}}{Closes the current window.}
-\twocolitem{{\bf Save}}{Saves the current diagram without prompting.}
-\twocolitem{{\bf Save As...}}{Saves the current diagram, prompting for a filename.}
-\twocolitem{{\bf Print...}}{Prints the current diagram (not implemented).}
-\twocolitem{{\bf Print Setup...}}{Invokes the printer setup dialog.}
-\twocolitem{{\bf Print Preview}}{Invokes print preview for this diagram (not implemented).}
-\twocolitem{{\bf Exit}}{Exits the program.}
-\end{twocollist}
-
-Further menu items appended to the end of the File menu allow you
-to load previously-saved diagram files quickly.
-
-\section{Edit}
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf Undo}}{Undoes the previous action.}
-\twocolitem{{\bf Redo}}{Redoes the previously undone action.}
-\twocolitem{{\bf Cut}}{Deletes the current selection and places it on the clipboard.}
-\twocolitem{{\bf Copy}}{Copies the current selection onto the clipboard, both to the internal
-diagram clipboard and under Windows, to the Windows clipboard, in metafile and bitmap formats.}
-\twocolitem{{\bf Paste}}{Pastes from the internal diagram clipboard to the currently active window.}
-\twocolitem{{\bf Duplicate}}{Duplicates the current selection, placing the objects further down and to the right.}
-\twocolitem{{\bf Clear}}{Clears the current selection without placing it on the clipboard.}
-\twocolitem{{\bf Select All}}{Selects all objects.}
-\twocolitem{{\bf Edit Label...}}{Invokes a dialog to edit the label of the currently selected object.}
-\end{twocollist}
-
-\begin{comment}%
-\section{View}
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf Toolbar}}{Toggles the toolbar on and off.}
-\twocolitem{{\bf Status Bar}}{Toggles the status bar on and off.}
-\twocolitem{{\bf Settings}}{Invokes the \helpref{Settings dialog}{settings} to allow you to adjust a variety of
-settings.}
-\end{twocollist}
-\end{comment}%
-
-\section{Window}
-
-The Window menu is shown when one or more child window is active.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf Cascade}}{Arranges the child windows in a cascade.}
-\twocolitem{{\bf Tile}}{Arranges the child windows in a tiled formation.}
-\twocolitem{{\bf Arrange Icons}}{Arranges the minimized icons.}
-\twocolitem{{\bf Next}}{Activates the next MDI window.}
-\end{twocollist}
-
-Further menu items appended to the end of the Window menu allow you
-to restore and activate any child window.
-
-\section{Help}
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf Help Contents}}{Invokes the on-line help, showing the contents page.}
-\twocolitem{{\bf About}}{Displays a small dialog giving copyright and version information.}
-\end{twocollist}
-
-\chapter{Toolbar commands}\label{toolbarcommands}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-This section describes the commands associated with the various toolbars and diagram palette.
-
-\section{Main toolbar}\label{maintoolbar}
-
-The main toolbar is active all the time, with buttons greyed out if not appropriate to the current context.
-
-\begin{twocollist}
-\twocolitem{\image{1cm;0cm}{new.bmp}}{{\bf New} Creates a new diagram window.}
-\twocolitem{\image{1cm;0cm}{open.bmp}}{{\bf Open} Opens a diagram file.}
-\twocolitem{\image{1cm;0cm}{save.bmp}}{{\bf Save} Saves the current diagram without prompting.}
-\twocolitem{\image{1cm;0cm}{print.bmp}}{{\bf Print} Prints the current diagram (not implemented).}
-\twocolitem{\image{1cm;0cm}{copy.bmp}}{{\bf Copy} Copies the current selection onto the internal clipboard, and under Windows, into the Windows clipboard
-in metafile and bitmap formats.}
-\twocolitem{\image{1cm;0cm}{cut.bmp}}{{\bf Cut} Deletes the current selection and puts it on the clipboard.}
-\twocolitem{\image{1cm;0cm}{paste.bmp}}{{\bf Paste} Pastes the contents of the internal diagram clipboard onto the
-current diagram window.}
-\twocolitem{\image{1cm;0cm}{undo.bmp}}{{\bf Undo} Undoes the last command.}
-\twocolitem{\image{1cm;0cm}{redo.bmp}}{{\bf Redo} Redoes the last command.}
-\twocolitem{\image{1cm;0cm}{help.bmp}}{{\bf Help button} Invokes on-line help.}
-\end{twocollist}
-
-\section{Diagram formatting toolbar}\label{diagramformattingtoolbar}
-
-The diagram toolbar is visible only when a diagram window is active.
-
-\begin{twocollist}
-\twocolitem{\image{1cm;0cm}{alignl.bmp}}{{\bf Align left} Aligns the selected objects to the left side of the last selection.}
-\twocolitem{\image{1cm;0cm}{alignr.bmp}}{{\bf Align right} Aligns the selected objects to the right side of the last selection.}
-\twocolitem{\image{1cm;0cm}{alignt.bmp}}{{\bf Align top} Aligns the selected objects to the top side of the last selection.}
-\twocolitem{\image{1cm;0cm}{alignb.bmp}}{{\bf Align bottom} Aligns the selected objects to the bottom side of the last selection.}
-\twocolitem{\image{1cm;0cm}{horiz.bmp}}{{\bf Align horizontally} Aligns the selected objects to be centered horizontally with respect to the last selection.}
-\twocolitem{\image{1cm;0cm}{vert.bmp}}{{\bf Align vertically} Aligns the selected objects to be centered vertically with respect to the last selection.}
-\twocolitem{\image{1cm;0cm}{copysize.bmp}}{{\bf Copy size} Makes the selected objects the same size as the last selection.}
-\twocolitem{\image{1cm;0cm}{linearrow.bmp}}{{\bf Line arrow} Toggles an arrow on or off for the selected objects.}
-\twocolitem{\image{1cm;0cm}{newpoint.bmp}}{{\bf New point} Inserts a control point into the selected line(s).}
-\twocolitem{\image{1cm;0cm}{cutpoint.bmp}}{{\bf Cut point} Deletes a control point from the selected line(s).}
-\twocolitem{\image{1cm;0cm}{straight.bmp}}{{\bf Straighten} Straightens line segments that are nearly horizontal
-or vertical.}
-\twocolitem{\image{1cm;0cm}{pointsize.bmp}}{{\bf Point size} Allows selection of the point size for the current
-selection.}
-\twocolitem{\image{1cm;0cm}{zoom.bmp}}{{\bf Zoom control} Allows selection of the zoom level for the current diagram.}
-\end{twocollist}
-
-\section{Diagram palette}\label{diagrampalette}
-
-The diagram palette is visible only when a diagram window is active. It contains the tools for
-adding objects and text to a diagram.
-
-\begin{twocollist}
-\twocolitem{\image{1cm;0cm}{arrow.bmp}}{{\bf Pointer tool} Click on this to allow dragging and selection of objects.}
-\twocolitem{\image{1cm;0cm}{texttool.bmp}}{{\bf Text tool} Click on this, then click on objects or the diagram background
-to edit object or free-floating text labels.}
-\end{twocollist}
-
-The other tools on this palette represent demo objects.
-
-To place an object on a diagram, click on its symbol, then left-click on the diagram. You will need to click
-on the palette symbol each time you wish to create an object, since the palette selection reverts to the pointer tool
-after each object is created.
-
-\chapter{Dialogs}\label{dialogs}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-To be written.
-
-\chapter{How To}\label{howto}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\section{Create a new object}
-
-Create a new diagram window if you have not already. Then:
-
-\begin{itemize}\itemsep=0pt
-\item Left-click on the required object on the palette, then left-click on the diagram window.
-\end{itemize}
-
-
-% This section commented out
-\begin{comment}
-\bibliography{refs}
-\addcontentsline{toc}{chapter}{Bibliography}
-\setheader{{\it REFERENCES}}{}{}{}{}{{\it REFERENCES}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\end{comment}
-
-\addcontentsline{toc}{chapter}{Index}
-\printindex%
-
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\end{document}
diff --git a/contrib/samples/ogl/studio/manual/tex2rtf.ini b/contrib/samples/ogl/studio/manual/tex2rtf.ini
deleted file mode 100644
index f44fc89982..0000000000
--- a/contrib/samples/ogl/studio/manual/tex2rtf.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-; Tex2RTF initialisation file
-runTwice = yes
-titleFontSize = 12
-authorFontSize = 10
-chapterFontSize = 12
-sectionFontSize = 12
-subsectionFontSize = 12
-headerRule = yes
-footerRule = yes
-useHeadingStyles = yes
-contentsDepth = 2
-listItemIndent=40
-winHelpContents = yes
-winHelpVersion = 4 ; 3 for Windows 3.x, 4 for Windows 95
-winHelpTitle = "OGL Studio"
-generateHPJ = yes
-htmlBrowseButtons = bitmap
-truncateFilenames = yes
-htmlIndex = no
-htmlFrameContents = no
diff --git a/contrib/samples/ogl/studio/manual/texttool.bmp b/contrib/samples/ogl/studio/manual/texttool.bmp
deleted file mode 100644
index 09c989aac1..0000000000
Binary files a/contrib/samples/ogl/studio/manual/texttool.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tick.bmp b/contrib/samples/ogl/studio/manual/tick.bmp
deleted file mode 100644
index c0d66c9460..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tick.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/toback.bmp b/contrib/samples/ogl/studio/manual/toback.bmp
deleted file mode 100644
index d2e5efffce..0000000000
Binary files a/contrib/samples/ogl/studio/manual/toback.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tofront.bmp b/contrib/samples/ogl/studio/manual/tofront.bmp
deleted file mode 100644
index 5b17cc44c8..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tofront.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tool1.bmp b/contrib/samples/ogl/studio/manual/tool1.bmp
deleted file mode 100644
index cb1760d285..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tool1.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tool2.bmp b/contrib/samples/ogl/studio/manual/tool2.bmp
deleted file mode 100644
index a18faccff7..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tool2.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tool3.bmp b/contrib/samples/ogl/studio/manual/tool3.bmp
deleted file mode 100644
index 6a49f459c3..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tool3.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tool4.bmp b/contrib/samples/ogl/studio/manual/tool4.bmp
deleted file mode 100644
index 95c2061a90..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tool4.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/undo.bmp b/contrib/samples/ogl/studio/manual/undo.bmp
deleted file mode 100644
index 17447ace6b..0000000000
Binary files a/contrib/samples/ogl/studio/manual/undo.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/up.gif b/contrib/samples/ogl/studio/manual/up.gif
deleted file mode 100644
index 316d0d2a14..0000000000
Binary files a/contrib/samples/ogl/studio/manual/up.gif and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/vert.bmp b/contrib/samples/ogl/studio/manual/vert.bmp
deleted file mode 100644
index dfd7b5cb53..0000000000
Binary files a/contrib/samples/ogl/studio/manual/vert.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/zoom.bmp b/contrib/samples/ogl/studio/manual/zoom.bmp
deleted file mode 100644
index c6a137ada5..0000000000
Binary files a/contrib/samples/ogl/studio/manual/zoom.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/project.cpp b/contrib/samples/ogl/studio/project.cpp
deleted file mode 100644
index aeb0ed4f2b..0000000000
--- a/contrib/samples/ogl/studio/project.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: project.cpp
-// Purpose: Studio project classes
-// Author: Julian Smart
-// Modified by:
-// Created: 27/7/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#include "wx/mdi.h"
-#endif
-
-#include "wx/laywin.h"
-#include "studio.h"
-#include "project.h"
-
-IMPLEMENT_CLASS(csProjectTreeCtrl, wxTreeCtrl)
-
-BEGIN_EVENT_TABLE(csProjectTreeCtrl, wxTreeCtrl)
-END_EVENT_TABLE()
-
-// Define my frame constructor
-csProjectTreeCtrl::csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
-
- wxTreeCtrl(parent, id, pos, size, style),
- m_imageList(16, 16)
-{
- m_imageList.Add(wxIcon(_T("folder1")));
- m_imageList.Add(wxIcon(_T("file1")));
-
- SetImageList(& m_imageList);
-}
-
-csProjectTreeCtrl::~csProjectTreeCtrl()
-{
- SetImageList(NULL);
-}
-
-// Create the project window
-bool csApp::CreateProjectWindow(wxFrame *WXUNUSED(parent))
-{
-#if 0
- // Create a layout window
- wxSashLayoutWindow* win = new wxSashLayoutWindow(parent, ID_LAYOUT_WINDOW_PROJECT, wxDefaultPosition, wxSize(200, 30), wxNO_BORDER|wxSW_3D|wxCLIP_CHILDREN);
- win->SetDefaultSize(wxSize(150, 10000));
- win->SetOrientation(wxLAYOUT_VERTICAL);
- win->SetAlignment(wxLAYOUT_LEFT);
- win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
- win->SetSashVisible(wxSASH_RIGHT, true);
- win->SetExtraBorderSize(5);
-
- m_projectSashWindow = win;
-
- m_projectTreeCtrl = new csProjectTreeCtrl(win, ID_WINDOW_PROJECT_TREE, wxDefaultPosition,
- wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxDOUBLE_BORDER);
-
- // For now, hide the window
- m_projectSashWindow->Show(false);
-#endif
-
- return true;
-}
-
-// Fill out the project tree control
-void csApp::FillProjectTreeCtrl()
-{
-#if 0
- csProjectTreeCtrl& tree = *GetProjectTreeCtrl();
-
- // Dummy data for now
- long level0 = tree.InsertItem(0, "Applications", 0, 0);
- long level1 = tree.InsertItem(level0, "Projects", 0, 0);
- tree.InsertItem(level1, "project1", 1, 1);
- tree.InsertItem(level1, "project2", 1, 1);
-#endif
-}
-
diff --git a/contrib/samples/ogl/studio/project.h b/contrib/samples/ogl/studio/project.h
deleted file mode 100644
index 2d0969e0c9..0000000000
--- a/contrib/samples/ogl/studio/project.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/project.h
-// Purpose: Studio project classes
-// Author: Julian Smart
-// Modified by:
-// Created: 27/7/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_PROJECT_H_
-#define _STUDIO_PROJECT_H_
-
-#include "wx/treectrl.h"
-#include "wx/imaglist.h"
-
-/*
- * This is the project tree control.
- */
-
-class csProjectTreeCtrl: public wxTreeCtrl
-{
-
-DECLARE_CLASS(csProjectTreeCtrl)
-public:
-
- csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
- long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT);
-
- ~csProjectTreeCtrl();
-
- wxImageList *GetImageList() const { return (wxImageList *)&m_imageList; }
-protected:
- wxImageList m_imageList;
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
- // _STUDIO_PROJECT_H_
diff --git a/contrib/samples/ogl/studio/shapes.cpp b/contrib/samples/ogl/studio/shapes.cpp
deleted file mode 100644
index e7125a4a24..0000000000
--- a/contrib/samples/ogl/studio/shapes.cpp
+++ /dev/null
@@ -1,1197 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/shapes.cpp
-// Purpose: Implements Studio shapes
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
-#endif
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#include "studio.h"
-#include "doc.h"
-#include "shapes.h"
-#include "view.h"
-#include "cspalette.h"
-#include "dialogs.h"
-
-#define csSTANDARD_SHAPE_WIDTH 100
-
-IMPLEMENT_CLASS(csDiagram, wxDiagram)
-
-csDiagram::~csDiagram()
-{
- DeleteAllShapes();
-}
-
-void csDiagram::Redraw(wxDC& dc)
-{
- wxDiagram::Redraw(dc);
-
- // Draw line crossings
- wxLineCrossings lineCrossings;
- lineCrossings.FindCrossings(*this);
- lineCrossings.DrawCrossings(*this, dc);
-}
-
-/*
- * csEvtHandler: an event handler class for all shapes
- */
-
-IMPLEMENT_DYNAMIC_CLASS(csEvtHandler, wxShapeEvtHandler)
-
-csEvtHandler::csEvtHandler(wxShapeEvtHandler *prev, wxShape *shape, const wxString& lab):
- wxShapeEvtHandler(prev, shape)
-{
- m_label = lab;
-}
-
-csEvtHandler::~csEvtHandler()
-{
-}
-
-// Copy any event handler data
-void csEvtHandler::CopyData(wxShapeEvtHandler& copy)
-{
- wxShapeEvtHandler::CopyData(copy);
-
- csEvtHandler& csCopy = (csEvtHandler&) copy;
- csCopy.m_label = m_label;
-}
-
-void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys, int WXUNUSED(attachment))
-{
- wxClientDC dc(GetShape()->GetCanvas());
- GetShape()->GetCanvas()->PrepareDC(dc);
-
- csDiagramView* view = ((csCanvas*)GetShape()->GetCanvas())->GetView();
- view->ReflectPointSize(GetShape()->GetFont()->GetPointSize());
-
- if (GetShape()->IsKindOf(CLASSINFO(wxLineShape)))
- view->ReflectArrowState((wxLineShape*) GetShape());
-
- csEditorToolPalette *palette = wxGetApp().GetDiagramPalette();
- if (palette->GetSelection() == PALETTE_TEXT_TOOL)
- {
- view->ReflectPointSize(GetShape()->GetFont()->GetPointSize());
-
- EditProperties();
-#if 0
- csLabelEditingDialog* dialog = new csLabelEditingDialog(GetShape()->GetCanvas()->GetParent());
- dialog->SetShapeLabel(m_label);
- if (dialog->ShowModal() == wxID_CANCEL)
- {
- dialog->Destroy();
- return;
- }
-
- wxString newLabel = dialog->GetShapeLabel();
- dialog->Destroy();
-
- wxShape* newShape = GetShape()->CreateNewCopy();
-
- csEvtHandler* handler = (csEvtHandler *)newShape->GetEventHandler();
- handler->m_label = newLabel;
-
- view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Edit label", (csDiagramDocument*) view->GetDocument(),
- new csCommandState(ID_CS_EDIT_PROPERTIES, newShape, GetShape())));
-#endif
- return;
- }
-
- if (keys == 0)
- {
- // If no shift key, then everything is deselected.
- // If the shape was selected, deselect it and vice versa.
- bool selected = GetShape()->Selected();
-
- view->SelectAll(false);
-
- selected = !selected;
-
- GetShape()->Select(selected, &dc);
- GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be missing
-
- view->SelectShape(GetShape(), selected);
- }
- else if (keys & KEY_SHIFT)
- {
- if (GetShape()->Selected())
- {
- GetShape()->Select(false, &dc);
- view->SelectShape(GetShape(), false);
- }
- else
- {
- GetShape()->Select(true, &dc);
- view->SelectShape(GetShape(), true);
- }
- GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be missing
- }
- else if (keys & KEY_CTRL)
- {
- // Do something for CONTROL
- }
- else
- {
-#if wxUSE_STATUSBAR
- ((wxFrame*)wxGetApp().GetTopWindow())->SetStatusText(m_label);
-#endif // wxUSE_STATUSBAR
- }
-}
-
-void csEvtHandler::OnRightClick(double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
- // Have to convert back to physical coordinates from logical coordinates.
-
- int viewStartX, viewStartY;
- int unitX, unitY;
- GetShape()->GetCanvas()->GetViewStart(& viewStartX, & viewStartY);
- GetShape()->GetCanvas()->GetScrollPixelsPerUnit(& unitX, & unitY);
-
- int x1 = (int)(x * GetShape()->GetCanvas()->GetScaleX());
- int y1 = (int)(y * GetShape()->GetCanvas()->GetScaleY());
-
- int menuX = (int) (x1 - (viewStartX * unitX)) ;
- int menuY = (int) (y1 - (viewStartY * unitY));
-
- wxGetApp().GetShapeEditMenu()->SetClientData((char*) GetShape());
- wxGetApp().GetShapeEditMenu()->Enable(ID_CS_ROTATE_CLOCKWISE, !GetShape()->IsKindOf(CLASSINFO(wxLineShape)));
- wxGetApp().GetShapeEditMenu()->Enable(ID_CS_ROTATE_ANTICLOCKWISE, !GetShape()->IsKindOf(CLASSINFO(wxLineShape)));
-
- GetShape()->GetCanvas()->PopupMenu(wxGetApp().GetShapeEditMenu(), menuX, menuY);
-}
-
-/*
- * Implement connection of two shapes by right-dragging between them.
- */
-
-void csEvtHandler::OnBeginDragRight(double x, double y, int WXUNUSED(keys), int attachment)
-{
- wxClientDC dc(GetShape()->GetCanvas());
- GetShape()->GetCanvas()->PrepareDC(dc);
-
- wxPen dottedPen(*wxBLACK, 1, wxDOT);
- dc.SetLogicalFunction(OGLRBLF);
- dc.SetPen(dottedPen);
- double xp, yp;
- GetShape()->GetAttachmentPositionEdge(attachment, &xp, &yp);
- dc.DrawLine((wxCoord)xp, (wxCoord)yp, (wxCoord)x, (wxCoord)y);
- GetShape()->GetCanvas()->CaptureMouse();
-}
-
-void csEvtHandler::OnDragRight(bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys), int attachment)
-{
- wxClientDC dc(GetShape()->GetCanvas());
- GetShape()->GetCanvas()->PrepareDC(dc);
-
- wxPen dottedPen(*wxBLACK, 1, wxDOT);
- dc.SetLogicalFunction(OGLRBLF);
- dc.SetPen(dottedPen);
- double xp, yp;
- GetShape()->GetAttachmentPositionEdge(attachment, &xp, &yp);
- dc.DrawLine((wxCoord)xp, (wxCoord)yp, (wxCoord)x, (wxCoord)y);
-}
-
-void csEvtHandler::OnEndDragRight(double x, double y, int WXUNUSED(keys), int attachment)
-{
- GetShape()->GetCanvas()->ReleaseMouse();
- csCanvas *canvas = (csCanvas *)GetShape()->GetCanvas();
-
- // Check if we're on an object
- int new_attachment;
- wxShape *otherShape = canvas->FindFirstSensitiveShape(x, y, &new_attachment, OP_DRAG_RIGHT);
-
- if (otherShape && !otherShape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- wxLineShape* theShape = new csLineShape;
-
- theShape->AssignNewIds();
- theShape->SetEventHandler(new csEvtHandler(theShape, theShape, wxEmptyString));
- theShape->SetPen(wxBLACK_PEN);
- theShape->SetBrush(wxRED_BRUSH);
-
- wxToolBar* toolbar = wxGetApp().GetDiagramToolBar();
- bool haveArrow = toolbar->GetToolState(DIAGRAM_TOOLBAR_LINE_ARROW);
-
- wxLineShape *lineShape = (wxLineShape *)theShape;
-
- // Yes, you can have more than 2 control points, in which case
- // it becomes a multi-segment line.
- lineShape->MakeLineControlPoints(2);
-
- if (haveArrow)
- lineShape->AddArrow(ARROW_ARROW, ARROW_POSITION_MIDDLE, 10.0, 0.0, _T("Normal arrowhead"));
-
- lineShape->SetFrom(GetShape());
- lineShape->SetTo(otherShape);
- lineShape->SetAttachments(attachment, new_attachment);
-
- canvas->GetView()->GetDocument()->GetCommandProcessor()->Submit(
- new csDiagramCommand(_T("Line"), (csDiagramDocument *)canvas->GetView()->GetDocument(),
- new csCommandState(ID_CS_ADD_LINE, lineShape, NULL)));
- }
-}
-
-static double g_DragOffsetX = 0.0;
-static double g_DragOffsetY = 0.0;
-static double g_DragStartX = 0.0;
-static double g_DragStartY = 0.0;
-
-void csEvtHandler::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
- if ((GetShape()->GetSensitivityFilter() & OP_DRAG_LEFT) != OP_DRAG_LEFT)
- {
- attachment = 0;
- double dist;
- if (GetShape()->GetParent())
- {
- GetShape()->GetParent()->HitTest(x, y, &attachment, &dist);
- GetShape()->GetParent()->GetEventHandler()->OnDragLeft(draw, x, y, keys, attachment);
- }
- return;
- }
-
- wxClientDC dc(GetShape()->GetCanvas());
- GetShape()->GetCanvas()->PrepareDC(dc);
-
- dc.SetLogicalFunction(OGLRBLF);
-
- wxPen dottedPen(*wxBLACK, 1, wxDOT);
- dc.SetPen(dottedPen);
- dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
- double xx, yy;
- xx = x + g_DragOffsetX;
- yy = y + g_DragOffsetY;
-
- GetShape()->GetCanvas()->Snap(&xx, &yy);
-
- double offsetX = xx - g_DragStartX;
- double offsetY = yy - g_DragStartY;
-
-// m_xpos = xx; m_ypos = yy;
- double w, h;
- GetShape()->GetBoundingBoxMax(&w, &h);
- GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
-
- // Draw bounding box for other selected shapes
- wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if (shape->Selected() && !shape->IsKindOf(CLASSINFO(wxLineShape)) && (shape != GetShape()))
- {
- shape->GetBoundingBoxMax(&w, &h);
- shape->OnDrawOutline(dc, shape->GetX() + offsetX, shape->GetY() + offsetY, w, h);
- }
- node = node->GetNext();
- }
-}
-
-void csEvtHandler::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
- if ((GetShape()->GetSensitivityFilter() & OP_DRAG_LEFT) != OP_DRAG_LEFT)
- {
- attachment = 0;
- double dist;
- if (GetShape()->GetParent())
- {
- GetShape()->GetParent()->HitTest(x, y, &attachment, &dist);
- GetShape()->GetParent()->GetEventHandler()->OnBeginDragLeft(x, y, keys, attachment);
- }
- return;
- }
-
- wxClientDC dc(GetShape()->GetCanvas());
- GetShape()->GetCanvas()->PrepareDC(dc);
-
- // New policy: don't erase shape until end of drag.
-// Erase(dc);
-
- g_DragOffsetX = GetShape()->GetX() - x;
- g_DragOffsetY = GetShape()->GetY() - y;
-
- double xx, yy;
- xx = x + g_DragOffsetX;
- yy = y + g_DragOffsetY;
-
- GetShape()->GetCanvas()->Snap(&xx, &yy);
-
- g_DragStartX = GetShape()->GetX();
- g_DragStartY = GetShape()->GetY();
-
- double offsetX = xx - g_DragStartX;
- double offsetY = yy - g_DragStartY;
-
- dc.SetLogicalFunction(OGLRBLF);
-
- wxPen dottedPen(*wxBLACK, 1, wxDOT);
- dc.SetPen(dottedPen);
- dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
- double w, h;
- GetShape()->GetBoundingBoxMax(&w, &h);
- GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
-
- // Draw bounding box for other selected shapes
- wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if (shape->Selected() && !shape->IsKindOf(CLASSINFO(wxLineShape)) && (shape != GetShape()))
- {
- shape->GetBoundingBoxMax(&w, &h);
- shape->OnDrawOutline(dc, shape->GetX() + offsetX, shape->GetY() + offsetY, w, h);
- }
- node = node->GetNext();
- }
-
- GetShape()->GetCanvas()->CaptureMouse();
-}
-
-
-void csEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
- csCanvas *canvas = (csCanvas *)GetShape()->GetCanvas();
-
- canvas->ReleaseMouse();
- if ((GetShape()->GetSensitivityFilter() & OP_DRAG_LEFT) != OP_DRAG_LEFT)
- {
- attachment = 0;
- double dist;
- if (GetShape()->GetParent())
- {
- GetShape()->GetParent()->HitTest(x, y, &attachment, &dist);
- GetShape()->GetParent()->GetEventHandler()->OnEndDragLeft(x, y, keys, attachment);
- }
- return;
- }
-
- wxClientDC dc(canvas);
- canvas->PrepareDC(dc);
-
- dc.SetLogicalFunction(wxCOPY);
-
- double xx = x + g_DragOffsetX;
- double yy = y + g_DragOffsetY;
-
- canvas->Snap(&xx, &yy);
-
- double offsetX = xx - g_DragStartX;
- double offsetY = yy - g_DragStartY;
-
- wxShape* newShape = GetShape()->CreateNewCopy();
-
- newShape->SetX(xx);
- newShape->SetY(yy);
-
- csDiagramCommand* cmd = new csDiagramCommand(_T("Move"), (csDiagramDocument*)canvas->GetView()->GetDocument(),
- new csCommandState(ID_CS_MOVE, newShape, GetShape()));
-
- // Move line points
- wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- // Only move the line point(s) if both ends move too
- if (shape->IsKindOf(CLASSINFO(wxLineShape)) &&
- ((wxLineShape*)shape)->GetTo()->Selected() && ((wxLineShape*)shape)->GetFrom()->Selected())
- {
- wxLineShape* lineShape = (wxLineShape*) shape;
-
- if (lineShape->GetLineControlPoints()->GetCount() > 2)
- {
- wxLineShape* newLineShape = (wxLineShape*) lineShape->CreateNewCopy();
-
- wxObjectList::compatibility_iterator node1 = newLineShape->GetLineControlPoints()->GetFirst();
- while (node1)
- {
- wxRealPoint *point = (wxRealPoint *)node1->GetData();
- point->x += offsetX;
- point->y += offsetY;
- node1 = node1->GetNext();
- }
- cmd->AddState(new csCommandState(ID_CS_MOVE_LINE_POINT, newLineShape, lineShape));
- lineShape->Erase(dc);
- }
- }
- node = node->GetNext();
- }
-
- // Add other selected node shapes, if any
- node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if (shape->Selected() && !shape->IsKindOf(CLASSINFO(wxLineShape)) && (shape != GetShape()))
- {
- wxShape* newShape2 = shape->CreateNewCopy();
- newShape2->SetX(shape->GetX() + offsetX);
- newShape2->SetY(shape->GetY() + offsetY);
- cmd->AddState(new csCommandState(ID_CS_MOVE, newShape2, shape));
- }
- node = node->GetNext();
- }
-
- canvas->GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
-}
-
-void csEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys, int attachment)
-{
- wxShape* shape = GetShape();
- csCanvas *canvas = (csCanvas *)GetShape()->GetCanvas();
-
- if (shape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- // TODO: Do/Undo support for line operations
- ((wxLineShape*)shape)->wxLineShape::OnSizingEndDragLeft(pt, x, y, keys, attachment);
-#if 0
- wxLineShape* lineShape = (wxLineShape*) shape;
-
- wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
-
- wxClientDC dc(canvas);
- canvas->PrepareDC(dc);
-
- shape->SetDisableLabel(false);
-
- if (lpt->m_type == CONTROL_POINT_LINE)
- {
- canvas->Snap(&x, &y);
-
- dc.SetLogicalFunction(wxCOPY);
- lpt->SetX(x); lpt->SetY(y);
- lpt->m_point->x = x; lpt->m_point->y = y;
-
- this->OnMoveLink(dc);
- }
- if (lpt->m_type == CONTROL_POINT_ENDPOINT_FROM)
- {
- if (lpt->m_oldCursor)
- canvas->SetCursor(lpt->m_oldCursor);
- lineShape->Erase(dc);
-
- lpt->SetX(x); lpt->SetY(y);
-
- if (lineShape->GetFrom())
- {
- lineShape->GetFrom()->MoveLineToNewAttachment(dc, lineShape, x, y);
- }
- }
- if (lpt->m_type == CONTROL_POINT_ENDPOINT_TO)
- {
- if (lpt->m_oldCursor)
- canvas->SetCursor(lpt->m_oldCursor);
-
- lpt->SetX(x); lpt->SetY(y);
-
- if (lineShape->GetTo())
- {
- lineShape->GetTo()->MoveLineToNewAttachment(dc, lineShape, x, y);
- }
- }
-#endif
- return;
- }
-
- wxClientDC dc(canvas);
- canvas->PrepareDC(dc);
-
- canvas->ReleaseMouse();
- dc.SetLogicalFunction(wxCOPY);
-
-// shape->Erase(dc);
-/*
- shape->Recompute();
- shape->ResetControlPoints();
- if (!pt->m_eraseObject)
- shape->Show(false);
-*/
-
- wxShape* newShape = shape->CreateNewCopy();
-
- if (newShape->IsKindOf(CLASSINFO(wxPolygonShape)))
- {
- wxPolygonControlPoint* ppt = (wxPolygonControlPoint*) pt;
- newShape->SetSize(ppt->GetNewSize().x, ppt->GetNewSize().y);
-
- ((wxPolygonShape *)newShape)->CalculateBoundingBox();
- ((wxPolygonShape *)newShape)->CalculatePolygonCentre();
- newShape->ResetControlPoints();
- }
- else
- {
- newShape->SetSize(pt->sm_controlPointDragEndWidth, pt->sm_controlPointDragEndHeight);
- if (shape->GetCentreResize())
- {
- // Old position is fine
- }
- else
- {
- newShape->SetX(pt->sm_controlPointDragPosX);
- newShape->SetY(pt->sm_controlPointDragPosY);
- }
- }
-
- csDiagramCommand* cmd = new csDiagramCommand(_T("Size"), (csDiagramDocument*)canvas->GetView()->GetDocument(),
- new csCommandState(ID_CS_SIZE, newShape, shape));
-
- canvas->GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
-
-}
-
-void csEvtHandler::OnEndSize(double WXUNUSED(x), double WXUNUSED(y))
-{
- wxClientDC dc(GetShape()->GetCanvas());
- GetShape()->GetCanvas()->PrepareDC(dc);
-
- GetShape()->FormatText(dc, m_label);
-}
-
-void csEvtHandler::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)
-{
- csCanvas *canvas = (csCanvas *)GetShape()->GetCanvas();
-
- // We actually submit two different states: one to change the ordering, and another
- // to change the attachment for the line.
- // Problem. If we refresh after the attachment change, we'll get a flicker.
- // We really want to do both in a oner.
-
- csDiagramCommand* cmd = new csDiagramCommand(_T("Change attachment"), (csDiagramDocument*)canvas->GetView()->GetDocument());
-
- wxLineShape* newLine = (wxLineShape*) line->CreateNewCopy();
- if (line->GetTo() == GetShape())
- newLine->SetAttachmentTo(attachment);
- else
- newLine->SetAttachmentFrom(attachment);
-
- cmd->AddState(new csCommandState(ID_CS_CHANGE_LINE_ATTACHMENT, newLine, line));
-
- // Change ordering
- wxShape* newShape = GetShape()->CreateNewCopy();
- newShape->ApplyAttachmentOrdering(ordering);
-
- cmd->AddState(new csCommandState(ID_CS_CHANGE_LINE_ORDERING, newShape, GetShape()));
-
- canvas->GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
-}
-
-void csEvtHandler::OnLeftDoubleClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys), int WXUNUSED(attachment))
-{
- EditProperties();
-}
-
-// Popup up a property dialog
-bool csEvtHandler::EditProperties()
-{
- wxShape* shape = GetShape();
-
- // For now, no line property editing
- if (shape->IsKindOf(CLASSINFO(wxLineShape)))
- return false;
-
- csDiagramView* view = ((csCanvas*)shape->GetCanvas())->GetView();
-
- wxPanel* attributeDialog;
- wxString attributeDialogName;
- wxString title;
-
- if (shape->IsKindOf(CLASSINFO(csThinRectangleShape)))
- {
- attributeDialog = new csThinRectangleDialog;
- attributeDialogName = _T("thin_rectangle");
- title = _T("Thin Rectangle Properties");
- }
- else if (shape->IsKindOf(CLASSINFO(csWideRectangleShape)))
- {
- attributeDialog = new csWideRectangleDialog;
- attributeDialogName = _T("wide_rectangle");
- title = _T("Wide Rectangle Properties");
- }
- else if (shape->IsKindOf(CLASSINFO(csTriangleShape)))
- {
- attributeDialog = new csTriangleDialog;
- attributeDialogName = _T("triangle");
- title = _T("Triangle Properties");
- }
- else if (shape->IsKindOf(CLASSINFO(csSemiCircleShape)))
- {
- attributeDialog = new csSemiCircleDialog;
- attributeDialogName = _T("semi_circle");
- title = _T("Semicircle Properties");
- }
- else if (shape->IsKindOf(CLASSINFO(csCircleShape)))
- {
- attributeDialog = new csCircleDialog;
- attributeDialogName = _T("circle");
- title = _T("Circle Properties");
- }
- else if (shape->IsKindOf(CLASSINFO(csCircleShadowShape)))
- {
- attributeDialog = new csCircleShadowDialog;
- attributeDialogName = _T("circle_shadow");
- title = _T("Circle Shadow Properties");
- }
- else if (shape->IsKindOf(CLASSINFO(csTextBoxShape)))
- {
- attributeDialog = new csTextBoxDialog;
- attributeDialogName = _T("text_box");
- title = _T("Text Box Properties");
- }
- else if (shape->IsKindOf(CLASSINFO(csGroupShape)))
- {
- attributeDialog = new csGroupDialog;
- attributeDialogName = _T("group");
- title = _T("Group Properties");
- }
- else if (shape->IsKindOf(CLASSINFO(csOctagonShape)))
- {
- attributeDialog = new csOctagonDialog;
- attributeDialogName = _T("octagon");
- title = _T("Octagon Properties");
- }
- else
- {
- wxMessageBox(_T("Unrecognised shape."), _T("Studio"), wxICON_EXCLAMATION);
- return false;
- }
-
- wxString newLabel(m_label);
-
-#if wxUSE_WX_RESOURCES
- csShapePropertiesDialog* dialog = new csShapePropertiesDialog(shape->GetCanvas()->GetParent(), title, attributeDialog, attributeDialogName);
- dialog->GetGeneralPropertiesDialog()->SetShapeLabel(m_label);
- if (dialog->ShowModal() == wxID_CANCEL)
- {
- dialog->Destroy();
- return false;
- }
-
- newLabel = dialog->GetGeneralPropertiesDialog()->GetShapeLabel();
- dialog->Destroy();
-#else
- wxUnusedVar(attributeDialog);
-#endif // wxUSE_WX_RESOURCES
-
- wxShape* newShape = shape->CreateNewCopy();
-
- csEvtHandler* handler2 = (csEvtHandler *)newShape->GetEventHandler();
- handler2->m_label = newLabel;
-
- view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Edit properties"), (csDiagramDocument*) view->GetDocument(),
- new csCommandState(ID_CS_EDIT_PROPERTIES, newShape, shape)));
-
- return true;
-}
-
-/*
- * Diagram
- */
-
-#if wxUSE_PROLOGIO
-bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
-{
- wxDiagram::OnShapeSave(db, shape, expr);
- csEvtHandler *handler = (csEvtHandler *)shape.GetEventHandler();
- expr.AddAttributeValueString(_T("label"), handler->m_label);
- return true;
-}
-
-bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
-{
- wxDiagram::OnShapeLoad(db, shape, expr);
- wxString label = wxEmptyString;
- expr.GetAttributeValue(_T("label"), label);
- csEvtHandler *handler = new csEvtHandler(&shape, &shape, label);
- shape.SetEventHandler(handler);
-
- return true;
-}
-#endif // wxUSE_PROLOGIO
-
-IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape)
-
-csThinRectangleShape::csThinRectangleShape()
-{
- SetDrawnPen(wxBLACK_PEN);
- wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
- SetDrawnBrush(brush);
-
- double w = csSTANDARD_SHAPE_WIDTH/2;
- double h = csSTANDARD_SHAPE_WIDTH;
-
- DrawRectangle(wxRect((int)(- w/2), (int)(- h/2), (int)(w), (int)(h)));
- CalculateSize();
-
- SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
- SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
- SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csWideRectangleShape, wxDrawnShape)
-
-csWideRectangleShape::csWideRectangleShape()
-{
- SetDrawnPen(wxBLACK_PEN);
- wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
- SetDrawnBrush(brush);
-
- double w = csSTANDARD_SHAPE_WIDTH;
- double h = w/2.0;
-
- DrawRoundedRectangle(wxRect((int)(- w/2), (int)(- h/2), (int)(w), (int)(h)), -0.3);
- CalculateSize();
-
- SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
- SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
- SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csTriangleShape, wxDrawnShape)
-
-csTriangleShape::csTriangleShape()
-{
- SetDrawnPen(wxBLACK_PEN);
- wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
- SetDrawnBrush(brush);
-
- double w = csSTANDARD_SHAPE_WIDTH;
- double h = (csSTANDARD_SHAPE_WIDTH*2.0)/3.0;
-
- // Triangle, from top vertex
- wxPoint* points = new wxPoint[3];
-
-
- points[0] = wxPoint( 0 , (int)(- h / 2) );
- points[1] = wxPoint( (int)(w / 2) , (int)(h / 2) );
- points[2] = wxPoint( (int)(-w / 2), (int)(h / 2) );
-
- DrawPolygon(3, points, oglMETAFLAGS_OUTLINE);
-
- delete[] points;
-
- // Add another triangle at the top for the black bit
- SetDrawnBrush(wxBLACK_BRUSH);
-
- points = new wxPoint[3];
-
- // Calculate where the new points will be, using the proportions
- // of the triangle.
- double h1 = 8; // Height of little triangle.
-
- /*
- Formula: ((w/2) / h) = w1 / h1
- w1 = ((w/2) / h) * h1;
- */
- double ratio = ((w/2.0) / h) ;
- double w1 = ratio * h1;
-
- points[0] = wxPoint(0 , (int) (- h / 2 ));
- points[1] = wxPoint( (int) w1, (int) (- h / 2 + h1));
- points[2] = wxPoint( (int) -w1, (int) (- h / 2 + h1));
-
- DrawPolygon(3, points);
-
- delete[] points;
-
- CalculateSize();
-
- SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
- SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
- SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csSemiCircleShape, wxDrawnShape)
-
-csSemiCircleShape::csSemiCircleShape()
-{
- // Zero degrees
- DrawAtAngle(oglDRAWN_ANGLE_0);
-
- double w = csSTANDARD_SHAPE_WIDTH;
- double h = w/2.0;
-
- SetDrawnPen(wxTRANSPARENT_PEN);
- SetDrawnBrush(wxTRANSPARENT_BRUSH);
-
- // Draw a dummy rectangle that will be used for calculating the
- // bounding box, since we can't calculate the bounding box for
- // an arbitrary arc (not implemented)
-
- DrawRectangle(wxRect((int)(-w/2.0), (int)(-h/2.0), (int)(w), (int)(h)));
-
- SetDrawnPen(wxBLACK_PEN);
- wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
- SetDrawnBrush(brush);
-
- DrawEllipticArc(wxRect((int)(-w/2), (int)(-h/2), (int)(w), (int)(2*h)), 0.0, 180.0);
- DrawLine(wxPoint((int)(-w/2), (int)(h/2)), wxPoint((int)(w/2), (int)(h/2)));
-
- CalculateSize();
-
- /// 90 degrees
-
- w = csSTANDARD_SHAPE_WIDTH/2;
- h = csSTANDARD_SHAPE_WIDTH;
-
- DrawAtAngle(oglDRAWN_ANGLE_90);
-
- SetDrawnPen(wxTRANSPARENT_PEN);
- SetDrawnBrush(wxTRANSPARENT_BRUSH);
-
- DrawRectangle(wxRect((int)(-w/2), (int)(-h/2), (int)(w), (int)(h)));
-
- SetDrawnPen(wxBLACK_PEN);
- SetDrawnBrush(brush);
-
- DrawEllipticArc(wxRect((int)(-w/2 - w), (int)(-h/2), (int)(2*w), (int)(h)), 270.0, 90.0);
- DrawLine(wxPoint((int)(-w/2), (int)(-h/2)), wxPoint((int)(-w/2), (int)(h/2)));
-
- CalculateSize();
-
- /// 180 degrees
-
- DrawAtAngle(oglDRAWN_ANGLE_180);
-
- w = csSTANDARD_SHAPE_WIDTH;
- h = csSTANDARD_SHAPE_WIDTH/2;
-
- SetDrawnPen(wxTRANSPARENT_PEN);
- SetDrawnBrush(wxTRANSPARENT_BRUSH);
-
- DrawRectangle(wxRect((int)(-w/2), (int)(-h/2), (int)(w), (int)(h)));
-
- SetDrawnPen(wxBLACK_PEN);
- SetDrawnBrush(brush);
-
- DrawEllipticArc(wxRect((int)(-w/2), (int)(-h/2 - h), (int)(w), (int)(2*h)), 180.0, 0.0);
- DrawLine(wxPoint((int)(-w/2), (int)(-h/2)), wxPoint((int)(w/2), (int)(-h/2)));
-
- CalculateSize();
-
- /// 270 degrees
-
- DrawAtAngle(oglDRAWN_ANGLE_270);
-
- w = csSTANDARD_SHAPE_WIDTH/2;
- h = csSTANDARD_SHAPE_WIDTH;
-
- SetDrawnPen(wxTRANSPARENT_PEN);
- SetDrawnBrush(wxTRANSPARENT_BRUSH);
-
- DrawRectangle(wxRect((int)(-w/2), (int)(-h/2), (int)(w), (int)(h)));
-
- SetDrawnPen(wxBLACK_PEN);
- SetDrawnBrush(brush);
-
- DrawEllipticArc(wxRect((int)(-w/2), (int)(-h/2), (int)(2*w), (int)(h)), 90.0, 270.0);
- DrawLine(wxPoint((int)(w/2),(int)(-h/2)), wxPoint((int)(w/2), (int)(h/2)));
-
- CalculateSize();
-
- // Reset to zero
- DrawAtAngle(oglDRAWN_ANGLE_0);
- CalculateSize();
-
- SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
- SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
- SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csCircleShape, wxCircleShape)
-
-csCircleShape::csCircleShape()
-{
- SetPen(wxBLACK_PEN);
- wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
- SetBrush(brush);
-
- SetSize(csSTANDARD_SHAPE_WIDTH*0.6, csSTANDARD_SHAPE_WIDTH*0.6);
-
- SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
- SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
- SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csCircleShadowShape, wxCircleShape)
-
-csCircleShadowShape::csCircleShadowShape()
-{
- SetPen(wxBLACK_PEN);
- wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
- SetBrush(brush);
-
- SetSize(csSTANDARD_SHAPE_WIDTH*0.6, csSTANDARD_SHAPE_WIDTH*0.6);
-
- SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
- SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
- SetCentreResize(false);
- SetShadowMode(SHADOW_RIGHT);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csOctagonShape, wxPolygonShape)
-
-csOctagonShape::csOctagonShape()
-{
- SetPen(wxBLACK_PEN);
- SetBrush(wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID));
-
- double w = csSTANDARD_SHAPE_WIDTH*0.5;
- double h = csSTANDARD_SHAPE_WIDTH*0.5;
-
- double prop = h/3.0;
-
- wxList* points = new wxList;
- points->Append((wxObject*) new wxRealPoint(-w/2.0 + prop, -h/2.0));
- points->Append((wxObject*) new wxRealPoint(w/2.0 - prop, -h/2.0));
- points->Append((wxObject*) new wxRealPoint(w/2.0, -h/2.0 + prop));
- points->Append((wxObject*) new wxRealPoint(w/2.0, h/2.0 - prop));
- points->Append((wxObject*) new wxRealPoint(w/2.0 - prop, h/2.0));
- points->Append((wxObject*) new wxRealPoint(-w/2.0 + prop, h/2.0));
- points->Append((wxObject*) new wxRealPoint(-w/2.0, h/2.0 - prop));
- points->Append((wxObject*) new wxRealPoint(-w/2.0, -h/2.0 + prop));
-
- Create(points);
-
- SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
- SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
- SetCentreResize(false);
-}
-
-// This is a transparent shape for drawing around other shapes.
-IMPLEMENT_DYNAMIC_CLASS(csGroupShape, wxRectangleShape)
-
-csGroupShape::csGroupShape()
-{
- SetPen(wxThePenList->FindOrCreatePen(_T("BLACK"), 1, wxDOT));
- SetBrush(wxTRANSPARENT_BRUSH);
-
- SetSize(csSTANDARD_SHAPE_WIDTH, csSTANDARD_SHAPE_WIDTH);
- SetCentreResize(false);
-}
-
-void csGroupShape::OnDraw(wxDC& dc)
-{
- wxRectangleShape::OnDraw(dc);
-}
-
-// Must modify the hit-test so it doesn't obscure shapes that are inside.
-bool csGroupShape::HitTest(double x, double y, int* attachment, double* distance)
-{
- *attachment = 0;
- *distance = 0.0;
-
- double width = 0.0, height = 0.0;
- GetBoundingBoxMin(&width, &height);
-
- double x1 = GetX() - (width/2.0);
- double y1 = GetY() - (height/2.0);
- double x2 = GetX() + (width/2.0);
- double y2 = GetY() + (height/2.0);
-
- double edgeTolerance = 4.0;
-
- // Test each edge in turn
-
- // Top/bottom edges
- if (x >= x1 && x <= x2)
- {
- if ((y >= y1 - edgeTolerance) && (y <= y1 + edgeTolerance))
- return true;
- if ((y <= y2 + edgeTolerance) && (y >= y2 - edgeTolerance))
- return true;
- }
- // Left/right edges
- if (y >= y1 && y <= y2)
- {
- if ((x >= x1 - edgeTolerance) && (x <= x1 + edgeTolerance))
- return true;
- if ((x <= x2 + edgeTolerance) && (x >= x2 - edgeTolerance))
- return true;
- }
-
- return false;
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csTextBoxShape, wxRectangleShape)
-
-csTextBoxShape::csTextBoxShape()
-{
- SetPen(wxTRANSPARENT_PEN);
- SetBrush(wxTRANSPARENT_BRUSH);
-
- SetSize(csSTANDARD_SHAPE_WIDTH, csSTANDARD_SHAPE_WIDTH/2.0);
-
- SetAttachmentMode(ATTACHMENT_MODE_NONE);
- SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
- SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csLineShape, wxLineShape)
-
-csLineShape::csLineShape()
-{
-}
-
-bool csLineShape::OnMoveMiddleControlPoint(wxDC& WXUNUSED(dc), wxLineControlPoint* lpt, const wxRealPoint& pt)
-{
- csDiagramView* view = ((csCanvas*)GetCanvas())->GetView();
-
- // Temporarily set the new shape properties so we can copy it
- lpt->SetX(pt.x); lpt->SetY(pt.y);
- lpt->m_point->x = pt.x; lpt->m_point->y = pt.y;
-
- wxLineShape* newShape = (wxLineShape*) this->CreateNewCopy();
-
- // Now set them back again
- lpt->SetX(lpt->m_originalPos.x); lpt->SetY(lpt->m_originalPos.y);
- lpt->m_point->x = lpt->m_originalPos.x; lpt->m_point->y = lpt->m_originalPos.y;
-
- view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Move line point"), (csDiagramDocument*) view->GetDocument(),
- new csCommandState(ID_CS_MOVE_LINE_POINT, newShape, this)));
-
- return true;
-}
-
-wxLabelShape* csLineShape::OnCreateLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h)
-{
- return new csLabelShape(parent, region, w, h);
-}
-
-#if 0
-bool csLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double old_x, double old_y, bool display)
-{
- csDiagramView* view = ((csCanvas*)GetCanvas())->GetView();
-
- wxLineShape* newShape = (wxLineShape*) this->CreateNewCopy();
-
- wxLineShape::OnLabelMovePre(dc, labelShape, x, y, old_x, old_y, display);
-
- view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Move label", (csDiagramDocument*) view->GetDocument(),
- new csCommandState(ID_CS_MOVE_LABEL, newShape, this)));
- return true;
-}
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(csLabelShape, wxLabelShape)
-
-csLabelShape::csLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h):
- wxLabelShape(parent, region, w, h)
-{
-}
-
-// TODO: not sure how intercept normal behaviour (OnMovePre) to make
-// label movement undo-able.
-void csLabelShape::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
- wxLabelShape::OnEndDragLeft(x, y, keys, attachment);
-}
-
-
-// Menu for editing shapes
-void studioShapeEditProc(wxMenu& menu, wxCommandEvent& event)
-{
- wxShape* shape = (wxShape*) menu.GetClientData();
- csDiagramView* view = ((csCanvas*)shape->GetCanvas())->GetView();
-
- switch (event.GetId())
- {
- case ID_CS_EDIT_PROPERTIES:
- {
- csEvtHandler* handler1 = (csEvtHandler *)shape->GetEventHandler();
- handler1->EditProperties();
-#if 0
- csEvtHandler* handler1 = (csEvtHandler *)shape->GetEventHandler();
- csLabelEditingDialog* dialog = new csLabelEditingDialog(shape->GetCanvas()->GetParent());
- dialog->SetShapeLabel(handler1->m_label);
- if (dialog->ShowModal() == wxID_CANCEL)
- {
- dialog->Destroy();
- return;
- }
-
- wxString newLabel = dialog->GetShapeLabel();
- dialog->Destroy();
-
- wxShape* newShape = shape->CreateNewCopy();
-
- csEvtHandler* handler2 = (csEvtHandler *)newShape->GetEventHandler();
- handler2->m_label = newLabel;
-
- view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Edit label", (csDiagramDocument*) view->GetDocument(),
- new csCommandState(ID_CS_EDIT_LABEL, newShape, shape)));
-#endif
- break;
- }
- case wxID_CUT:
- {
- wxList list;
- list.Append(shape);
- view->DoCut(list);
- break;
- }
- case ID_CS_ROTATE_CLOCKWISE:
- case ID_CS_ROTATE_ANTICLOCKWISE:
- {
- if (shape->IsKindOf(CLASSINFO(wxLineShape)))
- break;
-
- double theta = shape->GetRotation();
- const double myPi = M_PI;
- double ninetyDegrees = myPi/2.0;
-
- wxString opStr;
- if (event.GetId() == ID_CS_ROTATE_CLOCKWISE)
- {
- theta += ninetyDegrees;
- opStr = _T("Rotate clockwise");
- }
- else
- {
- theta -= ninetyDegrees;
- opStr = _T("Rotate anticlockwise");
- }
-
- if (theta >= 2.0*myPi || theta < 0.0)
- theta = 0.0;
- wxShape* newShape = shape->CreateNewCopy();
- newShape->Rotate(0.0, 0.0, theta);
- wxList newShapes;
- wxList oldShapes;
- newShapes.Append(newShape);
- oldShapes.Append(shape);
- view->DoCmd(newShapes, oldShapes, event.GetId(), opStr);
- break;
- }
- default:
- break;
- }
-}
-
-BEGIN_EVENT_TABLE(ShapeEditMenu, wxMenu)
- EVT_COMMAND_RANGE(1, 65000, wxEVT_COMMAND_MENU_SELECTED, ShapeEditMenu::OnCommand)
-END_EVENT_TABLE()
-
-void ShapeEditMenu::OnCommand(wxCommandEvent& event)
-{
- studioShapeEditProc(*this, event);
-}
diff --git a/contrib/samples/ogl/studio/shapes.h b/contrib/samples/ogl/studio/shapes.h
deleted file mode 100644
index 7f4548ba38..0000000000
--- a/contrib/samples/ogl/studio/shapes.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/shapes.h
-// Purpose: Shape classes
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_SHAPES_H_
-#define _STUDIO_SHAPES_H_
-
-#include "wx/docview.h"
-#include "wx/string.h"
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-#include "wx/ogl/basicp.h"
-#include "wx/ogl/linesp.h"
-#include "wx/ogl/drawn.h"
-
-class csDiagramDocument;
-
-/*
- * Override a few members for this application
- */
-
-class csDiagram: public wxDiagram
-{
-DECLARE_CLASS(csDiagram)
-public:
- csDiagram(csDiagramDocument* doc) { m_doc = doc; }
- ~csDiagram();
-#if wxUSE_PROLOGIO
- bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
- bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-#endif // wxUSE_PROLOGIO
-
- inline csDiagramDocument* GetDocument() const { return m_doc; }
- virtual void Redraw(wxDC& dc);
-
-protected:
- csDiagramDocument* m_doc;
-};
-
-class wxDiagramClipboard: public wxDiagram
-{
-DECLARE_DYNAMIC_CLASS(wxDiagramClipboard)
-public:
- wxDiagramClipboard() {}
- ~wxDiagramClipboard() {}
-
- // Copy selection to clipboard
- bool Copy(wxDiagram* diagram);
-
- // Copy contents to the diagram, with new ids.
- // If dc is non-NULL, the pasted shapes will be selected.
- // The offsets are used to place the shapes at a different position
- // from the original (for example, for duplicating shapes).
- bool Paste(wxDiagram* diagram, wxDC* dc = NULL,
- int offsetX = 0, int offsetY = 0);
-
-#ifdef __WXMSW__
- // Draw contents to a Windows metafile device context and bitmap, and then copy
- // to the Windows clipboard.
- bool CopyToClipboard(double scale);
-#endif
-
-// Overridables
- // Start/end copying
- virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return true; };
- virtual bool OnEndCopy(wxDiagram* WXUNUSED(diagramTo)) { return true; };
-
- // Override this to e.g. have the shape added through a Do/Undo command system.
- // By default, we'll just add it directly to the destination diagram, and
- // select the shape (if dc is non-NULL).
- virtual bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);
-
-protected:
- bool DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bool newIds,
- wxDC* dc, int offsetX = 0, int offsetY = 0);
-
-};
-
-class csDiagramCommand;
-
-class csDiagramClipboard: public wxDiagramClipboard
-{
-DECLARE_DYNAMIC_CLASS(csDiagramClipboard)
-public:
- csDiagramClipboard() { m_currentCmd = NULL; }
- ~csDiagramClipboard() {}
-
- // Start/end copying
- virtual bool OnStartCopy(wxDiagram* diagramTo);
- virtual bool OnEndCopy(wxDiagram* diagramTo);
-
- virtual bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);
-
-protected:
- csDiagramCommand* m_currentCmd;
-};
-
-
-/*
- * The Studio shapes
- * N.B. TODO: these should really all have another constructor
- * for the ready-initialised shape, with the default one not having any
- * data. Otherwise when copying a shape, you have to delete the old data
- * first -> slightly less efficient. The initialised shapes are only required
- * for the first creation of the shape in the palette, everything else is copied.
- */
-
-class csThinRectangleShape: public wxDrawnShape
-{
-DECLARE_DYNAMIC_CLASS(csThinRectangleShape)
-public:
- csThinRectangleShape();
-};
-
-class csWideRectangleShape: public wxDrawnShape
-{
-DECLARE_DYNAMIC_CLASS(csWideRectangleShape)
-public:
- csWideRectangleShape();
-};
-
-class csTriangleShape: public wxDrawnShape
-{
-DECLARE_DYNAMIC_CLASS(csTriangleShape)
-public:
- csTriangleShape();
-};
-
-class csSemiCircleShape: public wxDrawnShape
-{
-DECLARE_DYNAMIC_CLASS(csSemiCircleShape)
-public:
- csSemiCircleShape();
-};
-
-class csCircleShape: public wxCircleShape
-{
-DECLARE_DYNAMIC_CLASS(csCircleShape)
-public:
- csCircleShape();
-};
-
-class csCircleShadowShape: public wxCircleShape
-{
-DECLARE_DYNAMIC_CLASS(csCircleShadowShape)
-public:
- csCircleShadowShape();
-};
-
-class csOctagonShape: public wxPolygonShape
-{
-DECLARE_DYNAMIC_CLASS(csOctagonShape)
-public:
- csOctagonShape();
-
- // The attachments are as if it's a rectangle
- bool GetAttachmentPosition(int attachment, double *x, double *y,
- int nth = 0, int no_arcs = 1, wxLineShape *line = NULL)
- { return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line); }
- int GetNumberOfAttachments() const
- { return wxShape::GetNumberOfAttachments(); }
- bool AttachmentIsValid(int attachment) const
- { return wxShape::AttachmentIsValid(attachment); }
-};
-
-// This is a transparent shape for drawing around other shapes.
-class csGroupShape: public wxRectangleShape
-{
-DECLARE_DYNAMIC_CLASS(csGroupShape)
-public:
- csGroupShape();
-
- void OnDraw(wxDC& dc);
- // Must modify the hit-test so it doesn't obscure shapes that are inside.
- bool HitTest(double x, double y, int* attachment, double* distance);
-};
-
-class csTextBoxShape: public wxRectangleShape
-{
-DECLARE_DYNAMIC_CLASS(csTextBoxShape)
-public:
- csTextBoxShape();
-};
-
-class csLineShape: public wxLineShape
-{
-DECLARE_DYNAMIC_CLASS(csLineShape)
-public:
- csLineShape();
-
- virtual bool OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, const wxRealPoint& pt);
- wxLabelShape* OnCreateLabelShape(wxLineShape *parent = NULL, wxShapeRegion *region = NULL, double w = 0.0, double h = 0.0);
-};
-
-/*
- * Temporary arc label object
- */
-
-class csLabelShape: public wxLabelShape
-{
- DECLARE_DYNAMIC_CLASS(csLabelShape)
-
- public:
- csLabelShape(wxLineShape *parent = NULL, wxShapeRegion *region = NULL, double w = 0.0, double h = 0.0);
-
- void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-};
-
-/*
- * All shape event behaviour is routed through this handler, so we don't
- * have to derive from each shape class. We plug this in to each shape.
- */
-
-class csEvtHandler: public wxShapeEvtHandler
-{
- DECLARE_DYNAMIC_CLASS(csEvtHandler)
- public:
- csEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = wxEmptyString);
- ~csEvtHandler();
-
- void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
- void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
- void OnBeginDragRight(double x, double y, int keys = 0, int attachment = 0);
- void OnDragRight(bool draw, double x, double y, int keys = 0, int attachment = 0);
- void OnEndDragRight(double x, double y, int keys = 0, int attachment = 0);
- void OnEndSize(double x, double y);
- void OnDragLeft(bool draw, double x, double y, int keys = 0, int attachment = 0);
- void OnBeginDragLeft(double x, double y, int keys = 0, int attachment = 0);
- void OnEndDragLeft(double x, double y, int keys = 0, int attachment = 0);
- void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys = 0, int attachment = 0);
- void OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering);
-
- void OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-
- // Copy any event handler data
- virtual void CopyData(wxShapeEvtHandler& copy);
-
- // Popup up a property dialog
- virtual bool EditProperties();
-
-public:
- wxString m_label;
-};
-
-class ShapeEditMenu: public wxMenu
-{
-public:
- ShapeEditMenu() {}
-
- void OnCommand(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-extern void studioShapeEditProc(wxMenu& menu, wxCommandEvent& event);
-
-#endif
- // _STUDIO_SHAPES_H_
diff --git a/contrib/samples/ogl/studio/studio.bkl b/contrib/samples/ogl/studio/studio.bkl
deleted file mode 100644
index bae5d0377a..0000000000
--- a/contrib/samples/ogl/studio/studio.bkl
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
- $(SRCDIR)/../../../include
-
-
- studio.cpp
- doc.cpp
- shapes.cpp
- symbols.cpp
- view.cpp
- cspalette.cpp
- mainfrm.cpp
- project.cpp
- dialogs.cpp
- csprint.cpp
-
- ogl
- deprecated
- adv
- html
- xml
- core
- base
- studio.rc
-
-
-
-
- studio_resources.wxr
-
-
-
-
diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp
deleted file mode 100644
index 982a0bf50b..0000000000
--- a/contrib/samples/ogl/studio/studio.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: Studio.cpp
-// Purpose: Studio application class
-// Author: Julian Smart
-// Modified by:
-// Created: 27/7/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#include "wx/mdi.h"
-#endif
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#include "wx/config.h"
-#include "wx/laywin.h"
-#include "wx/helpwin.h"
-
-#include "studio.h"
-#include "view.h"
-#include "doc.h"
-#include "mainfrm.h"
-#include "cspalette.h"
-#include "project.h"
-#include "symbols.h"
-
-#include "bitmaps/new.xpm"
-#include "bitmaps/open.xpm"
-#include "bitmaps/save.xpm"
-#include "bitmaps/copy.xpm"
-#include "bitmaps/cut.xpm"
-#include "bitmaps/paste.xpm"
-#include "bitmaps/print.xpm"
-#include "bitmaps/help.xpm"
-#include "bitmaps/undo.xpm"
-#include "bitmaps/redo.xpm"
-
-#include "bitmaps/alignl.xpm"
-#include "bitmaps/alignr.xpm"
-#include "bitmaps/alignt.xpm"
-#include "bitmaps/alignb.xpm"
-#include "bitmaps/horiz.xpm"
-#include "bitmaps/vert.xpm"
-#include "bitmaps/copysize.xpm"
-#include "bitmaps/linearrow.xpm"
-#include "bitmaps/newpoint.xpm"
-#include "bitmaps/cutpoint.xpm"
-#include "bitmaps/straight.xpm"
-
-#include "studio.xpm"
-
-IMPLEMENT_APP(csApp)
-
-csApp::csApp()
-{
- m_docManager = NULL;
- m_diagramPalette = NULL;
- m_diagramToolBar = NULL;
- m_projectTreeCtrl = NULL;
- m_diagramPaletteSashWindow = NULL;
- m_projectSashWindow = NULL;
- m_symbolDatabase = NULL;
- m_pointSizeComboBox = NULL;
- m_zoomComboBox = NULL;
- m_shapeEditMenu = NULL;
-
- // Configuration
- m_mainFramePos.x = 20;
- m_mainFramePos.y = 20;
- m_mainFrameSize.x = 500;
- m_mainFrameSize.y = 400;
- m_gridStyle = csGRID_STYLE_INVISIBLE;
- m_gridSpacing = 5;
-}
-
-csApp::~csApp()
-{
-}
-
-// Initialise this in OnInit, not statically
-bool csApp::OnInit(void)
-{
-#if wxUSE_WX_RESOURCES
- if (!wxResourceParseFile(_T("studio_resources.wxr")))
- {
- wxMessageBox(_T("Could not find or parse resource file: studio_resources.wxr"), _T("Studio"));
- return false;
- }
-#endif
-
-#if wxUSE_MS_HTML_HELP && !defined(__WXUNIVERSAL__)
- m_helpController = new wxWinHelpController;
-#else
- m_helpController = new wxHtmlHelpController;
-#endif
-
- m_helpController->Initialize(_T("studio.hlp"));
-
- ReadOptions();
-
- wxOGLInitialize();
-
- InitSymbols();
-
- //// Create a document manager
- m_docManager = new wxDocManager;
-
- //// Create a template relating drawing documents to their views
- (void) new wxDocTemplate(m_docManager, _T("Diagram"), _T("*.dia"), wxEmptyString, _T("dia"), _T("Diagram Doc"), _T("Diagram View"),
- CLASSINFO(csDiagramDocument), CLASSINFO(csDiagramView));
-
- // Create the main frame window.
- // Note that we use a frame style that doesn't have wxCLIP_CHILDREN in it
- // (the default frame style contains wxCLIP_CHILDREN), otherwise the client
- // area doesn't refresh properly when we change its position, under Windows.
-
-#define wxDEFAULT_FRAME_STYLE_NO_CLIP \
- (wxDEFAULT_FRAME_STYLE & ~wxCLIP_CHILDREN)
-
- csFrame* frame = new csFrame(m_docManager, NULL, wxID_ANY, _T("OGL Studio"), m_mainFramePos, m_mainFrameSize,
- wxDEFAULT_FRAME_STYLE_NO_CLIP | wxHSCROLL | wxVSCROLL);
-
- // Give it an icon
- frame->SetIcon(wxIcon(studio_xpm));
-
- // Make a menubar
- wxMenu *fileMenu = new wxMenu;
-
- fileMenu->Append(wxID_NEW, _T("&New...\tCtrl+N"));
- fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl+O"));
-
- fileMenu->AppendSeparator();
-
- fileMenu->Append(wxID_PRINT, _T("&Print...\tCtrl+P"));
- fileMenu->Append(wxID_PRINT_SETUP, _T("Print &Setup..."));
- fileMenu->Append(wxID_PREVIEW, _T("Print Pre&view"));
- fileMenu->AppendSeparator();
- fileMenu->Append(wxID_EXIT, _T("E&xit"));
-
- // A history of files visited. Use this menu.
- m_docManager->FileHistoryUseMenu(fileMenu);
-
- wxMenu *viewMenu = new wxMenu;
- viewMenu->Append(ID_CS_SETTINGS, _T("&Settings..."));
-
- wxMenu *helpMenu = new wxMenu;
- helpMenu->Append(wxID_HELP, _T("&Help Contents\tF1"));
- helpMenu->Append(ID_CS_ABOUT, _T("&About"));
-
- wxMenuBar *menuBar = new wxMenuBar;
-
- menuBar->Append(fileMenu, _T("&File"));
- menuBar->Append(viewMenu, _T("&View"));
- menuBar->Append(helpMenu, _T("&Help"));
-
- // Associate the menu bar with the frame
- frame->SetMenuBar(menuBar);
-
- // Load the file history
- wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
- m_docManager->FileHistoryLoad(config);
-
-#if wxUSE_STATUSBAR
- frame->CreateStatusBar();
-#endif // wxUSE_STATUSBAR
-
- // The ordering of these is important for layout purposes
- CreateDiagramToolBar(frame);
- CreatePalette(frame);
-
- /*
- CreateProjectWindow(frame);
- FillProjectTreeCtrl();
- */
-
- // Create the shape editing menu
- m_shapeEditMenu = new ShapeEditMenu;
- m_shapeEditMenu->Append(ID_CS_EDIT_PROPERTIES, _T("Edit properties"));
- m_shapeEditMenu->AppendSeparator();
- m_shapeEditMenu->Append(ID_CS_ROTATE_CLOCKWISE, _T("Rotate clockwise"));
- m_shapeEditMenu->Append(ID_CS_ROTATE_ANTICLOCKWISE, _T("Rotate anticlockwise"));
- m_shapeEditMenu->AppendSeparator();
- m_shapeEditMenu->Append(ID_CS_CUT, _T("Cut"));
-
- frame->Show(true);
-
- SetTopWindow(frame);
-
- return true;
-}
-
-int csApp::OnExit(void)
-{
- WriteOptions();
-
- delete m_symbolDatabase;
- m_symbolDatabase = NULL;
-
- delete m_docManager;
- m_docManager = NULL;
-
- delete m_shapeEditMenu;
- m_shapeEditMenu = NULL;
-
- delete m_helpController;
- m_helpController = NULL;
-
- wxOGLCleanUp();
-
- return 0;
-}
-
-/*
- * Centralised code for creating a document frame.
- * Called from view.cpp, when a view is created.
- */
-
-wxMDIChildFrame *csApp::CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** editMenuRet)
-{
- //// Make a child frame
- csMDIChildFrame *subframe = new csMDIChildFrame(doc, view, ((wxDocMDIParentFrame*)GetTopWindow()), wxID_ANY, _T("Child Frame"),
- wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE);
-
-#ifdef __WXMSW__
- subframe->SetIcon(wxString(_T("chart")));
-#endif
-#ifdef __X__
- subframe->SetIcon(wxIcon(_T("doc.xbm")));
-#endif
-
- //// Make a menubar
- wxMenu *fileMenu = new wxMenu;
-
- fileMenu->Append(wxID_NEW, _T("&New...\tCtrl+N"));
- fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl+O"));
- fileMenu->Append(wxID_CLOSE, _T("&Close\tCtrl+W"));
- fileMenu->Append(wxID_SAVE, _T("&Save\tCtrl+S"));
- fileMenu->Append(wxID_SAVEAS, _T("Save &As...\tF12"));
-
- fileMenu->AppendSeparator();
- fileMenu->Append(wxID_PRINT, _T("&Print...\tCtrl+P"));
- fileMenu->Append(wxID_PRINT_SETUP, _T("Print &Setup..."));
- fileMenu->Append(wxID_PREVIEW, _T("Print Pre&view"));
-
- fileMenu->AppendSeparator();
- fileMenu->Append(wxID_EXIT, _T("E&xit"));
-
- wxMenu* editMenu = new wxMenu;
- editMenu->Append(wxID_UNDO, _T("&Undo\tCtrl+Z"));
- editMenu->Append(wxID_REDO, _T("&Redo\tCtrl+Y"));
- editMenu->AppendSeparator();
- editMenu->Append(wxID_CUT, _T("Cu&t\tCtrl+X"));
- editMenu->Append(wxID_COPY, _T("&Copy\tCtrl+C"));
- editMenu->Append(wxID_PASTE, _T("&Paste\tCtrl+V"));
- editMenu->Append(wxID_DUPLICATE, _T("&Duplicate\tCtrl+D"));
- editMenu->AppendSeparator();
- editMenu->Append(wxID_CLEAR, _T("Cle&ar\tDelete"));
- editMenu->Append(ID_CS_SELECT_ALL, _T("Select A&ll\tCtrl+A"));
- editMenu->AppendSeparator();
- editMenu->Append(ID_CS_EDIT_PROPERTIES, _T("Edit P&roperties..."));
-
- *editMenuRet = editMenu;
-
- m_docManager->FileHistoryUseMenu(fileMenu);
- m_docManager->FileHistoryAddFilesToMenu(fileMenu);
-
- doc->GetCommandProcessor()->SetEditMenu(editMenu);
-
- wxMenu *viewMenu = new wxMenu;
- viewMenu->Append(ID_CS_SETTINGS, _T("&Settings..."));
-
- wxMenu *helpMenu = new wxMenu;
- helpMenu->Append(wxID_HELP, _T("&Help Contents\tF1"));
- helpMenu->Append(ID_CS_ABOUT, _T("&About"));
-
- wxMenuBar *menuBar = new wxMenuBar;
-
- menuBar->Append(fileMenu, _T("&File"));
- menuBar->Append(editMenu, _T("&Edit"));
- menuBar->Append(viewMenu, _T("&View"));
- menuBar->Append(helpMenu, _T("&Help"));
-
- //// Associate the menu bar with the frame
- subframe->SetMenuBar(menuBar);
-
- return subframe;
-}
-
-// Creates a canvas. Called by OnInit as a child of the main window
-csCanvas *csApp::CreateCanvas(wxView *view, wxMDIChildFrame *parent)
-{
- int width, height;
- parent->GetClientSize(&width, &height);
-
- // Non-retained canvas
- csCanvas *canvas = new csCanvas((csDiagramView*) view, parent, 1000, wxPoint(0, 0), wxSize(width, height), wxSUNKEN_BORDER);
-
- wxColour bgColour(_T("WHITE"));
- canvas->SetBackgroundColour(bgColour);
-
- wxCursor cursor(wxCURSOR_HAND);
- canvas->SetCursor(cursor);
-
- // Give it scrollbars
- canvas->SetScrollbars(20, 20, 100, 100);
-
- return canvas;
-}
-
-void csApp::InitToolBar(wxToolBar* toolBar)
-{
- wxBitmap* bitmaps[10];
-
- bitmaps[0] = new wxBitmap( new_xpm );
- bitmaps[1] = new wxBitmap( open_xpm );
- bitmaps[2] = new wxBitmap( save_xpm );
- bitmaps[3] = new wxBitmap( copy_xpm );
- bitmaps[4] = new wxBitmap( cut_xpm );
- bitmaps[5] = new wxBitmap( paste_xpm );
- bitmaps[6] = new wxBitmap( print_xpm );
- bitmaps[7] = new wxBitmap( help_xpm );
- bitmaps[8] = new wxBitmap( undo_xpm );
- bitmaps[9] = new wxBitmap( redo_xpm );
-
- toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("New file"));
- toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Open file"));
- toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Save file"));
- toolBar->AddSeparator();
- toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Print"));
- toolBar->AddSeparator();
- toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Copy"));
- toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Cut"));
- toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Paste"));
- toolBar->AddSeparator();
- toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Undo"));
- toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Redo"));
- toolBar->AddSeparator();
- toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Help"));
-
- toolBar->Realize();
-
- toolBar->EnableTool(wxID_COPY, false);
- toolBar->EnableTool(wxID_PASTE, false);
- toolBar->EnableTool(wxID_PRINT, false);
- toolBar->EnableTool(wxID_UNDO, false);
- toolBar->EnableTool(wxID_REDO, false);
-
- int i;
- for (i = 0; i < 10; i++)
- delete bitmaps[i];
-}
-
-// Create and initialise the diagram toolbar
-void csApp::CreateDiagramToolBar(wxFrame* parent)
-{
- // First create a layout window
- wxSashLayoutWindow* win = new wxSashLayoutWindow(parent, ID_LAYOUT_WINDOW_DIAGRAM_TOOLBAR, wxDefaultPosition, wxSize(200, 30), wxNO_BORDER|wxSW_3D|wxCLIP_CHILDREN);
- win->SetDefaultSize(wxSize(10000, 30));
- win->SetOrientation(wxLAYOUT_HORIZONTAL);
- win->SetAlignment(wxLAYOUT_TOP);
- win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-
- m_diagramToolBarSashWindow = win;
- m_diagramToolBarSashWindow->Show(false);
-
- // Create the actual toolbar
- m_diagramToolBar = new wxToolBar(win, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT);
-
- wxBitmap* bitmaps[11];
-
- bitmaps[0] = new wxBitmap( alignl_xpm );
- bitmaps[1] = new wxBitmap( alignr_xpm );
- bitmaps[2] = new wxBitmap( alignt_xpm );
- bitmaps[3] = new wxBitmap( alignb_xpm );
- bitmaps[4] = new wxBitmap( horiz_xpm );
- bitmaps[5] = new wxBitmap( vert_xpm );
- bitmaps[6] = new wxBitmap( copysize_xpm );
- bitmaps[7] = new wxBitmap( linearrow_xpm );
- bitmaps[8] = new wxBitmap( newpoint_xpm );
- bitmaps[9] = new wxBitmap( cutpoint_xpm );
- bitmaps[10] = new wxBitmap( straight_xpm );
-
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNL, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align left"));
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNR, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align right"));
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNT, *bitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align top"));
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNB, *bitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align bottom"));
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_HORIZ, *bitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align horizontally"));
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_VERT, *bitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align vertically"));
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_COPY_SIZE, *bitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Copy size"));
- m_diagramToolBar->AddSeparator();
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_LINE_ARROW, *bitmaps[7], wxNullBitmap, true, wxDefaultCoord, wxDefaultCoord, NULL, _T("Toggle arrow"));
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_NEW_POINT, *bitmaps[8], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("New line point"));
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_CUT_POINT, *bitmaps[9], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Cut line point"));
- m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_STRAIGHTEN, *bitmaps[10], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Straighten lines"));
-
- m_diagramToolBar->Realize();
-
- int i;
- for (i = 0; i < 11; i++)
- delete bitmaps[i];
-
- // Create a combobox for point size
- int maxPointSize = 40;
- wxString *pointSizes = new wxString[maxPointSize];
- for (i = 1; i <= maxPointSize; i++)
- {
- pointSizes[i-1].Printf(_T("%d"), i);
- }
-
- int controlX = 260;
- int pointSizeW = 40;
- int pointSizeH = 18;
- int zoomW = 60;
- int zoomH = 18;
-#ifdef __WXMOTIF__
- controlX += 75;
- pointSizeW = 60;
- pointSizeH = 22;
- zoomW = 60;
- zoomH = 22;
-#endif
-
- m_pointSizeComboBox = new wxComboBox(m_diagramToolBar, ID_WINDOW_POINT_SIZE_COMBOBOX,
- wxEmptyString, wxPoint(controlX, 1), wxSize(pointSizeW, pointSizeH), maxPointSize, pointSizes);
- delete[] pointSizes;
-
-#ifdef __WXGTK__
- m_diagramToolBar->AddControl(m_pointSizeComboBox);
-#endif
-
- m_pointSizeComboBox->SetSelection(10 - 1);
-
- // Create a combobox for zooming
- int maxZoom = 200;
- int minZoom = 5;
- int increment = 5;
- int noStrings = (maxZoom - minZoom)/5 ;
- wxString *zoomStrings = new wxString[noStrings];
- for (i = 0; i < noStrings; i ++)
- {
- zoomStrings[noStrings - i - 1].Printf(_T("%d%%"), (i*increment + minZoom));
- }
-
- controlX += pointSizeW + 10;
-
- m_zoomComboBox = new wxComboBox(m_diagramToolBar, ID_WINDOW_ZOOM_COMBOBOX,
- wxEmptyString, wxPoint(controlX, 1), wxSize(zoomW, zoomH), noStrings, zoomStrings);
- delete[] zoomStrings;
-
-#ifdef __WXGTK__
- m_diagramToolBar->AddControl(m_zoomComboBox);
-#endif
-
- // i = (zoom - minZoom)/increment
- // index = noStrings - i - 1
- // 100%
- i = (100 - minZoom)/increment;
- m_zoomComboBox->SetSelection(noStrings - i - 1);
-}
-
-// Read/write configuration information
-bool csApp::ReadOptions()
-{
- wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
-
- config.Read(_T("mainX"), & m_mainFramePos.x);
- config.Read(_T("mainY"), & m_mainFramePos.y);
- config.Read(_T("mainWidth"), & m_mainFrameSize.x);
- config.Read(_T("mainHeight"), & m_mainFrameSize.y);
- config.Read(_T("gridStyle"), & m_gridStyle);
- config.Read(_T("gridSpacing"), & m_gridSpacing);
-
- return true;
-}
-
-bool csApp::WriteOptions()
-{
- wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
-
- config.Write(_T("mainX"), (long) m_mainFramePos.x);
- config.Write(_T("mainY"), (long) m_mainFramePos.y);
- config.Write(_T("mainWidth"), (long) m_mainFrameSize.x);
- config.Write(_T("mainHeight"), (long) m_mainFrameSize.y);
- config.Write(_T("gridStyle"), (long) m_gridStyle);
- config.Write(_T("gridSpacing"), (long) m_gridSpacing);
-
- m_docManager->FileHistorySave(config);
-
- return true;
-}
-
diff --git a/contrib/samples/ogl/studio/studio.dsp b/contrib/samples/ogl/studio/studio.dsp
deleted file mode 100644
index c64ca72b93..0000000000
--- a/contrib/samples/ogl/studio/studio.dsp
+++ /dev/null
@@ -1,516 +0,0 @@
-# Microsoft Developer Studio Project File - Name="studio" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=studio - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "studio.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "studio.mak" CFG="studio - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "studio - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "studio - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\studio.pdb /O2 /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "studio - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\studio.pdb /Od /GR /EHsc /I ".\..\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\..\include" /W4 /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /d "NOPCH" /i .\..\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "studio - Win32 DLL Universal Unicode Release"
-# Name "studio - Win32 DLL Universal Unicode Debug"
-# Name "studio - Win32 DLL Universal Release"
-# Name "studio - Win32 DLL Universal Debug"
-# Name "studio - Win32 DLL Unicode Release"
-# Name "studio - Win32 DLL Unicode Debug"
-# Name "studio - Win32 DLL Release"
-# Name "studio - Win32 DLL Debug"
-# Name "studio - Win32 Universal Unicode Release"
-# Name "studio - Win32 Universal Unicode Debug"
-# Name "studio - Win32 Universal Release"
-# Name "studio - Win32 Universal Debug"
-# Name "studio - Win32 Unicode Release"
-# Name "studio - Win32 Unicode Debug"
-# Name "studio - Win32 Release"
-# Name "studio - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\cspalette.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\csprint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dialogs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\doc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mainfrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\project.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\shapes.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\studio.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\studio.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\symbols.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/ogl/studio/studio.h b/contrib/samples/ogl/studio/studio.h
deleted file mode 100644
index c23652ad89..0000000000
--- a/contrib/samples/ogl/studio/studio.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/studio.h
-// Purpose: Studio application class
-// Author: Julian Smart
-// Modified by:
-// Created: 27/7/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_STUDIO_H_
-#define _STUDIO_STUDIO_H_
-
-#include "wx/docmdi.h"
-#include "wx/help.h"
-#include "wx/cshelp.h"
-#include "wx/helphtml.h"
-#ifdef __WXMSW__
- #include "wx/msw/helpchm.h"
-#else
- #include "wx/html/helpctrl.h"
-#endif
-
-#include "wx/ogl/ogl.h"
-#include "wx/ogl/canvas.h"
-#include "shapes.h"
-
-class csEditorToolPalette;
-class csProjectTreeCtrl;
-class csCanvas;
-class csSymbolDatabase;
-class wxSashLayoutWindow;
-class csFrame;
-
-// Grid style
-#define csGRID_STYLE_NONE 0
-#define csGRID_STYLE_INVISIBLE 1
-#define csGRID_STYLE_DOTTED 2
-
-// Define a new application
-class csApp: public wxApp
-{
- friend class csFrame;
-public:
- csApp();
- ~csApp();
-
-// Operations
- bool OnInit(void);
- int OnExit(void);
-
- // Read/write configuration information
- bool ReadOptions();
- bool WriteOptions();
-
- // Create the diagram tool palette
- bool CreatePalette(wxFrame *parent);
-
- // Create the project window
- bool CreateProjectWindow(wxFrame *parent);
-
- // Initialise the general toolbar
- void InitToolBar(wxToolBar* toolBar);
-
- // Create and initialise the diagram toolbar
- void CreateDiagramToolBar(wxFrame* parent);
-
- wxMDIChildFrame *CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** editMenu);
- csCanvas *CreateCanvas(wxView *view, wxMDIChildFrame *parent);
-
- // Fill out the project tree control
- void FillProjectTreeCtrl();
-
- // Add symbols to database
- void InitSymbols();
-
-// Accessors
- csEditorToolPalette* GetDiagramPalette() const { return m_diagramPalette; }
- wxToolBar* GetDiagramToolBar() const { return m_diagramToolBar; }
- csProjectTreeCtrl* GetProjectTreeCtrl() const { return m_projectTreeCtrl; }
- wxSashLayoutWindow* GetDiagramPaletteSashWindow() const { return m_diagramPaletteSashWindow; }
- wxSashLayoutWindow* GetProjectSashWindow() const { return m_projectSashWindow; }
- wxSashLayoutWindow* GetDiagramToolBarSashWindow() const { return m_diagramToolBarSashWindow; }
- csSymbolDatabase* GetSymbolDatabase() const { return m_symbolDatabase; }
- wxComboBox* GetPointSizeComboBox() const { return m_pointSizeComboBox; }
- wxComboBox* GetZoomComboBox() const { return m_zoomComboBox; }
- wxMenu* GetShapeEditMenu() const { return m_shapeEditMenu; }
- wxDiagramClipboard& GetDiagramClipboard() const { return (wxDiagramClipboard&) m_diagramClipboard; }
- wxDocManager* GetDocManager() const { return m_docManager; }
- wxHelpControllerBase* GetHelpController() const { return m_helpController; }
-
- int GetGridStyle() const { return m_gridStyle; }
- void SetGridStyle(int style) { m_gridStyle = style; }
-
- int GetGridSpacing() const { return m_gridSpacing; }
- void SetGridSpacing(int spacing) { m_gridSpacing = spacing; }
-
-protected:
- wxDocManager* m_docManager;
- wxSashLayoutWindow* m_diagramPaletteSashWindow;
- wxSashLayoutWindow* m_diagramToolBarSashWindow;
- wxSashLayoutWindow* m_projectSashWindow;
- csEditorToolPalette* m_diagramPalette;
- csProjectTreeCtrl* m_projectTreeCtrl;
- csSymbolDatabase* m_symbolDatabase;
- wxToolBar* m_diagramToolBar;
- wxComboBox* m_pointSizeComboBox;
- wxComboBox* m_zoomComboBox;
- wxMenu* m_shapeEditMenu;
-
- // Configuration
- wxPoint m_mainFramePos;
- wxSize m_mainFrameSize;
- int m_gridStyle;
- int m_gridSpacing;
-
- // Diagram clipboard
- csDiagramClipboard m_diagramClipboard;
-
- // Help instance
- wxHelpControllerBase* m_helpController;
-};
-
-DECLARE_APP(csApp)
-
-#define ID_CS_CUT wxID_CUT
-#define ID_CS_ADD_SHAPE 2
-#define ID_CS_ADD_LINE 3
-// #define ID_CS_EDIT_LABEL 4
-#define ID_CS_EDIT_PROPERTIES 4
-#define ID_CS_CHANGE_BACKGROUND_COLOUR 5
-#define ID_CS_MOVE 6
-#define ID_CS_SIZE 7
-#define ID_CS_FONT_CHANGE 8
-#define ID_CS_ARROW_CHANGE 9
-#define ID_CS_ROTATE_CLOCKWISE 11
-#define ID_CS_ROTATE_ANTICLOCKWISE 12
-#define ID_CS_CHANGE_LINE_ORDERING 13 // Change the list of lines for a wxShape
-#define ID_CS_CHANGE_LINE_ATTACHMENT 14 // Change the attachment point for one end of a line
-#define ID_CS_ALIGN 15
-#define ID_CS_NEW_POINT 16
-#define ID_CS_CUT_POINT 17
-#define ID_CS_STRAIGHTEN 18
-#define ID_CS_MOVE_LINE_POINT 19
-#define ID_CS_MOVE_LABEL 20
-#define ID_CS_ADD_SHAPE_SELECT 21
-#define ID_CS_ADD_LINE_SELECT 22
-
-#define ID_CS_ABOUT 100
-#define ID_CS_SELECT_ALL 102
-#define ID_CS_SETTINGS 103
-
-#define ID_LAYOUT_WINDOW_PALETTE 200
-#define ID_LAYOUT_WINDOW_DIAGRAM_TOOLBAR 201
-#define ID_LAYOUT_WINDOW_PROJECT 202
-
-#define ID_DIAGRAM_PALETTE 250
-
-#define ID_WINDOW_PROJECT_TREE 300
-#define ID_WINDOW_POINT_SIZE_COMBOBOX 301
-#define ID_WINDOW_ZOOM_COMBOBOX 302
-
-#define DIAGRAM_TOOLBAR_ALIGNL 500
-#define DIAGRAM_TOOLBAR_ALIGNR 501
-#define DIAGRAM_TOOLBAR_ALIGNB 502
-#define DIAGRAM_TOOLBAR_ALIGNT 503
-#define DIAGRAM_TOOLBAR_ALIGN_HORIZ 504
-#define DIAGRAM_TOOLBAR_ALIGN_VERT 505
-#define DIAGRAM_TOOLBAR_COPY_SIZE 506
-#define DIAGRAM_TOOLBAR_LINE_ARROW 507
-#define DIAGRAM_TOOLBAR_NEW_POINT 508
-#define DIAGRAM_TOOLBAR_CUT_POINT 509
-#define DIAGRAM_TOOLBAR_STRAIGHTEN 510
-
-#endif
- // _STUDIO_STUDIO_H_
diff --git a/contrib/samples/ogl/studio/studio.ico b/contrib/samples/ogl/studio/studio.ico
deleted file mode 100644
index 7cb092e04c..0000000000
Binary files a/contrib/samples/ogl/studio/studio.ico and /dev/null differ
diff --git a/contrib/samples/ogl/studio/studio.rc b/contrib/samples/ogl/studio/studio.rc
deleted file mode 100644
index e63bd2bfab..0000000000
--- a/contrib/samples/ogl/studio/studio.rc
+++ /dev/null
@@ -1,18 +0,0 @@
-aaaa ICON "studio.ico"
-
-/* Useful if PROVIDE_DEFAULT_ICONS is set in wx_setup.h */
-#define IHaveMDIParentIcon
-#define IHaveMDIChildIcon
-
-wxSTD_MDIPARENTFRAME ICON "studio.ico"
-wxSTD_MDICHILDFRAME ICON "studio.ico"
-
-studio ICON "studio.ico"
-folder1 ICON "bitmaps/folder1.ico"
-file1 ICON "bitmaps/file1.ico"
-
-arrowtool BITMAP "bitmaps/arrow.bmp"
-texttool BITMAP "bitmaps/texttool.bmp"
-
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/ogl/studio/studio.xpm b/contrib/samples/ogl/studio/studio.xpm
deleted file mode 100644
index cd5b1cbc14..0000000000
--- a/contrib/samples/ogl/studio/studio.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *studio_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-" c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-" ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" "
-};
diff --git a/contrib/samples/ogl/studio/studio_resources.h b/contrib/samples/ogl/studio/studio_resources.h
deleted file mode 100644
index 92a49c0f36..0000000000
--- a/contrib/samples/ogl/studio/studio_resources.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * studio_resources.h
- * Window identifiers file written by Dialog Editor
- */
-
-#define ID_GRID_STYLE 6004
-#define ID_TEXTCTRL5115 5115
-#define ID_TEXTCTRL5107 5107
-#define ID_LABEL_DIALOG 6008
-#define ID_GRID_SPACING 6007
-#define IDD_LABEL_ENTRY 100
-#define ID_STATIC 300
-#define ID_DIALOG100 100
-#define ID_DIALOG6001 6001
-#define ID_STATIC6005 6005
-#define ID_STATIC6006 6006
-#define ID_STATIC5116 5116
-#define ID_STATIC6009 6009
-#define ID_LABELTEXT 101
-#define ID_CONTROL101 106
-#define ID_CONTROL102 107
-#define ID_CONTROL111 111
-#define ID_CONTROL120 120
-#define ID_CONTROL103 108
-#define ID_CONTROL121 5105
-#define ID_CONTROL130 5114
-#define ID_CONTROL104 109
-#define ID_CONTROL122 5106
-#define ID_CONTROL131 121
-#define ID_CONTROL105 110
-#define ID_CONTROL114 115
-#define ID_CONTROL123 5107
-#define ID_CONTROL132 122
-#define ID_CONTROL124 5108
-#define ID_CONTROL116 116
-#define ID_CONTROL125 5109
-#define ID_CONTROL117 117
-#define ID_CONTROL126 5110
-#define ID_CONTROL118 118
-#define ID_CONTROL127 5111
-#define ID_CONTROL119 119
-#define ID_CONTROL128 5112
-#define ID_CONTROL129 5113
-#define ID_GENERAL_SETTINGS_DIALOG 2000
diff --git a/contrib/samples/ogl/studio/studio_resources.wxr b/contrib/samples/ogl/studio/studio_resources.wxr
deleted file mode 100644
index b5b240a20a..0000000000
--- a/contrib/samples/ogl/studio/studio_resources.wxr
+++ /dev/null
@@ -1,191 +0,0 @@
-static char *semi_circle = "dialog(name = 'semi_circle',\
- style = 'wxNO_BORDER',\
- title = 'SemiCircle',\
- id = 100,\
- x = 10, y = 40, width = 365, height = 405,\
- background_colour = 'C0C0C0',\
- use_dialog_units = 0,\
- use_system_defaults = 0,\
- font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
- control = [106, wxStaticText, 'Segment Id', '0', 'statictext7', 14, 163, 64, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [107, wxTextCtrl, '', '0', 'textctrl8', 108, 162, 120, 19, ''],\
- control = [108, wxStaticText, 'Num Channels', '0', 'statictext9', 14, 208, 79, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [109, wxTextCtrl, '1', '0', 'textctrl10', 108, 206, 30, 19, '1'],\
- control = [110, wxStaticText, 'Attributes', '0', 'statictext11', 14, 245, 54, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [111, wxTextCtrl, '', '0', 'textctrl12', 108, 245, 120, 19, ''],\
- control = [5106, wxRadioBox, 'Scope', 'wxRA_SPECIFY_COLS', 'radiobox1', 12, 13, 236, 44, ['Process', 'Application', 'Project'], 3],\
- control = [5108, wxRadioBox, 'Resource', 'wxRA_SPECIFY_ROWS', 'radiobox3', 174, 68, 72, 82, ['Heap', 'Segment', 'Any'], 3],\
- control = [5109, wxRadioBox, 'Volatility', 'wxRA_SPECIFY_ROWS', 'radiobox4', 12, 69, 81, 63, ['Permanent', 'Temporary'], 2],\
- control = [5111, wxStaticText, 'Num Events', '0', 'statictext1', 154, 208, 68, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [5112, wxTextCtrl, '1', '0', 'textctrl2', 230, 205, 40, 19, '1']).";
-
-static char *general_shape_properties_dialog = "panel(name = 'general_shape_properties_dialog',\
- style = 'wxNO_BORDER',\
- title = 'General',\
- id = 100,\
- x = 10, y = 40, width = 400, height = 400,\
- background_colour = 'C0C0C0',\
- use_dialog_units = 0,\
- use_system_defaults = 0,\
- font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
- control = [101, wxTextCtrl, '', '0', 'textctrl3', 8, 31, 203, 24, ''],\
- control = [300, wxStaticText, 'Name:', '0', 'message4', 8, 11, 41, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [5115, wxTextCtrl, '', 'wxTE_MULTILINE', 'textctrl1', 8, 101, 204, 100, ''],\
- control = [5116, wxStaticText, 'Description:', '0', 'statictext2', 9, 79, 66, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']]).";
-
-static char *diagram_settings_dialog = "dialog(name = 'diagram_settings_dialog',\
- style = 'wxNO_BORDER',\
- title = 'Diagram settings',\
- id = 6001,\
- x = 10, y = 40, width = 400, height = 300,\
- background_colour = 'C0C0C0',\
- use_dialog_units = 0,\
- use_system_defaults = 0,\
- font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
- control = [6004, wxChoice, '', '0', 'choice4', 13, 31, 85, 21, ['None', 'Invisible', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted']],\
- control = [6005, wxStaticText, 'Grid style:', '0', 'statictext5', 13, 11, 56, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [6006, wxStaticText, 'Grid spacing:', '0', 'statictext6', 137, 11, 72, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [6007, wxTextCtrl, '', '0', 'textctrl7', 136, 31, 66, 21, '']).";
-
-static char *general_settings_dialog = "dialog(name = 'general_settings_dialog',\
- style = 'wxNO_BORDER | wxCAPTION | wxSYSTEM_MENU',\
- title = '',\
- id = 2000,\
- x = 10, y = 40, width = 375, height = 325,\
- background_colour = 'C0C0C0',\
- use_dialog_units = 0,\
- use_system_defaults = 0,\
- font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
- control = [300, wxStaticText, 'Project path:', '0', 'statictext3', 12, 15, 70, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [5107, wxTextCtrl, '', '0', 'textctrl4', 12, 34, 183, 24, '']).";
-
-static char *wide_rectangle = "dialog(name = 'wide_rectangle',\
- style = 'wxNO_BORDER',\
- title = 'Wide Rectangle',\
- id = 100,\
- x = 10, y = 40, width = 355, height = 405,\
- background_colour = 'C0C0C0',\
- use_dialog_units = 0,\
- use_system_defaults = 0,\
- font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
- control = [106, wxStaticText, 'Segment Id', '0', 'statictext7', 13, 184, 64, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [107, wxTextCtrl, '', '0', 'textctrl8', 13, 184, 120, 19, ''],\
- control = [108, wxStaticText, 'Num Channels', '0', 'statictext9', 13, 184, 79, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [109, wxTextCtrl, '', '0', 'textctrl10', 13, 184, 30, 19, ''],\
- control = [110, wxStaticText, 'Attributes', '0', 'statictext11', 13, 184, 54, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [111, wxTextCtrl, '', '0', 'textctrl12', 13, 184, 120, 19, ''],\
- control = [5106, wxRadioBox, 'Scope', 'wxRA_SPECIFY_COLS', 'radiobox1', 13, 11, 313, 46, ['Process', 'Application', 'Project'], 3],\
- control = [5108, wxRadioBox, 'Resource', 'wxRA_SPECIFY_ROWS', 'radiobox3', 166, 70, 72, 82, ['Heap', 'Segment', 'Any'], 3],\
- control = [5109, wxRadioBox, 'Volatility', 'wxRA_SPECIFY_ROWS', 'radiobox4', 14, 73, 81, 63, ['Permanent', 'Temporary'], 2]).";
-
-static char *thin_rectangle = "dialog(name = 'thin_rectangle',\
- style = 'wxNO_BORDER',\
- title = 'Thin Rectangle',\
- id = 100,\
- x = 10, y = 40, width = 361, height = 405,\
- background_colour = 'C0C0C0',\
- use_dialog_units = 0,\
- use_system_defaults = 0,\
- font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
- control = [106, wxStaticText, 'Segment Id', '0', 'statictext7', 12, 169, 64, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [107, wxTextCtrl, '', '0', 'textctrl8', 106, 168, 120, 19, ''],\
- control = [108, wxStaticText, 'Num Channels', '0', 'statictext9', 12, 204, 79, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [109, wxTextCtrl, '1', '0', 'textctrl10', 106, 202, 30, 19, '1'],\
- control = [110, wxStaticText, 'Attributes', '0', 'statictext11', 12, 267, 54, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [111, wxTextCtrl, '', '0', 'textctrl12', 106, 265, 120, 19, ''],\
- control = [5106, wxRadioBox, 'Scope', 'wxRA_SPECIFY_COLS', 'radiobox1', 13, 16, 236, 44, ['Process', 'Application', 'Project'], 3],\
- control = [5108, wxRadioBox, 'Resource', 'wxRA_SPECIFY_ROWS', 'radiobox3', 176, 73, 72, 82, ['Heap', 'Segment', 'Any'], 3],\
- control = [5109, wxRadioBox, 'Volatility', 'wxRA_SPECIFY_ROWS', 'radiobox4', 14, 73, 81, 63, ['Permanent', 'Temporary'], 2],\
- control = [5111, wxStaticText, 'Num Events', '0', 'statictext1', 156, 205, 68, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [5112, wxTextCtrl, '1', '0', 'textctrl2', 228, 202, 40, 19, '1'],\
- control = [5113, wxStaticText, 'Num Fields', '0', 'statictext3', 12, 234, 62, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [5114, wxTextCtrl, '1', '0', 'textctrl4', 106, 234, 40, 19, '1']).";
-
-static char *circle = "dialog(name = 'circle',\
- style = 'wxNO_BORDER',\
- title = 'Circle',\
- id = 100,\
- x = 10, y = 40, width = 361, height = 405,\
- background_colour = 'C0C0C0',\
- use_dialog_units = 0,\
- use_system_defaults = 0,\
- font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
- control = [106, wxStaticText, 'Segment Id', '0', 'statictext7', 12, 169, 64, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [107, wxTextCtrl, '', '0', 'textctrl8', 106, 168, 120, 19, ''],\
- control = [108, wxStaticText, 'Num Channels', '0', 'statictext9', 12, 204, 79, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [109, wxTextCtrl, '1', '0', 'textctrl10', 106, 202, 30, 19, '1'],\
- control = [110, wxStaticText, 'Attributes', '0', 'statictext11', 12, 267, 54, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [111, wxTextCtrl, '', '0', 'textctrl12', 106, 265, 120, 19, ''],\
- control = [5106, wxRadioBox, 'Scope', 'wxRA_SPECIFY_COLS', 'radiobox1', 13, 16, 236, 44, ['Process', 'Application', 'Project'], 3],\
- control = [5108, wxRadioBox, 'Resource', 'wxRA_SPECIFY_ROWS', 'radiobox3', 176, 73, 72, 82, ['Heap', 'Segment', 'Any'], 3],\
- control = [5109, wxRadioBox, 'Volatility', 'wxRA_SPECIFY_ROWS', 'radiobox4', 14, 73, 81, 63, ['Permanent', 'Temporary'], 2],\
- control = [5111, wxStaticText, 'Num Events', '0', 'statictext1', 156, 205, 68, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [5112, wxTextCtrl, '1', '0', 'textctrl2', 228, 202, 40, 19, '1'],\
- control = [5113, wxStaticText, 'Num Fields', '0', 'statictext3', 12, 234, 62, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [5114, wxTextCtrl, '1', '0', 'textctrl4', 106, 234, 40, 19, '1']).";
-
-static char *triangle = "dialog(name = 'triangle',\
- style = 'wxNO_BORDER',\
- title = 'Triangle',\
- id = 100,\
- x = 10, y = 40, width = 362, height = 405,\
- background_colour = 'C0C0C0',\
- use_dialog_units = 0,\
- use_system_defaults = 0,\
- font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
- control = [106, wxStaticText, 'Segment Id', '0', 'statictext7', 16, 170, 64, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [107, wxTextCtrl, '', '0', 'textctrl8', 110, 169, 120, 19, ''],\
- control = [108, wxStaticText, 'Num Channels', '0', 'statictext9', 16, 213, 79, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [109, wxTextCtrl, '1', '0', 'textctrl10', 110, 213, 30, 19, '1'],\
- control = [110, wxStaticText, 'Attributes', '0', 'statictext11', 16, 252, 54, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [111, wxTextCtrl, '', '0', 'textctrl12', 110, 252, 120, 19, ''],\
- control = [5106, wxRadioBox, 'Scope', 'wxRA_SPECIFY_COLS', 'radiobox1', 14, 16, 236, 44, ['Process', 'Application', 'Project'], 3],\
- control = [5108, wxRadioBox, 'Resource', 'wxRA_SPECIFY_ROWS', 'radiobox3', 178, 75, 72, 82, ['Heap', 'Segment', 'Any'], 3],\
- control = [5109, wxRadioBox, 'Volatility', 'wxRA_SPECIFY_ROWS', 'radiobox4', 15, 75, 81, 63, ['Permanent', 'Temporary'], 2],\
- control = [5111, wxStaticText, 'Num Events', '0', 'statictext1', 156, 215, 68, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [5112, wxTextCtrl, '1', '0', 'textctrl2', 227, 213, 40, 19, '1']).";
-
-static char *shape_label_dialog = "dialog(name = 'shape_label_dialog',\
- style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\
- title = 'Edit Shape Label',\
- id = 6008,\
- x = 10, y = 10, width = 190, height = 60,\
- background_colour = 'C0C0C0',\
- use_dialog_units = 1,\
- use_system_defaults = 0,\
- font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
- control = [6009, wxStaticText, 'Please enter a label for this shape.', '0', 'statictext2', 8, 6, 100, 6, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [101, wxTextCtrl, '', '0', 'textctrl4', 8, 18, 168, 11, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [5100, wxButton, 'OK', '0', 'button5', 100, 37, 36, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
- control = [5101, wxButton, 'Cancel', '0', 'button6', 140, 37, 36, 13, '',\
- [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']]).";
-
diff --git a/contrib/samples/ogl/studio/symbols.cpp b/contrib/samples/ogl/studio/symbols.cpp
deleted file mode 100644
index 5aaffd6816..0000000000
--- a/contrib/samples/ogl/studio/symbols.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/symbols.cpp
-// Purpose: Implements the Studio symbol database
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#include "studio.h"
-#include "doc.h"
-#include "shapes.h"
-#include "view.h"
-#include "symbols.h"
-
-/*
- * csSymbol
- * Represents information about a symbol.
- */
-
-csSymbol::csSymbol(const wxString& name, wxShape* shape)
-{
- m_name = name;
- m_shape = shape;
- m_toolId = 0;
-}
-
-csSymbol::~csSymbol()
-{
- delete m_shape;
-}
-
-/*
- * A table of all possible shapes.
- * We can use this to construct a palette, etc.
- */
-csSymbolDatabase::csSymbolDatabase()
-{
- m_currentId = 800;
-}
-
-csSymbolDatabase::~csSymbolDatabase()
-{
- ClearSymbols();
-}
-
-void csSymbolDatabase::AddSymbol(csSymbol* symbol)
-{
- symbol->SetToolId(m_currentId);
- m_symbols.Append(symbol);
-
- m_currentId ++;
-}
-
-void csSymbolDatabase::ClearSymbols()
-{
- wxObjectList::compatibility_iterator node = m_symbols.GetFirst();
- while (node)
- {
- csSymbol* symbol = (csSymbol*) node->GetData();
- delete symbol;
-
- node = node->GetNext();
- }
- m_symbols.Clear();
-}
-
-csSymbol* csSymbolDatabase::FindSymbol(const wxString& name) const
-{
- wxObjectList::compatibility_iterator node = m_symbols.GetFirst();
- while (node)
- {
- csSymbol* symbol = (csSymbol*) node->GetData();
- if (symbol->GetName() == name)
- return symbol;
-
- node = node->GetNext();
- }
- return NULL;
-}
-
-csSymbol* csSymbolDatabase::FindSymbol(int toolId) const
-{
- wxObjectList::compatibility_iterator node = m_symbols.GetFirst();
- while (node)
- {
- csSymbol* symbol = (csSymbol*) node->GetData();
- if (symbol->GetToolId() == toolId)
- return symbol;
-
- node = node->GetNext();
- }
- return NULL;
-}
-
-// Add symbols to database
-void csApp::InitSymbols()
-{
- m_symbolDatabase = new csSymbolDatabase;
-
- wxShape* shape = new csCircleShape();
- shape->AssignNewIds();
- shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
- m_symbolDatabase->AddSymbol(new csSymbol(_T("Circle"), shape));
-
- shape = new csCircleShadowShape();
- shape->AssignNewIds();
- shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
- m_symbolDatabase->AddSymbol(new csSymbol(_T("Circle shadow"), shape));
-
- shape = new csThinRectangleShape();
- shape->AssignNewIds();
- shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
- m_symbolDatabase->AddSymbol(new csSymbol(_T("Thin Rectangle"), shape));
-
- shape = new csWideRectangleShape();
- shape->AssignNewIds();
- shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
- m_symbolDatabase->AddSymbol(new csSymbol(_T("Wide Rectangle"), shape));
-
- shape = new csSemiCircleShape();
- shape->AssignNewIds();
- shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
- m_symbolDatabase->AddSymbol(new csSymbol(_T("SemiCircle"), shape));
-
- shape = new csTriangleShape();
- shape->AssignNewIds();
- shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
- m_symbolDatabase->AddSymbol(new csSymbol(_T("Triangle"), shape));
-
- shape = new csOctagonShape();
- shape->AssignNewIds();
- shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
- m_symbolDatabase->AddSymbol(new csSymbol(_T("Octagon"), shape));
-
- shape = new csGroupShape();
- shape->AssignNewIds();
- shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
- m_symbolDatabase->AddSymbol(new csSymbol(_T("Group"), shape));
-}
-
-wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& toolSize)
-{
- symbol->GetShape()->Recompute();
-
- wxBitmap *newBitmap = new wxBitmap(toolSize.x, toolSize.y);
-
- // Test code
-#if 0
- wxMemoryDC memDC;
- memDC.SelectObject(*newBitmap);
- memDC.SetPen(* wxBLACK_PEN);
- memDC.SetBrush(* wxWHITE_BRUSH);
- memDC.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), wxSOLID));
- memDC.SetLogicalFunction(wxCOPY);
- memDC.Clear();
-
- memDC.DrawLine(0, 0, toolSize.x, toolSize.y);
- memDC.DrawLine(0, toolSize.y, toolSize.x, 0);
-
- memDC.SelectObject(wxNullBitmap);
-#endif
-
-#if 1
- wxMemoryDC memDC;
-
- double height, width, maxSize;
- symbol->GetShape()->GetBoundingBoxMax(&width, &height);
-
- if (height > width)
- maxSize = height;
- else
- maxSize = width;
-
- double borderMargin = 4.0;
- double scaleFactor = (double)(toolSize.x / (maxSize + 2*borderMargin));
- double centreX = (double)((toolSize.x/scaleFactor)/2.0)-1;
- double centreY = centreX;
-
- memDC.SelectObject(*newBitmap);
-
- memDC.SetUserScale(scaleFactor, scaleFactor);
-
- memDC.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), wxSOLID));
- memDC.Clear();
-
- symbol->GetShape()->Show(true);
- symbol->GetShape()->Move(memDC, centreX, centreY);
-
- memDC.SelectObject(wxNullBitmap);
-#endif
-
- return newBitmap;
-}
diff --git a/contrib/samples/ogl/studio/symbols.h b/contrib/samples/ogl/studio/symbols.h
deleted file mode 100644
index 8ee823780f..0000000000
--- a/contrib/samples/ogl/studio/symbols.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/symbols.h
-// Purpose: Symbol classes (symbol database)
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_SYMBOLS_H_
-#define _STUDIO_SYMBOLS_H_
-
-#include "wx/docview.h"
-#include "wx/string.h"
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-/*
- * csSymbol
- * Represents information about a symbol.
- */
-
-class csSymbol: public wxObject
-{
-public:
- csSymbol(const wxString& name, wxShape* shape);
- ~csSymbol();
-
- inline void SetName(const wxString& name) { m_name = name; }
- inline wxString GetName() const { return m_name; }
-
- inline void SetShape(wxShape* shape) { m_shape = shape; }
- inline wxShape* GetShape() const { return m_shape; }
-
- inline void SetToolId(int id) { m_toolId = id; }
- inline int GetToolId() const { return m_toolId; }
-protected:
- wxString m_name;
- wxShape* m_shape;
- int m_toolId;
-};
-
-/*
- * A table of all possible shapes.
- * We can use this to construct a palette, etc.
- */
-class csSymbolDatabase: public wxObject
-{
-public:
- csSymbolDatabase();
- ~csSymbolDatabase();
-
-// Accessors
- inline wxList& GetSymbols() const { return (wxList&) m_symbols; }
-
-// Operations
- void AddSymbol(csSymbol* symbol);
- void ClearSymbols();
- csSymbol* FindSymbol(const wxString& name) const;
- csSymbol* FindSymbol(int toolId) const;
- wxBitmap* CreateToolBitmap(csSymbol* symbol, const wxSize& sz);
-
-protected:
- wxList m_symbols;
- int m_currentId;
-};
-
-#endif
- // _STUDIO_SYMBOLS_H_
diff --git a/contrib/samples/ogl/studio/view.cpp b/contrib/samples/ogl/studio/view.cpp
deleted file mode 100644
index 8a5e625c62..0000000000
--- a/contrib/samples/ogl/studio/view.cpp
+++ /dev/null
@@ -1,1038 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/view.cpp
-// Purpose: Implements view functionality
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/colordlg.h"
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
-#endif
-
-#include "studio.h"
-#include "doc.h"
-#include "view.h"
-#include "cspalette.h"
-#include "symbols.h"
-#include "dialogs.h"
-#include "wx/ogl/basicp.h"
-#include "wx/ogl/linesp.h"
-
-IMPLEMENT_DYNAMIC_CLASS(csDiagramView, wxView)
-
-BEGIN_EVENT_TABLE(csDiagramView, wxView)
- EVT_MENU(wxID_CUT, csDiagramView::OnCut)
- EVT_MENU(wxID_COPY, csDiagramView::OnCopy)
- EVT_MENU(wxID_CLEAR, csDiagramView::OnClear)
- EVT_MENU(wxID_PASTE, csDiagramView::OnPaste)
- EVT_MENU(wxID_DUPLICATE, csDiagramView::OnDuplicate)
- EVT_MENU(ID_CS_CHANGE_BACKGROUND_COLOUR, csDiagramView::OnChangeBackgroundColour)
- EVT_MENU(ID_CS_EDIT_PROPERTIES, csDiagramView::OnEditProperties)
- EVT_MENU(ID_CS_SELECT_ALL, csDiagramView::OnSelectAll)
- EVT_TOOL(DIAGRAM_TOOLBAR_LINE_ARROW, csDiagramView::OnToggleArrowTool)
- EVT_COMBOBOX(ID_WINDOW_POINT_SIZE_COMBOBOX, csDiagramView::OnPointSizeComboSel)
- EVT_COMBOBOX(ID_WINDOW_ZOOM_COMBOBOX, csDiagramView::OnZoomSel)
- EVT_TEXT(ID_WINDOW_POINT_SIZE_COMBOBOX, csDiagramView::OnPointSizeComboText)
- EVT_TOOL(DIAGRAM_TOOLBAR_ALIGNL, csDiagramView::OnAlign)
- EVT_TOOL(DIAGRAM_TOOLBAR_ALIGNR, csDiagramView::OnAlign)
- EVT_TOOL(DIAGRAM_TOOLBAR_ALIGNB, csDiagramView::OnAlign)
- EVT_TOOL(DIAGRAM_TOOLBAR_ALIGNT, csDiagramView::OnAlign)
- EVT_TOOL(DIAGRAM_TOOLBAR_ALIGN_HORIZ, csDiagramView::OnAlign)
- EVT_TOOL(DIAGRAM_TOOLBAR_ALIGN_VERT, csDiagramView::OnAlign)
- EVT_TOOL(DIAGRAM_TOOLBAR_COPY_SIZE, csDiagramView::OnAlign)
- EVT_TOOL(DIAGRAM_TOOLBAR_NEW_POINT, csDiagramView::OnNewLinePoint)
- EVT_TOOL(DIAGRAM_TOOLBAR_CUT_POINT, csDiagramView::OnCutLinePoint)
- EVT_TOOL(DIAGRAM_TOOLBAR_STRAIGHTEN, csDiagramView::OnStraightenLines)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGNL, csDiagramView::OnAlignUpdate)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGNR, csDiagramView::OnAlignUpdate)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGNB, csDiagramView::OnAlignUpdate)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGNT, csDiagramView::OnAlignUpdate)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGN_HORIZ, csDiagramView::OnAlignUpdate)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGN_VERT, csDiagramView::OnAlignUpdate)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_COPY_SIZE, csDiagramView::OnAlignUpdate)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_NEW_POINT, csDiagramView::OnNewLinePointUpdate)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_CUT_POINT, csDiagramView::OnCutLinePointUpdate)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_STRAIGHTEN, csDiagramView::OnStraightenLinesUpdate)
- EVT_UPDATE_UI(DIAGRAM_TOOLBAR_LINE_ARROW, csDiagramView::OnToggleArrowToolUpdate)
- EVT_UPDATE_UI(wxID_CUT, csDiagramView::OnCutUpdate)
- EVT_UPDATE_UI(wxID_COPY, csDiagramView::OnCopyUpdate)
- EVT_UPDATE_UI(wxID_CLEAR, csDiagramView::OnClearUpdate)
- EVT_UPDATE_UI(wxID_PASTE, csDiagramView::OnPasteUpdate)
- EVT_UPDATE_UI(wxID_DUPLICATE, csDiagramView::OnDuplicateUpdate)
- EVT_UPDATE_UI(ID_CS_EDIT_PROPERTIES, csDiagramView::OnEditPropertiesUpdate)
- EVT_UPDATE_UI(wxID_UNDO, csDiagramView::OnUndoUpdate)
- EVT_UPDATE_UI(wxID_REDO, csDiagramView::OnRedoUpdate)
-END_EVENT_TABLE()
-
-// What to do when a view is created. Creates actual
-// windows for displaying the view.
-bool csDiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
-{
- wxMenu* editMenu;
- frame = wxGetApp().CreateChildFrame(doc, this, &editMenu);
- canvas = wxGetApp().CreateCanvas(this, frame);
- canvas->SetView(this);
-
- SetFrame(frame);
- Activate(true);
-
- // Initialize the edit menu Undo and Redo items
- doc->GetCommandProcessor()->SetEditMenu(editMenu);
- doc->GetCommandProcessor()->Initialize();
-
- wxShapeCanvas *shapeCanvas = (wxShapeCanvas *)canvas;
- csDiagramDocument *diagramDoc = (csDiagramDocument *)doc;
- shapeCanvas->SetDiagram(diagramDoc->GetDiagram());
- diagramDoc->GetDiagram()->SetCanvas(shapeCanvas);
-
- diagramDoc->GetDiagram()->SetGridSpacing((double) wxGetApp().GetGridSpacing());
-
- switch (wxGetApp().GetGridStyle())
- {
- case csGRID_STYLE_NONE:
- {
- diagramDoc->GetDiagram()->SetSnapToGrid(false);
- break;
- }
- case csGRID_STYLE_INVISIBLE:
- {
- diagramDoc->GetDiagram()->SetSnapToGrid(true);
- break;
- }
- case csGRID_STYLE_DOTTED:
- {
- // TODO (not implemented in OGL)
- break;
- }
- }
-
-
- return true;
-}
-
-csDiagramView::~csDiagramView(void)
-{
- if (frame)
- {
- ((wxDocMDIChildFrame*)frame)->SetView(NULL);
- }
-}
-
-// Sneakily gets used for default print/preview
-// as well as drawing on the screen.
-void csDiagramView::OnDraw(wxDC *WXUNUSED(dc))
-{
-}
-
-void csDiagramView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
-{
- if (canvas)
- canvas->Refresh();
-}
-
-// Clean up windows used for displaying the view.
-bool csDiagramView::OnClose(bool deleteWindow)
-{
- if (!GetDocument()->Close())
- return false;
-
- csDiagramDocument *diagramDoc = (csDiagramDocument *)GetDocument();
- diagramDoc->GetDiagram()->SetCanvas(NULL);
-
- canvas->ClearBackground();
- canvas->SetDiagram(NULL);
- canvas->SetView(NULL);
- canvas = NULL;
-
- wxMenu* fileMenu = frame->GetMenuBar()->GetMenu(0);
-
- // Remove file menu from those managed by the command history
- wxGetApp().GetDocManager()->FileHistoryRemoveMenu(fileMenu);
-
- Activate(false);
- frame->Show(false);
-
- if (deleteWindow)
- {
- frame->Destroy();
- }
-
- return true;
-}
-
-// Adds or removes shape from m_selections
-void csDiagramView::SelectShape(wxShape* shape, bool select)
-{
- if (select && !m_selections.Member(shape))
- m_selections.Append(shape);
- else if (!select)
- m_selections.DeleteObject(shape);
-}
-
-void csDiagramView::OnSelectAll(wxCommandEvent& WXUNUSED(event))
-{
- SelectAll(true);
-}
-
-wxShape *csDiagramView::FindFirstSelectedShape(void)
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
- while (node)
- {
- wxShape *eachShape = (wxShape *)node->GetData();
- if ((eachShape->GetParent() == NULL) && !eachShape->IsKindOf(CLASSINFO(wxLabelShape)) && eachShape->Selected())
- {
- return eachShape;
- }
- else node = node->GetNext();
- }
- return NULL;
-}
-
-void csDiagramView::FindSelectedShapes(wxList& selections, wxClassInfo* toFind)
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
- while (node)
- {
- wxShape *eachShape = (wxShape *)node->GetData();
- if ((eachShape->GetParent() == NULL) && !eachShape->IsKindOf(CLASSINFO(wxLabelShape)) && eachShape->Selected() && ((toFind == NULL) || (eachShape->IsKindOf(toFind))))
- {
- selections.Append(eachShape);
- }
- node = node->GetNext();
- }
-}
-
-void csDiagramView::OnUndoUpdate(wxUpdateUIEvent& event)
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- event.Enable(doc->GetCommandProcessor()->CanUndo());
-}
-
-void csDiagramView::OnRedoUpdate(wxUpdateUIEvent& event)
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- event.Enable(doc->GetCommandProcessor()->CanRedo());
-}
-
-void csDiagramView::OnCut(wxCommandEvent& WXUNUSED(event))
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
- // Copy the shapes to the clipboard
- wxGetApp().GetDiagramClipboard().Copy(doc->GetDiagram());
-
- wxList selections;
- FindSelectedShapes(selections);
-
- DoCut(selections);
-}
-
-void csDiagramView::OnClear(wxCommandEvent& WXUNUSED(event))
-{
- wxList selections;
- FindSelectedShapes(selections);
-
- DoCut(selections);
-}
-
-void csDiagramView::OnCopy(wxCommandEvent& WXUNUSED(event))
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
- // Copy the shapes to the clipboard
- if (wxGetApp().GetDiagramClipboard().Copy(doc->GetDiagram()))
- {
-#ifdef __WXMSW__
- // Copy to the Windows clipboard
- wxGetApp().GetDiagramClipboard().CopyToClipboard(1.0);
-#endif
- }
-}
-
-void csDiagramView::OnPaste(wxCommandEvent& WXUNUSED(event))
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
- wxGetApp().GetDiagramClipboard().Paste(doc->GetDiagram());
-}
-
-void csDiagramView::OnDuplicate(wxCommandEvent& WXUNUSED(event))
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
- // Do a copy, then a paste
- wxGetApp().GetDiagramClipboard().Copy(doc->GetDiagram());
-
- // Apply an offset. Really, this offset should keep being incremented,
- // but where do we reset it again?
- wxGetApp().GetDiagramClipboard().Paste(doc->GetDiagram(), NULL, 20, 20);
-}
-
-void csDiagramView::OnCutUpdate(wxUpdateUIEvent& event)
-{
- event.Enable( (m_selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnClearUpdate(wxUpdateUIEvent& event)
-{
- event.Enable( (m_selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnCopyUpdate(wxUpdateUIEvent& event)
-{
- event.Enable( (m_selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnPasteUpdate(wxUpdateUIEvent& event)
-{
- int n = wxGetApp().GetDiagramClipboard().GetCount();
-
- event.Enable( (n > 0) );
-}
-
-void csDiagramView::OnDuplicateUpdate(wxUpdateUIEvent& event)
-{
- event.Enable( (m_selections.GetCount() > 0) );
-}
-
-void csDiagramView::DoCut(wxList& shapes)
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
- if (shapes.GetCount() > 0)
- {
- csDiagramCommand* cmd = new csDiagramCommand(_T("Cut"), doc);
-
- wxObjectList::compatibility_iterator node = shapes.GetFirst();
- while (node)
- {
- wxShape *theShape = (wxShape*) node->GetData();
- csCommandState* state = new csCommandState(ID_CS_CUT, NULL, theShape);
-
- // Insert lines at the front, so they are cut first.
- // Otherwise we may try to remove a shape with a line still
- // attached.
- if (theShape->IsKindOf(CLASSINFO(wxLineShape)))
- cmd->InsertState(state);
- else
- cmd->AddState(state);
-
- node = node->GetNext();
- }
- cmd->RemoveLines(); // Schedule any connected lines, not already mentioned,
- // to be removed first
-
- doc->GetCommandProcessor()->Submit(cmd);
- }
-}
-
-// Generalised command
-void csDiagramView::DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxString& op)
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
- if (shapes.GetCount() > 0)
- {
- csDiagramCommand* command = new csDiagramCommand(op, doc);
-
- wxObjectList::compatibility_iterator node = shapes.GetFirst();
- wxObjectList::compatibility_iterator node1 = oldShapes.GetFirst();
- while (node && node1)
- {
- wxShape *theShape = (wxShape*) node->GetData();
- wxShape *oldShape = (wxShape*) node1->GetData();
- csCommandState* state = new csCommandState(cmd, theShape, oldShape);
- command->AddState(state);
-
- node = node->GetNext();
- node1 = node1->GetNext();
- }
- doc->GetCommandProcessor()->Submit(command);
- }
-}
-
-void csDiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
- wxList selections;
- FindSelectedShapes(selections);
-
- if (selections.GetCount() > 0)
- {
- wxColourData data;
- data.SetChooseFull(true);
- if (selections.GetCount() == 1)
- {
- wxShape* firstShape = (wxShape*) selections.GetFirst()->GetData();
- data.SetColour(firstShape->GetBrush()->GetColour());
- }
-
- wxColourDialog *dialog = new wxColourDialog(frame, &data);
- wxBrush *theBrush = NULL;
- if (dialog->ShowModal() == wxID_OK)
- {
- wxColourData retData = dialog->GetColourData();
- wxColour col = retData.GetColour();
- theBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID);
- }
- dialog->Close(true);
- if (!theBrush)
- return;
-
- csDiagramCommand* cmd = new csDiagramCommand(_T("Change colour"), doc);
-
- wxObjectList::compatibility_iterator node = selections.GetFirst();
- while (node)
- {
- wxShape *theShape = (wxShape*) node->GetData();
- wxShape* newShape = theShape->CreateNewCopy();
- newShape->SetBrush(theBrush);
-
- csCommandState* state = new csCommandState(ID_CS_CHANGE_BACKGROUND_COLOUR, newShape, theShape);
- cmd->AddState(state);
-
- node = node->GetNext();
- }
- doc->GetCommandProcessor()->Submit(cmd);
- }
-}
-
-void csDiagramView::OnEditProperties(wxCommandEvent& WXUNUSED(event))
-{
- wxShape *theShape = FindFirstSelectedShape();
- if (theShape)
- ((csEvtHandler *)theShape->GetEventHandler())->EditProperties();
-}
-
-void csDiagramView::OnEditPropertiesUpdate(wxUpdateUIEvent& event)
-{
- wxList selections;
- FindSelectedShapes(selections);
- event.Enable( (selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnPointSizeComboSel(wxCommandEvent& event)
-{
- wxComboBox* combo = (wxComboBox*) event.GetEventObject();
- wxASSERT( combo != NULL );
-
- int newPointSize = (combo->GetSelection() + 1);
-
- ApplyPointSize(newPointSize);
-
-}
-
-// TODO: must find out how to intercept the Return key, rather than
-// every key stroke. But for now, do every key stroke.
-void csDiagramView::OnPointSizeComboText(wxCommandEvent& event)
-{
- wxComboBox* combo = (wxComboBox*) event.GetEventObject();
- wxASSERT( combo != NULL );
-
- wxString str(combo->GetValue());
- long newPointSize;
- str.ToLong( &newPointSize );
-
- if (newPointSize < 2)
- return;
-
- ApplyPointSize(newPointSize);
-}
-
-void csDiagramView::ApplyPointSize(int pointSize)
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
- wxList selections;
- FindSelectedShapes(selections);
-
- if (selections.GetCount() > 0)
- {
- csDiagramCommand* cmd = new csDiagramCommand(_T("Point size"), doc);
-
- wxObjectList::compatibility_iterator node = selections.GetFirst();
- while (node)
- {
- wxShape *theShape = (wxShape*) node->GetData();
- wxShape *newShape = theShape->CreateNewCopy();
-
- wxFont* newFont = wxTheFontList->FindOrCreateFont(pointSize,
- theShape->GetFont()->GetFamily(),
- theShape->GetFont()->GetStyle(),
- theShape->GetFont()->GetWeight(),
- theShape->GetFont()->GetUnderlined(),
- theShape->GetFont()->GetFaceName());
-
- newShape->SetFont(newFont);
-
- csCommandState* state = new csCommandState(ID_CS_FONT_CHANGE, newShape, theShape);
-
- cmd->AddState(state);
-
- node = node->GetNext();
- }
- doc->GetCommandProcessor()->Submit(cmd);
- }
-}
-
-void csDiagramView::OnZoomSel(wxCommandEvent& event)
-{
- int maxZoom = 200;
- int minZoom = 5;
- int inc = 5;
- int noStrings = (maxZoom - minZoom)/inc ;
-
- wxComboBox* combo = (wxComboBox*) event.GetEventObject();
- wxASSERT( combo != NULL );
-
- int scale = (int) ((noStrings - combo->GetSelection() - 1)*inc + minZoom);
-
- canvas->SetScale((double) (scale/100.0), (double) (scale/100.0));
- canvas->Refresh();
-}
-
-// Select or deselect all
-void csDiagramView::SelectAll(bool select)
-{
- wxClientDC dc(canvas);
- canvas->PrepareDC(dc);
-
- if (!select)
- {
- wxList selections;
- FindSelectedShapes(selections);
-
- wxObjectList::compatibility_iterator node = selections.GetFirst();
- while (node)
- {
- wxShape *theShape = (wxShape*) node->GetData();
- theShape->Select(false, &dc);
- SelectShape(theShape, false);
-
- node = node->GetNext();
- }
- }
- else
- {
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
- while (node)
- {
- wxShape *eachShape = (wxShape *)node->GetData();
- if (eachShape->GetParent() == NULL &&
- !eachShape->IsKindOf(CLASSINFO(wxControlPoint)) &&
- !eachShape->IsKindOf(CLASSINFO(wxLabelShape)))
- {
- eachShape->Select(true, &dc);
- SelectShape(eachShape, true);
- }
- node = node->GetNext();
- }
- }
-}
-
-
-void csDiagramView::OnToggleArrowTool(wxCommandEvent& WXUNUSED(event))
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
- bool state = wxGetApp().GetDiagramToolBar()->GetToolState(DIAGRAM_TOOLBAR_LINE_ARROW);
- wxString stateName;
- if (state)
- stateName = _T("Arrow on");
- else
- stateName = _T("Arrow off");
-
- wxList selections;
- FindSelectedShapes(selections, CLASSINFO(wxLineShape));
-
- if (selections.GetCount() > 0)
- {
- csDiagramCommand* cmd = new csDiagramCommand(stateName, doc);
-
- wxObjectList::compatibility_iterator node = selections.GetFirst();
- while (node)
- {
- wxLineShape *theShape = (wxLineShape*) node->GetData();
- wxLineShape *newShape = NULL;
-
- if (state)
- {
- // Add arrow
- if (theShape->GetArrows().GetCount() == 0)
- {
- newShape = (wxLineShape*) theShape->CreateNewCopy();
- newShape->AddArrow(ARROW_ARROW, ARROW_POSITION_MIDDLE, 10.0, 0.0, _T("Normal arrowhead"));
- }
- }
- else
- {
- if (theShape->GetArrows().GetCount() > 0)
- {
- newShape = (wxLineShape*) theShape->CreateNewCopy();
- newShape->ClearArrowsAtPosition();
- }
- }
-
- // If the new state is the same as the old, don't bother adding it to the command state.
- if (newShape)
- {
- csCommandState* state = new csCommandState(ID_CS_ARROW_CHANGE, newShape, theShape);
- cmd->AddState(state);
- }
-
- node = node->GetNext();
- }
- doc->GetCommandProcessor()->Submit(cmd);
- }
-}
-
-void csDiagramView::OnToggleArrowToolUpdate(wxUpdateUIEvent& event)
-{
- wxList selections;
- FindSelectedShapes(selections, CLASSINFO(wxLineShape));
- event.Enable( (selections.GetCount() > 0) );
-}
-
-// Make the point size combobox reflect this
-void csDiagramView::ReflectPointSize(int pointSize)
-{
- wxComboBox* comboBox = wxGetApp().GetPointSizeComboBox();
- comboBox->SetSelection(pointSize -1);
-}
-
-// Make the arrow toggle button reflect the state of the line
-void csDiagramView::ReflectArrowState(wxLineShape* lineShape)
-{
- bool haveArrow = false;
- wxObjectList::compatibility_iterator node = lineShape->GetArrows().GetFirst();
- while (node)
- {
- wxArrowHead *arrow = (wxArrowHead *)node->GetData();
- if (ARROW_POSITION_MIDDLE == arrow->GetArrowEnd())
- haveArrow = true;
- node = node->GetNext();
- }
-
- wxGetApp().GetDiagramToolBar()->ToggleTool(DIAGRAM_TOOLBAR_LINE_ARROW, haveArrow);
-}
-
-void csDiagramView::OnAlign(wxCommandEvent& event)
-{
- // Make a copy of the selections, keeping only those shapes
- // that are top-level non-line shapes.
- wxList selections;
- wxObjectList::compatibility_iterator node = GetSelectionList().GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if ((shape->GetParent() == NULL) && (!shape->IsKindOf(CLASSINFO(wxLineShape))))
- {
- selections.Append(shape);
- }
- node = node->GetNext();
- }
-
- if (selections.GetCount() == 0)
- return;
-
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- csDiagramCommand* cmd = new csDiagramCommand(_T("Align"), doc);
-
- node = selections.GetFirst();
- wxShape* firstShape = (wxShape*) node->GetData();
-
- double x = firstShape->GetX();
- double y = firstShape->GetY();
- double width, height;
- firstShape->GetBoundingBoxMax(&width, &height);
-
- node = selections.GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if (shape != firstShape)
- {
- /* double x1 = */ shape->GetX();
- /* double y1 = */ shape->GetY();
- double width1, height1;
- shape->GetBoundingBoxMax(& width1, & height1);
-
- wxShape* newShape = shape->CreateNewCopy();
-
- switch (event.GetId())
- {
- case DIAGRAM_TOOLBAR_ALIGNL:
- {
- double x2 = (double)(x - (width/2.0) + (width1/2.0));
- newShape->SetX(x2);
- break;
- }
- case DIAGRAM_TOOLBAR_ALIGNR:
- {
- double x2 = (double)(x + (width/2.0) - (width1/2.0));
- newShape->SetX(x2);
- break;
- }
- case DIAGRAM_TOOLBAR_ALIGNB:
- {
- double y2 = (double)(y + (height/2.0) - (height1/2.0));
- newShape->SetY(y2);
- break;
- }
- case DIAGRAM_TOOLBAR_ALIGNT:
- {
- double y2 = (double)(y - (height/2.0) + (height1/2.0));
- newShape->SetY(y2);
- break;
- }
- case DIAGRAM_TOOLBAR_ALIGN_HORIZ:
- {
- newShape->SetX(x);
- break;
- }
- case DIAGRAM_TOOLBAR_ALIGN_VERT:
- {
- newShape->SetY(y);
- break;
- }
- case DIAGRAM_TOOLBAR_COPY_SIZE:
- {
- newShape->SetSize(width, height);
- break;
- }
- }
- csCommandState* state = new csCommandState(ID_CS_ALIGN, newShape, shape);
- cmd->AddState(state);
- }
- node = node->GetNext();
- }
- doc->GetCommandProcessor()->Submit(cmd);
-}
-
-void csDiagramView::OnAlignUpdate(wxUpdateUIEvent& event)
-{
- // This is an approximation, since there may be lines
- // amongst the selections.
- event.Enable( (m_selections.GetCount() > 1) ) ;
-}
-
-void csDiagramView::OnNewLinePoint(wxCommandEvent& WXUNUSED(event))
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- csDiagramCommand* cmd = new csDiagramCommand(_T("New line point"), doc);
-
- wxObjectList::compatibility_iterator node = m_selections.GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if (shape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- wxShape* newShape = shape->CreateNewCopy();
- ((wxLineShape*)newShape)->InsertLineControlPoint(NULL);
- csCommandState* state = new csCommandState(ID_CS_NEW_POINT, newShape, shape);
- cmd->AddState(state);
- }
- node = node->GetNext();
- }
- doc->GetCommandProcessor()->Submit(cmd);
-}
-
-void csDiagramView::OnCutLinePoint(wxCommandEvent& WXUNUSED(event))
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- csDiagramCommand* cmd = new csDiagramCommand(_T("Cut line point"), doc);
-
- wxObjectList::compatibility_iterator node = m_selections.GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if (shape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- wxShape* newShape = shape->CreateNewCopy();
- ((wxLineShape*)newShape)->DeleteLineControlPoint();
- csCommandState* state = new csCommandState(ID_CS_CUT_POINT, newShape, shape);
- cmd->AddState(state);
- }
- node = node->GetNext();
- }
- doc->GetCommandProcessor()->Submit(cmd);
-}
-
-void csDiagramView::OnStraightenLines(wxCommandEvent& WXUNUSED(event))
-{
- csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
- csDiagramCommand* cmd = new csDiagramCommand(_T("Straighten lines"), doc);
-
- wxObjectList::compatibility_iterator node = m_selections.GetFirst();
- while (node)
- {
- wxShape* shape = (wxShape*) node->GetData();
- if (shape->IsKindOf(CLASSINFO(wxLineShape)))
- {
- wxShape* newShape = shape->CreateNewCopy();
- ((wxLineShape*)newShape)->Straighten();
- csCommandState* state = new csCommandState(ID_CS_STRAIGHTEN, newShape, shape);
- cmd->AddState(state);
- }
- node = node->GetNext();
- }
- doc->GetCommandProcessor()->Submit(cmd);
-}
-
-void csDiagramView::OnNewLinePointUpdate(wxUpdateUIEvent& event)
-{
- wxList selections;
- FindSelectedShapes(selections, CLASSINFO(wxLineShape));
- event.Enable( (selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnCutLinePointUpdate(wxUpdateUIEvent& event)
-{
- wxList selections;
- FindSelectedShapes(selections, CLASSINFO(wxLineShape));
- event.Enable( (selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnStraightenLinesUpdate(wxUpdateUIEvent& event)
-{
- wxList selections;
- FindSelectedShapes(selections, CLASSINFO(wxLineShape));
- event.Enable( (selections.GetCount() > 0) );
-}
-
-/*
- * Window implementations
- */
-
-IMPLEMENT_CLASS(csCanvas, wxShapeCanvas)
-
-BEGIN_EVENT_TABLE(csCanvas, wxShapeCanvas)
- EVT_MOUSE_EVENTS(csCanvas::OnMouseEvent)
- EVT_PAINT(csCanvas::OnPaint)
-END_EVENT_TABLE()
-
-// Define a constructor for my canvas
-csCanvas::csCanvas(csDiagramView *v, wxWindow *parent, wxWindowID id, const wxPoint& pos,
- const wxSize& size, long style):
- wxShapeCanvas(parent, id, pos, size, style)
-{
- m_view = v;
-}
-
-csCanvas::~csCanvas(void)
-{
-}
-
-void csCanvas::DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2)
-{
- wxPen dottedPen(*wxBLACK, 1, wxDOT);
- dc.SetPen(dottedPen);
- dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
- dc.DrawRectangle((long) x1, (long) y1, (long) (x2 - x1), (long) (y2 - y1));
-}
-
-void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
-{
- csEditorToolPalette *palette = wxGetApp().GetDiagramPalette();
-
- if (palette->GetSelection() == PALETTE_ARROW)
- {
- GetView()->SelectAll(false);
-
- wxClientDC dc(this);
- PrepareDC(dc);
-
- Redraw(dc);
- return;
- }
-
- if (palette->GetSelection() == PALETTE_TEXT_TOOL)
- {
- wxString newLabel;
-
-#if wxUSE_WX_RESOURCES
- // Ask for a label and create a new free-floating text region
- csLabelEditingDialog* dialog = new csLabelEditingDialog(GetParent());
-
- dialog->SetShapeLabel( wxEmptyString );
- dialog->SetTitle(_T("New text box"));
- if (dialog->ShowModal() == wxID_CANCEL)
- {
- dialog->Destroy();
- return;
- }
-
- newLabel = dialog->GetShapeLabel();
- dialog->Destroy();
-#endif // wxUSE_WX_RESOURCES
-
- wxShape* shape = new csTextBoxShape;
- shape->AssignNewIds();
- shape->SetEventHandler(new csEvtHandler(shape, shape, newLabel));
-
- wxComboBox* comboBox = wxGetApp().GetPointSizeComboBox();
- wxString str(comboBox->GetValue());
- long pointSize;
- str.ToLong( &pointSize );
-
- wxFont* newFont = wxTheFontList->FindOrCreateFont(pointSize,
- shape->GetFont()->GetFamily(),
- shape->GetFont()->GetStyle(),
- shape->GetFont()->GetWeight(),
- shape->GetFont()->GetUnderlined(),
- shape->GetFont()->GetFaceName());
-
- shape->SetFont(newFont);
-
- shape->SetX(x);
- shape->SetY(y);
-
- csDiagramCommand* cmd = new csDiagramCommand(_T("Text box"),
- (csDiagramDocument *)GetView()->GetDocument(),
- new csCommandState(ID_CS_ADD_SHAPE, shape, NULL));
- GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
-
- palette->SetSelection(PALETTE_ARROW);
-
- return;
- }
-
- csSymbol* symbol = wxGetApp().GetSymbolDatabase()->FindSymbol(palette->GetSelection());
- if (symbol)
- {
- wxShape* theShape = symbol->GetShape()->CreateNewCopy();
-
- wxComboBox* comboBox = wxGetApp().GetPointSizeComboBox();
- wxString str(comboBox->GetValue());
- long pointSize;
- str.ToLong( &pointSize );
-
- wxFont* newFont = wxTheFontList->FindOrCreateFont(pointSize,
- symbol->GetShape()->GetFont()->GetFamily(),
- symbol->GetShape()->GetFont()->GetStyle(),
- symbol->GetShape()->GetFont()->GetWeight(),
- symbol->GetShape()->GetFont()->GetUnderlined(),
- symbol->GetShape()->GetFont()->GetFaceName());
-
- theShape->SetFont(newFont);
-
- theShape->AssignNewIds();
- theShape->SetX(x);
- theShape->SetY(y);
-
- csDiagramCommand* cmd = new csDiagramCommand(symbol->GetName(),
- (csDiagramDocument *)GetView()->GetDocument(),
- new csCommandState(ID_CS_ADD_SHAPE, theShape, NULL));
- GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
-
- palette->SetSelection(PALETTE_ARROW);
- }
-}
-
-void csCanvas::OnRightClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-// Initial point
-static double sg_initialX, sg_initialY;
-
-void csCanvas::OnDragLeft(bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys))
-{
- wxClientDC dc(this);
- PrepareDC(dc);
-
- dc.SetLogicalFunction(OGLRBLF);
- DrawOutline(dc, sg_initialX, sg_initialY, x, y);
-}
-
-void csCanvas::OnBeginDragLeft(double x, double y, int WXUNUSED(keys))
-{
- sg_initialX = x;
- sg_initialY = y;
-
- wxClientDC dc(this);
- PrepareDC(dc);
-
- dc.SetLogicalFunction(OGLRBLF);
- DrawOutline(dc, sg_initialX, sg_initialY, x, y);
- CaptureMouse();
-}
-
-void csCanvas::OnEndDragLeft(double x, double y, int WXUNUSED(keys))
-{
- ReleaseMouse();
-
- wxClientDC dc(this);
- PrepareDC(dc);
-
- // Select all images within the rectangle
- float min_x, max_x, min_y, max_y;
- min_x = wxMin(x, sg_initialX);
- max_x = wxMax(x, sg_initialX);
- min_y = wxMin(y, sg_initialY);
- max_y = wxMax(y, sg_initialY);
-
- wxObjectList::compatibility_iterator node = GetDiagram()->GetShapeList()->GetFirst();
- while (node)
- {
- wxShape *shape = (wxShape *)node->GetData();
- if (shape->GetParent() == NULL && !shape->IsKindOf(CLASSINFO(wxControlPoint)))
- {
- float image_x = shape->GetX();
- float image_y = shape->GetY();
- if (image_x >= min_x && image_x <= max_x &&
- image_y >= min_y && image_y <= max_y)
- {
- shape->Select(true, &dc);
- GetView()->SelectShape(shape, true);
- }
- }
- node = node->GetNext();
- }
-}
-
-void csCanvas::OnDragRight(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void csCanvas::OnBeginDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void csCanvas::OnEndDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void csCanvas::OnMouseEvent(wxMouseEvent& event)
-{
- wxShapeCanvas::OnMouseEvent(event);
-}
-
-void csCanvas::OnPaint(wxPaintEvent& event)
-{
-// if (GetDiagram())
- wxShapeCanvas::OnPaint(event);
-}
diff --git a/contrib/samples/ogl/studio/view.h b/contrib/samples/ogl/studio/view.h
deleted file mode 100644
index c3fc46c3f3..0000000000
--- a/contrib/samples/ogl/studio/view.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/samples/ogl/studio/view.h
-// Purpose: View-related classes
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_VIEW_H_
-#define _STUDIO_VIEW_H_
-
-#include "doc.h"
-#include "wx/ogl/ogl.h"
-
-class csDiagramView;
-class csCanvas: public wxShapeCanvas
-{
-DECLARE_CLASS(csCanvas)
- public:
-
- csCanvas(csDiagramView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
- const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- long style = wxRETAINED);
- ~csCanvas(void);
-
- void DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2);
-
- void OnMouseEvent(wxMouseEvent& event);
- void OnPaint(wxPaintEvent& event);
-
- virtual void OnLeftClick(double x, double y, int keys = 0);
- virtual void OnRightClick(double x, double y, int keys = 0);
-
- virtual void OnDragLeft(bool draw, double x, double y, int keys=0); // Erase if draw false
- virtual void OnBeginDragLeft(double x, double y, int keys=0);
- virtual void OnEndDragLeft(double x, double y, int keys=0);
-
- virtual void OnDragRight(bool draw, double x, double y, int keys=0); // Erase if draw false
- virtual void OnBeginDragRight(double x, double y, int keys=0);
- virtual void OnEndDragRight(double x, double y, int keys=0);
-
- inline csDiagramView* GetView() const { return m_view; }
- inline void SetView(csDiagramView* view) { m_view = view; }
-
- protected:
- csDiagramView* m_view;
-
-DECLARE_EVENT_TABLE()
-};
-
-class csDiagramView: public wxView
-{
- DECLARE_DYNAMIC_CLASS(csDiagramView)
- public:
- csDiagramView(void) { canvas = NULL; frame = NULL; };
- ~csDiagramView(void);
-
- bool OnCreate(wxDocument *doc, long flags);
- void OnDraw(wxDC *dc);
- void OnUpdate(wxView *sender, wxObject *hint = NULL);
- bool OnClose(bool deleteWindow = true);
- void OnSelectAll(wxCommandEvent& event);
-
- wxShape *FindFirstSelectedShape(void);
-
- // Scans the canvas for selections (doesn't use m_selections)
- void FindSelectedShapes(wxList& selections, wxClassInfo* toFind = NULL);
-
- // The selections in the order in which they were selected
- inline wxList& GetSelectionList() const { return (wxList&) m_selections; }
-
- // Adds or removes shape from m_selections
- void SelectShape(wxShape* shape, bool select);
-
- // Apply point size to current shapes
- void ApplyPointSize(int pointSize);
-
- // Make the point size combobox reflect this
- void ReflectPointSize(int pointSize);
-
- // Make the arrow toggle button reflect the state of the line
- void ReflectArrowState(wxLineShape* lineShape);
-
- // Do a cut operation for the given list of shapes
- void DoCut(wxList& shapes);
-
- // Do a general command
- void DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxString& op);
-
- // Select or deselect all
- void SelectAll(bool select = true);
-
-// Event handlers
- void OnCut(wxCommandEvent& event);
- void OnCopy(wxCommandEvent& event);
- void OnPaste(wxCommandEvent& event);
- void OnDuplicate(wxCommandEvent& event);
- void OnClear(wxCommandEvent& event);
- void OnChangeBackgroundColour(wxCommandEvent& event);
- void OnEditProperties(wxCommandEvent& event);
- void OnPointSizeComboSel(wxCommandEvent& event);
- void OnPointSizeComboText(wxCommandEvent& event);
- void OnToggleArrowTool(wxCommandEvent& event);
- void OnZoomSel(wxCommandEvent& event);
- void OnAlign(wxCommandEvent& event);
- void OnNewLinePoint(wxCommandEvent& event);
- void OnCutLinePoint(wxCommandEvent& event);
- void OnStraightenLines(wxCommandEvent& event);
-
-// UI update handles
- void OnToggleArrowToolUpdate(wxUpdateUIEvent& event);
- void OnEditPropertiesUpdate(wxUpdateUIEvent& event);
- void OnCutUpdate(wxUpdateUIEvent& event);
- void OnClearUpdate(wxUpdateUIEvent& event);
- void OnCopyUpdate(wxUpdateUIEvent& event);
- void OnPasteUpdate(wxUpdateUIEvent& event);
- void OnDuplicateUpdate(wxUpdateUIEvent& event);
- void OnAlignUpdate(wxUpdateUIEvent& event);
- void OnNewLinePointUpdate(wxUpdateUIEvent& event);
- void OnCutLinePointUpdate(wxUpdateUIEvent& event);
- void OnStraightenLinesUpdate(wxUpdateUIEvent& event);
- void OnUndoUpdate(wxUpdateUIEvent& event);
- void OnRedoUpdate(wxUpdateUIEvent& event);
-
-DECLARE_EVENT_TABLE()
-
-public:
- wxMDIChildFrame* frame;
- csCanvas* canvas;
- wxList m_selections;
-};
-
-#endif
- // _STUDIO_VIEW_H_
diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in
deleted file mode 100644
index 3ec57fe71a..0000000000
--- a/contrib/samples/plot/Makefile.in
+++ /dev/null
@@ -1,192 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-PLOT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
- -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-PLOT_OBJECTS = \
- $(__plot_os2_lib_res) \
- plot_plot.o \
- $(__plot___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-@COND_PLATFORM_MAC_1@__plot___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C plot$(EXEEXT)
-@COND_PLATFORM_MAC_1@__plot___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___plot___os2_emxbindcmd = $(NM) plot$(EXEEXT) | if grep -q \
- pmwin.763 ; then emxbind -ep plot$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__plot___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___plot___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__plot_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__plot_bundle___depname = plot_bundle
-@COND_TOOLKIT_COCOA@____plot_BUNDLE_TGT_REF_DEP = plot.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____plot_BUNDLE_TGT_REF_DEP = plot.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__plot___win32rc = plot_plot_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
- __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
- $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
- $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
- $(srcdir)/../../include -o plot$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: plot$(EXEEXT) $(__plot_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f plot$(EXEEXT)
- rm -rf plot.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc)
- $(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
- $(__plot___mac_rezcmd)
- $(__plot___mac_setfilecmd)
- $(__plot___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p plot.app/Contents
- mkdir -p plot.app/Contents/MacOS
- mkdir -p plot.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/plot/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >plot.app/Contents/Info.plist
-
-
- echo -n "APPL????" >plot.app/Contents/PkgInfo
-
-
- ln -f plot$(EXEEXT) plot.app/Contents/MacOS/plot
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns plot.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@plot_bundle: $(____plot_BUNDLE_TGT_REF_DEP)
-
-plot_plot.o: $(srcdir)/plot.cpp
- $(CXXC) -c -o $@ $(PLOT_CXXFLAGS) $(srcdir)/plot.cpp
-
-plot_plot_rc.o: $(srcdir)/plot.rc
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean plot_bundle
diff --git a/contrib/samples/plot/makefile.bcc b/contrib/samples/plot/makefile.bcc
deleted file mode 100644
index 65b4fa8172..0000000000
--- a/contrib/samples/plot/makefile.bcc
+++ /dev/null
@@ -1,234 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOT_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
- -I.\..\..\..\samples -DNOPCH -I.\..\..\include $(CPPFLAGS) $(CXXFLAGS)
-PLOT_OBJECTS = \
- $(OBJS)\plot_plot.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 =
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 =
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 =
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\plot.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
- -if exist $(OBJS)\plot.exe del $(OBJS)\plot.exe
- -if exist $(OBJS)\plot.tds del $(OBJS)\plot.tds
- -if exist $(OBJS)\plot.ilc del $(OBJS)\plot.ilc
- -if exist $(OBJS)\plot.ild del $(OBJS)\plot.ild
- -if exist $(OBJS)\plot.ilf del $(OBJS)\plot.ilf
- -if exist $(OBJS)\plot.ils del $(OBJS)\plot.ils
-
-$(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
- ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
- c0w32.obj $(PLOT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\plot_plot.res
-|
-
-$(OBJS)\plot_plot.obj: .\plot.cpp
- $(CXX) -q -c -P -o$@ $(PLOT_CXXFLAGS) $**
-
-$(OBJS)\plot_plot.res: .\plot.rc
- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH -i.\..\..\include $**
-
diff --git a/contrib/samples/plot/makefile.gcc b/contrib/samples/plot/makefile.gcc
deleted file mode 100644
index a210bd0e3b..0000000000
--- a/contrib/samples/plot/makefile.gcc
+++ /dev/null
@@ -1,232 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
- gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
- -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \
- -I.\..\..\..\samples -DNOPCH -I.\..\..\include $(__RTTIFLAG_5) \
- $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-PLOT_OBJECTS = \
- $(OBJS)\plot_plot.o \
- $(OBJS)\plot_plot_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 =
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 =
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
- -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO =
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO =
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG =
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\plot.exe
-
-clean:
- -if exist $(OBJS)\*.o del $(OBJS)\*.o
- -if exist $(OBJS)\*.d del $(OBJS)\*.d
- -if exist $(OBJS)\plot.exe del $(OBJS)\plot.exe
-
-$(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot_rc.o
- $(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\plot_plot.o: ./plot.cpp
- $(CXX) -c -o $@ $(PLOT_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\plot_plot_rc.o: ./plot.rc
- windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/plot/makefile.vc b/contrib/samples/plot/makefile.vc
deleted file mode 100644
index c10c5f1b2d..0000000000
--- a/contrib/samples/plot/makefile.vc
+++ /dev/null
@@ -1,309 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
- vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
- $(__DEBUGINFO_0) /Fd$(OBJS)\plot.pdb $(____DEBUGRUNTIME_2_p) \
- $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
- $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \
- $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH /I.\..\..\include \
- $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)
-PLOT_OBJECTS = \
- $(OBJS)\plot_plot.obj \
- $(OBJS)\plot_plot.res
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\plot.exe
-
-clean:
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\plot.exe del $(OBJS)\plot.exe
- -if exist $(OBJS)\plot.ilk del $(OBJS)\plot.ilk
- -if exist $(OBJS)\plot.pdb del $(OBJS)\plot.pdb
-
-$(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
- link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
- $(PLOT_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\plot_plot.obj: .\plot.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(PLOT_CXXFLAGS) $**
-
-$(OBJS)\plot_plot.res: .\plot.rc
- rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include $**
-
diff --git a/contrib/samples/plot/makefile.wat b/contrib/samples/plot/makefile.wat
deleted file mode 100644
index 0814a5372c..0000000000
--- a/contrib/samples/plot/makefile.wat
+++ /dev/null
@@ -1,262 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-! loaddll wcc wccd
-! loaddll wccaxp wccdaxp
-! loaddll wcc386 wccd386
-! loaddll wpp wppdi86
-! loaddll wppaxp wppdaxp
-! loaddll wpp386 wppd386
-! loaddll wlink wlink
-! loaddll wlib wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE =
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 =
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 =
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 =
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 =
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 =
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 =
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
- wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
- wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
- $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
- $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
- $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
- -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
- $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
- $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-PLOT_OBJECTS = &
- $(OBJS)\plot_plot.obj
-
-
-all : $(OBJS)
-$(OBJS) :
- -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\plot.exe
-
-clean : .SYMBOLIC
- -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
- -if exist $(OBJS)\*.res del $(OBJS)\*.res
- -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
- -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
- -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
- -if exist $(OBJS)\plot.exe del $(OBJS)\plot.exe
-
-$(OBJS)\plot.exe : $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
- @%create $(OBJS)\plot.lbc
- @%append $(OBJS)\plot.lbc option quiet
- @%append $(OBJS)\plot.lbc name $^@
- @%append $(OBJS)\plot.lbc option caseexact
- @%append $(OBJS)\plot.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
- @for %i in ($(PLOT_OBJECTS)) do @%append $(OBJS)\plot.lbc file %i
- @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\plot.lbc library %i
- @%append $(OBJS)\plot.lbc option resource=$(OBJS)\plot_plot.res
- @for %i in () do @%append $(OBJS)\plot.lbc option stack=%i
- wlink @$(OBJS)\plot.lbc
-
-$(OBJS)\plot_plot.obj : .AUTODEPEND .\plot.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(PLOT_CXXFLAGS) $<
-
-$(OBJS)\plot_plot.res : .AUTODEPEND .\plot.rc
- wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $<
-
diff --git a/contrib/samples/plot/plot.bkl b/contrib/samples/plot/plot.bkl
deleted file mode 100644
index cfef76512d..0000000000
--- a/contrib/samples/plot/plot.bkl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
- plot.cpp
-
- plot
- core
- base
- plot.rc
-
-
-
diff --git a/contrib/samples/plot/plot.cpp b/contrib/samples/plot/plot.cpp
deleted file mode 100644
index 6ebbd6c60e..0000000000
--- a/contrib/samples/plot/plot.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: plot.cpp
-// Purpose: wxPlotWindow sample
-// Author: Robert Roebling
-// Modified by:
-// Created:
-// Copyright: (C) 1999, Robert Roebling
-// RCS-ID: $Id$
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/plot/plot.h"
-
-#include "wx/image.h"
-#include "wx/listctrl.h"
-#include "wx/sizer.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/math.h"
-
-// derived classes
-
-class MyPlotCurve;
-class MyFrame;
-class MyApp;
-
-// MyPlotCurve
-
-class MyPlotCurve: public wxPlotCurve
-{
-public:
- MyPlotCurve( int offsetY, double startY, double endY ) :
- wxPlotCurve( offsetY, startY, endY ) {}
-
- virtual wxInt32 GetStartX()
- { return 0; }
- virtual wxInt32 GetEndX()
- { return 7000; }
-
- virtual double GetY( wxInt32 x )
- {
- double dx = x;
- dx /= 100;
- return sin( dx );
- }
-};
-
-// MyFrame
-
-class MyFrame: public wxFrame
-{
-public:
- MyFrame();
-
- void OnAbout( wxCommandEvent &event );
- void OnQuit( wxCommandEvent &event );
-
- void OnPlotClick( wxPlotEvent &event );
- void OnPlotDClick( wxPlotEvent &event );
-
-private:
-
- wxPlotWindow *m_plot;
-#if wxUSE_LOG
- wxTextCtrl *m_log;
-#endif // wxUSE_LOG
-
- DECLARE_DYNAMIC_CLASS(MyFrame)
- DECLARE_EVENT_TABLE()
-};
-
-// MyApp
-
-class MyApp: public wxApp
-{
-public:
- virtual bool OnInit();
-};
-
-// main program
-
-IMPLEMENT_APP(MyApp)
-
-// MyFrame
-
-IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
-
-BEGIN_EVENT_TABLE(MyFrame,wxFrame)
- EVT_MENU (wxID_ABOUT, MyFrame::OnAbout)
- EVT_MENU (wxID_EXIT, MyFrame::OnQuit)
- EVT_PLOT_CLICKED (wxID_ANY, MyFrame::OnPlotClick)
- EVT_PLOT_DOUBLECLICKED (wxID_ANY, MyFrame::OnPlotDClick)
-END_EVENT_TABLE()
-
-MyFrame::MyFrame()
- : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxPlotWindow sample"),
- wxPoint(20,20), wxSize(470,500) )
-{
- wxMenu *fileMenu = new wxMenu();
- fileMenu->Append( wxID_EXIT, _T("E&xit\tAlt-X"), _T("Quit this program"));
-
- wxMenu *helpMenu = new wxMenu;
- helpMenu->Append(wxID_ABOUT, _T("&About...\tF1"), _T("Show about dialog"));
-
- wxMenuBar *menuBar = new wxMenuBar();
- menuBar->Append(fileMenu, _T("&File"));
- menuBar->Append(helpMenu, _T("&Help"));
-
- SetMenuBar( menuBar );
-
-#if wxUSE_STATUSBAR
- CreateStatusBar(2);
- int widths[] = { -1, 100 };
- SetStatusWidths( 2, widths );
-#endif // wxUSE_STATUSBAR
-
- m_plot = new wxPlotWindow( this, wxID_ANY, wxPoint(0,0), wxSize(100,100), wxSUNKEN_BORDER | wxPLOT_DEFAULT );
- m_plot->SetUnitsPerValue( 0.01 );
-// m_plot->SetScrollOnThumbRelease( true );
-
- //Add a blue, 16pt chart title
- wxString titleText( _T("The Chart Title") );
- wxFont titleFont( *wxNORMAL_FONT );
- titleFont.SetPointSize( 16 );
- wxColour titleColour( *wxBLUE );
- m_plot->AddChartTitle( titleText, titleFont, titleColour );
-
- m_plot->Add( new MyPlotCurve( 0, -1.5, 1.5 ) );
- m_plot->Add( new MyPlotCurve( 50, -1.5, 1.5 ) );
- wxPlotOnOffCurve *oo = new wxPlotOnOffCurve( 10 );
- oo->Add( 10, 20 );
- oo->Add( 25, 30 );
- oo->Add( 100, 400 );
- oo->Add( 1000, 2000 );
- m_plot->Add( oo );
-
-#if wxUSE_LOG
- m_log = new wxTextCtrl( this, wxID_ANY, _T("This is the log window.\n"), wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
- wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
- delete old_log;
-#endif // wxUSE_LOG
-
- wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-
- topsizer->Add( m_plot, 1, wxEXPAND );
-#if wxUSE_LOG
- topsizer->Add( m_log, 0, wxEXPAND );
-#endif // wxUSE_LOG
-
- SetAutoLayout( true );
- SetSizer( topsizer );
- topsizer->Fit(this);
- topsizer->SetSizeHints(this);
-}
-
-void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
-{
- Close( true );
-}
-
-void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
-{
- (void)wxMessageBox( _T("wxPlotWindow Demo\n")
- _T("Robert Roebling (c) 1999,2000"),
- _T("About wxPlotWindow Demo"), wxICON_INFORMATION | wxOK );
-}
-
-void MyFrame::OnPlotClick( wxPlotEvent &event )
-{
- double x = event.GetPosition() * m_plot->GetUnitsPerValue();
- double y = event.GetCurve()->GetY( event.GetPosition() );
- wxLogMessage( _T("Clicked on curve at x coordinate: %f, value: %f"), x, y );
-}
-
-void MyFrame::OnPlotDClick( wxPlotEvent &event )
-{
- double x = event.GetPosition() * m_plot->GetUnitsPerValue();
- double y = event.GetCurve()->GetY( event.GetPosition() );
- wxLogMessage( _T("Double clicked on curve at x coordinate: %f, value: %f"), x, y );
-}
-
-//-----------------------------------------------------------------------------
-// MyApp
-//-----------------------------------------------------------------------------
-
-bool MyApp::OnInit()
-{
- wxFrame *frame = new MyFrame();
- frame->Show( true );
-
- return true;
-}
-
diff --git a/contrib/samples/plot/plot.dsp b/contrib/samples/plot/plot.dsp
deleted file mode 100644
index c35fedf4d9..0000000000
--- a/contrib/samples/plot/plot.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="plot" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=plot - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "plot.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "plot.mak" CFG="plot - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "plot - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "plot - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_plot.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_plot.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_plot.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_plot.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_plot.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_plot.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_plot.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_plot.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_plot.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_plot.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_plot.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_plot.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_plot.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_plot.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_plot.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_plot.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_plot.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_plot.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_plot.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_plot.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_plot.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_plot.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_plot.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_plot.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_plot.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_plot.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_plot.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_plot.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\plot.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_plot.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_plot.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF "$(CFG)" == "plot - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\plot.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_plot.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_plot.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "plot - Win32 DLL Universal Unicode Release"
-# Name "plot - Win32 DLL Universal Unicode Debug"
-# Name "plot - Win32 DLL Universal Release"
-# Name "plot - Win32 DLL Universal Debug"
-# Name "plot - Win32 DLL Unicode Release"
-# Name "plot - Win32 DLL Unicode Debug"
-# Name "plot - Win32 DLL Release"
-# Name "plot - Win32 DLL Debug"
-# Name "plot - Win32 Universal Unicode Release"
-# Name "plot - Win32 Universal Unicode Debug"
-# Name "plot - Win32 Universal Release"
-# Name "plot - Win32 Universal Debug"
-# Name "plot - Win32 Unicode Release"
-# Name "plot - Win32 Unicode Debug"
-# Name "plot - Win32 Release"
-# Name "plot - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\plot.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\plot.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/plot/plot.rc b/contrib/samples/plot/plot.rc
deleted file mode 100644
index 2b2f92f2da..0000000000
--- a/contrib/samples/plot/plot.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-#include "wx/plot/wxplot.rc"
diff --git a/contrib/src/applet/applet.cpp b/contrib/src/applet/applet.cpp
deleted file mode 100644
index 1765f9b54e..0000000000
--- a/contrib/src/applet/applet.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-*
-* wxWindows HTML Applet Package
-*
-* Copyright (C) 1991-2001 SciTech Software, Inc.
-* All rights reserved.
-*
-* ========================================================================
-*
-* The contents of this file are subject to the wxWindows License
-* Version 3.0 (the "License"); you may not use this file except in
-* compliance with the License. You may obtain a copy of the License at
-* http://www.wxwindows.org/licence3.txt
-*
-* Software distributed under the License is distributed on an
-* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-*
-* ========================================================================
-*
-* Language: ANSI C++
-* Environment: Any
-*
-* Description: Main wxApplet class implementation
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/applet.h"
-#include "wx/applet/window.h"
-
-/*------------------------- Implementation --------------------------------*/
-
-// Empty event handler. We include this event handler simply so that
-// sub-classes of wxApplet can reference wxApplet in the event tables
-// that they create as necessary.
-BEGIN_EVENT_TABLE(wxApplet, wxPanel)
- EVT_ERASE_BACKGROUND(wxApplet::OnEraseBackground)
-END_EVENT_TABLE()
-
-// Implement the abstract class functions
-IMPLEMENT_ABSTRACT_CLASS(wxApplet, wxPanel);
-
-/****************************************************************************
-REMARKS:
-Psuedo virtual constructor for the wxApplet class.
-****************************************************************************/
-bool wxApplet::Create(
- wxHtmlAppletWindow *parent,
- const wxHtmlTag& ,
- const wxSize& size,
- long style)
-{
- bool ret = wxPanel::Create(parent, -1, wxDefaultPosition, size, style);
- if (ret) {
- m_parent = parent;
- }
- return ret;
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the wxApplet class.
-****************************************************************************/
-wxApplet::~wxApplet()
-{
- ((wxHtmlAppletWindow *) m_parent)->RemoveApplet(this);
-}
-
-/****************************************************************************
-REMARKS:
-Special handler for background erase messages. We do nothing in here which
-causes the background to not be erased which is exactly what we want. All
-the wxApplet classes display over an HTML window, so we want the HTML
-background to show through.
-****************************************************************************/
-void wxApplet::OnEraseBackground(wxEraseEvent&)
-{
-}
-
diff --git a/contrib/src/applet/appletwindow.cpp b/contrib/src/applet/appletwindow.cpp
deleted file mode 100644
index 07c52493f8..0000000000
--- a/contrib/src/applet/appletwindow.cpp
+++ /dev/null
@@ -1,833 +0,0 @@
-/****************************************************************************
-*
-* wxWindows HTML Applet Package
-*
-* Copyright (C) 1991-2001 SciTech Software, Inc.
-* All rights reserved.
-*
-* ========================================================================
-*
-* The contents of this file are subject to the wxWindows License
-* Version 3.0 (the "License"); you may not use this file except in
-* compliance with the License. You may obtain a copy of the License at
-* http://www.wxwindows.org/licence3.txt
-*
-* Software distributed under the License is distributed on an
-* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-*
-* ========================================================================
-*
-* Language: ANSI C++
-* Environment: Any
-*
-* Description: Main wxHtmlAppletWindow class implementation
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/applet.h"
-#include "wx/applet/window.h"
-#include "wx/applet/loadpage.h"
-#include "wx/applet/plugin.h"
-
-// Preprocessor Stuff
-#include "wx/applet/prepinclude.h"
-#include "wx/applet/prepecho.h"
-#include "wx/applet/prepifelse.h"
-
-// wxWindows headers
-
-// Kind of pointless to use precompiled headers when this is the only
-// file in this lib that would need them.
-#include "wx/defs.h"
-#include "wx/spawnbrowser.h"
-#include "wx/html/forcelnk.h"
-#include "wx/log.h"
-#include "wx/msgdlg.h"
-#include "wx/tbarbase.h"
-
-// crt
-#ifdef __WXMSW__
-#include // spawnl()
-#endif
-
-/*---------------------------- Global variables ---------------------------*/
-
-wxHashTable wxHtmlAppletWindow::m_Cookies;
-
-/*------------------------- Implementation --------------------------------*/
-
-// Empty event handler. We include this event handler simply so that
-// sub-classes of wxApplet can reference wxApplet in the event tables
-// that they create as necessary.
-BEGIN_EVENT_TABLE(wxHtmlAppletWindow, wxHtmlWindow)
- EVT_LOAD_PAGE(wxHtmlAppletWindow::OnLoadPage)
- EVT_PAGE_LOADED(wxHtmlAppletWindow::OnPageLoaded)
-END_EVENT_TABLE()
-
-// Implement the class functions for wxHtmlAppletWindow
-IMPLEMENT_CLASS(wxHtmlAppletWindow, wxHtmlWindow)
-
-// Implement the dynamic class so it can be constructed dynamically
-IMPLEMENT_DYNAMIC_CLASS(VirtualData, wxObject)
-
-// Define the wxAppletList implementation
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxAppletList)
-
-/****************************************************************************
-REMARKS:
-Constructor for the applet window class.
-****************************************************************************/
-wxHtmlAppletWindow::wxHtmlAppletWindow(
- wxWindow *parent,
- wxWindowID id,
- wxToolBarBase *navBar,
- int navBackId,
- int navForwardId,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
- : wxHtmlWindow(parent,id,pos,size,style,name), m_AppletList(wxKEY_STRING)
-{
- // Init our locks
- UnLock();
-
- // setup client navbars
- if (navBar) {
- m_NavBarEnabled = true;
- m_NavBar = navBar;
- m_NavBackId = navBackId;
- m_NavForwardId = navForwardId;
- }
- else {
- m_NavBarEnabled = false;
- m_NavBar = NULL;
- }
-
- m_NavBackId = navBackId;
- m_NavForwardId = navForwardId;
-
- // Add HTML preprocessors
- // deleting preprocessors is done by the code within the window
- incPreprocessor = new wxIncludePrep(); // #include preprocessor
- incPreprocessor->ChangeDirectory(m_FS); // give it access to our filesys object
- this->AddProcessor(incPreprocessor);
- this->AddProcessor(new wxEchoPrep());
- this->AddProcessor(new wxIfElsePrep());
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the applet window class.
-****************************************************************************/
-wxHtmlAppletWindow::~wxHtmlAppletWindow()
-{
-}
-
-/****************************************************************************
-PARAMETERS:
-dc - wxDC object to draw on
-
-REMARKS:
-****************************************************************************/
-void wxHtmlAppletWindow::OnDraw(
- wxDC& dc)
-{
- wxHtmlWindow::OnDraw(dc);
-}
-
-/****************************************************************************
-PARAMETERS:
-className - Name of the applet class to create an object for
-size - Initial size of the applet to be created
-
-RETURNS:
-Pointer to the wxApplet created, or NULL if unable to create the applet.
-
-REMARKS:
-This function is used to create new wxApplet objects dynamically based on the
-class name as a string. This allows instances of wxApplet classes to be
-created dynamically based on string values embedded in the custom tags of an
-HTML page.
-****************************************************************************/
-wxApplet *wxHtmlAppletWindow::CreateApplet(
- const wxString& classId,
- const wxString& iName,
- const wxHtmlTag& params,
- const wxSize& size)
-{
- // Dynamically create the class instance at runtime
- wxObject *obj = wxCreateDynamicObject(classId.c_str());
- wxApplet *applet = wxDynamicCast(obj,wxApplet);
- if (!applet)
- return NULL;
- if (!applet->Create(this,params,size)) {
- delete applet;
- return NULL;
- }
- else {
- // do some fixups on the size if its screwed up
- wxSize nsize = applet->GetBestSize();
- if (nsize.x < size.x) nsize.x = size.x;
- if (nsize.y < size.y) nsize.y = size.y;
- applet->SetSize(nsize);
- }
-
- m_AppletList.Append(iName,(wxObject*)applet);
- return applet;
-}
-
-/****************************************************************************
-PARAMETERS:
-classId - Name of the Plugin class to create an object for
-
-RETURNS:
-Pointer to the wxplugIn created, or NULL if unable to create the PlugIn.
-
-REMARKS:
-This function is used to create new wxPlugIn objects dynamically based on the
-class name as a string. This allows instances of wxPlugIn classes to be
-created dynamically based on string values embedded in the custom tags of an
-HTML page.
-****************************************************************************/
-bool wxHtmlAppletWindow::CreatePlugIn(
- const wxString& classId,
- const wxString& cmdLine)
-{
- // Dynamically create the class instance at runtime, execute it
- // and then destroy it.
- wxObject *obj = wxCreateDynamicObject(classId.c_str());
- wxPlugIn *plugIn = wxDynamicCast(obj,wxPlugIn);
- if (!plugIn)
- return false;
- if (!plugIn->Create(this)) {
- delete plugIn;
- return false;
- }
- plugIn->Run(cmdLine);
- delete plugIn;
- return true;
-}
-
-/****************************************************************************
-PARAMETERS:
-appletName - Name of the applet class to find
-
-RETURNS:
-Pointer to the wxApplet found, or NULL if not found.
-
-REMARKS:
-Find an instance of an applet based on it's name
-****************************************************************************/
-wxApplet *wxHtmlAppletWindow::FindApplet(
- const wxString& appletName)
-{
- wxAppletList::Node *node = m_AppletList.Find(appletName);
- if (!node)
- return NULL;
- return node->GetData();
-}
-
-/****************************************************************************
-PARAMETERS:
-applet - Pointer to the applet object to remove from the list
-
-RETURNS:
-True if the applet was found and removed, false if not. The applet itself
-is *not* destroyed!
-
-REMARKS:
-Remove an applet from the manager. Called during applet destruction
-****************************************************************************/
-bool wxHtmlAppletWindow::RemoveApplet(
- const wxApplet *applet)
-{
- for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext()) {
- if (node->GetData() == applet) {
- m_AppletList.DeleteNode(node);
- return true;
- }
- }
- return false;
-}
-
-/****************************************************************************
-PARAMETERS:
-URL - New URL for the page to load
-
-RETURNS:
-True if page loaded successfully, false if not
-
-REMARKS:
-Remove an applet from the manager. Called during applet destruction
-****************************************************************************/
-bool wxHtmlAppletWindow::LoadPage(
- const wxString& link)
-{
- wxString href(link);
-
- if (link.GetChar(0) == '?'){
- wxString cmd = link.BeforeFirst('=');
- wxString cmdValue = link.AfterFirst('=');
-
- // Launches the default Internet browser for the system.
- if(!(cmd.CmpNoCase("?EXTERNAL"))) {
- return wxSpawnBrowser(this, cmdValue.c_str());
- }
-
- // Launches an external program on the system.
- if (!(cmd.CmpNoCase("?EXECUTE"))) {
- int waitflag = P_NOWAIT;
- bool ret;
- wxString currentdir;
- wxString filename, path, ext;
-
- // Parse the params sent to the execute command. For now the only
- // parm is "wait". wait will cause spawn wait, default is nowait.
- // Since we only need one param for now I am not going to make this
- // any smater then it needs to be. If we need more params later i'll
- // fix it.
- int i = cmdValue.Find('(');
- if (i != -1) {
- wxString param = cmdValue.AfterFirst('(');
- cmdValue.Truncate(i);
- if (!param.CmpNoCase("wait)"))
- waitflag = P_WAIT;
- }
-
- currentdir = wxGetCwd();
- //we don't want to change the path of the virtual file system so we have to use these
- //functions rather than the filesystem
- wxSplitPath(cmdValue, &path, &filename, &ext);
- if (path.CmpNoCase("") != 0) wxSetWorkingDirectory(path);
-
- ret = !spawnl( waitflag, cmdValue , NULL );
- //HACK should use wxExecute
- //ret = wxExecute(filename, bool sync = FALSE, wxProcess *callback = NULL)
- wxSetWorkingDirectory(currentdir);
-
- return ret;
- }
-
- // Looks for a href in a variable stored as a cookie. The href can be
- // changed on the fly.
- if (!(cmd.CmpNoCase("?VIRTUAL"))){
- wxObject *obj = FindCookie(cmdValue);
- VirtualData *virtData = wxDynamicCast(obj,VirtualData);
- if (virtData) {
- // recurse and loadpage, just in case the link is like another
- // ? link
- return LoadPage(virtData->GetHref());
- }
- else {
-#ifdef CHECKED
- wxLogError(_T("VIRTUAL LINK ERROR: '%s' does not exist."), cmdValue.c_str());
-#endif
- return true;
- }
- }
-
- // This launches a qlet - It is like an applet but is more generic in that it
- // can be of any wxWin type so it then has the freedom to do more stuff.
- if (!(cmd.CmpNoCase("?WXPLUGIN"))){
- if (!cmdValue.IsNull()) {
- // TODO: We are going to need to add code to parse the command line
- // parameters string in here in the future...
- wxString cmdLine = link.AfterFirst('(');
- cmdLine = cmdLine.BeforeLast(')');
- if (!CreatePlugIn(cmdValue,cmdLine)) {
-#ifdef CHECKED
- wxLogError(_T("Launch PlugIn ERROR: '%s' does not exist."), cmdValue.c_str());
-#endif
- }
- }
- return true;
- }
-
- // This used in a link or href will take you back in the history.
- if (!(cmd.CmpNoCase("?BACK"))){
- HistoryBack();
- return true;
- }
-
- // This used in a link or href will take you forward in the history
- if (!(cmd.CmpNoCase("?FORWARD"))){
- HistoryForward();
- return true;
- }
- }
-
- // Inform all the applets that the new page is being loaded
- for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
- (node->GetData())->OnLinkClicked(wxHtmlLinkInfo(href));
- Show(false);
-
- m_openedlast = href;
- bool stat = wxHtmlWindow::LoadPage(href);
- Show(true);
-
- // Enable/Dis the navbar tools
- if (m_NavBarEnabled) {
- m_NavBar->EnableTool(m_NavForwardId,HistoryCanForward());
- m_NavBar->EnableTool(m_NavBackId,HistoryCanBack());
- }
- return stat;
-}
-
-/****************************************************************************
-PARAMETERS:
-URL - String URL that we are navigating to
-
-REMARKS:
-Called when the user navigates to a new URL from the current page. We simply
-call the LoadPage function above to load the new page and display it.
-****************************************************************************/
-void wxHtmlAppletWindow::OnLinkClicked(
- const wxHtmlLinkInfo& link)
-{
- LoadPage(link.GetHref());
-}
-
-/****************************************************************************
-REMARKS:
-Called when the user navigates forward within the HTML history stack.
-We call all the applets in turn allowing them to handle the navigation
-command prior to being destructed when the current page is destroyed.
-****************************************************************************/
-bool wxHtmlAppletWindow::HistoryForward()
-{
- if (!HistoryCanForward())
- return false;
-
- for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
- (node->GetData())->OnHistoryForward();
-
- return wxHtmlWindow::HistoryForward();
-}
-
-/****************************************************************************
-REMARKS:
-Called when the user navigates backwards within the HTML history stack.
-We call all the applets in turn allowing them to handle the navigation
-command prior to being destructed when the current page is destroyed.
-****************************************************************************/
-bool wxHtmlAppletWindow::HistoryBack()
-{
- if (!HistoryCanBack())
- return false;
-
- for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
- (node->GetData())->OnHistoryBack();
-
- return wxHtmlWindow::HistoryBack();
-}
-
-/****************************************************************************
-REMARKS:
-This function is used to disable the navigation bars. If you want to
-toggle to the navbars off you must call this function.
-****************************************************************************/
-void wxHtmlAppletWindow::DisableNavBar()
-{
- m_NavBarEnabled = false;
-}
-
-/****************************************************************************
-REMARKS:
-This function is used to enable the nav bars. If you toggle the nav bars on
-you must call this function.
-****************************************************************************/
-void wxHtmlAppletWindow::EnableNavBar()
-{
- m_NavBarEnabled = true;
-}
-
-/****************************************************************************
-REMARKS:
-This function is used to set the nav bar to a new nav bar if you deleted the
-one that you were useing. Usally this happens when you toggle a nav bar
-on or off.
-****************************************************************************/
-void wxHtmlAppletWindow::SetNavBar(wxToolBarBase *navBar)
-{
- m_NavBar = navBar;
-}
-
-/****************************************************************************
-PARAMETERS:
-msg - wxEvent message to be sent to all wxApplets
-
-REMARKS:
-This function is called by the wxApplet's when they need to send a message
-to all other applets on the current page. This is the primary form of
-communication between applets on the page if they need to inform each
-other of internal information.
-
-****************************************************************************/
-void wxHtmlAppletWindow::SendAppletMessage(
- wxAppletEvent& msg)
-{
- // TODO: make a named target for messages, only send a message to the correct
- // named applet
-
- // Process all applets in turn and send them the message
- for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext()) {
- (node->GetData())->OnMessage(msg);
- }
-}
-
-/****************************************************************************
-PARAMETERS:
-name - Uniq wxString used as hash key
-cookie - wxObject data returned when name is found.
-
-RETURNS:
-True if new cookie was added, false if cookie with same name already exists.
-
-REMARKS:
-This function is called by the wxApplet's when they need register a cookie
-of data in the applet window's cookie table. Cookies are arbitrary data
-objects that are references by unique name's by the wxApplet. These
-values can be used to store and retrieve data that needs to remain
-persisent across invocations of the wxApplet. Ie: The first time an
-applet is created it would use the cookie to store data to maintain
-it's present state so that if you navigated back to the same page
-is would be able to re-load the prior state as though the applet
-was never actually destructed.
-
-Note: If a cookie with the same name already exists, this function returns
- false. Hence if you wish to replace a cookie you should first call
- UnRegisterCookie to ensure the cookie is deleted and then call this
- function.
-****************************************************************************/
-bool wxHtmlAppletWindow::RegisterCookie(
- const wxString& name,
- wxObject *cookie)
-{
- // Fail if the named cookie already exists!
- if (m_Cookies.Get(name))
- return false;
- m_Cookies.Put(name,cookie);
- return true;
-}
-
-/****************************************************************************
-PARAMETERS:
-name - wxString uniq haskey used to remove item from hash
-
-RETURNS:
-True if found and deleted, false if not found in table.
-
-REMARKS:
-This function is called by the wxApplet's when they need de-register a
-cookie of data in the applet window's cookie table. The data in the
-cookie itself is also deleted before it is removed from the table.
-****************************************************************************/
-bool wxHtmlAppletWindow::UnRegisterCookie(
- const wxString& name)
-{
- wxObject *data = m_Cookies.Delete(name);
- if (data) {
- delete data;
- return true;
- }
- return false;
-}
-
-/****************************************************************************
-PARAMETERS:
-msg - wxEvent message to be sent to all wxApplets
-
-RETURNS:
-Pointer to the cookie data if found, NULL if not found.
-
-REMARKS:
-This function is called by the wxApplet's when they need to find a cookie
-of data given it's public name. If the cookie is not found, NULL is
-returned.
-****************************************************************************/
-wxObject *wxHtmlAppletWindow::FindCookie(
- const wxString& name)
-{
- return m_Cookies.Get(name);
-}
-
-/****************************************************************************
-PARAMETERS:
-event - Event to handle
-
-REMARKS:
-This function handles delayed LoadPage events posted from applets that
-need to change the page for the current window to a new window.
-****************************************************************************/
-void wxHtmlAppletWindow::OnLoadPage(
- wxLoadPageEvent &event)
-{
- // Test the mutex lock.
- if (!(IsLocked())) {
- Lock();
- if (event.GetHtmlWindow() == this) {
- if (LoadPage(event.GetHRef())) {
- // wxPageLoadedEvent evt;
- // NOTE: This is reserved for later use as we might need to send
- // page loaded events to applets.
- }
- }
- UnLock();
- }
-}
-
-/****************************************************************************
-PARAMETERS:
-event - Event to handle
-
-REMARKS:
-This function handles delayed LoadPage events posted from applets that
-need to change the page for the current window to a new window.
-****************************************************************************/
-void wxHtmlAppletWindow::OnPageLoaded(
- wxPageLoadedEvent &)
-{
- Enable(true);
-}
-
-/****************************************************************************
-PARAMETERS:
-none
-
-REMARKS:
-This function tries to lock the mutex. If it can't, returns
-immediately with false.
-***************************************************************************/
-bool wxHtmlAppletWindow::TryLock()
-{
- if (!m_mutexLock) {
- m_mutexLock = true;
- return true;
- }
- return false;
-}
-
-/****************************************************************************
-PARAMETERS:
-name - name of the last applet that changed the data in this object
-group - name of the group the allplet belongs to.
-href - webpage to go to.
-
-REMARKS:
-VirtualData is used to store information on the virtual links.
-****************************************************************************/
-VirtualData::VirtualData(
- wxString& name,
- wxString& group,
- wxString& href,
- wxString& plugin )
-{
- m_name = name;
- m_group = group;
- m_href = href;
- m_plugIn = plugin;
-}
-
-/****************************************************************************
-PARAMETERS:
-REMARKS:
-VirtualData is used to store information on the virtual links.
-****************************************************************************/
-VirtualData::VirtualData()
-{
- m_name.Empty();
- m_group.Empty();
- m_href.Empty();
-}
-
-#include "wx/html/m_templ.h"
-
-/****************************************************************************
-REMARKS:
-Implementation for the HTML tag handler. This handler takes care
-of automatically constructing the wxApplet objects of the appropriate
-class based on the tag information.
-****************************************************************************/
-TAG_HANDLER_BEGIN(wxApplet, "WXAPPLET")
-
-TAG_HANDLER_PROC(tag)
-{
- wxWindow *wnd;
- wxHtmlAppletWindow *appletWindow;
- wxApplet *applet;
- wxString classId;
- wxString name;
- int width, height;
-
- // Get access to our wxHtmlAppletWindow class
- wnd = m_WParser->GetWindow();
- if ((appletWindow = wxDynamicCast(wnd,wxHtmlAppletWindow)) == NULL)
- return false;
-
- // Parse the applet dimensions from the tag
- wxSize size = wxDefaultSize;
- int al;
- if (tag.HasParam("WIDTH")) {
- tag.GetParamAsInt("WIDTH", &width);
- size.SetWidth(width);
- }
- if (tag.HasParam("HEIGHT")) {
- tag.GetParamAsInt("HEIGHT", &height);
- size.SetHeight(height);
- }
-
- // Parse the applet alignment from the tag
- al = wxHTML_ALIGN_BOTTOM;
- if (tag.HasParam(wxT("ALIGN"))) {
- wxString alstr = tag.GetParam(wxT("ALIGN"));
- alstr.MakeUpper(); // for the case alignment was in ".."
- if (alstr == wxT("TEXTTOP") || alstr == wxT("TOP"))
- al = wxHTML_ALIGN_TOP;
- else if ((alstr == wxT("CENTER")) || (alstr == wxT("ABSCENTER")))
- al = wxHTML_ALIGN_CENTER;
- }
-
- // Create the applet based on it's class
- if (tag.HasParam("CLASSID")) {
- classId = tag.GetParam("CLASSID");
- if (classId.IsNull() || classId.Len() == 0) {
- wxMessageBox("wxApplet tag error: CLASSID is NULL or empty.","Error",wxICON_ERROR);
- return false;
- }
- if (tag.HasParam("NAME"))
- name = tag.GetParam("NAME");
-
- // If the name is NULL or len is zero then we assume that the html guy
- // didn't include the name param which is optional.
- if (name.IsNull() || name.Len() == 0)
- name = classId;
-
- // We got all the params and can now create the applet
- if ((applet = appletWindow->CreateApplet(classId, name, tag , size)) != NULL) {
- applet->Show(true);
- m_WParser->OpenContainer()->InsertCell(new wxHtmlAppletCell(applet,al));
- }
- else
- wxMessageBox("wxApplet error: Could not create:" + classId + "," + name);
- }
- else {
- wxMessageBox("wxApplet tag error: Can not find CLASSID param.","Error",wxICON_ERROR);
- return false;
- }
-
- // Add more param parsing here. If or when spec changes.
- // For now we'll ignore any other params those HTML guys
- // might put in our tag.
- return true;
-}
-
-TAG_HANDLER_END(wxApplet)
-
-TAGS_MODULE_BEGIN(wxApplet)
- TAGS_MODULE_ADD(wxApplet)
-TAGS_MODULE_END(wxApplet)
-
-/****************************************************************************
-REMARKS:
-Constructor for the HTML cell class to store our wxApplet windows in
-the HTML page to be rendered by wxHTML.
-****************************************************************************/
-wxHtmlAppletCell::wxHtmlAppletCell(
- wxWindow *wnd,
- int align)
- : wxHtmlCell()
-{
- int sx, sy;
- m_Wnd = wnd;
- m_Wnd->GetSize(&sx, &sy);
- m_Width = sx, m_Height = sy;
- switch (align) {
- case wxHTML_ALIGN_TOP :
- m_Descent = m_Height;
- break;
- case wxHTML_ALIGN_CENTER :
- m_Descent = m_Height / 2;
- break;
- case wxHTML_ALIGN_BOTTOM :
- default :
- m_Descent = 0;
- break;
- }
- SetCanLiveOnPagebreak(FALSE);
-}
-
-/****************************************************************************
-REMARKS:
-Implementation for the HTML cell class to store our wxApplet windows in
-the HTML page to be rendered by wxHTML.
-****************************************************************************/
-wxHtmlAppletCell::~wxHtmlAppletCell()
-{
- delete m_Wnd;
-}
-
-/****************************************************************************
-REMARKS:
-Code to draw the html applet cell
-****************************************************************************/
-void wxHtmlAppletCell::Draw(
- wxDC& WXUNUSED(dc),
- int WXUNUSED(x),
- int WXUNUSED(y),
- int WXUNUSED(view_y1),
- int WXUNUSED(view_y2))
-{
- int absx = 0, absy = 0, stx, sty;
- wxHtmlCell *c = this;
-
- while (c) {
- absx += c->GetPosX();
- absy += c->GetPosY();
- c = c->GetParent();
- }
- ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);
- m_Wnd->Move(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty);
-}
-
-/****************************************************************************
-REMARKS:
-Code to draw the html applet cell invisibly
-****************************************************************************/
-void wxHtmlAppletCell::DrawInvisible(
- wxDC& WXUNUSED(dc),
- int WXUNUSED(x),
- int WXUNUSED(y))
-{
- int absx = 0, absy = 0, stx, sty;
- wxHtmlCell *c = this;
-
- while (c) {
- absx += c->GetPosX();
- absy += c->GetPosY();
- c = c->GetParent();
- }
- ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);
- m_Wnd->Move(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty);
-}
-
-/****************************************************************************
-REMARKS:
-Code to layout the html applet cell.
-****************************************************************************/
-void wxHtmlAppletCell::Layout(
- int w)
-{
- int sx, sy;
- m_Wnd->GetSize(&sx, &sy);
- m_Width = sx, m_Height = sy;
- wxHtmlCell::Layout(w);
-}
-
-// This is our little forcelink hack.
-FORCE_LINK(loadpage)
-
diff --git a/contrib/src/applet/echovar.cpp b/contrib/src/applet/echovar.cpp
deleted file mode 100644
index 3da0f23d45..0000000000
--- a/contrib/src/applet/echovar.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/****************************************************************************
-*
-* wxWindows HTML Applet Package
-*
-* Copyright (C) 1991-2001 SciTech Software, Inc.
-* All rights reserved.
-*
-* ========================================================================
-*
-* The contents of this file are subject to the wxWindows License
-* Version 3.0 (the "License"); you may not use this file except in
-* compliance with the License. You may obtain a copy of the License at
-* http://www.wxwindows.org/licence3.txt
-*
-* Software distributed under the License is distributed on an
-* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-*
-* ========================================================================
-*
-* Language: ANSI C++
-* Environment: Any
-*
-* Description: Implementation of wxEchoVariable Class, Dynamically constructed
-* objects representing variables in SSI #echo directive
-*
-****************************************************************************/
-
-// For compilers that support precompilation
-
-#include "wx/applet/echovar.h"
-#include "wx/msgdlg.h"
-#include "wx/html/forcelnk.h"
-
-// Include private headers
-
-/*---------------------------- Global variables ---------------------------*/
-
-static wxEchoVariable *wxEchoVariable::sm_first = NULL;
-static wxHashTable *wxEchoVariable::sm_varTable = NULL;
-
-/*----------------------------- Implementation ----------------------------*/
-
-/****************************************************************************
-PARAMETERS:
-varName - The String name of the class
-getValueFn - Pointer to the function that returns the echo variable value
-
-REMARKS:
-Constructor for the wxEchoVariable class that self registers itself with
-the list of all echo variables when the static class instance is created
-at program init time (remember all the constructors get called before
-the main program function!).
-****************************************************************************/
-wxEchoVariable::wxEchoVariable(
- const char *varName,
- wxEchoVariableGetValueFn getValueFn)
-{
- m_varName = varName;
- m_getValueFn = getValueFn;
- m_next = sm_first;
- sm_first = this;
-}
-
-/****************************************************************************
-REMARKS:
-Initializes parent pointers and hash table for fast searching for echo
-variables.
-****************************************************************************/
-void wxEchoVariable::Initialize()
-{
- wxEchoVariable::sm_varTable = new wxHashTable(wxKEY_STRING);
-
- // Index all class infos by their class name
- wxEchoVariable *info = sm_first;
- while (info) {
- if (info->m_varName)
- sm_varTable->Put(info->m_varName, info);
- info = info->m_next;
- }
-}
-
-/****************************************************************************
-REMARKS:
-Clean up echo variable hash tables on application exit.
-****************************************************************************/
-void wxEchoVariable::CleanUp()
-{
- delete wxEchoVariable::sm_varTable;
- wxEchoVariable::sm_varTable = NULL;
-}
-
-/****************************************************************************
-PARAMETERS:
-varName - The String name of the class
-parms - Parameter string for the echo variable
-
-REMARKS:
-Constructor for the wxEchoVariable class that self registers itself with
-the list of all echo variables when the static class instance is created
-at program init time (remember all the constructors get called before
-the main program function!).
-****************************************************************************/
-wxString wxEchoVariable::GetValue(
- const wxChar *varName,
- const wxChar *parms)
-{
- wxEchoVariable *info = wxEchoVariable::FindVariable(varName);
- if (info)
- return info->m_getValueFn(parms);
-#ifdef CHECKED
- wxMessageBox(wxString("wxHTML #echo error: Class is not a valid echo variable (") + varName + wxString(")."),"Error",wxICON_ERROR);
-#endif
- return wxString("");
-}
-
-/****************************************************************************
-PARAMETERS:
-varName - The String name of the class
-
-RETURNS:
-True if the echo variable exists, false if not.
-****************************************************************************/
-bool wxEchoVariable::Exists(
- const wxChar *varName)
-{
- return wxEchoVariable::FindVariable(varName) != NULL;
-}
-
-/*------------------------ Macro Documentation ---------------------------*/
-
-// Here we declare some fake functions to get doc-jet to properly document the macros
-
-#undef ECHO_PARM
-/****************************************************************************
-RETURNS:
-The value of the parameter string from the HTML parm= field
-
-REMARKS:
-This is a macro to retrieve the parameter string passed in the parm= field.
-Use this macro to get the correct variable within a BEGIN_ECHO_VARIABLE and
-END_ECHO_VARIABLE block.
-
-SEE ALSO:
-wxEchoVariable, wxEchoPrep, BEGIN_ECHO_VARIABLE, END_ECHO_VARIABLE
-****************************************************************************/
-wxString ECHO_PARM();
-
-
-#undef BEGIN_ECHO_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name - The name of the variable to create
-
-REMARKS:
-This macro is used to create variables for use by the #echo directive
-the HTML preprocessor.
-To create a new variable include the code necessary to get the value of the
-variable between a block of BEGIN_ECHO_VARIABLE and END_ECHO_VARIABLE macros.
-Use the ECHO_PARM macro to grab the optional parameter string passed from the
-'parm=' field in the html file.
-
-EXAMPLE:
-BEGIN_ECHO_VARIABLE(UserName)
- // Get username from nucleus
- wxString tmp = GA_GetUserName();
-END_ECHO_VARIABLE(UserName, tmp)
-
-SEE ALSO:
-wxEchoVariable, wxEchoPrep, END_ECHO_VARIABLE, ECHO_PARM, STRING_ECHO_VARIABLE
-****************************************************************************/
-void BEGIN_ECHO_VARIABLE(
- const char *name);
-
-#undef END_ECHO_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name - The name of the variable to end
-returnval - The value which should be sent back as the value of the variable
-
-REMARKS:
-This macro is used to create variables for use by the #echo directive
-the HTML preprocessor.
-To create a new variable include the code necessary to get the value of the
-variable between a block of BEGIN_ECHO_VARIABLE and END_ECHO_VARIABLE macros.
-
-EXAMPLE:
-BEGIN_ECHO_VARIABLE(UserName)
- // Get username from nucleus
- wxString tmp = GA_GetUserName();
-END_ECHO_VARIABLE(UserName, tmp)
-
-SEE ALSO:
-wxEchoVariable, wxEchoPrep, BEGIN_ECHO_VARIABLE, ECHO_PARM, STRING_ECHO_VARIABLE
-****************************************************************************/
-void END_ECHO_VARIABLE(
- const char *name,
- wxString returnval);
-
-#undef STRING_ECHO_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name - The name of the variable
-returnval - String to return as the value of the variable
-
-REMARKS:
-This macro is used to create constant string variables for use by the #echo
-directive in the HTML preprocessor.
-This MACRO creates a variable that simply returns the given string and is
-not modifiable.
-
-SEE ALSO:
-wxEchoVariable, wxEchoPrep, BEGIN_ECHO_VARIABLE, END_ECHO_VARIABLE
-****************************************************************************/
-void STRING_ECHO_VARIABLE(
- const char *name,
- wxString string);
-
-// hack to make this file link
-FORCE_LINK_ME(echovar)
-
diff --git a/contrib/src/applet/ifelsevar.cpp b/contrib/src/applet/ifelsevar.cpp
deleted file mode 100644
index e7280b23fe..0000000000
--- a/contrib/src/applet/ifelsevar.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-/****************************************************************************
-*
-* wxWindows HTML Applet Package
-*
-* Copyright (C) 1991-2001 SciTech Software, Inc.
-* All rights reserved.
-*
-* ========================================================================
-*
-* The contents of this file are subject to the wxWindows License
-* Version 3.0 (the "License"); you may not use this file except in
-* compliance with the License. You may obtain a copy of the License at
-* http://www.wxwindows.org/licence3.txt
-*
-* Software distributed under the License is distributed on an
-* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-*
-* ========================================================================
-*
-* Language: ANSI C++
-* Environment: Any
-*
-* Description: Implementation of wxIfElseVariable Class, Dynamically constructed
-* objects representing variables in SSI #if, #else, and #endif directives
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/ifelsevar.h"
-
-// wxWindows forcelink macro
-#include "wx/html/forcelnk.h"
-#include "wx/msgdlg.h"
-
-/*---------------------------- Global variables ---------------------------*/
-
-static wxIfElseVariable *wxIfElseVariable::sm_first = NULL;
-static wxHashTable *wxIfElseVariable::sm_varTable = NULL;
-
-/*----------------------------- Implementation ----------------------------*/
-
-/****************************************************************************
-PARAMETERS:
-varName - The String name of the class
-getValueFn - Pointer to the function that returns the echo variable value
-
-REMARKS:
-Constructor for the wxIfElseVariable class that self registers itself with
-the list of all echo variables when the static class instance is created
-at program init time (remember all the constructors get called before
-the main program function!).
-****************************************************************************/
-wxIfElseVariable::wxIfElseVariable(
- const char *varName,
- wxIfElseVariableGetValueFn getValueFn)
-{
- m_varName = varName;
- m_getValueFn = getValueFn;
- m_next = sm_first;
- sm_first = this;
-}
-
-/****************************************************************************
-REMARKS:
-Initializes parent pointers and hash table for fast searching for echo
-variables.
-****************************************************************************/
-void wxIfElseVariable::Initialize()
-{
- wxIfElseVariable::sm_varTable = new wxHashTable(wxKEY_STRING);
-
- // Index all class infos by their class name
- wxIfElseVariable *info = sm_first;
- while (info) {
- if (info->m_varName)
- sm_varTable->Put(info->m_varName, info);
- info = info->m_next;
- }
-}
-
-/****************************************************************************
-REMARKS:
-Clean up echo variable hash tables on application exit.
-****************************************************************************/
-void wxIfElseVariable::CleanUp()
-{
- delete wxIfElseVariable::sm_varTable;
- wxIfElseVariable::sm_varTable = NULL;
-}
-
-/****************************************************************************
-PARAMETERS:
-varName - The String name of the class
-
-REMARKS:
-Constructor for the wxIfElseVariable class that self registers itself with
-the list of all ifelse variables when the static class instance is created
-at program init time (remember all the constructors get called before
-the main program function!).
-****************************************************************************/
-bool wxIfElseVariable::GetValue(
- const wxChar *varName)
-{
- wxIfElseVariable *info = wxIfElseVariable::FindVariable(varName);
- if (info) {
- // Return the forced value if the variable has been forced.
- if (info->forced)
- return info->forceVal;
- return info->m_getValueFn();
- }
-#ifdef CHECKED
- wxMessageBox(wxString("wxHTML #if error: Class is not a valid if else variable (") + varName + wxString(")."),"Error",wxICON_ERROR);
-#endif
- return wxString("");
-}
-
-/****************************************************************************
-PARAMETERS:
-varName - The String name of the class
-
-RETURNS:
-True if the if/else variable exists, false if not.
-****************************************************************************/
-bool wxIfElseVariable::Exists(
- const wxChar *varName)
-{
- return wxIfElseVariable::FindVariable(varName) != NULL;
-}
-
-/****************************************************************************
-PARAMETERS:
-varName - The String name of the class
-val - Value to force the if/else variable with
-
-REMARKS:
-Function to forcibly override the value of an if/else variable for
-testing purposes. Once the variable has been forced, it will always return
-the forced value until the application exists.
-
-NOTE: This is only available when compiled in CHECKED mode.
-****************************************************************************/
-void wxIfElseVariable::Force(
- const wxChar *varName,
- bool val)
-{
- wxIfElseVariable *info = wxIfElseVariable::FindVariable(varName);
- if (info) {
- info->forced = true;
- info->forceVal = val;
- }
- else {
-#ifdef CHECKED
- wxMessageBox(wxString("wxHTML #if error: Class is not a valid if else variable (") + varName + wxString(")."),"Error",wxICON_ERROR);
-#endif
- }
-}
-
-/*------------------------ Macro Documentation ---------------------------*/
-
-// Here we declare some fake functions to get doc-jet to properly document the macros
-
-#undef BEGIN_IFELSE_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name - The name of the variable to create
-
-REMARKS:
-This macro is used to create variables for use by the #if, #else and #endif
-blocks in the HTML preprocessor.
-To create a new variable include the code necessary to get the value of the
-variable between a block of BEGIN_IFELSE_VARIABLE and END_IFELSE_VARIABLE macros.
-
-EXAMPLE:
-BEGIN_IFELSE_VARIABLE(UserName)
- // Get username from nucleus
- bool tmp = GA_HasRegistered();
-END_IFELSE_VARIABLE(UserName, tmp)
-
-SEE ALSO:
-wxIfElseVariable, wxIfElsePrep, END_IFELSE_VARIABLE, IFELSE_VARIABLE
-****************************************************************************/
-void BEGIN_IFELSE_VARIABLE(
- const char *name);
-
-#undef END_IFELSE_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name - The name of the variable to end
-returnval - The boolean value which is the value of the variable
-
-REMARKS:
-This macro is used to create variables for use by the #if, #else and #endif
-blocks in the HTML preprocessor.
-To create a new variable include the code necessary to get the value of the
-variable between a block of BEGIN_IFELSE_VARIABLE and END_IFELSE_VARIABLE macros.
-
-EXAMPLE:
-BEGIN_IFELSE_VARIABLE(UserName)
- // Get username from nucleus
- bool tmp = GA_HasRegistered();
-END_IFELSE_VARIABLE(UserName, tmp)
-
-SEE ALSO:
-wxIfElseVariable, wxIfElsePrep, BEGIN_IFELSE_VARIABLE, IFELSE_VARIABLE
-****************************************************************************/
-void END_IFELSE_VARIABLE(
- const char *name,
- bool returnval);
-
-#undef IFELSE_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name - The name of the variable
-state - value of the variable
-
-REMARKS:
-This macro is used to create constant boolean variables for use by the
-#if, #else and #endif blocks in the HTML preprocessor.
-This MACRO creates a variable that simply returns the given state and is
-not modifiable.
-
-SEE ALSO:
-wxIfElseVariable, wxIfElsePrep, BEGIN_IFELSE_VARIABLE, END_IFELSE_VARIABLE
-****************************************************************************/
-void IFELSE_VARIABLE(
- const char *name,
- bool state);
-
-FORCE_LINK_ME(ifelsevar)
-
diff --git a/contrib/src/applet/loadpage.cpp b/contrib/src/applet/loadpage.cpp
deleted file mode 100644
index c743228e8c..0000000000
--- a/contrib/src/applet/loadpage.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-*
-* wxWindows HTML Applet Package
-*
-* Copyright (C) 1991-2001 SciTech Software, Inc.
-* All rights reserved.
-*
-* ========================================================================
-*
-* The contents of this file are subject to the wxWindows License
-* Version 3.0 (the "License"); you may not use this file except in
-* compliance with the License. You may obtain a copy of the License at
-* http://www.wxwindows.org/licence3.txt
-*
-* Software distributed under the License is distributed on an
-* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-*
-* ========================================================================
-*
-* Language: ANSI C++
-* Environment: Any
-*
-* Description: Loadpage event class implementation
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/loadpage.h"
-
-// wxWindows forcelink macro
-#include "wx/html/forcelnk.h"
-
-/*------------------------- Implementation --------------------------------*/
-
-// Implement the class functions for wxLoadPageEvent
-IMPLEMENT_DYNAMIC_CLASS(wxLoadPageEvent, wxEvent)
-
-// Implement the class functions for wxPageLoadedEvent
-IMPLEMENT_DYNAMIC_CLASS(wxPageLoadedEvent, wxEvent)
-
-// Define our custom event ID for load page
-DEFINE_EVENT_TYPE(wxEVT_LOAD_PAGE)
-
-// Define our custom event ID for page loaded
-DEFINE_EVENT_TYPE(wxEVT_PAGE_LOADED)
-
-/****************************************************************************
-REMARKS:
-Constructor for the wxLoadPageEvent class
-****************************************************************************/
-wxLoadPageEvent::wxLoadPageEvent(
- const wxString &hRef,
- wxHtmlAppletWindow *htmlWindow)
- : m_hRef(hRef), m_htmlWindow(htmlWindow)
-{
- m_eventType = wxEVT_LOAD_PAGE;
-}
-
-/****************************************************************************
-REMARKS:
-Constructor for the wxPageLoadedEvent class
-****************************************************************************/
-wxPageLoadedEvent::wxPageLoadedEvent()
-{
- m_eventType = wxEVT_LOAD_PAGE;
-}
-
-// This is out little force link hack
-FORCE_LINK_ME(loadpage)
-
diff --git a/contrib/src/applet/makefile b/contrib/src/applet/makefile
deleted file mode 100644
index f67ebbd821..0000000000
--- a/contrib/src/applet/makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#############################################################################
-#
-# Copyright (C) 1999 SciTech Software
-# All rights reserved.
-#
-# Description: Generic makefile for the SciTech wxApplet library
-# License: wxWindows license
-#
-#############################################################################
-
-# We are building with the Win32 version
-
-USE_RTTI := 1
-USE_CPPEXCEPT := 1
-PRECOMP_HDR := wx/wxprec.h
-CFLAGS += -D__WIN95__ -D__WXMSW__ -D__WINDOWS__
-
-# Link with wxWindows static link libraries or with the DLL. DLL is default.
-
-.IF $(STATIC_LINK)
-.ELSE
-CFLAGS += -DWXUSINGDLL
-.ENDIF
-
-# Define the library name and objects
-
-LIBFILE = wxapplet$L
-LIBCLEAN = *.il? *.dll *.lib
-OBJECTS := applet$O appletwindow$O
-
-DEPEND_OBJ = $(OBJECTS)
-.INCLUDE: "$(SCITECH)\makedefs\common.mk"
-
diff --git a/contrib/src/applet/plugin.cpp b/contrib/src/applet/plugin.cpp
deleted file mode 100644
index 2e67780b98..0000000000
--- a/contrib/src/applet/plugin.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-*
-* wxWindows HTML Applet Package
-*
-* Copyright (C) 1991-2001 SciTech Software, Inc.
-* All rights reserved.
-*
-* ========================================================================
-*
-* The contents of this file are subject to the wxWindows License
-* Version 3.0 (the "License"); you may not use this file except in
-* compliance with the License. You may obtain a copy of the License at
-* http://www.wxwindows.org/licence3.txt
-*
-* Software distributed under the License is distributed on an
-* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-*
-* ========================================================================
-*
-* Language: ANSI C++
-* Environment: Any
-*
-* Description: Main wxPlugIn class implementation
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/plugin.h"
-#include "wx/applet/window.h"
-
-/*------------------------- Implementation --------------------------------*/
-
-// Implement the abstract class functions
-IMPLEMENT_ABSTRACT_CLASS(wxPlugIn, wxEvtHandler);
-
-/****************************************************************************
-REMARKS:
-Psuedo virtual constructor for the wxPlugIn class.
-****************************************************************************/
-bool wxPlugIn::Create(
- wxHtmlAppletWindow *parent)
-{
- m_parent = parent;
- return true;
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the wxPlugIn class.
-****************************************************************************/
-wxPlugIn::~wxPlugIn()
-{
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the wxPlugIn class.
-****************************************************************************/
-void wxPlugIn::Run(
- const wxString& WXUNUSED(cmdLine))
-{
-}
-
diff --git a/contrib/src/applet/prepecho.cpp b/contrib/src/applet/prepecho.cpp
deleted file mode 100644
index 8181077116..0000000000
--- a/contrib/src/applet/prepecho.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-*
-* wxWindows HTML Applet Package
-*
-* Copyright (C) 1991-2001 SciTech Software, Inc.
-* All rights reserved.
-*
-* ========================================================================
-*
-* The contents of this file are subject to the wxWindows License
-* Version 3.0 (the "License"); you may not use this file except in
-* compliance with the License. You may obtain a copy of the License at
-* http://www.wxwindows.org/licence3.txt
-*
-* Software distributed under the License is distributed on an
-* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-*
-* ========================================================================
-*
-* Language: ANSI C++
-* Environment: Any
-*
-* Description: This file is the implementation of the Preprocessor object
-* for parsing the ");
- if (end == -1) {
-#ifdef CHECKED
- wxMessageBox("wxHTML #echo error: Premature end of file while parsing #echo.","Error",wxICON_ERROR);
-#endif
- break;
- }
-
- end += 3;
- tag = output.Mid(i, end);
- output.Remove(i, end);
-
- n = (tag.Lower()).Find(" parm=");
- c = tag.Find("-->");
- if (n == -1) {
- n = c;
- // find the classname
- c = (tag.Mid(10, n-10)).Find(" ");
- if (c == -1) n -= 10;
- else n = c;
- cname = tag.Mid(10, n);
-
- // grab the value from the class, put it in tag since the data is no longer needed
- tag = wxEchoVariable::GetValue(cname, NULL);
- }
- else {
- // Find the parms
- parms = tag.Mid(n+6, c-n-6);
- // Clip off any quotation marks if they exist. (don't die if there arn't any)
- c = parms.Find("\"");
- if (c != -1) parms = parms.Mid(c+1);
- c = parms.Find("\"");
- if (c != -1) parms = parms.Mid(0, c);
- // find the classname
- c = (tag.Mid(10, n-10)).Find(" ");
- if (c == -1) n -= 10;
- else n = c;
- cname = tag.Mid(10, n);
-
- // grab the value from the class, put it in tag since the data is no longer needed
- tag = wxEchoVariable::GetValue(cname, parms.c_str());
- }
- // remove ampersands and <> chars
- tag.Replace("&", "&");
- tag.Replace("<", "<");
- tag.Replace(">", ">");
-
- output = (output.Mid(0,i) + tag + output.Mid(i));
- }
- return output;
-}
-
-FORCE_LINK(echovar)
-
diff --git a/contrib/src/applet/prepifelse.cpp b/contrib/src/applet/prepifelse.cpp
deleted file mode 100644
index 0724dae644..0000000000
--- a/contrib/src/applet/prepifelse.cpp
+++ /dev/null
@@ -1,441 +0,0 @@
-/****************************************************************************
-*
-* wxWindows HTML Applet Package
-*
-* Copyright (C) 1991-2001 SciTech Software, Inc.
-* All rights reserved.
-*
-* ========================================================================
-*
-* The contents of this file are subject to the wxWindows License
-* Version 3.0 (the "License"); you may not use this file except in
-* compliance with the License. You may obtain a copy of the License at
-* http://www.wxwindows.org/licence3.txt
-*
-* Software distributed under the License is distributed on an
-* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-*
-* ========================================================================
-*
-* Language: ANSI C++
-* Environment: Any
-*
-* Description: This file is the implementation of the Preprocessor object
-* for parsing the ";
- char ftelse[] = "";
- char ftnot[] = "", b + strlen(ftelif));
-
- if (e == wxString::npos) {
-#ifdef CHECKED
- wxMessageBox("wxHTML #elif error: Premature end of file while parsing #elif.","Error",wxICON_ERROR);
-#endif
- break;
- }
-
- // Convert to lower case so find is easy, grab everything after #elif tag
- wxString remains = (output.Mid(e+strlen("-->"))).Lower();
-
- // find matching else or endif
- int nextif, nextendif;
- int ifcount = 1, min = 0;
- do {
- nextif = remains.find(ft, min);
- nextendif = remains.find(ftend, min);
- if (nextif < nextendif && nextif != wxString::npos) {
- ifcount++;
- min = nextif+1;
- }
- else {
- ifcount--;
- min = nextendif+1;
- }
-
- if (nextendif == wxString::npos) {
-#ifdef CHECKED
- wxMessageBox("wxHTML #elif error: Premature end of file before finding #endif.","Error",wxICON_ERROR);
-#endif
- break;
- }
- // once ifcount reaches 0 again we have found our matchin #endif
- } while (ifcount > 0);
-
- // If it couldn't be found die gracefully
- if (nextendif == wxString::npos) {
- // We already displayed a message, just break all the way out
- break;
- }
-
- int elifsize = e - (b + strlen(ftelif)) + strlen("-->");
- // Create the #if/else block, removing the #elif code
- output = output.Mid(0, b) +
- wxString(wxString(ftelse)+wxString(ft)) +
- output.Mid(b+strlen(ftelif), elifsize+nextendif) +
- wxString(ftend) +
- output.Mid(b+strlen(ftelif)+elifsize+nextendif);
- }
-
- // Parse out the if else blocks themselves
- while ((b = ReverseFind(output.Lower(), ft)) != -1) {
- // Loop until every #if directive is found
- // We search from the end of the string so that #if statements will properly recurse
- // and we avoid the hassle of matching statements with the correct
- bool notval = false;
- int off = 0;
- int end;
- wxString usecode, code;
- wxString cname;
- wxString tag;
- bool value;
-
- code = wxString("");
-
- // grab the tag and get the name of the variable
- end = (output.Mid(b)).Find("-->");
- if (end == -1) {
-#ifdef CHECKED
- wxMessageBox("wxHTML #if error: Premature end of file while parsing #if.","Error",wxICON_ERROR);
-#endif
- break;
- }
-
- end += 3;
- // remove the sections from the tag before passing it on to be parsed
- tag = output.Mid(b+strlen(ft), end-strlen(ft)-3);
- output.Remove(b, end);
-
- value = ParseIfStatementValue(tag);
-
- // Find the end of the tag () and copy it all into the variable code
- end = ((output.Mid(b)).Lower()).Find(ftend);
- if (end == -1) {
-#ifdef CHECKED
- wxMessageBox("wxHTML #if error: Premature end of file while searching for matching #endif.","Error",wxICON_ERROR);
-#endif
- break;
- }
-
- code = output.Mid(b, end);
- output.Remove(b, end+strlen(ftend)); // remove the entire #if block from original document
-
- // Find out if there is an else statement
- end = (code.Lower()).Find(ftelse);
- if (end != -1) {
- if (!value) {
- // Use the else statement
- usecode = code.Mid(end+strlen(ftelse));
- }
- else {
- // Use statement before #else
- usecode = code.Mid(0, end);
- }
- }
- else if (value) {
- // There is no #else statement
- usecode = code;
- }
-
- if (usecode != wxString(""))
- output = (output.Mid(0,b) + usecode + output.Mid(b));
- }
-
- return output;
-}
-
-FORCE_LINK(ifelsevar)
-
diff --git a/contrib/src/applet/prepinclude.cpp b/contrib/src/applet/prepinclude.cpp
deleted file mode 100644
index bf03a84ef8..0000000000
--- a/contrib/src/applet/prepinclude.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/****************************************************************************
-*
-* wxWindows HTML Applet Package
-*
-* Copyright (C) 1991-2001 SciTech Software, Inc.
-* All rights reserved.
-*
-* ========================================================================
-*
-* The contents of this file are subject to the wxWindows License
-* Version 3.0 (the "License"); you may not use this file except in
-* compliance with the License. You may obtain a copy of the License at
-* http://www.wxwindows.org/licence3.txt
-*
-* Software distributed under the License is distributed on an
-* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-* implied. See the License for the specific language governing
-* rights and limitations under the License.
-*
-* ========================================================================
-*
-* Language: ANSI C++
-* Environment: Any
-*
-* Description: This file is the implementation of the Preprocessor object
-* for parsing the ");
-
- if (n == -1) {
-#ifdef CHECKED
- wxMessageBox("wxHTML #include error: Could not read filename. Premature end of file.","Error",wxICON_ERROR);
-#endif
- break;
- }
-
- fname = output.Mid(i+21, n);
-
- // Clip off any quotation marks if they exist. (don't die if there arn't any)
- c = fname.Find("\"");
- if (c != -1) fname = fname.Mid(c+1);
- c = fname.Find("\"");
- if (c != -1) fname = fname.Mid(0, c);
-
- // remove the #include tag
- output.Remove(i, n+21+3);
-
- wxFSFile * file;
- file = m_FS->OpenFile(ParseFilename(fname));
-
- if (!file) {
-#ifdef CHECKED
- wxMessageBox(wxString("wxHTML #include error: File not Found ") + fname + wxString("."),"Error",wxICON_ERROR);
-#endif
- delete file;
- continue;
- }
-
- wxString tmp;
-
- do {
- char tmp2[257];
- (file->GetStream())->Read(tmp2, 256);
- c = (file->GetStream())->LastRead();
- tmp2[c] = 0;
- tmp += wxString(tmp2);
- } while (c == 256);
-
- output = (output.Mid(0,i) + tmp + output.Mid(i));
-#ifdef CHECKED
- if (openedcount > RECURSE_LIMIT) {
- wxMessageBox(wxString("wxHTML #include error: More than RECURSE_LIMIT files have been #included you may have a file that is directly or indirectly including itself, causing an endless loop"), "Error" ,wxICON_ERROR);
- break;
- }
-#endif
- openedcount++;
- delete file;
- }
-
- return output;
-}
-
-/****************************************************************************
-PARAMETERS:
-dir - Default directory to get included HTML files from
-
-REMARKS:
-This function sets the directory to get included HTML files from. The default
-value is the current directory. Directorys may be given as a relative path.
-****************************************************************************/
-void wxIncludePrep::ChangeDirectory(
- wxFileSystem *fs)
-{
- m_FS = fs;
-}
-
diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in
deleted file mode 100644
index f423f5fd27..0000000000
--- a/contrib/src/deprecated/Makefile.in
+++ /dev/null
@@ -1,365 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-LIBEXT = @LIBEXT@
-LIBPREFIX = @LIBPREFIX@
-SO_SUFFIX = @SO_SUFFIX@
-DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
-LN_S = @LN_S@
-WINDRES = @WINDRES@
-PIC_FLAG = @PIC_FLAG@
-SONAME_FLAG = @SONAME_FLAG@
-STRIP = @STRIP@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = @INSTALL_DIR@
-BK_DEPS = @BK_DEPS@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-libdir = @libdir@
-includedir = @includedir@
-DLLPREFIX = @DLLPREFIX@
-LIBS = @LIBS@
-AR = @AR@
-AROPTIONS = @AROPTIONS@
-RANLIB = @RANLIB@
-CC = @CC@
-CXX = @CXX@
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-VENDOR = @VENDOR@
-WX_FLAVOUR = @WX_FLAVOUR@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-DEPRECATEDDLL_CFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
- -DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
-DEPRECATEDDLL_CXXFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
- -DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-DEPRECATEDDLL_OBJECTS = \
- $(__deprecateddll___win32rc) \
- deprecateddll_prop.o \
- deprecateddll_propform.o \
- deprecateddll_proplist.o \
- deprecateddll_resource.o \
- deprecateddll_tbarsmpl.o \
- deprecateddll_treelay.o \
- deprecateddll_wxexpr.o \
- deprecateddll_dosyacc.o
-DEPRECATEDDLL_ODEP = \
- $(___pch_wxprec_deprecateddll_wx_wxprec_h_gch___depname)
-DEPRECATEDLIB_CFLAGS = $(__deprecatedlib_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CPPFLAGS) \
- $(CFLAGS)
-DEPRECATEDLIB_CXXFLAGS = $(__deprecatedlib_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CPPFLAGS) \
- $(CXXFLAGS)
-DEPRECATEDLIB_OBJECTS = \
- deprecatedlib_prop.o \
- deprecatedlib_propform.o \
- deprecatedlib_proplist.o \
- deprecatedlib_resource.o \
- deprecatedlib_tbarsmpl.o \
- deprecatedlib_treelay.o \
- deprecatedlib_wxexpr.o \
- deprecatedlib_dosyacc.o
-DEPRECATEDLIB_ODEP = \
- $(___pch_wxprec_deprecatedlib_wx_wxprec_h_gch___depname)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CCC = $(CC)
-@COND_DEPS_TRACKING_1@CCC = $(BK_DEPS) $(CC)
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
-@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-COND_SHARED_1___deprecateddll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
-@COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-@COND_SHARED_1@__install_deprecateddll___depname = install_deprecateddll
-@COND_SHARED_1@__uninstall_deprecateddll___depname = \
-@COND_SHARED_1@ uninstall_deprecateddll
-COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd = -install_name \
- $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__deprecateddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd)
-COND_PLATFORM_OS2_1___deprecateddll___importlib = -import \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__deprecateddll___importlib = $(COND_PLATFORM_OS2_1___deprecateddll___importlib)
-COND_WINDOWS_IMPLIB_1___deprecateddll___importlib = \
- -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__deprecateddll___importlib = $(COND_WINDOWS_IMPLIB_1___deprecateddll___importlib)
-@COND_GCC_PCH_1@__deprecateddll_PCH_INC = -I.pch/wxprec_deprecateddll
-@COND_ICC_PCH_1@__deprecateddll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_deprecateddll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_deprecateddll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_deprecateddll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__deprecateddll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__deprecateddll___targetsuf2 = .$(SO_SUFFIX)
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__deprecateddll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__deprecateddll___targetsuf3 = .$(SO_SUFFIX)
-COND_USE_SOVERLINUX_1___deprecateddll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__deprecateddll___soname_flags = $(COND_USE_SOVERLINUX_1___deprecateddll___soname_flags)
-COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__deprecateddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags)
-COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \
- rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd = rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_uninst_cmd = rm -f \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__deprecateddll___win32rc = \
-@COND_PLATFORM_WIN32_1@ deprecateddll_version_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_SHARED_0___deprecatedlib___depname = \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__deprecatedlib___depname = $(COND_SHARED_0___deprecatedlib___depname)
-@COND_SHARED_0@__install_deprecatedlib___depname = install_deprecatedlib
-@COND_SHARED_0@__uninstall_deprecatedlib___depname = \
-@COND_SHARED_0@ uninstall_deprecatedlib
-@COND_GCC_PCH_1@__deprecatedlib_PCH_INC = -I.pch/wxprec_deprecatedlib
-@COND_ICC_PCH_1@__deprecatedlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_deprecatedlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_deprecatedlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_deprecatedlib/wx/wxprec.h.gch
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-
-### Targets: ###
-
-all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
-
-install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
- fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-uninstall: $(__uninstall_deprecateddll___depname) $(__uninstall_deprecatedlib___depname)
- for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
- rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-install-strip: install
- $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
-@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
-@COND_SHARED_1@
-@COND_SHARED_1@ $(__deprecateddll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_deprecateddll:
-@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__deprecateddll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_deprecateddll:
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__deprecateddll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_deprecateddll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_deprecateddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(DEPRECATEDLIB_OBJECTS)
-@COND_SHARED_0@ rm -f $@
-@COND_SHARED_0@ $(AR) $(AROPTIONS) $@ $(DEPRECATEDLIB_OBJECTS)
-@COND_SHARED_0@ $(RANLIB) $@
-
-@COND_SHARED_0@install_deprecatedlib:
-@COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_deprecatedlib:
-@COND_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_deprecatedlib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_deprecatedlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDLIB_CXXFLAGS)
-
-deprecateddll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(DEPRECATEDDLL_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-deprecateddll_prop.o: $(srcdir)/prop.cpp $(DEPRECATEDDLL_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/prop.cpp
-
-deprecateddll_propform.o: $(srcdir)/propform.cpp $(DEPRECATEDDLL_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/propform.cpp
-
-deprecateddll_proplist.o: $(srcdir)/proplist.cpp $(DEPRECATEDDLL_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/proplist.cpp
-
-deprecateddll_resource.o: $(srcdir)/resource.cpp $(DEPRECATEDDLL_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/resource.cpp
-
-deprecateddll_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp $(DEPRECATEDDLL_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/tbarsmpl.cpp
-
-deprecateddll_treelay.o: $(srcdir)/treelay.cpp $(DEPRECATEDDLL_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/treelay.cpp
-
-deprecateddll_wxexpr.o: $(srcdir)/wxexpr.cpp $(DEPRECATEDDLL_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/wxexpr.cpp
-
-deprecateddll_dosyacc.o: $(srcdir)/dosyacc.c $(DEPRECATEDDLL_ODEP)
- $(CCC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $(srcdir)/dosyacc.c
-
-deprecatedlib_prop.o: $(srcdir)/prop.cpp $(DEPRECATEDLIB_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/prop.cpp
-
-deprecatedlib_propform.o: $(srcdir)/propform.cpp $(DEPRECATEDLIB_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/propform.cpp
-
-deprecatedlib_proplist.o: $(srcdir)/proplist.cpp $(DEPRECATEDLIB_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/proplist.cpp
-
-deprecatedlib_resource.o: $(srcdir)/resource.cpp $(DEPRECATEDLIB_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/resource.cpp
-
-deprecatedlib_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp $(DEPRECATEDLIB_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/tbarsmpl.cpp
-
-deprecatedlib_treelay.o: $(srcdir)/treelay.cpp $(DEPRECATEDLIB_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/treelay.cpp
-
-deprecatedlib_wxexpr.o: $(srcdir)/wxexpr.cpp $(DEPRECATEDLIB_ODEP)
- $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/wxexpr.cpp
-
-deprecatedlib_dosyacc.o: $(srcdir)/dosyacc.c $(DEPRECATEDLIB_ODEP)
- $(CCC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $(srcdir)/dosyacc.c
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_deprecateddll uninstall_deprecateddll install_deprecatedlib uninstall_deprecatedlib
diff --git a/contrib/src/deprecated/cwlex_yy.c b/contrib/src/deprecated/cwlex_yy.c
deleted file mode 100644
index 18464795f7..0000000000
--- a/contrib/src/deprecated/cwlex_yy.c
+++ /dev/null
@@ -1,1216 +0,0 @@
-/* A lexical scanner generated by flex */
-/* Copyright: (c) Julian Smart */
-/* Licence: wxWindows Licence */
-
-/* scanner skeleton version:
- * $Header$
- Last change: JS 13 Jul 97 6:17 pm
- */
-
-#define FLEX_SCANNER
-
-#include
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include
-#include
-
-/* use prototypes in function declarations */
-#define YY_USE_PROTOS
-
-/* the "const" storage-class-modifier is valid */
-#define YY_USE_CONST
-
-#else /* ! __cplusplus */
-
-#ifdef __STDC__
-
-#ifdef __GNUC__
-#include
-#else
-#include
-#endif /* __GNUC__ */
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif /* __STDC__ */
-#endif /* ! __cplusplus */
-
-
-#ifdef __TURBOC__
-#define YY_USE_CONST
-#endif
-
-
-#ifndef YY_USE_CONST
-#define const
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-/* we can't get here if it's an ANSI C compiler, or a C++ compiler,
- * so it's got to be a K&R compiler, and therefore there's no standard
- * place from which to include these definitions
- */
-/*
-char *malloc();
-int free();
-*/
-
-//int read();
-#endif
-
-
-/* amount of stuff to slurp up with each read */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* returned upon end-of-file */
-#define YY_END_TOK 0
-
-/* copy whatever the last rule matched to the standard output */
-
-/* cast to (char *) is because for 8-bit chars, yytext is (unsigned char *) */
-/* this used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite()
- */
-#define ECHO (void) fwrite( (char *) yytext, yyleng, 1, yyout )
-
-/* gets input and stuffs it into "buf". number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#define YY_INPUT(buf,result,max_size) \
- if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
- YY_FATAL_ERROR( "read() in flex scanner failed" );
-#define YY_NULL 0
-
-/* no semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#define yyterminate() return ( YY_NULL )
-
-/* report a fatal error */
-
-/* The funky do-while is used to turn this macro definition into
- * a single C statement (which needs a semi-colon terminator).
- * This avoids problems with code like:
- *
- * if ( something_happens )
- * YY_FATAL_ERROR( "oops, the something happened" );
- * else
- * everything_okay();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the YY_FATAL_ERROR() call.
- */
-
-#define YY_FATAL_ERROR(msg) \
- do \
- { \
- (void) fputs( msg, stderr ); \
- (void) putc( '\n', stderr ); \
- exit( 1 ); \
- } \
- while ( 0 )
-
-/* default yywrap function - always treat EOF as an EOF */
-int yywrap(void) { return 1; }
-
-
-/* enter a start condition. This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* action number for EOF rule of a given start state */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* special action meaning "start processing a new file" */
-#define YY_NEW_FILE \
- do \
- { \
- yy_init_buffer( yy_current_buffer, yyin ); \
- yy_load_buffer_state(); \
- } \
- while ( 0 )
-
-/* default declaration of generated scanner - a define so the user can
- * easily add parameters
- */
-#define YY_DECL int yylex YY_PROTO(( void ))
-
-/* code executed at the end of each rule */
-#define YY_BREAK break;
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE (YY_READ_BUF_SIZE * 2) /* size of default input buffer */
-#endif
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-#define YY_CHAR unsigned char
-# line 1 "lexer.l"
-#define INITIAL 0
-# line 9 "lexer.l"
-/*
- * File: lexer.l
- * Description: Lexical analyser for PROLOGIO; can be used with
- * either lex and flex.
- */
-#include
-
-/* +++steve162e: added, otherwise, PROIO_input will be undefined (at least under LINUX)
- please check, if this is also TRUE under other UNIXes.
- */
-
-#if defined(FLEX_SCANNER) && defined(_LINUX)
-#define PROIO_input my_input
-#endif
-/* ---steve162e */
-
-#include "wx/expr.h"
-#ifdef wx_x
-extern char *malloc();
-#endif
-#define Return(x) return x;
-
-#if defined(VMS) && ( __VMS_VER < 70000000 )
-#define strdup(s) (strcpy((char *)malloc(strlen(s)+1), s));
-#endif
-
-static size_t lex_buffer_length = 0;
-static const char *lex_buffer = NULL;
-static size_t lex_string_ptr = 0;
-static int lex_read_from_string = 0;
-
-static int my_input(void);
-static int my_unput(char);
-
-#ifdef FLEX_SCANNER
-#undef YY_INPUT
-# define YY_INPUT(buf,result,max_size) \
- if (lex_read_from_string) \
- { int c = my_input(); result = (c == 0) ? YY_NULL : ((buf)[0]=(c), 1); } \
- else \
- if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
- YY_FATAL_ERROR( "read() in flex scanner failed" );
-#else
-# undef unput
-# define unput(_c) my_unput(_c)
-#endif
-
-# line 58 "lexer.l"
-
-/* done after the current pattern has been matched and before the
- * corresponding action - sets up yytext
- */
-#define YY_DO_BEFORE_ACTION \
- yytext = yy_bp; \
- yyleng = yy_cp - yy_bp; \
- yy_hold_char = *yy_cp; \
- *yy_cp = '\0'; \
- yy_c_buf_p = yy_cp;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* return all but the first 'n' matched characters back to the input stream */
-#define yyless(n) \
- do \
- { \
- /* undo effects of setting up yytext */ \
- *yy_cp = yy_hold_char; \
- yy_c_buf_p = yy_cp = yy_bp + n; \
- YY_DO_BEFORE_ACTION; /* set up yytext again */ \
- } \
- while ( 0 )
-
-#undef unput
-#define unput(c) yyunput( c, yytext )
-
-
-struct yy_buffer_state
- {
- FILE *yy_input_file;
-
- YY_CHAR *yy_ch_buf; /* input buffer */
- YY_CHAR *yy_buf_pos; /* current position in input buffer */
-
- /* size of input buffer in bytes, not including room for EOB characters*/
- int yy_buf_size;
-
- /* number of characters read into yy_ch_buf, not including EOB characters */
- int yy_n_chars;
-
- int yy_eof_status; /* whether we've seen an EOF on this buffer */
-#define EOF_NOT_SEEN 0
- /* "pending" happens when the EOF has been seen but there's still
- * some text process
- */
-#define EOF_PENDING 1
-#define EOF_DONE 2
- };
-
-static YY_BUFFER_STATE yy_current_buffer;
-
-/* we provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state"
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed */
-static YY_CHAR yy_hold_char;
-
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-
-
-
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-#ifndef YY_USER_INIT
-#define YY_USER_INIT
-#endif
-
-extern YY_CHAR *yytext;
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-YY_CHAR *yytext;
-int yyleng;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
-#define YY_END_OF_BUFFER 18
-typedef int yy_state_type;
-static const short int yy_accept[34] =
- { 0,
- 0, 0, 18, 16, 13, 14, 16, 16, 6, 7,
- 16, 8, 12, 16, 1, 11, 3, 9, 10, 2,
- 0, 5, 0, 0, 0, 4, 1, 15, 3, 5,
- 0, 0, 0
- } ;
-
-static const YY_CHAR yy_ec[256] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 1, 4, 1, 1, 1, 1, 5, 6,
- 7, 8, 9, 10, 9, 11, 12, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 1, 1, 1,
- 14, 1, 1, 1, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 16, 17, 18, 1, 15, 1, 15, 15, 15, 15,
-
- 19, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 1, 20, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1
- } ;
-
-static const YY_CHAR yy_meta[21] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 2, 1, 2, 1, 3, 1, 2, 1
- } ;
-
-static const short int yy_base[37] =
- { 0,
- 0, 0, 48, 55, 55, 55, 17, 42, 55, 55,
- 19, 55, 55, 23, 17, 55, 0, 55, 55, 0,
- 18, 55, 19, 23, 21, 55, 12, 55, 0, 24,
- 25, 29, 55, 49, 52, 22
- } ;
-
-static const short int yy_def[37] =
- { 0,
- 33, 1, 33, 33, 33, 33, 34, 35, 33, 33,
- 33, 33, 33, 33, 33, 33, 36, 33, 33, 36,
- 34, 33, 34, 34, 35, 33, 33, 33, 36, 34,
- 34, 34, 0, 33, 33, 33
- } ;
-
-static const short int yy_nxt[76] =
- { 0,
- 4, 5, 6, 7, 8, 9, 10, 4, 11, 12,
- 13, 14, 15, 16, 17, 18, 4, 19, 20, 4,
- 22, 22, 30, 29, 27, 26, 22, 22, 30, 27,
- 28, 27, 30, 23, 23, 23, 24, 24, 24, 31,
- 23, 32, 24, 24, 24, 23, 26, 33, 24, 21,
- 21, 21, 25, 25, 3, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33
- } ;
-
-static const short int yy_chk[76] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 7, 21, 23, 36, 27, 25, 24, 30, 31, 15,
- 14, 11, 32, 7, 21, 23, 7, 21, 23, 24,
- 30, 31, 24, 30, 31, 32, 8, 3, 32, 34,
- 34, 34, 35, 35, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33
- } ;
-
-static yy_state_type yy_last_accepting_state;
-static YY_CHAR *yy_last_accepting_cpos;
-
-/* the intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-
-/* these variables are all declared out here so that section 3 code can
- * manipulate them
- */
-/* points to current character in buffer */
-static YY_CHAR *yy_c_buf_p = (YY_CHAR *) 0;
-static int yy_init = 1; /* whether we need to initialize */
-static int yy_start = 0; /* start state number */
-
-/* flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin. A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yyunput YY_PROTO(( YY_CHAR c, YY_CHAR *buf_ptr ));
-void yyrestart YY_PROTO(( FILE *input_file ));
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-
-#define yy_new_buffer yy_create_buffer
-
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-
-YY_DECL
- {
- register yy_state_type yy_current_state;
- register YY_CHAR *yy_cp, *yy_bp;
- register int yy_act;
-
-
-
-
- if ( yy_init )
- {
- YY_USER_INIT;
-
- if ( ! yy_start )
- yy_start = 1; /* first start state */
-
- if ( ! yyin )
- yyin = stdin;
-
- if ( ! yyout )
- yyout = stdout;
-
- if ( yy_current_buffer )
- yy_init_buffer( yy_current_buffer, yyin );
- else
- yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
- yy_load_buffer_state();
-
- yy_init = 0;
- }
-
- while ( 1 ) /* loops until end-of-file is reached */
- {
- yy_cp = yy_c_buf_p;
-
- /* support of yytext */
- *yy_cp = yy_hold_char;
-
- /* yy_bp points to the position in yy_ch_buf of the start of the
- * current run.
- */
- yy_bp = yy_cp;
-
- yy_current_state = yy_start;
-yy_match:
- do
- {
- register YY_CHAR yy_c = yy_ec[*yy_cp];
- if ( yy_accept[yy_current_state] )
- {
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = yy_def[yy_current_state];
- if ( yy_current_state >= 34 )
- yy_c = yy_meta[yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
- ++yy_cp;
- }
- while ( yy_current_state != 33 );
- yy_cp = yy_last_accepting_cpos;
- yy_current_state = yy_last_accepting_state;
-
-yy_find_action:
- yy_act = yy_accept[yy_current_state];
-
- YY_DO_BEFORE_ACTION;
- YY_USER_ACTION;
-
-do_action: /* this label is used only to access EOF actions */
-
-
- switch ( yy_act )
- {
- case 0: /* must backtrack */
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = yy_hold_char;
- yy_cp = yy_last_accepting_cpos;
- yy_current_state = yy_last_accepting_state;
- goto yy_find_action;
-
-case 1:
-# line 60 "lexer.l"
-{yylval.s = strdup(yytext); Return(INTEGER);}
- YY_BREAK
-case 2:
-# line 62 "lexer.l"
-Return(EXP);
- YY_BREAK
-case 3:
-# line 64 "lexer.l"
-{yylval.s = strdup(yytext); Return(WORD);}
- YY_BREAK
-case 4:
-# line 66 "lexer.l"
-{int len = strlen(yytext);
- yytext[len-1] = 0;
- yylval.s = strdup(yytext+1);
- Return(WORD);}
- YY_BREAK
-case 5:
-# line 71 "lexer.l"
-{yylval.s = strdup(yytext); Return(STRING);}
- YY_BREAK
-case 6:
-# line 73 "lexer.l"
-Return(OPEN);
- YY_BREAK
-case 7:
-# line 75 "lexer.l"
-Return(CLOSE);
- YY_BREAK
-case 8:
-# line 77 "lexer.l"
-Return(COMMA);
- YY_BREAK
-case 9:
-# line 79 "lexer.l"
-Return(OPEN_SQUARE);
- YY_BREAK
-case 10:
-# line 81 "lexer.l"
-Return(CLOSE_SQUARE);
- YY_BREAK
-case 11:
-# line 83 "lexer.l"
-Return(EQUALS);
- YY_BREAK
-case 12:
-# line 85 "lexer.l"
-Return(PERIOD);
- YY_BREAK
-case 13:
-# line 87 "lexer.l"
-;
- YY_BREAK
-case 14:
-# line 89 "lexer.l"
-;
- YY_BREAK
-case 15:
-# line 91 "lexer.l"
-{ loop:
-#ifdef __cplusplus
- while (yyinput() != '*');
- switch (yyinput())
-#else
- while (input() != '*');
- switch (input())
-#endif
- {
- case '/': break;
- case '*': unput('*');
- default: goto loop;
- }
- }
- YY_BREAK
-case 16:
-# line 106 "lexer.l"
-Return(ERROR);
- YY_BREAK
-case 17:
-# line 108 "lexer.l"
-ECHO;
- YY_BREAK
-case YY_STATE_EOF(INITIAL):
- yyterminate();
-
- case YY_END_OF_BUFFER:
- {
- /* amount of text matched not including the EOB char */
- int yy_amount_of_matched_text = yy_cp - yytext - 1;
-
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = yy_hold_char;
-
- /* note that here we test for yy_c_buf_p "<=" to the position
- * of the first EOB in the buffer, since yy_c_buf_p will
- * already have been incremented past the NUL character
- * (since all states make transitions on EOB to the end-
- * of-buffer state). Contrast this with the test in yyinput().
- */
- if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
- /* this was really a NUL */
- {
- yy_state_type yy_next_state;
-
- yy_c_buf_p = yytext + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state();
-
- /* okay, we're now positioned to make the
- * NUL transition. We couldn't have
- * yy_get_previous_state() go ahead and do it
- * for us because it doesn't know how to deal
- * with the possibility of jamming (and we
- * don't want to build jamming into it because
- * then it will run more slowly)
- */
-
- yy_next_state = yy_try_NUL_trans( yy_current_state );
-
- yy_bp = yytext + YY_MORE_ADJ;
-
- if ( yy_next_state )
- {
- /* consume the NUL */
- yy_cp = ++yy_c_buf_p;
- yy_current_state = yy_next_state;
- goto yy_match;
- }
-
- else
- {
- yy_cp = yy_last_accepting_cpos;
- yy_current_state = yy_last_accepting_state;
- goto yy_find_action;
- }
- }
-
- else switch ( yy_get_next_buffer() )
- {
- case EOB_ACT_END_OF_FILE:
- {
- yy_did_buffer_switch_on_eof = 0;
-
- if ( yywrap() )
- {
- /* note: because we've taken care in
- * yy_get_next_buffer() to have set up yytext,
- * we can now set up yy_c_buf_p so that if some
- * total hoser (like flex itself) wants
- * to call the scanner after we return the
- * YY_NULL, it'll still work - another YY_NULL
- * will get returned.
- */
- yy_c_buf_p = yytext + YY_MORE_ADJ;
-
- yy_act = YY_STATE_EOF((yy_start - 1) / 2);
- goto do_action;
- }
-
- else
- {
- if ( ! yy_did_buffer_switch_on_eof )
- YY_NEW_FILE;
- }
- }
- break;
-
- case EOB_ACT_CONTINUE_SCAN:
- yy_c_buf_p = yytext + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state();
-
- yy_cp = yy_c_buf_p;
- yy_bp = yytext + YY_MORE_ADJ;
- goto yy_match;
-
- case EOB_ACT_LAST_MATCH:
- yy_c_buf_p =
- &yy_current_buffer->yy_ch_buf[yy_n_chars];
-
- yy_current_state = yy_get_previous_state();
-
- yy_cp = yy_c_buf_p;
- yy_bp = yytext + YY_MORE_ADJ;
- goto yy_find_action;
- }
- break;
- }
-
- default:
-#ifdef FLEX_DEBUG
- printf( "action # %d\n", yy_act );
-#endif
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--no action found" );
- }
- }
- }
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * synopsis
- * int yy_get_next_buffer();
- *
- * returns a code representing an action
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-
- {
- register YY_CHAR *dest = yy_current_buffer->yy_ch_buf;
- register YY_CHAR *source = yytext - 1; /* copy prev. char, too */
- register int number_to_move, i;
- int ret_val;
-
- if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--end of buffer missed" );
-
- /* try to read more data */
-
- /* first move last chars to start of buffer */
- number_to_move = yy_c_buf_p - yytext;
-
- for ( i = 0; i < number_to_move; ++i )
- *(dest++) = *(source++);
-
- if ( yy_current_buffer->yy_eof_status != EOF_NOT_SEEN )
- /* don't do the read, it's not guaranteed to return an EOF,
- * just force an EOF
- */
- yy_n_chars = 0;
-
- else
- {
- int num_to_read = yy_current_buffer->yy_buf_size - number_to_move - 1;
-
- if ( num_to_read > YY_READ_BUF_SIZE )
- num_to_read = YY_READ_BUF_SIZE;
-
- else if ( num_to_read <= 0 )
- YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" );
-
- /* read in more data */
- YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
- yy_n_chars, num_to_read );
- }
-
- if ( yy_n_chars == 0 )
- {
- if ( number_to_move == 1 )
- {
- ret_val = EOB_ACT_END_OF_FILE;
- yy_current_buffer->yy_eof_status = EOF_DONE;
- }
-
- else
- {
- ret_val = EOB_ACT_LAST_MATCH;
- yy_current_buffer->yy_eof_status = EOF_PENDING;
- }
- }
-
- else
- ret_val = EOB_ACT_CONTINUE_SCAN;
-
- yy_n_chars += number_to_move;
- yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
- yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
- /* yytext begins at the second character in yy_ch_buf; the first
- * character is the one which preceded it before reading in the latest
- * buffer; it needs to be kept around in case it's a newline, so
- * yy_get_previous_state() will have with '^' rules active
- */
-
- yytext = &yy_current_buffer->yy_ch_buf[1];
-
- return ( ret_val );
- }
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached
- *
- * synopsis
- * yy_state_type yy_get_previous_state();
- */
-
-static yy_state_type yy_get_previous_state()
-
- {
- register yy_state_type yy_current_state;
- register YY_CHAR *yy_cp;
-
- yy_current_state = yy_start;
-
- for ( yy_cp = yytext + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
- {
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[*yy_cp] : 1);
- if ( yy_accept[yy_current_state] )
- {
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = yy_def[yy_current_state];
- if ( yy_current_state >= 34 )
- yy_c = yy_meta[yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
- }
-
- return ( yy_current_state );
- }
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- * next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( register yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-register yy_state_type yy_current_state;
-#endif
-
- {
- register int yy_is_jam;
- register YY_CHAR *yy_cp = yy_c_buf_p;
-
- register YY_CHAR yy_c = 1;
- if ( yy_accept[yy_current_state] )
- {
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = yy_def[yy_current_state];
- if ( yy_current_state >= 34 )
- yy_c = yy_meta[yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
- yy_is_jam = (yy_current_state == 33);
-
- return ( yy_is_jam ? 0 : yy_current_state );
- }
-
-
-#ifdef YY_USE_PROTOS
-static void yyunput( YY_CHAR c, register YY_CHAR *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-YY_CHAR c;
-register YY_CHAR *yy_bp;
-#endif
-
- {
- register YY_CHAR *yy_cp = yy_c_buf_p;
-
- /* undo effects of setting up yytext */
- *yy_cp = yy_hold_char;
-
- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
- { /* need to shift things up to make room */
- register int number_to_move = yy_n_chars + 2; /* +2 for EOB chars */
- register YY_CHAR *dest =
- &yy_current_buffer->yy_ch_buf[yy_current_buffer->yy_buf_size + 2];
- register YY_CHAR *source =
- &yy_current_buffer->yy_ch_buf[number_to_move];
-
- while ( source > yy_current_buffer->yy_ch_buf )
- *--dest = *--source;
-
- yy_cp += dest - source;
- yy_bp += dest - source;
- yy_n_chars = yy_current_buffer->yy_buf_size;
-
- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
- YY_FATAL_ERROR( "flex scanner push-back overflow" );
- }
-
- if ( yy_cp > yy_bp && yy_cp[-1] == '\n' )
- yy_cp[-2] = '\n';
-
- *--yy_cp = c;
-
- /* note: the formal parameter *must* be called "yy_bp" for this
- * macro to now work correctly
- */
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- }
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-
- {
- int c;
- YY_CHAR *yy_cp = yy_c_buf_p;
-
- *yy_cp = yy_hold_char;
-
- if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
- {
- /* yy_c_buf_p now points to the character we want to return.
- * If this occurs *before* the EOB characters, then it's a
- * valid NUL; if not, then we've hit the end of the buffer.
- */
- if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
- /* this was really a NUL */
- *yy_c_buf_p = '\0';
-
- else
- { /* need more input */
- yytext = yy_c_buf_p;
- ++yy_c_buf_p;
-
- switch ( yy_get_next_buffer() )
- {
- case EOB_ACT_END_OF_FILE:
- {
- if ( yywrap() )
- {
- yy_c_buf_p = yytext + YY_MORE_ADJ;
- return ( EOF );
- }
-
- YY_NEW_FILE;
-
-#ifdef __cplusplus
- return ( yyinput() );
-#else
- return ( input() );
-#endif
- }
- break;
-
- case EOB_ACT_CONTINUE_SCAN:
- yy_c_buf_p = yytext + YY_MORE_ADJ;
- break;
-
- case EOB_ACT_LAST_MATCH:
-#ifdef __cplusplus
- YY_FATAL_ERROR( "unexpected last match in yyinput()" );
-#else
- YY_FATAL_ERROR( "unexpected last match in input()" );
-#endif
- }
- }
- }
-
- c = *yy_c_buf_p;
- yy_hold_char = *++yy_c_buf_p;
-
- return ( c );
- }
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-
- {
- yy_init_buffer( yy_current_buffer, input_file );
- yy_load_buffer_state();
- }
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-
- {
- if ( yy_current_buffer == new_buffer )
- return;
-
- if ( yy_current_buffer )
- {
- /* flush out information for old buffer */
- *yy_c_buf_p = yy_hold_char;
- yy_current_buffer->yy_buf_pos = yy_c_buf_p;
- yy_current_buffer->yy_n_chars = yy_n_chars;
- }
-
- yy_current_buffer = new_buffer;
- yy_load_buffer_state();
-
- /* we don't actually know whether we did this switch during
- * EOF (yywrap()) processing, but the only time this flag
- * is looked at is after yywrap() is called, so it's safe
- * to go ahead and always set it.
- */
- yy_did_buffer_switch_on_eof = 1;
- }
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-
- {
- yy_n_chars = yy_current_buffer->yy_n_chars;
- yytext = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
- yyin = yy_current_buffer->yy_input_file;
- yy_hold_char = *yy_c_buf_p;
- }
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-
- {
- YY_BUFFER_STATE b;
-
- b = (YY_BUFFER_STATE) malloc( sizeof( struct yy_buffer_state ) );
-
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
- b->yy_buf_size = size;
-
- /* yy_ch_buf has to be 2 characters longer than the size given because
- * we need to put in 2 end-of-buffer characters.
- */
- b->yy_ch_buf = (YY_CHAR *) malloc( (unsigned) (b->yy_buf_size + 2) );
-
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
- yy_init_buffer( b, file );
-
- return ( b );
- }
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
- {
- if ( b == yy_current_buffer )
- yy_current_buffer = (YY_BUFFER_STATE) 0;
-
- free( (char *) b->yy_ch_buf );
- free( (char *) b );
- }
-
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
- {
- b->yy_input_file = file;
-
- /* we put in the '\n' and start reading from [1] so that an
- * initial match-at-newline will be true.
- */
-
- b->yy_ch_buf[0] = '\n';
- b->yy_n_chars = 1;
-
- /* we always need two end-of-buffer characters. The first causes
- * a transition to the end-of-buffer state. The second causes
- * a jam in that state.
- */
- b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
- b->yy_ch_buf[2] = YY_END_OF_BUFFER_CHAR;
-
- b->yy_buf_pos = &b->yy_ch_buf[1];
-
- b->yy_eof_status = EOF_NOT_SEEN;
- }
-# line 108 "lexer.l"
-
-
-
-#ifdef FLEX_SCANNER
-static int lex_input() {
- return input();
-}
-#else /* BSD/AT&T lex */
-#ifndef input
-# error "Sorry, but need either flex or AT&T lex"
-#endif
-static int lex_input() {
- return input();
-}
-/* # undef unput
-# define unput(_c) my_unput(_c)
-*/
-
-# undef input
-# define input() my_input()
-static int my_unput(char c)
-{
- if (lex_read_from_string) {
- /* Make sure we have something */
- if (lex_string_ptr) {
- if (c == '\n') yylineno--;
- lex_string_ptr--;
- }
- } else {
- yytchar= (c);if(yytchar=='\n')yylineno--;*yysptr++=yytchar;
-/* unput(c); Causes infinite recursion! */
- }
- return c;
-}
-
-#endif
-
-/* Public */
-void LexFromFile(FILE *fd)
-{
- lex_read_from_string = 0;
- yyin = fd;
- /* Don't know why this is necessary, but otherwise
- * lex only works _once_!
- */
-#ifdef FLEX_SCANNER
- yy_init = 1;
-#endif
-}
-
-void LexFromString(char *buffer)
-{
- lex_read_from_string = 1;
- lex_buffer = buffer;
- lex_buffer_length = strlen(buffer);
- lex_string_ptr = 0;
- /* Don't know why this is necessary, but otherwise
- * lex only works _once_!
- */
-#ifdef FLEX_SCANNER
- yy_init = 1;
-#endif
-}
-
-static int my_input( void )
-{
- if (lex_read_from_string) {
- if (lex_string_ptr == lex_buffer_length)
- return 0;
- else {
- char c = lex_buffer[lex_string_ptr++];
-#ifndef FLEX_SCANNER
- if (c == '\n') yylineno++;
-#endif
- return c;
- }
- } else {
- return lex_input();
- }
-}
-
-void wxExprCleanUp()
-{
- if (yy_current_buffer)
- yy_delete_buffer(yy_current_buffer);
-}
diff --git a/contrib/src/deprecated/cwy_tab.c b/contrib/src/deprecated/cwy_tab.c
deleted file mode 100644
index c3ce961313..0000000000
--- a/contrib/src/deprecated/cwy_tab.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/* Copyright: (c) Julian Smart */
-/* Licence: wxWindows Licence */
-
-#ifndef lint
-static char yysccsid[] = "@(#)yaccpar 1.7 (Berkeley) 09/09/90";
-#endif
-#define YYBYACC 1
-#line 2 "parser.y"
-#include "string.h"
-#ifdef _MSC_VER
-#include
-#endif
-#include "wx/expr.h"
-#include "wx/deprecated/expr.h"
-
-#ifndef __EXTERN_C__
-#define __EXTERN_C__ 1
-#endif
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-extern "C" {
-#endif
-#endif
-int yyparse(void);
-int PROIO_yyparse(void) {
- return yyparse() ;
-}
-int yylex(void);
-int yylook(void);
-int yywrap(void);
-int yyback(int *, int);
-#if __MSL__ < 0x6000
-int read( int , char * , int ) ;
-#else
-int _read( int , void * , size_t ) ;
-#define read _read
-#endif
-#ifdef __WXMSW__
-//int fileno( FILE* ) ; This is defined in watcom
-#else
-#if __MSL__ < 0x6000
-int fileno( void* ) ;
-#endif
-#endif
-
-/* You may need to put /DLEX_SCANNER in your makefile
- * if you're using LEX!
- Last change: JS 13 Jul 97 6:12 pm
- */
-#ifdef LEX_SCANNER
-/* int yyoutput(int); */
-void yyoutput(int);
-#else
-void yyoutput(int);
-#endif
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-}
-#endif
-#endif
-#line 36 "parser.y"
-typedef union {
- char *s;
-/* struct pexpr *expr; */
-} YYSTYPE;
-#line 44 "y_tab.c"
-#define INTEGER 1
-#define WORD 2
-#define STRING 3
-#define PERIOD 13
-#define OPEN 4
-#define CLOSE 5
-#define COMMA 6
-#define NEWLINE 7
-#define ERROR 8
-#define OPEN_SQUARE 9
-#define CLOSE_SQUARE 10
-#define EQUALS 11
-#define EXP 14
-#define YYERRCODE 256
-short yylhs[] = { -1,
- 0, 0, 1, 1, 1, 2, 2, 2, 3, 3,
- 3, 4, 4, 5, 5, 5, 5, 5, 5, 5,
-};
-short yylen[] = { 2,
- 0, 2, 2, 2, 2, 4, 2, 3, 0, 1,
- 3, 3, 1, 1, 1, 1, 3, 3, 5, 1,
-};
-short yydefred[] = { 1,
- 0, 0, 0, 0, 2, 0, 5, 3, 0, 0,
- 0, 15, 7, 20, 0, 0, 13, 4, 0, 0,
- 0, 0, 8, 0, 6, 0, 18, 0, 12, 11,
- 0, 19,
-};
-short yydgoto[] = { 1,
- 5, 14, 15, 16, 17,
-};
-short yysindex[] = { 0,
- -2, 9, 2, 1, 0, 10, 0, 0, 11, -5,
- 17, 0, 0, 0, 14, -1, 0, 0, 33, 38,
- 41, 16, 0, 11, 0, 29, 0, 40, 0, 0,
- 44, 0,
-};
-short yyrindex[] = { 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 42, 21,
- 24, 0, 0, 0, 0, 30, 0, 0, 0, 0,
- 0, 0, 0, 31, 0, 27, 0, 24, 0, 0,
- 0, 0,
-};
-short yygindex[] = { 0,
- 0, 45, -8, 0, 26,
-};
-#define YYTABLESIZE 254
-short yytable[] = { 3,
- 19, 10, 11, 12, 24, 9, 4, 20, 21, 4,
- 13, 10, 11, 12, 8, 30, 10, 28, 12, 4,
- 9, 7, 18, 23, 4, 16, 16, 22, 14, 14,
- 16, 17, 17, 14, 10, 9, 17, 25, 26, 10,
- 9, 27, 31, 9, 32, 6, 9, 29, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 2,
-};
-short yycheck[] = { 2,
- 9, 1, 2, 3, 6, 4, 9, 13, 14, 9,
- 10, 1, 2, 3, 13, 24, 1, 2, 3, 9,
- 4, 13, 13, 10, 9, 5, 6, 11, 5, 6,
- 10, 5, 6, 10, 5, 5, 10, 5, 1, 10,
- 10, 1, 14, 4, 1, 1, 5, 22, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 256,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 14
-#if YYDEBUG
-char *yyname[] = {
-"end-of-file","INTEGER","WORD","STRING","OPEN","CLOSE","COMMA","NEWLINE",
-"ERROR","OPEN_SQUARE","CLOSE_SQUARE","EQUALS",0,"PERIOD","EXP",
-};
-char *yyrule[] = {
-"$accept : commands",
-"commands :",
-"commands : commands command",
-"command : WORD PERIOD",
-"command : expr PERIOD",
-"command : error PERIOD",
-"expr : WORD OPEN arglist CLOSE",
-"expr : OPEN_SQUARE CLOSE_SQUARE",
-"expr : OPEN_SQUARE arglist CLOSE_SQUARE",
-"arglist :",
-"arglist : arg",
-"arglist : arg COMMA arglist",
-"arg : WORD EQUALS arg1",
-"arg : arg1",
-"arg1 : WORD",
-"arg1 : STRING",
-"arg1 : INTEGER",
-"arg1 : INTEGER PERIOD INTEGER",
-"arg1 : INTEGER EXP INTEGER",
-"arg1 : INTEGER PERIOD INTEGER EXP INTEGER",
-"arg1 : expr",
-};
-#endif
-#define yyclearin (yychar=(-1))
-#define yyerrok (yyerrflag=0)
-#ifdef YYSTACKSIZE
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
-#endif
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 600
-#define YYMAXDEPTH 600
-#endif
-#endif
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short yyss[YYSTACKSIZE];
-YYSTYPE yyvs[YYSTACKSIZE];
-#define yystacksize YYSTACKSIZE
-#line 118 "parser.y"
-
-#ifdef IDE_INVOKED
-#include "doslex.c"
-#else
-#if (defined(__MWERKS__))
-#include "cwlex_yy.c"
-#else
-#include "lex_yy.c"
-#endif
-#endif
-
-/*
-void yyerror(s)
-char *s;
-{
- syntax_error(s);
-}
-*/
-
-/* Ansi prototype. If this doesn't work for you... uncomment
- the above instead.
- */
-
-void yyerror(char *s)
-{
- syntax_error(s);
-}
-
-/*
- * Unfortunately, my DOS version of FLEX
- * requires yywrap to be #def'ed, whereas
- * the UNIX flex expects a proper function.
- */
-
-/* Not sure if __SC__ is the appropriate thing
- * to test
- */
-
-#ifndef __SC__
-#ifdef USE_DEFINE
-#ifndef yywrap
-#define yywrap() 1
-#endif
-#else
-int yywrap() { return 1; }
-#endif
-#endif
-#line 247 "y_tab.c"
-#define YYABORT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-int
-yyparse()
-{
- register int yym, yyn, yystate;
-#if YYDEBUG
- register char *yys;
- extern char *getenv();
-
- if (yys = getenv("YYDEBUG"))
- {
- yyn = *yys;
- if (yyn >= '0' && yyn <= '9')
- yydebug = yyn - '0';
- }
-#endif
-
- yynerrs = 0;
- yyerrflag = 0;
- yychar = (-1);
-
- yyssp = yyss;
- yyvsp = yyvs;
- *yyssp = yystate = 0;
-
-yyloop:
- if (yyn = yydefred[yystate]) goto yyreduce;
- if (yychar < 0)
- {
- if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
- if (yydebug)
- {
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
- printf("yydebug: state %d, reading %d (%s)\n", yystate,
- yychar, yys);
- }
-#endif
- }
- if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
- {
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: state %d, shifting to state %d\n",
- yystate, yytable[yyn]);
-#endif
- if (yyssp >= yyss + yystacksize - 1)
- {
- goto yyoverflow;
- }
- *++yyssp = yystate = yytable[yyn];
- *++yyvsp = yylval;
- yychar = (-1);
- if (yyerrflag > 0) --yyerrflag;
- goto yyloop;
- }
- if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
- {
- yyn = yytable[yyn];
- goto yyreduce;
- }
- if (yyerrflag) goto yyinrecovery;
-#ifdef lint
- goto yynewerror;
-#endif
-yynewerror:
- yyerror("syntax error");
-#ifdef lint
- goto yyerrlab;
-#endif
-yyerrlab:
- ++yynerrs;
-yyinrecovery:
- if (yyerrflag < 3)
- {
- yyerrflag = 3;
- for (;;)
- {
- if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
- {
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: state %d, error recovery shifting\
- to state %d\n", *yyssp, yytable[yyn]);
-#endif
- if (yyssp >= yyss + yystacksize - 1)
- {
- goto yyoverflow;
- }
- *++yyssp = yystate = yytable[yyn];
- *++yyvsp = yylval;
- goto yyloop;
- }
- else
- {
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: error recovery discarding state %d\n",
- *yyssp);
-#endif
- if (yyssp <= yyss) goto yyabort;
- --yyssp;
- --yyvsp;
- }
- }
- }
- else
- {
- if (yychar == 0) goto yyabort;
-#if YYDEBUG
- if (yydebug)
- {
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
- printf("yydebug: state %d, error recovery discards token %d (%s)\n",
- yystate, yychar, yys);
- }
-#endif
- yychar = (-1);
- goto yyloop;
- }
-yyreduce:
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: state %d, reducing by rule %d (%s)\n",
- yystate, yyn, yyrule[yyn]);
-#endif
- yym = yylen[yyn];
- yyval = yyvsp[1-yym];
- switch (yyn)
- {
-case 3:
-#line 68 "parser.y"
-{process_command(proio_cons(wxmake_word(yyvsp[-1].s), NULL)); free(yyvsp[-1].s);}
-break;
-case 4:
-#line 70 "parser.y"
-{process_command(yyvsp[-1].s);}
-break;
-case 5:
-#line 72 "parser.y"
-{syntax_error("Unrecognized command.");}
-break;
-case 6:
-#line 76 "parser.y"
-{yyval.s = proio_cons(wxmake_word(yyvsp[-3].s), yyvsp[-1].s); free(yyvsp[-3].s);}
-break;
-case 7:
-#line 78 "parser.y"
-{yyval.s = proio_cons(NULL, NULL);}
-break;
-case 8:
-#line 80 "parser.y"
-{yyval.s = yyvsp[-1].s; }
-break;
-case 9:
-#line 84 "parser.y"
-{yyval.s = NULL;}
-break;
-case 10:
-#line 86 "parser.y"
-{yyval.s = proio_cons(yyvsp[0].s, NULL);}
-break;
-case 11:
-#line 89 "parser.y"
-{yyval.s = proio_cons(yyvsp[-2].s, yyvsp[0].s);}
-break;
-case 12:
-#line 93 "parser.y"
-{yyval.s = proio_cons(wxmake_word("="), proio_cons(wxmake_word(yyvsp[-2].s), proio_cons(yyvsp[0].s, NULL)));
- free(yyvsp[-2].s); }
-break;
-case 13:
-#line 96 "parser.y"
-{yyval.s = yyvsp[0].s; }
-break;
-case 14:
-#line 99 "parser.y"
-{yyval.s = wxmake_word(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 15:
-#line 101 "parser.y"
-{yyval.s = wxmake_string(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 16:
-#line 103 "parser.y"
-{yyval.s = wxmake_integer(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 17:
-#line 105 "parser.y"
-{yyval.s = wxmake_real(yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-2].s); free(yyvsp[0].s); }
-break;
-case 18:
-#line 107 "parser.y"
-{yyval.s = wxmake_exp(yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-2].s); free(yyvsp[0].s); }
-break;
-case 19:
-#line 110 "parser.y"
-{yyval.s = wxmake_exp2(yyvsp[-4].s, yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-4].s); free(yyvsp[-2].s);
- free(yyvsp[0].s); }
-break;
-case 20:
-#line 114 "parser.y"
-{yyval.s = yyvsp[0].s;}
-break;
-#line 461 "y_tab.c"
- }
- yyssp -= yym;
- yystate = *yyssp;
- yyvsp -= yym;
- yym = yylhs[yyn];
- if (yystate == 0 && yym == 0)
- {
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: after reduction, shifting from state 0 to\
- state %d\n", YYFINAL);
-#endif
- yystate = YYFINAL;
- *++yyssp = YYFINAL;
- *++yyvsp = yyval;
- if (yychar < 0)
- {
- if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
- if (yydebug)
- {
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
- printf("yydebug: state %d, reading %d (%s)\n",
- YYFINAL, yychar, yys);
- }
-#endif
- }
- if (yychar == 0) goto yyaccept;
- goto yyloop;
- }
- if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
- yystate = yytable[yyn];
- else
- yystate = yydgoto[yym];
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: after reduction, shifting from state %d \
-to state %d\n", *yyssp, yystate);
-#endif
- if (yyssp >= yyss + yystacksize - 1)
- {
- goto yyoverflow;
- }
- *++yyssp = yystate;
- *++yyvsp = yyval;
- goto yyloop;
-yyoverflow:
- yyerror("yacc stack overflow");
-yyabort:
- return (1);
-yyaccept:
- return (0);
-}
diff --git a/contrib/src/deprecated/descrip.mms b/contrib/src/deprecated/descrip.mms
deleted file mode 100644
index 7e92facaac..0000000000
--- a/contrib/src/deprecated/descrip.mms
+++ /dev/null
@@ -1,102 +0,0 @@
-#*****************************************************************************
-# *
-# Make file for VMS *
-# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
-# Date : 13 February 2006 *
-# *
-#*****************************************************************************
-.first
- define wx [---.include.wx]
- set command $disk2:[joukj.com]bison.cld
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
- /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
-.else
-.ifdef __WXGTK2__
-CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee\
- /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee\
- /name=(as_is,short)/ieee=denorm
-.else
-.ifdef __WXGTK__
-.ifdef __WXUNIVERSAL__
-CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
- /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
- /name=(as_is,short)/ieee=denorm
-.else
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
- /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.endif
-.else
-CXX_DEFINE =
-CC_DEFINE =
-.endif
-.endif
-.endif
-
-YACC=bison/yacc
-
-SED=gsed
-
-LEX=flex
-
-.suffixes : .cpp
-
-.cpp.obj :
- cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-.c.obj :
- cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
-
-OBJECTS=prop.obj,propform.obj,proplist.obj,wxexpr.obj,parser.obj,resource.obj,\
- treelay.obj
-
-SOURCES=prop.cpp,propform.cpp,proplist.cpp,wxexpr.cpp,parser.y,resource.cpp,\
- treelay.cpp
-
-all : $(SOURCES)
- $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
-.ifdef __WXMOTIF__
- library/crea [---.lib]libwx_motif_deprecated.olb $(OBJECTS)
-.else
-.ifdef __WXGTK2__
- library/crea [---.lib]libwx_gtk2_deprecated.olb $(OBJECTS)
-.else
-.ifdef __WXGTK__
-.ifdef __WXUNIVERSAL__
- library/crea [---.lib]libwx_gtk_univ_deprecated.olb $(OBJECTS)
-.else
- library/crea [---.lib]libwx_gtk_deprecated.olb $(OBJECTS)
-.endif
-.endif
-.endif
-.endif
-
-prop.obj : prop.cpp
-propform.obj : propform.cpp
-proplist.obj : proplist.cpp
-wxexpr.obj : wxexpr.cpp
-parser.obj : parser.c lexer.c
-parser.c : parser.y lexer.c
- $(YACC) parser.y
- pipe $(SED) -e "s;y_tab.c;parser.y;g" < y_tab.c | \
- $(SED) -e "s/BUFSIZ/5000/g" | \
- $(SED) -e "s/YYLMAX 200/YYLMAX 5000/g" | \
- $(SED) -e "s/yy/PROIO_yy/g" | \
- $(SED) -e "s/input/PROIO_input/g" | \
- $(SED) -e "s/unput/PROIO_unput/g" > parser.c
- delete y_tab.c;*
-
-lexer.c : lexer.l
- $(LEX) lexer.l
- pipe $(SED) -e "s;lexyy.c;lexer.l;g" < lexyy.c | \
- $(SED) -e "s/yy/PROIO_yy/g" | \
- $(SED) -e "s/input/PROIO_input/g" | \
- $(SED) -e "s/unput/PROIO_unput/g" > lexer.c
- delete lexyy.c;*
-
-resource.obj : resource.cpp
-treelay.obj : treelay.cpp
diff --git a/contrib/src/deprecated/doslex.c b/contrib/src/deprecated/doslex.c
deleted file mode 100644
index 1198926aab..0000000000
--- a/contrib/src/deprecated/doslex.c
+++ /dev/null
@@ -1,1336 +0,0 @@
-/* A lexical scanner generated by flex */
-
-/* scanner skeleton version:
- * $Header$
- Last change: JS 13 Jul 97 6:17 pm
- */
-/* Copyright: (c) Julian Smart */
-/* Licence: wxWindows Licence */
-
-#ifdef __VISUALC__
- #pragma warning(push)
- #pragma warning(disable:4127) /* warning C4127: conditional expression is constant [about while ( 0 | 1 )] */
- #pragma warning(disable:4244) /* warning C4244: '=' : conversion from 'A' to 'B', possible loss of data */
-#endif
-
-#define FLEX_SCANNER
-
-#include
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
- #ifndef __cplusplus
- #define __cplusplus
- #endif
-#endif
-
-
-#ifdef __cplusplus
-
- #include
-
- #ifdef __SALFORDC__
- #include
- #include
- #else
- #include
- #endif
-
- #ifdef __VISAGECPP__
- #include
- #endif
-
- #ifdef __cplusplus
- static int yyinput()
- #else
- static int input()
- #endif
-
- /* use prototypes in function declarations */
- #define YY_USE_PROTOS
-
- /* the "const" storage-class-modifier is valid */
- #define YY_USE_CONST
-
-#else /* ! __cplusplus */
-
- #ifdef __STDC__
-
- #ifdef __GNUC__
- #include
- #else
- #include
- #endif /* __GNUC__ */
-
- #define YY_USE_PROTOS
- #define YY_USE_CONST
-
- #endif /* __STDC__ */
-
- #ifdef __VISUALC__
- #define YY_USE_PROTOS
- #endif
-
- #ifdef __BORLANDC__
- #include
- #define YY_USE_PROTOS
- #define YY_USE_CONST
- #endif
-
- #if defined(__MINGW32__) || defined(__WATCOMC__)
- #include
- #endif
-
-#endif /* ! __cplusplus */
-
-
-#ifdef __TURBOC__
- #define YY_USE_CONST
-#endif
-
-
-#ifndef YY_USE_CONST
- #define const
-#endif
-
-
-#ifdef YY_USE_PROTOS
- #define YY_PROTO(proto) proto
-#else
- #define YY_PROTO(proto) ()
- /* we can't get here if it's an ANSI C compiler, or a C++ compiler,
- * so it's got to be a K&R compiler, and therefore there's no standard
- * place from which to include these definitions
- */
- /*
- char *malloc();
- int free();
- */
-#endif
-
-
-/* amount of stuff to slurp up with each read */
-#ifndef YY_READ_BUF_SIZE
- #define YY_READ_BUF_SIZE 8192
-#endif
-
-
-/* returned upon end-of-file */
-#define YY_END_TOK 0
-
-
-/* copy whatever the last rule matched to the standard output */
-
-/* cast to (char *) is because for 8-bit chars, yytext is (unsigned char *) */
-/* this used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite()
- */
-#define ECHO (void) fwrite( (char *) yytext, yyleng, 1, yyout )
-
-
-/* gets input and stuffs it into "buf". number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#define YY_INPUT(buf,result,max_size) \
- if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
- YY_FATAL_ERROR( "read() in flex scanner failed" );
-#define YY_NULL 0
-
-
-/* no semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#define yyterminate() return ( YY_NULL )
-
-
-/* report a fatal error */
-
-/* The funky do-while is used to turn this macro definition into
- * a single C statement (which needs a semi-colon terminator).
- * This avoids problems with code like:
- *
- * if ( something_happens )
- * YY_FATAL_ERROR( "oops, the something happened" );
- * else
- * everything_okay();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the YY_FATAL_ERROR() call.
- */
-
-#if !defined(__VISAGECPP__)
- #define YY_FATAL_ERROR(msg) \
- do \
- { \
- (void) fputs( msg, stderr ); \
- (void) putc( '\n', stderr ); \
- exit( 1 ); \
- } \
- while ( 0 )
-#else
- /* suppress expression always false warning */
- int os2var = 0;
- #define YY_FATAL_ERROR(msg) \
- do \
- { \
- (void) fputs( msg, stderr ); \
- (void) putc( '\n', stderr ); \
- exit( 1 ); \
- } \
- while ( os2var == 0 )
-#endif
-
-
-/* default yywrap function - always treat EOF as an EOF */
-int yywrap(void) { return 1; }
-
-
-/* enter a start condition. This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* action number for EOF rule of a given start state */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* special action meaning "start processing a new file" */
-#if !defined(__VISAGECPP__)
- #define YY_NEW_FILE \
- do \
- { \
- yy_init_buffer( yy_current_buffer, yyin ); \
- yy_load_buffer_state(); \
- } \
- while ( 0 )
-#else
- #define YY_NEW_FILE \
- do \
- { \
- yy_init_buffer( yy_current_buffer, yyin ); \
- yy_load_buffer_state(); \
- } \
- while ( os2var == 0 )
-#endif
-
-
-/* default declaration of generated scanner - a define so the user can
- * easily add parameters
- */
-#define YY_DECL int yylex YY_PROTO(( void ))
-
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-#ifndef YY_BUF_SIZE
- #define YY_BUF_SIZE (YY_READ_BUF_SIZE * 2) /* size of default input buffer */
-#endif
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-#define YY_CHAR unsigned char
-/* # line 1 "lexer.l" */
-#define INITIAL 0
-/* # line 9 "lexer.l" */
-/*
- * File: lexer.l
- * Description: Lexical analyser for PROLOGIO; can be used with
- * either lex and flex.
- */
-#include
-
-/* +++steve162e: added, otherwise, PROIO_input will be undefined (at least under LINUX)
- please check, if this is also TRUE under other UNIXes.
- */
-
-#if defined(FLEX_SCANNER) && defined(_LINUX)
- #define PROIO_input my_input
-#endif
-/* ---steve162e */
-
-#include "wx/deprecated/expr.h"
-#ifdef wx_x
- extern char *malloc();
-#endif
-
-#if defined(VMS) && ( __VMS_VER < 70000000 )
- #define strdup(s) (strcpy((char *)malloc(strlen(s)+1), s));
-#endif
-
-static size_t lex_buffer_length = 0;
-static const char *lex_buffer = NULL;
-static size_t lex_string_ptr = 0;
-static int lex_read_from_string = 0;
-
-static int my_input(void);
-#ifndef FLEX_SCANNER
- static int my_unput(char);
-#endif
-
-#ifdef FLEX_SCANNER
- #undef YY_INPUT
- #define YY_INPUT(buf,result,max_size) \
- if (lex_read_from_string) \
- { \
- int c = my_input(); \
- result = (c == 0) ? YY_NULL : ((buf)[0]=(c), 1); \
- } \
- else \
- if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
- YY_FATAL_ERROR( "read() in flex scanner failed" );
-#else
- #ifndef unput
- #undef unput
- #endif
- #define unput(_c) my_unput(_c)
-#endif
-
-/* # line 58 "lexer.l" */
-
-/* done after the current pattern has been matched and before the
- * corresponding action - sets up yytext
- */
-
-#define YY_DO_BEFORE_ACTION \
- yytext = yy_bp; \
- yyleng = yy_cp - yy_bp; \
- yy_hold_char = *yy_cp; \
- *yy_cp = '\0'; \
- yy_c_buf_p = yy_cp;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* return all but the first 'n' matched characters back to the input stream */
-#if !defined(__VISAGECPP__)
- #define yyless(n) \
- do \
- { \
- /* undo effects of setting up yytext */ \
- *yy_cp = yy_hold_char; \
- yy_c_buf_p = yy_cp = yy_bp + n; \
- YY_DO_BEFORE_ACTION; /* set up yytext again */ \
- } \
- while ( 0 )
-#else
- #define yyless(n) \
- do \
- { \
- /* undo effects of setting up yytext */ \
- *yy_cp = yy_hold_char; \
- yy_c_buf_p = yy_cp = yy_bp + n; \
- YY_DO_BEFORE_ACTION; /* set up yytext again */ \
- } \
- while ( os2var == 0 )
-#endif
-
-#undef unput
-#define unput(c) yyunput( c, yytext )
-
-struct yy_buffer_state
-{
- FILE *yy_input_file;
-
- YY_CHAR *yy_ch_buf; /* input buffer */
- YY_CHAR *yy_buf_pos; /* current position in input buffer */
-
- /* size of input buffer in bytes, not including room for EOB characters*/
- int yy_buf_size;
-
- /* number of characters read into yy_ch_buf, not including EOB characters */
- int yy_n_chars;
-
- int yy_eof_status; /* whether we've seen an EOF on this buffer */
-
-#define EOF_NOT_SEEN 0
-
- /* "pending" happens when the EOF has been seen but there's still
- * some text process
- */
-
-#define EOF_PENDING 1
-#define EOF_DONE 2
-};
-
-static YY_BUFFER_STATE yy_current_buffer;
-
-/* we provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state"
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed */
-static YY_CHAR yy_hold_char;
-
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-
-
-
-#ifndef YY_USER_ACTION
- #define YY_USER_ACTION
-#endif
-
-#ifndef YY_USER_INIT
- #define YY_USER_INIT
-#endif
-
-extern YY_CHAR *yytext;
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-YY_CHAR *yytext;
-int yyleng;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
-#define YY_END_OF_BUFFER 18
-typedef int yy_state_type;
-static const short int yy_accept[34] =
- { 0,
- 0, 0, 18, 16, 13, 14, 16, 16, 6, 7,
- 16, 8, 12, 16, 1, 11, 3, 9, 10, 2,
- 0, 5, 0, 0, 0, 4, 1, 15, 3, 5,
- 0, 0, 0
- } ;
-
-static const YY_CHAR yy_ec[256] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 1, 4, 1, 1, 1, 1, 5, 6,
- 7, 8, 9, 10, 9, 11, 12, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 1, 1, 1,
- 14, 1, 1, 1, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 16, 17, 18, 1, 15, 1, 15, 15, 15, 15,
-
- 19, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
- 15, 15, 1, 20, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1
- } ;
-
-static const YY_CHAR yy_meta[21] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 2, 1, 2, 1, 3, 1, 2, 1
- } ;
-
-static const short int yy_base[37] =
- { 0,
- 0, 0, 48, 55, 55, 55, 17, 42, 55, 55,
- 19, 55, 55, 23, 17, 55, 0, 55, 55, 0,
- 18, 55, 19, 23, 21, 55, 12, 55, 0, 24,
- 25, 29, 55, 49, 52, 22
- } ;
-
-static const short int yy_def[37] =
- { 0,
- 33, 1, 33, 33, 33, 33, 34, 35, 33, 33,
- 33, 33, 33, 33, 33, 33, 36, 33, 33, 36,
- 34, 33, 34, 34, 35, 33, 33, 33, 36, 34,
- 34, 34, 0, 33, 33, 33
- } ;
-
-static const short int yy_nxt[76] =
- { 0,
- 4, 5, 6, 7, 8, 9, 10, 4, 11, 12,
- 13, 14, 15, 16, 17, 18, 4, 19, 20, 4,
- 22, 22, 30, 29, 27, 26, 22, 22, 30, 27,
- 28, 27, 30, 23, 23, 23, 24, 24, 24, 31,
- 23, 32, 24, 24, 24, 23, 26, 33, 24, 21,
- 21, 21, 25, 25, 3, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33
- } ;
-
-static const short int yy_chk[76] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 7, 21, 23, 36, 27, 25, 24, 30, 31, 15,
- 14, 11, 32, 7, 21, 23, 7, 21, 23, 24,
- 30, 31, 24, 30, 31, 32, 8, 3, 32, 34,
- 34, 34, 35, 35, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 33, 33
- } ;
-
-static yy_state_type yy_last_accepting_state;
-static YY_CHAR *yy_last_accepting_cpos;
-
-/* the intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-
-/* these variables are all declared out here so that section 3 code can
- * manipulate them
- */
-/* points to current character in buffer */
-static YY_CHAR *yy_c_buf_p = (YY_CHAR *) 0;
-static int yy_init = 1; /* whether we need to initialize */
-static int yy_start = 0; /* start state number */
-
-/* flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin. A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yyunput YY_PROTO(( YY_CHAR c, YY_CHAR *buf_ptr ));
-void yyrestart YY_PROTO(( FILE *input_file ));
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-
-#define yy_new_buffer yy_create_buffer
-
-#ifdef __cplusplus
- static int yyinput YY_PROTO(( void ));
-#else
- static int input YY_PROTO(( void ));
-#endif
-
-YY_DECL
- {
- register yy_state_type yy_current_state;
- register YY_CHAR *yy_cp, *yy_bp;
- register int yy_act;
-
-
-
-
- if ( yy_init )
- {
- YY_USER_INIT;
-
- if ( ! yy_start )
- yy_start = 1; /* first start state */
-
- if ( ! yyin )
- yyin = stdin;
-
- if ( ! yyout )
- yyout = stdout;
-
- if ( yy_current_buffer )
- yy_init_buffer( yy_current_buffer, yyin );
- else
- yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
- yy_load_buffer_state();
-
- yy_init = 0;
- }
-
-#if !defined(__VISAGECPP__)
- while ( 1 ) /* loops until end-of-file is reached */
-#else
- os2var = 1;
- if (os2var == 0) return 0;
- while ( os2var == 1 ) /* loops until end-of-file is reached */
-#endif
- {
- yy_cp = yy_c_buf_p;
-
- /* support of yytext */
- *yy_cp = yy_hold_char;
-
- /* yy_bp points to the position in yy_ch_buf of the start of the
- * current run.
- */
- yy_bp = yy_cp;
-
- yy_current_state = yy_start;
-yy_match:
- do
- {
- register YY_CHAR yy_c = yy_ec[*yy_cp];
- if ( yy_accept[yy_current_state] )
- {
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = yy_def[yy_current_state];
- if ( yy_current_state >= 34 )
- yy_c = yy_meta[yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
- ++yy_cp;
- }
- while ( yy_current_state != 33 );
- yy_cp = yy_last_accepting_cpos;
- yy_current_state = yy_last_accepting_state;
-
-yy_find_action:
- yy_act = yy_accept[yy_current_state];
-
- YY_DO_BEFORE_ACTION;
- YY_USER_ACTION;
-
-do_action: /* this label is used only to access EOF actions */
-
-
- switch ( yy_act )
- {
- case 0: /* must backtrack */
- {
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = yy_hold_char;
- yy_cp = yy_last_accepting_cpos;
- yy_current_state = yy_last_accepting_state;
- goto yy_find_action;
- }
-
- case 1:
- {
- yylval.s = strdup((const char*) yytext);
- return INTEGER;
- }
-
- case 2:
- {
- return EXP;
- }
-
- case 3:
- {
- yylval.s = strdup((const char*) yytext);
- return WORD;
- }
-
- case 4:
- {
- int len = strlen((const char*) yytext);
- yytext[len-1] = 0;
- yylval.s = strdup((const char*) (yytext+1));
- return WORD;
- }
-
- case 5:
- {
- yylval.s = strdup((const char*) yytext);
- return STRING;
- }
-
- case 6:
- {
- return OPEN;
- }
-
- case 7:
- {
- return CLOSE;
- }
-
- case 8:
- {
- return COMMA;
- }
-
- case 9:
- {
- return OPEN_SQUARE;
- }
-
- case 10:
- {
- return CLOSE_SQUARE;
- }
-
- case 11:
- {
- return EQUALS;
- }
-
- case 12:
- {
- return PERIOD;
- }
-
- case 13:
- {
- break;
- }
-
- case 14:
- {
- break;
- }
-
- case 15:
- {
- loop:
-#ifdef __cplusplus
- while (yyinput() != '*') ;
- switch (yyinput())
-#else
- while (input() != '*') ;
- switch (input())
-#endif
- {
- case '/':
- break;
- case '*':
- unput('*');
- default:
- goto loop;
- }
- break;
- }
-
- case 16:
- {
- return ERROR;
- }
-
- case 17:
- {
- ECHO;
- break;
- }
-
- case YY_STATE_EOF(INITIAL):
- {
- yyterminate();
- }
-
- case YY_END_OF_BUFFER:
- {
- /* amount of text matched not including the EOB char */
- int yy_amount_of_matched_text = yy_cp - yytext - 1;
-
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = yy_hold_char;
-
- /* note that here we test for yy_c_buf_p "<=" to the position
- * of the first EOB in the buffer, since yy_c_buf_p will
- * already have been incremented past the NUL character
- * (since all states make transitions on EOB to the end-
- * of-buffer state). Contrast this with the test in yyinput().
- */
- if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
- /* this was really a NUL */
- {
- yy_state_type yy_next_state;
-
- yy_c_buf_p = yytext + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state();
-
- /* okay, we're now positioned to make the
- * NUL transition. We couldn't have
- * yy_get_previous_state() go ahead and do it
- * for us because it doesn't know how to deal
- * with the possibility of jamming (and we
- * don't want to build jamming into it because
- * then it will run more slowly)
- */
-
- yy_next_state = yy_try_NUL_trans( yy_current_state );
-
- yy_bp = yytext + YY_MORE_ADJ;
-
- if ( yy_next_state )
- {
- /* consume the NUL */
- yy_cp = ++yy_c_buf_p;
- yy_current_state = yy_next_state;
- goto yy_match;
- }
- else
- {
- yy_cp = yy_last_accepting_cpos;
- yy_current_state = yy_last_accepting_state;
- goto yy_find_action;
- }
- }
- else switch ( yy_get_next_buffer() )
- {
- case EOB_ACT_END_OF_FILE:
- {
- yy_did_buffer_switch_on_eof = 0;
-
- if ( yywrap() )
- {
- /* note: because we've taken care in
- * yy_get_next_buffer() to have set up yytext,
- * we can now set up yy_c_buf_p so that if some
- * total hoser (like flex itself) wants
- * to call the scanner after we return the
- * YY_NULL, it'll still work - another YY_NULL
- * will get returned.
- */
- yy_c_buf_p = yytext + YY_MORE_ADJ;
-
- yy_act = YY_STATE_EOF((yy_start - 1) / 2);
- goto do_action;
- }
- else
- {
- if ( ! yy_did_buffer_switch_on_eof )
- YY_NEW_FILE;
- }
- }
- break;
-
- case EOB_ACT_CONTINUE_SCAN:
- yy_c_buf_p = yytext + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state();
-
- yy_cp = yy_c_buf_p;
- yy_bp = yytext + YY_MORE_ADJ;
- goto yy_match;
-
- case EOB_ACT_LAST_MATCH:
- yy_c_buf_p = &yy_current_buffer->yy_ch_buf[yy_n_chars];
-
- yy_current_state = yy_get_previous_state();
-
- yy_cp = yy_c_buf_p;
- yy_bp = yytext + YY_MORE_ADJ;
- goto yy_find_action;
- }
- }
- break;
-
- default:
-#ifdef FLEX_DEBUG
- printf( "action # %d\n", yy_act );
-#endif
- YY_FATAL_ERROR("fatal flex scanner internal error--no action found" );
- }
- }
-
-#if defined(__VISAGECPP__)
- /* VA complains about proc maybe not returning a value so return one */
- return 0;
-#endif
-}
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * synopsis
- * int yy_get_next_buffer();
- *
- * returns a code representing an action
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-{
- register YY_CHAR *dest = yy_current_buffer->yy_ch_buf;
- register YY_CHAR *source = yytext - 1; /* copy prev. char, too */
- register int number_to_move, i;
- int ret_val;
-
- if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
- YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" );
-
- /* try to read more data */
-
- /* first move last chars to start of buffer */
- number_to_move = yy_c_buf_p - yytext;
-
- for ( i = 0; i < number_to_move; ++i )
- *(dest++) = *(source++);
-
- if ( yy_current_buffer->yy_eof_status != EOF_NOT_SEEN )
- /* don't do the read, it's not guaranteed to return an EOF,
- * just force an EOF
- */
- yy_n_chars = 0;
-
- else
- {
- int num_to_read = yy_current_buffer->yy_buf_size - number_to_move - 1;
-
- if ( num_to_read > YY_READ_BUF_SIZE )
- num_to_read = YY_READ_BUF_SIZE;
-
- else if ( num_to_read <= 0 )
- YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" );
-
- /* read in more data */
- YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
- yy_n_chars, num_to_read );
- }
-
- if ( yy_n_chars == 0 )
- {
- if ( number_to_move == 1 )
- {
- ret_val = EOB_ACT_END_OF_FILE;
- yy_current_buffer->yy_eof_status = EOF_DONE;
- }
-
- else
- {
- ret_val = EOB_ACT_LAST_MATCH;
- yy_current_buffer->yy_eof_status = EOF_PENDING;
- }
- }
-
- else
- ret_val = EOB_ACT_CONTINUE_SCAN;
-
- yy_n_chars += number_to_move;
- yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
- yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
- /* yytext begins at the second character in yy_ch_buf; the first
- * character is the one which preceded it before reading in the latest
- * buffer; it needs to be kept around in case it's a newline, so
- * yy_get_previous_state() will have with '^' rules active
- */
-
- yytext = &yy_current_buffer->yy_ch_buf[1];
-
- return ( ret_val );
-}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached
- *
- * synopsis
- * yy_state_type yy_get_previous_state();
- */
-
-static yy_state_type yy_get_previous_state()
-{
- register yy_state_type yy_current_state;
- register YY_CHAR *yy_cp;
-
- yy_current_state = yy_start;
-
- for ( yy_cp = yytext + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
- {
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[*yy_cp] : 1);
- if ( yy_accept[yy_current_state] )
- {
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = yy_def[yy_current_state];
- if ( yy_current_state >= 34 )
- yy_c = yy_meta[yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
- }
-
- return ( yy_current_state );
-}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- * next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( register yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-register yy_state_type yy_current_state;
-#endif
-{
- register int yy_is_jam;
- register YY_CHAR *yy_cp = yy_c_buf_p;
-
- register YY_CHAR yy_c = 1;
- if ( yy_accept[yy_current_state] )
- {
- yy_last_accepting_state = yy_current_state;
- yy_last_accepting_cpos = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = yy_def[yy_current_state];
- if ( yy_current_state >= 34 )
- yy_c = yy_meta[yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
- yy_is_jam = (yy_current_state == 33);
-
- return ( yy_is_jam ? 0 : yy_current_state );
-}
-
-
-#ifdef YY_USE_PROTOS
-static void yyunput( YY_CHAR c, register YY_CHAR *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-YY_CHAR c;
-register YY_CHAR *yy_bp;
-#endif
-{
- register YY_CHAR *yy_cp = yy_c_buf_p;
-
- /* undo effects of setting up yytext */
- *yy_cp = yy_hold_char;
-
- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
- { /* need to shift things up to make room */
- register int number_to_move = yy_n_chars + 2; /* +2 for EOB chars */
- register YY_CHAR *dest =
- &yy_current_buffer->yy_ch_buf[yy_current_buffer->yy_buf_size + 2];
- register YY_CHAR *source =
- &yy_current_buffer->yy_ch_buf[number_to_move];
-
- while ( source > yy_current_buffer->yy_ch_buf )
- *--dest = *--source;
-
- yy_cp += dest - source;
- yy_bp += dest - source;
- yy_n_chars = yy_current_buffer->yy_buf_size;
-
- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
- YY_FATAL_ERROR( "flex scanner push-back overflow" );
- }
-
- if ( yy_cp > yy_bp && yy_cp[-1] == '\n' )
- yy_cp[-2] = '\n';
-
- *--yy_cp = c;
-
- /* note: the formal parameter *must* be called "yy_bp" for this
- * macro to now work correctly
- */
- YY_DO_BEFORE_ACTION; /* set up yytext again */
-}
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-{
- int c;
- YY_CHAR *yy_cp = yy_c_buf_p;
-
- *yy_cp = yy_hold_char;
-
- if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
- {
- /* yy_c_buf_p now points to the character we want to return.
- * If this occurs *before* the EOB characters, then it's a
- * valid NUL; if not, then we've hit the end of the buffer.
- */
- if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
- { /* this was really a NUL */
- *yy_c_buf_p = '\0';
- }
- else
- { /* need more input */
- yytext = yy_c_buf_p;
- ++yy_c_buf_p;
-
- switch ( yy_get_next_buffer() )
- {
- case EOB_ACT_END_OF_FILE:
- {
- if ( yywrap() )
- {
- yy_c_buf_p = yytext + YY_MORE_ADJ;
- return ( EOF );
- }
- YY_NEW_FILE;
-
-#ifdef __cplusplus
- return ( yyinput() );
-#else
- return ( input() );
-#endif
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- yy_c_buf_p = yytext + YY_MORE_ADJ;
- break;
-
- case EOB_ACT_LAST_MATCH:
-#ifdef __cplusplus
- YY_FATAL_ERROR( "unexpected last match in yyinput()" );
-#else
- YY_FATAL_ERROR( "unexpected last match in input()" );
-#endif
- }
- }
- }
-
- c = *yy_c_buf_p;
- yy_hold_char = *++yy_c_buf_p;
-
- return ( c );
-}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-{
- yy_init_buffer( yy_current_buffer, input_file );
- yy_load_buffer_state();
-}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-{
- if ( yy_current_buffer == new_buffer )
- return;
-
- if ( yy_current_buffer )
- {
- /* flush out information for old buffer */
- *yy_c_buf_p = yy_hold_char;
- yy_current_buffer->yy_buf_pos = yy_c_buf_p;
- yy_current_buffer->yy_n_chars = yy_n_chars;
- }
-
- yy_current_buffer = new_buffer;
- yy_load_buffer_state();
-
- /* we don't actually know whether we did this switch during
- * EOF (yywrap()) processing, but the only time this flag
- * is looked at is after yywrap() is called, so it's safe
- * to go ahead and always set it.
- */
- yy_did_buffer_switch_on_eof = 1;
-}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-{
- yy_n_chars = yy_current_buffer->yy_n_chars;
- yytext = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
- yyin = yy_current_buffer->yy_input_file;
- yy_hold_char = *yy_c_buf_p;
-}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-{
- YY_BUFFER_STATE b;
-
- b = (YY_BUFFER_STATE) malloc( sizeof( struct yy_buffer_state ) );
-
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
- b->yy_buf_size = size;
-
- /* yy_ch_buf has to be 2 characters longer than the size given because
- * we need to put in 2 end-of-buffer characters.
- */
- b->yy_ch_buf = (YY_CHAR *) malloc( (unsigned) (b->yy_buf_size + 2) );
-
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
- yy_init_buffer( b, file );
-
- return ( b );
-}
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-{
- if ( b == yy_current_buffer )
- yy_current_buffer = (YY_BUFFER_STATE) 0;
-
- free( (char *) b->yy_ch_buf );
- free( (char *) b );
-}
-
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-{
- b->yy_input_file = file;
-
- /* we put in the '\n' and start reading from [1] so that an
- * initial match-at-newline will be true.
- */
-
- b->yy_ch_buf[0] = '\n';
- b->yy_n_chars = 1;
-
- /* we always need two end-of-buffer characters. The first causes
- * a transition to the end-of-buffer state. The second causes
- * a jam in that state.
- */
- b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
- b->yy_ch_buf[2] = YY_END_OF_BUFFER_CHAR;
-
- b->yy_buf_pos = &b->yy_ch_buf[1];
-
- b->yy_eof_status = EOF_NOT_SEEN;
-}
-/* # line 108 "lexer.l" */
-
-
-
-#ifdef FLEX_SCANNER
- static int lex_input()
- {
- return input();
- }
-#else /* BSD/AT&T lex */
- #ifndef input
- #error "Sorry, but need either flex or AT&T lex"
- #endif
- static int lex_input() {
- return input();
- }
-
- /*
- # undef unput
- # define unput(_c) my_unput(_c)
- */
-
- # undef input
- # define input() my_input()
- static int my_unput(char c)
- {
- if (lex_read_from_string)
- {
- /* Make sure we have something */
- if (lex_string_ptr)
- {
- if (c == '\n') yylineno--;
- lex_string_ptr--;
- }
- }
- else
- {
- yytchar= (c);if(yytchar=='\n')yylineno--;*yysptr++=yytchar;
- /* unput(c); Causes infinite recursion! */
- }
- return c;
- }
-#endif
-
-/* Public */
-void LexFromFile(FILE *fd)
-{
- lex_read_from_string = 0;
- yyin = fd;
- /* Don't know why this is necessary, but otherwise
- * lex only works _once_!
- */
-#ifdef FLEX_SCANNER
- yy_init = 1;
-#endif
-}
-
-void LexFromString(char *buffer)
-{
- lex_read_from_string = 1;
- lex_buffer = buffer;
- lex_buffer_length = strlen((const char*) buffer);
- lex_string_ptr = 0;
- /* Don't know why this is necessary, but otherwise
- * lex only works _once_!
- */
-#ifdef FLEX_SCANNER
- yy_init = 1;
-#endif
-}
-
-static int my_input( void )
-{
- if (lex_read_from_string)
- {
- if (lex_string_ptr == lex_buffer_length)
- {
- return 0;
- }
- else
- {
- char c = lex_buffer[lex_string_ptr++];
-#ifndef FLEX_SCANNER
- if (c == '\n') yylineno++;
-#endif
- return c;
- }
- }
- else
- {
- return lex_input();
- }
-}
-
-void wxExprCleanUp()
-{
- if (yy_current_buffer)
- yy_delete_buffer(yy_current_buffer);
-}
-
-#ifdef __VISUALC__
- #pragma warning(pop)
-#endif
diff --git a/contrib/src/deprecated/dosyacc.c b/contrib/src/deprecated/dosyacc.c
deleted file mode 100644
index 6b03b4159d..0000000000
--- a/contrib/src/deprecated/dosyacc.c
+++ /dev/null
@@ -1,552 +0,0 @@
-/* Copyright: (c) Julian Smart */
-/* Licence: wxWindows Licence */
-/* include platform.h first to get __WIN32__ definition */
-
-#include "wx/platform.h"
-#include "wx/setup.h"
-#include "wx/deprecated/setup.h"
-
-#if !defined(wxUSE_PROLOGIO) || wxUSE_PROLOGIO
-
-#ifdef __VISUALC__
- #pragma warning(push)
- #pragma warning(disable:4244) /* warning C4244: '=' : conversion from 'A' to 'B', possible loss of data */
-#endif
-
-#if !defined(lint) && 0
-static char yysccsid[] = "@(#)yaccpar 1.7 (Berkeley) 09/09/90";
-#endif
-#define YYBYACC 1
-// #line 2 "parser.y"
-#include "string.h"
-#if defined(_MSC_VER) || defined(__VISAGECPP__)
-#include
-#endif
-#include "wx/deprecated/expr.h"
-
-#ifndef __EXTERN_C__
-#define __EXTERN_C__ 1
-#endif
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-extern "C" {
-#endif
-#endif
-int yylex(void);
-int yylook(void);
-int yywrap(void);
-int yyback(int *, int);
-
-/* You may need to put /DLEX_SCANNER in your makefile
- * if you're using LEX!
- */
-#ifdef LEX_SCANNER
-/* int yyoutput(int); */
-void yyoutput(int);
-#else
-void yyoutput(int);
-#endif
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-}
-#endif
-#endif
-// #line 36 "parser.y"
-typedef union {
- char *s;
-/* struct pexpr *expr; */
-} YYSTYPE;
-// #line 44 "y_tab.c"
-#define INTEGER 1
-#define WORD 2
-#define STRING 3
-#define PERIOD 13
-#define OPEN 4
-#define CLOSE 5
-#define COMMA 6
-#define NEWLINE 7
-#define ERROR 8
-#define OPEN_SQUARE 9
-#define CLOSE_SQUARE 10
-#define EQUALS 11
-#define EXP 14
-#define YYERRCODE 256
-short yylhs[] = { -1,
- 0, 0, 1, 1, 1, 2, 2, 2, 3, 3,
- 3, 4, 4, 5, 5, 5, 5, 5, 5, 5,
-};
-short yylen[] = { 2,
- 0, 2, 2, 2, 2, 4, 2, 3, 0, 1,
- 3, 3, 1, 1, 1, 1, 3, 3, 5, 1,
-};
-short yydefred[] = { 1,
- 0, 0, 0, 0, 2, 0, 5, 3, 0, 0,
- 0, 15, 7, 20, 0, 0, 13, 4, 0, 0,
- 0, 0, 8, 0, 6, 0, 18, 0, 12, 11,
- 0, 19,
-};
-short yydgoto[] = { 1,
- 5, 14, 15, 16, 17,
-};
-short yysindex[] = { 0,
- -2, 9, 2, 1, 0, 10, 0, 0, 11, -5,
- 17, 0, 0, 0, 14, -1, 0, 0, 33, 38,
- 41, 16, 0, 11, 0, 29, 0, 40, 0, 0,
- 44, 0,
-};
-short yyrindex[] = { 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 42, 21,
- 24, 0, 0, 0, 0, 30, 0, 0, 0, 0,
- 0, 0, 0, 31, 0, 27, 0, 24, 0, 0,
- 0, 0,
-};
-short yygindex[] = { 0,
- 0, 45, -8, 0, 26,
-};
-#define YYTABLESIZE 254
-short yytable[] = { 3,
- 19, 10, 11, 12, 24, 9, 4, 20, 21, 4,
- 13, 10, 11, 12, 8, 30, 10, 28, 12, 4,
- 9, 7, 18, 23, 4, 16, 16, 22, 14, 14,
- 16, 17, 17, 14, 10, 9, 17, 25, 26, 10,
- 9, 27, 31, 9, 32, 6, 9, 29, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 2,
-};
-short yycheck[] = { 2,
- 9, 1, 2, 3, 6, 4, 9, 13, 14, 9,
- 10, 1, 2, 3, 13, 24, 1, 2, 3, 9,
- 4, 13, 13, 10, 9, 5, 6, 11, 5, 6,
- 10, 5, 6, 10, 5, 5, 10, 5, 1, 10,
- 10, 1, 14, 4, 1, 1, 5, 22, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 256,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 14
-#if YYDEBUG
-char *yyname[] = {
-"end-of-file","INTEGER","WORD","STRING","OPEN","CLOSE","COMMA","NEWLINE",
-"ERROR","OPEN_SQUARE","CLOSE_SQUARE","EQUALS",0,"PERIOD","EXP",
-};
-char *yyrule[] = {
-"$accept : commands",
-"commands :",
-"commands : commands command",
-"command : WORD PERIOD",
-"command : expr PERIOD",
-"command : error PERIOD",
-"expr : WORD OPEN arglist CLOSE",
-"expr : OPEN_SQUARE CLOSE_SQUARE",
-"expr : OPEN_SQUARE arglist CLOSE_SQUARE",
-"arglist :",
-"arglist : arg",
-"arglist : arg COMMA arglist",
-"arg : WORD EQUALS arg1",
-"arg : arg1",
-"arg1 : WORD",
-"arg1 : STRING",
-"arg1 : INTEGER",
-"arg1 : INTEGER PERIOD INTEGER",
-"arg1 : INTEGER EXP INTEGER",
-"arg1 : INTEGER PERIOD INTEGER EXP INTEGER",
-"arg1 : expr",
-};
-#endif
-#define yyclearin (yychar=(-1))
-#define yyerrok (yyerrflag=0)
-#ifdef YYSTACKSIZE
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
-#endif
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 600
-#define YYMAXDEPTH 600
-#endif
-#endif
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short yyss[YYSTACKSIZE];
-YYSTYPE yyvs[YYSTACKSIZE];
-#define yystacksize YYSTACKSIZE
-// #line 118 "parser.y"
-
-#include "doslex.c"
-
-/*
-void yyerror(s)
-char *s;
-{
- syntax_error(s);
-}
-*/
-
-/* Ansi prototype. If this doesn't work for you... uncomment
- the above instead.
- */
-
-void yyerror(char *s)
-{
- syntax_error(s);
-}
-
-/*
- * Unfortunately, my DOS version of FLEX
- * requires yywrap to be #def'ed, whereas
- * the UNIX flex expects a proper function.
- */
-
-/* Not sure if __SC__ is the appropriate thing
- * to test
- */
-
-#if 0 /* VS: doesn't work... */
-#ifndef __SC__
-#ifdef USE_DEFINE
-#ifndef yywrap
-#define yywrap() 1
-#endif
-#else
-# if !(defined(__VISAGECPP__) && __IBMC__ >= 400)
-/* VA 4.0 thinks this is multiply defined (in lex_yy.c) */
- int yywrap() { return 1; }
-# endif
-#endif
-#endif
-#endif
-
-// #line 247 "y_tab.c"
-#define YYABORT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-int
-PROIO_yyparse()
-{
- register int yym, yyn, yystate;
-#if YYDEBUG
- register char *yys;
- extern char *getenv();
-
- yys = getenv("YYDEBUG");
- if (yys)
- {
- yyn = *yys;
- if (yyn >= '0' && yyn <= '9')
- yydebug = yyn - '0';
- }
-#endif
-
- yynerrs = 0;
- yyerrflag = 0;
- yychar = (-1);
-
- yyssp = yyss;
- yyvsp = yyvs;
- *yyssp = yystate = 0;
-
-yyloop:
- yyn = yydefred[yystate];
- if (yyn != 0) goto yyreduce;
- if (yychar < 0)
- {
- if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
- if (yydebug)
- {
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
- printf("yydebug: state %d, reading %d (%s)\n", yystate,
- yychar, yys);
- }
-#endif
- }
- yyn = yysindex[yystate];
- if ((yyn) && (yyn += yychar) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
- {
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: state %d, shifting to state %d\n",
- yystate, yytable[yyn]);
-#endif
- if (yyssp >= yyss + yystacksize - 1)
- {
- goto yyoverflow;
- }
- *++yyssp = yystate = yytable[yyn];
- *++yyvsp = yylval;
- yychar = (-1);
- if (yyerrflag > 0) --yyerrflag;
- goto yyloop;
- }
- yyn = yyrindex[yystate];
- if ((yyn) && (yyn += yychar) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
- {
- yyn = yytable[yyn];
- goto yyreduce;
- }
- if (yyerrflag) goto yyinrecovery;
-#ifdef lint
- goto yynewerror;
-yynewerror:
-#endif
- yyerror("syntax error");
-#ifdef lint
- goto yyerrlab;
-yyerrlab:
-#endif
- ++yynerrs;
-yyinrecovery:
- if (yyerrflag < 3)
- {
- yyerrflag = 3;
- for (;;)
- {
- yyn = yysindex[*yyssp];
- if ((yyn) && (yyn += YYERRCODE) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
- {
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: state %d, error recovery shifting\
- to state %d\n", *yyssp, yytable[yyn]);
-#endif
- if (yyssp >= yyss + yystacksize - 1)
- {
- goto yyoverflow;
- }
- *++yyssp = yystate = yytable[yyn];
- *++yyvsp = yylval;
- goto yyloop;
- }
- else
- {
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: error recovery discarding state %d\n",
- *yyssp);
-#endif
- if (yyssp <= yyss) goto yyabort;
- --yyssp;
- --yyvsp;
- }
- }
- }
- else
- {
- if (yychar == 0) goto yyabort;
-#if YYDEBUG
- if (yydebug)
- {
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
- printf("yydebug: state %d, error recovery discards token %d (%s)\n",
- yystate, yychar, yys);
- }
-#endif
- yychar = (-1);
- goto yyloop;
- }
-yyreduce:
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: state %d, reducing by rule %d (%s)\n",
- yystate, yyn, yyrule[yyn]);
-#endif
- yym = yylen[yyn];
- yyval = yyvsp[1-yym];
- switch (yyn)
- {
-case 3:
-// #line 68 "parser.y"
-{process_command(proio_cons(wxmake_word(yyvsp[-1].s), NULL)); free(yyvsp[-1].s);}
-break;
-case 4:
-// #line 70 "parser.y"
-{process_command(yyvsp[-1].s);}
-break;
-case 5:
-// #line 72 "parser.y"
-{syntax_error("Unrecognized command.");}
-break;
-case 6:
-// #line 76 "parser.y"
-{yyval.s = proio_cons(wxmake_word(yyvsp[-3].s), yyvsp[-1].s); free(yyvsp[-3].s);}
-break;
-case 7:
-// #line 78 "parser.y"
-{yyval.s = proio_cons(NULL, NULL);}
-break;
-case 8:
-// #line 80 "parser.y"
-{yyval.s = yyvsp[-1].s; }
-break;
-case 9:
-// #line 84 "parser.y"
-{yyval.s = NULL;}
-break;
-case 10:
-// #line 86 "parser.y"
-{yyval.s = proio_cons(yyvsp[0].s, NULL);}
-break;
-case 11:
-// #line 89 "parser.y"
-{yyval.s = proio_cons(yyvsp[-2].s, yyvsp[0].s);}
-break;
-case 12:
-// #line 93 "parser.y"
-{yyval.s = proio_cons(wxmake_word("="), proio_cons(wxmake_word(yyvsp[-2].s), proio_cons(yyvsp[0].s, NULL)));
- free(yyvsp[-2].s); }
-break;
-case 13:
-// #line 96 "parser.y"
-{yyval.s = yyvsp[0].s; }
-break;
-case 14:
-// #line 99 "parser.y"
-{yyval.s = wxmake_word(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 15:
-// #line 101 "parser.y"
-{yyval.s = wxmake_string(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 16:
-// #line 103 "parser.y"
-{yyval.s = wxmake_integer(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 17:
-// #line 105 "parser.y"
-{yyval.s = wxmake_real(yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-2].s); free(yyvsp[0].s); }
-break;
-case 18:
-// #line 107 "parser.y"
-{yyval.s = wxmake_exp(yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-2].s); free(yyvsp[0].s); }
-break;
-case 19:
-// #line 110 "parser.y"
-{yyval.s = wxmake_exp2(yyvsp[-4].s, yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-4].s); free(yyvsp[-2].s);
- free(yyvsp[0].s); }
-break;
-case 20:
-// #line 114 "parser.y"
-{yyval.s = yyvsp[0].s;}
-break;
-// #line 461 "y_tab.c"
- }
- yyssp -= yym;
- yystate = *yyssp;
- yyvsp -= yym;
- yym = yylhs[yyn];
- if (yystate == 0 && yym == 0)
- {
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: after reduction, shifting from state 0 to\
- state %d\n", YYFINAL);
-#endif
- yystate = YYFINAL;
- *++yyssp = YYFINAL;
- *++yyvsp = yyval;
- if (yychar < 0)
- {
- if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
- if (yydebug)
- {
- yys = 0;
- if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
- if (!yys) yys = "illegal-symbol";
- printf("yydebug: state %d, reading %d (%s)\n",
- YYFINAL, yychar, yys);
- }
-#endif
- }
- if (yychar == 0) goto yyaccept;
- goto yyloop;
- }
- yyn = yygindex[yym];
- if ((yyn) && (yyn += yystate) >= 0 &&
- yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
- yystate = yytable[yyn];
- else
- yystate = yydgoto[yym];
-#if YYDEBUG
- if (yydebug)
- printf("yydebug: after reduction, shifting from state %d \
-to state %d\n", *yyssp, yystate);
-#endif
- if (yyssp >= yyss + yystacksize - 1)
- {
- goto yyoverflow;
- }
- *++yyssp = yystate;
- *++yyvsp = yyval;
- goto yyloop;
-yyoverflow:
- yyerror("yacc stack overflow");
-yyabort:
- return (1);
-yyaccept:
- return (0);
-}
-
-#ifdef __VISUALC__
- #pragma warning(pop)
-#endif
-
-#endif /* wxUSE_PROLOGIO */
diff --git a/contrib/src/deprecated/lexer.l b/contrib/src/deprecated/lexer.l
deleted file mode 100644
index 3b0c75f0b4..0000000000
--- a/contrib/src/deprecated/lexer.l
+++ /dev/null
@@ -1,194 +0,0 @@
-SIGN [+-]
-DIGIT [0-9]
-ALPHA [a-zA-Z_]
-ALPHADIGIT [a-zA-Z_0-9]
-STRINGCHAR [^"\\]
-WORDCHAR [^'\\]
-
-%{
-/*
- * File: lexer.l
- * Description: Lexical analyser for PROLOGIO; can be used with
- * either lex and flex.
- * Copyright: (c) Julian Smart
- * Licence: wxWindows Licence
- */
-#include
-#include
-
-/* +++steve162e: added, otherwise, PROIO_input will be undefined (at least under LINUX)
- please check, if this is also TRUE under other UNIXes.
- */
-
-#if defined(FLEX_SCANNER) && defined(_LINUX)
-#define PROIO_input my_input
-#endif
-/* ---steve162e */
-
-#include "wx/deprecated/expr.h"
-
-#define Return(x) return x;
-
-#if defined(VMS) && !defined(strdup)
-#define strdup(s) (strcpy((char *)malloc(strlen(s)+1), s));
-#endif
-
-static size_t lex_buffer_length = 0;
-static const char *lex_buffer = NULL;
-static size_t lex_string_ptr = 0;
-static int lex_read_from_string = 0;
-
-static int my_input(void);
-
-#ifdef FLEX_SCANNER
-# undef YY_INPUT
-# define YY_INPUT(buf,result,max_size) \
- if (lex_read_from_string) \
- { int c = my_input(); result = (c == 0) ? YY_NULL : ((buf)[0]=(c), 1); } \
- else \
- if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
- YY_FATAL_ERROR( "read() in flex scanner failed" );
-#else
-# undef unput
-# define unput(_c) my_unput(_c)
- static int my_unput(char);
-#endif
-
-%}
-
-%%
-
-{SIGN}?{DIGIT}+ {yylval.s = strdup(yytext); Return(INTEGER);}
-
-"e" Return(EXP);
-
-{ALPHA}{ALPHADIGIT}* {yylval.s = strdup(yytext); Return(WORD);}
-
-"'"{WORDCHAR}*"'" {int len = strlen(yytext);
- yytext[len-1] = 0;
- yylval.s = strdup(yytext+1);
- Return(WORD);}
-
-\"({STRINGCHAR}|\\\"|\|\\\\|\\)*\" {yylval.s = strdup(yytext); Return(STRING);}
-
-"(" Return(OPEN);
-
-")" Return(CLOSE);
-
-"," Return(COMMA);
-
-"[" Return(OPEN_SQUARE);
-
-"]" Return(CLOSE_SQUARE);
-
-"=" Return(EQUALS);
-
-"." Return(PERIOD);
-
-[ \t] ;
-
-\n ;
-
-"/*" { loop:
-#ifdef __cplusplus
- while (yyinput() != '*');
- switch (yyinput())
-#else
- while (input() != '*');
- switch (input())
-#endif
- {
- case '/': break;
- case '*': unput('*');
- default: goto loop;
- }
- }
-
-. Return(ERROR);
-
-%%
-
-
-#ifdef FLEX_SCANNER
-static int lex_input() {
- return input();
-}
-#else /* BSD/AT&T lex */
-#ifndef input
-# error "Sorry, but need either flex or AT&T lex"
-#endif
-static int lex_input() {
- return input();
-}
-
-# undef input
-# define input() my_input()
-static int my_unput(char c)
-{
- if (lex_read_from_string != 0) {
- /* Make sure we have something */
- if (lex_string_ptr) {
- if (c == '\n') yylineno--;
- lex_string_ptr--;
- }
- } else {
- yytchar= (c);if(yytchar=='\n')yylineno--;*yysptr++=yytchar;
-/* unput(c); Causes infinite recursion! */
- }
- return c;
-}
-
-#endif
-
-/* Public */
-void LexFromFile(FILE *fd)
-{
- lex_read_from_string = 0;
- yyin = fd;
- /* Don't know why this is necessary, but otherwise
- * lex only works _once_!
- */
-#ifdef FLEX_SCANNER
- yyrestart(fd);
- yy_init = 1;
-#endif
-}
-
-void LexFromString(char *buffer)
-{
- lex_read_from_string = 1;
- lex_buffer = buffer;
- lex_buffer_length = strlen(buffer);
- lex_string_ptr = 0;
- /* Don't know why this is necessary, but otherwise
- * lex only works _once_!
- */
-#ifdef FLEX_SCANNER
- yy_init = 1;
-#endif
-}
-
-static int my_input( void )
-{
- if (lex_read_from_string) {
- if (lex_string_ptr == lex_buffer_length)
- return 0;
- else {
- char c = lex_buffer[lex_string_ptr++];
-#ifndef FLEX_SCANNER
- if (c == '\n') yylineno++;
-#endif
- return c;
- }
- } else {
- return lex_input();
- }
-}
-
-void wxExprCleanUp()
-{
-#ifdef FLEX_SCANNER
- if (yy_current_buffer)
- yy_delete_buffer(yy_current_buffer);
-#endif
-}
diff --git a/contrib/src/deprecated/parser.y b/contrib/src/deprecated/parser.y
deleted file mode 100644
index 91e3b95320..0000000000
--- a/contrib/src/deprecated/parser.y
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Version: $Id$ */
-/* Copyright: (c) Julian Smart */
-/* Licence: wxWindows Licence */
- %{
-#include "wx/setup.h"
-#include
-#ifdef _MSC_VER
-#include
-#endif
-#if defined(__GNUWIN32__) && !defined(__TWIN32__)
-#include
-#endif
-
-#include "wx/deprecated/expr.h"
-
-#ifndef __EXTERN_C__
-#define __EXTERN_C__ 1
-#endif
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-extern "C" {
-#endif
-#endif
-int yylex(void);
-int yylook(void);
-int yywrap(void);
-int yyback(int *, int);
-void yyerror(char *);
-
-/* You may need to put /DLEX_SCANNER in your makefile
- * if you're using LEX!
- */
-void yyoutput(int);
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-}
-#endif
-#endif
-%}
-
-%union {
- char *s;
-/* struct pexpr *expr; */
-}
-
-
-%start commands
-
-%token INTEGER 1
-%token WORD 2
-%token STRING 3
-%token PERIOD 13
-%token OPEN 4
-%token CLOSE 5
-%token COMMA 6
-%token NEWLINE 7
-%token ERROR 8
-%token OPEN_SQUARE 9
-%token CLOSE_SQUARE 10
-%token EQUALS 11
-%token EXP 14
-
-/* %type command expr arglist arg arg1 */
-%type command expr arglist arg arg1
-
-%%
-
-commands : /* empty */
- | commands command
- ;
-
-command : WORD PERIOD
- {process_command(proio_cons(wxmake_word($1), NULL)); free($1);}
- | expr PERIOD
- {process_command($1);}
- | error PERIOD
- {syntax_error("Unrecognized command.");}
- ;
-
-expr : WORD OPEN arglist CLOSE
- {$$ = proio_cons(wxmake_word($1), $3); free($1);}
- | OPEN_SQUARE arglist CLOSE_SQUARE
- {$$ = $2; }
- ;
-
-arglist :
- {$$ = proio_cons(NULL, NULL);}
- | arg
- {$$ = proio_cons($1, NULL);}
- |
- arg COMMA arglist
- {$$ = proio_cons($1, $3);}
- ;
-
-arg : WORD EQUALS arg1
- {$$ = proio_cons(wxmake_word("="), proio_cons(wxmake_word($1), proio_cons($3, NULL)));
- free($1); }
- | arg1
- {$$ = $1; }
- ;
-
-arg1 : WORD
- {$$ = wxmake_word($1); free($1);}
- | STRING
- {$$ = wxmake_string($1); free($1);}
- | INTEGER
- {$$ = wxmake_integer($1); free($1);}
- | INTEGER PERIOD INTEGER
- {$$ = wxmake_real($1, $3); free($1); free($3); }
- | INTEGER EXP INTEGER
- {$$ = wxmake_exp($1, $3); free($1); free($3); }
- |
- INTEGER PERIOD INTEGER EXP INTEGER
- {$$ = wxmake_exp2($1, $3, $5); free($1); free($3);
- free($5); }
-
- | expr
- {$$ = $1;}
- ;
-
-%%
-
-/* We include lexer.c if we are building for gtk, wine or motif
- * and also whenever we are using configure (marked by __WX_SETUP_H__) for,
- * for example, cross compilation. */
-#if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) || defined(__WX_SETUP_H__) && !defined(NO_CONFIGURE)
-#include "lexer.c"
-#elif defined(__WXMAC__) && defined(__APPLE__)
-#include "lexer.c"
-#elif defined(__MWERKS__)
-#include "cwlex_yy.c"
-#else
-#include "lex_yy.c"
-#endif
-
-/*
-void yyerror(s)
-char *s;
-{
- syntax_error(s);
-}
-*/
-
-/* Ansi prototype. If this doesn't work for you... uncomment
- the above instead.
- */
-
-void yyerror(char *s)
-{
- syntax_error(s);
-}
-
-/*
- * Unfortunately, my DOS version of FLEX
- * requires yywrap to be #def'ed, whereas
- * the UNIX flex expects a proper function.
- */
-
-/* At least on alphaev6-dec-osf4.0e yywrap() must be #define'd.
- * RL: ... but on Debian/Alpha(linux) it must not, so hopefully
- * testing for __OSF__ here is what we really want.
- */
-#ifdef __OSF__
-#ifndef yywrap
-#define yywrap() 1
-#endif
-#else
-/* HH: Added test for __WX_SETUP_H__ for gnuwin builds
- * using configure */
-#if !defined(__SC__) && !defined(__GNUWIN32__)
-#ifdef USE_DEFINE
-#ifndef yywrap
-#define yywrap() 1
-#endif
-#elif !defined(__ultrix)
-int yywrap() { return 1; }
-#elif defined(__VMS__)
-int yywrap() { return 1; }
-#endif
-#elif defined(__WX_SETUP_H__)
-int yywrap() { return 1; }
-#endif
-#endif
-
diff --git a/contrib/src/deprecated/prop.cpp b/contrib/src/deprecated/prop.cpp
deleted file mode 100644
index 7f7d122551..0000000000
--- a/contrib/src/deprecated/prop.cpp
+++ /dev/null
@@ -1,1169 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: prop.cpp
-// Purpose: Propert sheet classes implementation
-// Author: Julian Smart
-// Modified by:
-// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROPSHEET
-
-#ifndef WX_PRECOMP
-#endif
-
-#include "wx/debug.h"
-#include "wx/deprecated/prop.h"
-
-#include
-#include
-#include
-#include
-
-#if !WXWIN_COMPATIBILITY_2_4
-static inline wxChar* copystring(const wxChar* s)
- { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)
-
-wxPropertyValue::wxPropertyValue(void)
-{
- m_type = wxPropertyValueNull;
- m_next = NULL;
- m_last = NULL;
- m_value.first = NULL;
- m_clientData = NULL;
- m_modifiedFlag = false;
-}
-
-wxPropertyValue::wxPropertyValue(const wxPropertyValue& copyFrom)
- : wxObject()
-{
- m_value.string = (wxChar*) NULL;
- m_modifiedFlag = false;
- Copy((wxPropertyValue& )copyFrom);
-}
-
-wxPropertyValue::wxPropertyValue(const wxChar *val)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueString;
-
- m_value.string = copystring(val);
- m_clientData = NULL;
- m_next = NULL;
- m_last = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(const wxString& val)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueString;
-
- m_value.string = copystring(val.c_str());
- m_clientData = NULL;
- m_next = NULL;
- m_last = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(long the_integer)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueInteger;
- m_value.integer = the_integer;
- m_clientData = NULL;
- m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(bool val)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValuebool;
- m_value.integer = val;
- m_clientData = NULL;
- m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(float the_real)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueReal;
- m_value.real = the_real;
- m_clientData = NULL;
- m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(double the_real)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueReal;
- m_value.real = (float)the_real;
- m_clientData = NULL;
- m_next = NULL;
-}
-
-// Pointer versions: we have a pointer to the real C++ value.
-wxPropertyValue::wxPropertyValue(wxChar **val)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueStringPtr;
-
- m_value.stringPtr = val;
- m_clientData = NULL;
- m_next = NULL;
- m_last = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(long *val)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueIntegerPtr;
- m_value.integerPtr = val;
- m_clientData = NULL;
- m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(bool *val)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueboolPtr;
- m_value.boolPtr = val;
- m_clientData = NULL;
- m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(float *val)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueRealPtr;
- m_value.realPtr = val;
- m_clientData = NULL;
- m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(wxList *the_list)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueList;
- m_clientData = NULL;
- m_last = NULL;
- m_value.first = NULL;
-
- wxObjectList::compatibility_iterator node = the_list->GetFirst();
- while (node)
- {
- wxPropertyValue *expr = (wxPropertyValue *)node->GetData();
- Append(expr);
- node = node->GetNext();
- }
-
- delete the_list;
-}
-
-wxPropertyValue::wxPropertyValue(wxStringList *the_list)
-{
- m_modifiedFlag = false;
- m_type = wxPropertyValueList;
- m_clientData = NULL;
- m_last = NULL;
- m_value.first = NULL;
-
- wxStringList::compatibility_iterator node = the_list->GetFirst();
- while (node)
- {
- wxString s = node->GetData();
- Append(new wxPropertyValue(s));
- node = node->GetNext();
- }
- delete the_list;
-}
-
-wxPropertyValue::~wxPropertyValue(void)
-{
- switch (m_type)
- {
- case wxPropertyValueInteger:
- case wxPropertyValuebool:
- case wxPropertyValueReal:
- {
- break;
- }
- case wxPropertyValueString:
- {
- delete[] m_value.string;
- break;
- }
- case wxPropertyValueList:
- {
- wxPropertyValue *expr = m_value.first;
- while (expr)
- {
- wxPropertyValue *expr1 = expr->m_next;
-
- delete expr;
- expr = expr1;
- }
- break;
- }
- default:
- case wxPropertyValueNull: break;
- }
-}
-
-void wxPropertyValue::Append(wxPropertyValue *expr)
-{
- m_modifiedFlag = true;
- if (!m_value.first)
- m_value.first = expr;
-
- if (m_last)
- m_last->m_next = expr;
- m_last = expr;
-}
-
-void wxPropertyValue::Insert(wxPropertyValue *expr)
-{
- m_modifiedFlag = true;
- expr->m_next = m_value.first;
- m_value.first = expr;
-
- if (!m_last)
- m_last = expr;
-}
-
-// Delete from list
-void wxPropertyValue::Delete(wxPropertyValue *node)
-{
- wxPropertyValue *expr = GetFirst();
-
- wxPropertyValue *previous = NULL;
- while (expr && (expr != node))
- {
- previous = expr;
- expr = expr->GetNext();
- }
-
- if (expr)
- {
- if (previous)
- previous->m_next = expr->m_next;
-
- // If node was the first in the list,
- // make the list point to the NEXT one.
- if (GetFirst() == expr)
- {
- m_value.first = expr->m_next;
- }
-
- // If node was the last in the list,
- // make the list 'last' pointer point to the PREVIOUS one.
- if (GetLast() == expr)
- {
- if (previous)
- m_last = previous;
- else
- m_last = NULL;
- }
- m_modifiedFlag = true;
- delete expr;
- }
-
-}
-
-void wxPropertyValue::ClearList(void)
-{
- wxPropertyValue *val = GetFirst();
- if (val)
- m_modifiedFlag = true;
-
- while (val)
- {
- wxPropertyValue *next = val->GetNext();
- delete val;
- val = next;
- }
- m_value.first = NULL;
- m_last = NULL;
-}
-
-wxPropertyValue *wxPropertyValue::NewCopy(void) const
-{
- switch (m_type)
- {
- case wxPropertyValueInteger:
- return new wxPropertyValue(m_value.integer);
- case wxPropertyValuebool:
- return new wxPropertyValue((bool) (m_value.integer != 0));
- case wxPropertyValueReal:
- return new wxPropertyValue(m_value.real);
- case wxPropertyValueString:
- return new wxPropertyValue(m_value.string);
- case wxPropertyValueList:
- {
- wxPropertyValue *expr = m_value.first;
- wxPropertyValue *new_list = new wxPropertyValue;
- new_list->SetType(wxPropertyValueList);
- while (expr)
- {
- wxPropertyValue *expr2 = expr->NewCopy();
- new_list->Append(expr2);
- expr = expr->m_next;
- }
- return new_list;
- }
- case wxPropertyValueIntegerPtr:
- return new wxPropertyValue(m_value.integerPtr);
- case wxPropertyValueRealPtr:
- return new wxPropertyValue(m_value.realPtr);
- case wxPropertyValueboolPtr:
- return new wxPropertyValue(m_value.boolPtr);
- case wxPropertyValueStringPtr:
- return new wxPropertyValue(m_value.stringPtr);
-
- case wxPropertyValueNull:
- wxFAIL_MSG( wxT("Should never get here!\n" ) );
- break;
- }
- return NULL;
-}
-
-void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
-{
- if (m_type == wxPropertyValueString)
- {
- delete[] m_value.string ;
- m_value.string = NULL;
- }
- m_type = copyFrom.Type();
-
- switch (m_type)
- {
- case wxPropertyValueInteger:
- (*this) = copyFrom.IntegerValue();
- return ;
-
- case wxPropertyValueReal:
- (*this) = copyFrom.RealValue();
- return ;
-
- case wxPropertyValueString:
- (*this) = wxString(copyFrom.StringValue());
- return ;
-
- case wxPropertyValuebool:
- (*this) = copyFrom.BoolValue();
- return ;
-
- // Pointers
- case wxPropertyValueboolPtr:
- (*this) = copyFrom.BoolValuePtr();
- return ;
- case wxPropertyValueRealPtr:
- (*this) = copyFrom.RealValuePtr();
- return ;
- case wxPropertyValueIntegerPtr:
- (*this) = copyFrom.IntegerValuePtr();
- return ;
- case wxPropertyValueStringPtr:
- {
- wxChar** s = copyFrom.StringValuePtr();
-
-#if 0
- // what is this? are you trying to assign a bool or a string? VA can't figure it out..
-#if defined(__VISAGECPP__) || defined( __VISUALC__ )
- (*this) = s;
-#else
- (*this) = s != 0;
-#endif
-#endif // if 0
-
- (*this) = (bool)(s != 0);
-
- return ;
- }
-
- case wxPropertyValueList:
- {
- m_value.first = NULL;
- m_next = NULL;
- m_last = NULL;
- wxPropertyValue *expr = copyFrom.m_value.first;
- while (expr)
- {
- wxPropertyValue *expr2 = expr->NewCopy();
- Append(expr2);
- expr = expr->m_next;
- }
- return;
- }
- case wxPropertyValueNull:
- wxFAIL_MSG( wxT("Should never get here!\n" ) );
- break;
- }
-}
-
-// Return nth argument of a clause (starting from 1)
-wxPropertyValue *wxPropertyValue::Arg(wxPropertyValueType type, int arg) const
-{
- wxPropertyValue *expr = m_value.first;
- for (int i = 1; i < arg; i++)
- if (expr)
- expr = expr->m_next;
-
- if (expr && (expr->m_type == type))
- return expr;
- else
- return NULL;
-}
-
-// Return nth argument of a list expression (starting from zero)
-wxPropertyValue *wxPropertyValue::Nth(int arg) const
-{
- if (m_type != wxPropertyValueList)
- return NULL;
-
- wxPropertyValue *expr = m_value.first;
- for (int i = 0; i < arg; i++)
- if (expr)
- expr = expr->m_next;
- else return NULL;
-
- if (expr)
- return expr;
- else
- return NULL;
-}
-
- // Returns the number of elements in a list expression
-int wxPropertyValue::Number(void) const
-{
- if (m_type != wxPropertyValueList)
- return 0;
-
- int i = 0;
- wxPropertyValue *expr = m_value.first;
- while (expr)
- {
- expr = expr->m_next;
- i ++;
- }
- return i;
-}
-
-void wxPropertyValue::WritePropertyClause(wxString& stream) // Write this expression as a top-level clause
-{
- if (m_type != wxPropertyValueList)
- return;
-
- wxPropertyValue *node = m_value.first;
- if (node)
- {
- node->WritePropertyType(stream);
- stream.Append( wxT("(") );
- node = node->m_next;
- bool first = true;
- while (node)
- {
- if (!first)
- stream.Append( wxT(" ") );
- node->WritePropertyType(stream);
- node = node->m_next;
- if (node)
- stream.Append( wxT(",\n" ) );
- first = false;
- }
- stream.Append( wxT(").\n\n") );
- }
-}
-
-void wxPropertyValue::WritePropertyType(wxString& stream) // Write as any other subexpression
-{
- wxString tmp;
- switch (m_type)
- {
- case wxPropertyValueInteger:
- {
- tmp.Printf( wxT("%ld"), m_value.integer );
- stream.Append( tmp );
- break;
- }
- case wxPropertyValueIntegerPtr:
- {
- tmp.Printf( wxT("%ld"), *m_value.integerPtr );
- stream.Append( tmp );
- break;
- }
- case wxPropertyValuebool:
- {
- if (m_value.integer)
- stream.Append( wxT("True") );
- else
- stream.Append( wxT("False") );
- break;
- }
- case wxPropertyValueboolPtr:
- {
- if (*m_value.integerPtr)
- stream.Append( wxT("True") );
- else
- stream.Append( wxT("False") );
- break;
- }
- case wxPropertyValueReal:
- {
- double d = m_value.real;
- tmp.Printf( wxT("%.6g"), d );
- stream.Append( tmp );
- break;
- }
- case wxPropertyValueRealPtr:
- {
- double d = *m_value.realPtr;
- tmp.Printf( wxT("%.6g"), d );
- stream.Append( tmp );
- break;
- }
- case wxPropertyValueString:
- {
- stream.Append( m_value.string );
- break;
- }
- case wxPropertyValueStringPtr:
- {
- wxFAIL_MSG( wxT("wxPropertyValue::WritePropertyType( wxPropertyValueStringPtr ) not implemented") );
- /*
- int i;
- int len = strlen(*(m_value.stringPtr));
- for (i = 0; i < len; i++)
- {
- char ch = *(m_value.stringPtr)[i];
-
- }
- */
- break;
- }
- case wxPropertyValueList:
- {
- if (!m_value.first)
- stream.Append( wxT("[]") );
- else
- {
- wxPropertyValue *expr = m_value.first;
-
- stream.Append( wxT("[") );
- while (expr)
- {
- expr->WritePropertyType(stream);
- expr = expr->m_next;
- if (expr)
- stream.Append( wxT(", ") );
- }
- stream.Append( wxT("]") );
- }
- break;
- }
- case wxPropertyValueNull: break;
- }
-}
-
-wxString wxPropertyValue::GetStringRepresentation(void)
-{
- wxString str;
- WritePropertyType(str);
- return str;
-}
-
-void wxPropertyValue::operator=(const wxPropertyValue& val)
-{
- m_modifiedFlag = true;
- Copy((wxPropertyValue&)val);
-}
-
-// void wxPropertyValue::operator=(const char *val)
-void wxPropertyValue::operator=(const wxString& val1)
-{
- const wxChar *val = (const wxChar *)val1;
-
- m_modifiedFlag = true;
-
- wxPropertyValueType oldType = m_type;
- if (oldType == wxPropertyValueString)
- {
- delete[] m_value.string ;
- m_value.string = NULL;
- }
-
- if (m_type == wxPropertyValueNull)
- m_type = wxPropertyValueString;
-
- if (m_type == wxPropertyValueString)
- {
- if (val)
- m_value.string = copystring(val);
- else
- m_value.string = NULL;
- }
- else if (m_type == wxPropertyValueStringPtr)
- {
- wxFAIL_MSG( wxT("Shouldn't try to assign a wxString reference to a char* pointer.") );
- if (val)
- *m_value.stringPtr = copystring(val);
- else
- *m_value.stringPtr = NULL;
- }
-
- m_clientData = NULL;
- m_next = NULL;
- m_last = NULL;
-
-}
-
-void wxPropertyValue::operator=(const long val)
-{
- wxPropertyValueType oldType = m_type;
- if (oldType == wxPropertyValueString)
- {
- delete[] m_value.string ;
- m_value.string = NULL;
- }
-
- m_modifiedFlag = true;
- if (m_type == wxPropertyValueNull)
- m_type = wxPropertyValueInteger;
-
- if (m_type == wxPropertyValueInteger)
- m_value.integer = val;
- else if (m_type == wxPropertyValueIntegerPtr)
- *m_value.integerPtr = val;
- else if (m_type == wxPropertyValueReal)
- m_value.real = (float)val;
- else if (m_type == wxPropertyValueRealPtr)
- *m_value.realPtr = (float)val;
-
- m_clientData = NULL;
- m_next = NULL;
-}
-
-void wxPropertyValue::operator=(const bool val)
-{
- wxPropertyValueType oldType = m_type;
- if (oldType == wxPropertyValueString)
- {
- delete[] m_value.string ;
- m_value.string = NULL;
- }
-
- m_modifiedFlag = true;
- if (m_type == wxPropertyValueNull)
- m_type = wxPropertyValuebool;
-
- if (m_type == wxPropertyValuebool)
- m_value.integer = (long)val;
- else if (m_type == wxPropertyValueboolPtr)
- *m_value.boolPtr = val;
-
- m_clientData = NULL;
- m_next = NULL;
-}
-
-void wxPropertyValue::operator=(const float val)
-{
- wxPropertyValueType oldType = m_type;
- if (oldType == wxPropertyValueString)
- {
- delete[] m_value.string ;
- m_value.string = NULL;
- }
-
- m_modifiedFlag = true;
- if (m_type == wxPropertyValueNull)
- m_type = wxPropertyValueReal;
-
- if (m_type == wxPropertyValueInteger)
- m_value.integer = (long)val;
- else if (m_type == wxPropertyValueIntegerPtr)
- *m_value.integerPtr = (long)val;
- else if (m_type == wxPropertyValueReal)
- m_value.real = val;
- else if (m_type == wxPropertyValueRealPtr)
- *m_value.realPtr = val;
-
- m_clientData = NULL;
- m_next = NULL;
-}
-
-void wxPropertyValue::operator=(const wxChar **val)
-{
- wxPropertyValueType oldType = m_type;
- if (oldType == wxPropertyValueString)
- {
- delete[] m_value.string ;
- m_value.string = NULL;
- }
-
- m_modifiedFlag = true;
- m_type = wxPropertyValueStringPtr;
-
- if (val)
- m_value.stringPtr = (wxChar **)val;
- else
- m_value.stringPtr = NULL;
- m_clientData = NULL;
- m_next = NULL;
- m_last = NULL;
-
-}
-
-void wxPropertyValue::operator=(const long *val)
-{
- m_modifiedFlag = true;
- m_type = wxPropertyValueIntegerPtr;
- m_value.integerPtr = (long *)val;
- m_clientData = NULL;
- m_next = NULL;
-}
-
-void wxPropertyValue::operator=(const bool *val)
-{
- m_modifiedFlag = true;
- m_type = wxPropertyValueboolPtr;
- m_value.boolPtr = (bool *)val;
- m_clientData = NULL;
- m_next = NULL;
-}
-
-void wxPropertyValue::operator=(const float *val)
-{
- m_modifiedFlag = true;
- m_type = wxPropertyValueRealPtr;
- m_value.realPtr = (float *)val;
- m_clientData = NULL;
- m_next = NULL;
-}
-
-long wxPropertyValue::IntegerValue(void) const
- {
- if (m_type == wxPropertyValueInteger)
- return m_value.integer;
- else if (m_type == wxPropertyValueReal)
- return (long)m_value.real;
- else if (m_type == wxPropertyValueIntegerPtr)
- return *m_value.integerPtr;
- else if (m_type == wxPropertyValueRealPtr)
- return (long)(*m_value.realPtr);
- else return 0;
- }
-
-long *wxPropertyValue::IntegerValuePtr(void) const
-{
- return m_value.integerPtr;
-}
-
-float wxPropertyValue::RealValue(void) const {
- if (m_type == wxPropertyValueReal)
- return m_value.real;
- else if (m_type == wxPropertyValueRealPtr)
- return *m_value.realPtr;
- else if (m_type == wxPropertyValueInteger)
- return (float)m_value.integer;
- else if (m_type == wxPropertyValueIntegerPtr)
- return (float)*(m_value.integerPtr);
- else return 0.0;
- }
-
-float *wxPropertyValue::RealValuePtr(void) const
-{
- return m_value.realPtr;
-}
-
-bool wxPropertyValue::BoolValue(void) const {
- if (m_type == wxPropertyValueReal)
- return (m_value.real != 0.0);
- if (m_type == wxPropertyValueRealPtr)
- return (*(m_value.realPtr) != 0.0);
- else if (m_type == wxPropertyValueInteger)
- return (m_value.integer != 0);
- else if (m_type == wxPropertyValueIntegerPtr)
- return (*(m_value.integerPtr) != 0);
- else if (m_type == wxPropertyValuebool)
- return (m_value.integer != 0);
- else if (m_type == wxPropertyValueboolPtr)
- return (*(m_value.boolPtr) != 0);
- else return false;
- }
-
-bool *wxPropertyValue::BoolValuePtr(void) const
-{
- return m_value.boolPtr;
-}
-
-wxChar *wxPropertyValue::StringValue(void) const {
- if (m_type == wxPropertyValueString)
- return m_value.string;
- else if (m_type == wxPropertyValueStringPtr)
- return *(m_value.stringPtr);
- else return NULL;
- }
-
-wxChar **wxPropertyValue::StringValuePtr(void) const
-{
- return m_value.stringPtr;
-}
-
-/*
- * A property (name plus value)
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxProperty, wxObject)
-
-wxProperty::wxProperty(void)
-{
- m_propertyRole = wxEmptyString;
- m_propertyValidator = NULL;
- m_propertyWindow = NULL;
- m_enabled = true;
-}
-
-wxProperty::wxProperty(wxProperty& copyFrom)
- : wxObject()
-{
- m_value = copyFrom.GetValue();
- m_name = copyFrom.GetName();
- m_propertyRole = copyFrom.GetRole();
- m_propertyValidator = copyFrom.GetValidator();
- m_enabled = copyFrom.IsEnabled();
- m_propertyWindow = NULL;
-}
-
-wxProperty::wxProperty(wxString nm, wxString role, wxPropertyValidator *ed):m_name(nm), m_propertyRole(role)
-{
- m_propertyValidator = ed;
- m_propertyWindow = NULL;
- m_enabled = true;
-}
-
-wxProperty::wxProperty(wxString nm, const wxPropertyValue& val, wxString role, wxPropertyValidator *ed):
- m_value(val), m_name(nm), m_propertyRole(role)
-{
- m_propertyValidator = ed;
- m_propertyWindow = NULL;
- m_enabled = true;
-}
-
-wxProperty::~wxProperty(void)
-{
- if (m_propertyValidator)
- delete m_propertyValidator;
-}
-
-wxPropertyValue& wxProperty::GetValue(void) const
-{
- return (wxPropertyValue&) m_value;
-}
-
-wxPropertyValidator *wxProperty::GetValidator(void) const
-{
- return m_propertyValidator;
-}
-
-wxString& wxProperty::GetName(void) const
-{
- return (wxString&) m_name;
-}
-
-wxString& wxProperty::GetRole(void) const
-{
- return (wxString&) m_propertyRole;
-}
-
-void wxProperty::SetValue(const wxPropertyValue& val)
-{
- m_value = val;
-}
-
-void wxProperty::SetValidator(wxPropertyValidator *ed)
-{
- m_propertyValidator = ed;
-}
-
-void wxProperty::SetRole(wxString& role)
-{
- m_propertyRole = role;
-}
-
-void wxProperty::SetName(wxString& nm)
-{
- m_name = nm;
-}
-
-void wxProperty::operator=(const wxPropertyValue& val)
-{
- m_value = val;
-}
-
-/*
- * Base property view class
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyView, wxEvtHandler)
-
-wxPropertyView::wxPropertyView(long flags)
-{
- m_buttonFlags = flags;
- m_propertySheet = NULL;
- m_currentValidator = NULL;
- m_currentProperty = NULL;
-}
-
-wxPropertyView::~wxPropertyView(void)
-{
-}
-
-void wxPropertyView::AddRegistry(wxPropertyValidatorRegistry *registry)
-{
- m_validatorRegistryList.Append(registry);
-}
-
-wxPropertyValidator *wxPropertyView::FindPropertyValidator(wxProperty *property)
-{
- if (property->GetValidator())
- return property->GetValidator();
-
- wxObjectList::compatibility_iterator node = m_validatorRegistryList.GetFirst();
- while (node)
- {
- wxPropertyValidatorRegistry *registry = (wxPropertyValidatorRegistry *)node->GetData();
- wxPropertyValidator *validator = registry->GetValidator(property->GetRole());
- if (validator)
- return validator;
- node = node->GetNext();
- }
- return NULL;
-/*
- if (!wxDefaultPropertyValidator)
- wxDefaultPropertyValidator = new wxPropertyListValidator;
- return wxDefaultPropertyValidator;
-*/
-}
-
-/*
- * Property sheet
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertySheet, wxObject)
-
-wxPropertySheet::wxPropertySheet(const wxString& name)
-:m_properties(wxKEY_STRING),m_name(name)
-{
-}
-
-wxPropertySheet::~wxPropertySheet(void)
-{
- Clear();
-}
-
-void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )
-{
-}
-
-// Add a property
-void wxPropertySheet::AddProperty(wxProperty *property)
-{
- m_properties.Append((const wxChar*) property->GetName(), property);
-}
-
-// Get property by name
-wxProperty *wxPropertySheet::GetProperty(const wxString& name) const
-{
- wxObjectList::compatibility_iterator node = m_properties.Find((const wxChar*) name);
- if (!node)
- return NULL;
- else
- return (wxProperty *)node->GetData();
-}
-
-bool wxPropertySheet::SetProperty(const wxString& name, const wxPropertyValue& value)
-{
- wxProperty* prop = GetProperty(name);
- if(prop){
- prop->SetValue(value);
- return true;
- }else{
- return false;
- }
-}
-
-void wxPropertySheet::RemoveProperty(const wxString& name)
-{
- wxObjectList::compatibility_iterator node = m_properties.Find(name);
- if(node)
- {
- wxProperty *prop = (wxProperty *)node->GetData();
- delete prop;
- m_properties.Erase(node);
- }
-}
-
-bool wxPropertySheet::HasProperty(const wxString& name) const
-{
- return (GetProperty(name)?true:false);
-}
-
-// Clear all properties
-void wxPropertySheet::Clear(void)
-{
- wxObjectList::compatibility_iterator node = m_properties.GetFirst();
- while (node)
- {
- wxProperty *prop = (wxProperty *)node->GetData();
- delete prop;
- node = node->GetNext();
- }
- m_properties.Clear();
-}
-
-// Sets/clears the modified flag for each property value
-void wxPropertySheet::SetAllModified(bool flag)
-{
- wxObjectList::compatibility_iterator node = m_properties.GetFirst();
- while (node)
- {
- wxProperty *prop = (wxProperty *)node->GetData();
- prop->GetValue().SetModified(flag);
- node = node->GetNext();
- }
-}
-
-/*
- * Property validator registry
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyValidatorRegistry, wxHashTable)
-
-wxPropertyValidatorRegistry::wxPropertyValidatorRegistry(void):wxHashTable(wxKEY_STRING)
-{
-}
-
-wxPropertyValidatorRegistry::~wxPropertyValidatorRegistry(void)
-{
- ClearRegistry();
-}
-
-void wxPropertyValidatorRegistry::RegisterValidator(const wxString& typeName, wxPropertyValidator *validator)
-{
- Put((const wxChar*) typeName, validator);
-}
-
-wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& typeName)
-{
- return (wxPropertyValidator *)Get((const wxChar*) typeName);
-}
-
-void wxPropertyValidatorRegistry::ClearRegistry(void)
-{
- BeginFind();
- wxHashTable::Node *node;
- while ((node = Next()) != NULL)
- {
- delete (wxPropertyValidator *)node->GetData();
- }
-}
-
- /*
- * Property validator
- */
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxPropertyValidator, wxEvtHandler)
-
-wxPropertyValidator::wxPropertyValidator(long flags)
-{
- m_validatorFlags = flags;
- m_validatorProperty = NULL;
-}
-
-wxPropertyValidator::~wxPropertyValidator(void)
-{}
-
-bool wxPropertyValidator::StringToFloat (wxChar *s, float *number) {
- double num;
- bool ok = StringToDouble (s, &num);
- *number = (float) num;
- return ok;
-}
-
-bool wxPropertyValidator::StringToDouble (wxChar *s, double *number) {
- bool ok = true;
- wxChar *value_ptr;
- *number = wxStrtod (s, &value_ptr);
- if (value_ptr) {
- int len = wxStrlen (value_ptr);
- for (int i = 0; i < len; i++) {
- ok = (wxIsspace (value_ptr[i]) != 0);
- if (!ok) return false;
- }
- }
- return ok;
-}
-
-bool wxPropertyValidator::StringToInt (wxChar *s, int *number) {
- long num;
- bool ok = StringToLong (s, &num);
- *number = (int) num;
- return ok;
-}
-
-bool wxPropertyValidator::StringToLong (wxChar *s, long *number) {
- bool ok = true;
- wxChar *value_ptr;
- *number = wxStrtol (s, &value_ptr, 10);
- if (value_ptr) {
- int len = wxStrlen (value_ptr);
- for (int i = 0; i < len; i++) {
- ok = (wxIsspace (value_ptr[i]) != 0);
- if (!ok) return false;
- }
- }
- return ok;
-}
-
-wxChar *wxPropertyValidator::FloatToString (float number) {
- static wxChar buf[20];
- wxSnprintf (buf, 20, wxT("%.6g"), number);
- return buf;
-}
-
-wxChar *wxPropertyValidator::DoubleToString (double number) {
- static wxChar buf[20];
- wxSnprintf (buf, 20, wxT("%.6g"), number);
- return buf;
-}
-
-wxChar *wxPropertyValidator::IntToString (int number) {
- static wxChar buf[20];
-
- wxSprintf (buf, wxT("%d"), number);
- return buf;
-}
-
-wxChar *wxPropertyValidator::LongToString (long number) {
- static wxChar buf[20];
-
- wxSprintf (buf, wxT("%ld"), number);
- return buf;
-}
-
-#endif // wxUSE_PROPSHEET
diff --git a/contrib/src/deprecated/propform.cpp b/contrib/src/deprecated/propform.cpp
deleted file mode 100644
index df77fe214d..0000000000
--- a/contrib/src/deprecated/propform.cpp
+++ /dev/null
@@ -1,759 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: propform.cpp
-// Purpose: Property form classes
-// Author: Julian Smart
-// Modified by:
-// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROPSHEET
-
-#ifndef WX_PRECOMP
- #include "wx/choice.h"
- #include "wx/checkbox.h"
- #include "wx/slider.h"
- #include "wx/msgdlg.h"
-#endif
-
-#include "wx/deprecated/propform.h"
-
-#include
-#include
-#include
-#include
-
-
-/*
-* Property view
-*/
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyFormView, wxPropertyView)
-
-BEGIN_EVENT_TABLE(wxPropertyFormView, wxPropertyView)
-EVT_BUTTON(wxID_OK, wxPropertyFormView::OnOk)
-EVT_BUTTON(wxID_CANCEL, wxPropertyFormView::OnCancel)
-EVT_BUTTON(wxID_HELP, wxPropertyFormView::OnHelp)
-EVT_BUTTON(wxID_PROP_REVERT, wxPropertyFormView::OnRevert)
-EVT_BUTTON(wxID_PROP_UPDATE, wxPropertyFormView::OnUpdate)
-END_EVENT_TABLE()
-
-bool wxPropertyFormView::sm_dialogCancelled = false;
-
-wxPropertyFormView::wxPropertyFormView(wxWindow *propPanel, long flags):wxPropertyView(flags)
-{
- m_propertyWindow = propPanel;
- m_managedWindow = NULL;
-
- m_windowCloseButton = NULL;
- m_windowCancelButton = NULL;
- m_windowHelpButton = NULL;
-
- m_detailedEditing = false;
-}
-
-wxPropertyFormView::~wxPropertyFormView(void)
-{
-}
-
-void wxPropertyFormView::ShowView(wxPropertySheet *ps, wxWindow *panel)
-{
- m_propertySheet = ps;
-
- AssociatePanel(panel);
- // CreateControls();
- // UpdatePropertyList();
-}
-
-// Update this view of the viewed object, called e.g. by
-// the object itself.
-bool wxPropertyFormView::OnUpdateView(void)
-{
- return true;
-}
-
-bool wxPropertyFormView::Check(void)
-{
- if (!m_propertySheet)
- return false;
-
- wxNode *node = m_propertySheet->GetProperties().GetFirst();
- while (node)
- {
- wxProperty *prop = (wxProperty *)node->GetData();
- wxPropertyValidator *validator = FindPropertyValidator(prop);
- if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
- {
- wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
- if (!formValidator->OnCheckValue(prop, this, m_propertyWindow))
- return false;
- }
- node = node->GetNext();
- }
- return true;
-}
-
-bool wxPropertyFormView::TransferToPropertySheet(void)
-{
- if (!m_propertySheet)
- return false;
-
- wxNode *node = m_propertySheet->GetProperties().GetFirst();
- while (node)
- {
- wxProperty *prop = (wxProperty *)node->GetData();
- wxPropertyValidator *validator = FindPropertyValidator(prop);
- if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
- {
- wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
- formValidator->OnRetrieveValue(prop, this, m_propertyWindow);
- }
- node = node->GetNext();
- }
- return true;
-}
-
-bool wxPropertyFormView::TransferToDialog(void)
-{
- if (!m_propertySheet)
- return false;
-
- wxNode *node = m_propertySheet->GetProperties().GetFirst();
- while (node)
- {
- wxProperty *prop = (wxProperty *)node->GetData();
- wxPropertyValidator *validator = FindPropertyValidator(prop);
- if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
- {
- wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
- formValidator->OnDisplayValue(prop, this, m_propertyWindow);
- }
- node = node->GetNext();
- }
- return true;
-}
-
-bool wxPropertyFormView::AssociateNames(void)
-{
- if (!m_propertySheet || !m_propertyWindow)
- return false;
-
- wxWindowList::Node *node = m_propertyWindow->GetChildren().GetFirst();
- while (node)
- {
- wxWindow *win = node->GetData();
- if ( win->GetName() != wxEmptyString )
- {
- wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
- if (prop)
- prop->SetWindow(win);
- }
- node = node->GetNext();
- }
- return true;
-}
-
-
-bool wxPropertyFormView::OnClose(void)
-{
- if (m_propertyWindow->IsKindOf(CLASSINFO(wxPropertyFormPanel)))
- {
- ((wxPropertyFormPanel*)m_propertyWindow)->SetView(NULL);
- }
- delete this;
- return true;
-}
-
-void wxPropertyFormView::OnOk(wxCommandEvent& WXUNUSED(event))
-{
- // Retrieve the value if any
- if (!Check())
- return;
-
- sm_dialogCancelled = false;
- TransferToPropertySheet();
-
- m_managedWindow->Close(true);
-}
-
-void wxPropertyFormView::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
- sm_dialogCancelled = true;
-
- m_managedWindow->Close(true);
-}
-
-void wxPropertyFormView::OnHelp(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void wxPropertyFormView::OnUpdate(wxCommandEvent& WXUNUSED(event))
-{
- if (Check())
- TransferToPropertySheet();
-}
-
-void wxPropertyFormView::OnRevert(wxCommandEvent& WXUNUSED(event))
-{
- TransferToDialog();
-}
-
-void wxPropertyFormView::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
- if (!m_propertySheet)
- return;
-
- if (win.GetName().empty())
- return;
-
- if (wxStrcmp(win.GetName(), wxT("ok")) == 0)
- OnOk(event);
- else if (wxStrcmp(win.GetName(), wxT("cancel")) == 0)
- OnCancel(event);
- else if (wxStrcmp(win.GetName(), wxT("help")) == 0)
- OnHelp(event);
- else if (wxStrcmp(win.GetName(), wxT("update")) == 0)
- OnUpdate(event);
- else if (wxStrcmp(win.GetName(), wxT("revert")) == 0)
- OnRevert(event);
- else
- {
- // Find a validator to route the command to.
- wxNode *node = m_propertySheet->GetProperties().GetFirst();
- while (node)
- {
- wxProperty *prop = (wxProperty *)node->GetData();
- if (prop->GetWindow() && (prop->GetWindow() == &win))
- {
- wxPropertyValidator *validator = FindPropertyValidator(prop);
- if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
- {
- wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
- formValidator->OnCommand(prop, this, m_propertyWindow, event);
- return;
- }
- }
- node = node->GetNext();
- }
- }
-}
-
-// Extend event processing to call OnCommand
-bool wxPropertyFormView::ProcessEvent(wxEvent& event)
-{
- if (wxEvtHandler::ProcessEvent(event))
- return true;
- else if (event.IsCommandEvent() && !event.IsKindOf(CLASSINFO(wxUpdateUIEvent)) && event.GetEventObject())
- {
- OnCommand(* ((wxWindow*) event.GetEventObject()), (wxCommandEvent&) event);
- return true;
- }
- else
- return false;
-}
-
-void wxPropertyFormView::OnDoubleClick(wxControl *item)
-{
- if (!m_propertySheet)
- return;
-
- // Find a validator to route the command to.
- wxNode *node = m_propertySheet->GetProperties().GetFirst();
- while (node)
- {
- wxProperty *prop = (wxProperty *)node->GetData();
- if (prop->GetWindow() && ((wxControl *)prop->GetWindow() == item))
- {
- wxPropertyValidator *validator = FindPropertyValidator(prop);
- if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
- {
- wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
- formValidator->OnDoubleClick(prop, this, m_propertyWindow);
- return;
- }
- }
- node = node->GetNext();
- }
-}
-
-/*
-* Property form dialog box
-*/
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyFormDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(wxPropertyFormDialog, wxDialog)
-EVT_CLOSE(wxPropertyFormDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-wxPropertyFormDialog::wxPropertyFormDialog(wxPropertyFormView *v, wxWindow *parent, const wxString& title,
- const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-wxDialog(parent, wxID_ANY, title, pos, size, style, name)
-{
- m_view = v;
- m_view->AssociatePanel(this);
- m_view->SetManagedWindow(this);
- // SetAutoLayout(true);
-}
-
-void wxPropertyFormDialog::OnCloseWindow(wxCloseEvent& event)
-{
- if (m_view)
- {
- m_view->OnClose();
- m_view = NULL;
- this->Destroy();
- }
- else
- event.Veto();
-}
-
-void wxPropertyFormDialog::OnDefaultAction(wxControl *item)
-{
- m_view->OnDoubleClick(item);
-}
-
-void wxPropertyFormDialog::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
- if ( m_view )
- m_view->OnCommand(win, event);
-}
-
-// Extend event processing to search the view's event table
-bool wxPropertyFormDialog::ProcessEvent(wxEvent& event)
-{
- if ( !m_view || ! m_view->ProcessEvent(event) )
- return wxEvtHandler::ProcessEvent(event);
- else
- return true;
-}
-
-
-/*
-* Property form panel
-*/
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyFormPanel, wxPanel)
-
-void wxPropertyFormPanel::OnDefaultAction(wxControl *item)
-{
- m_view->OnDoubleClick(item);
-}
-
-void wxPropertyFormPanel::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
- m_view->OnCommand(win, event);
-}
-
-// Extend event processing to search the view's event table
-bool wxPropertyFormPanel::ProcessEvent(wxEvent& event)
-{
- if ( !m_view || ! m_view->ProcessEvent(event) )
- return wxEvtHandler::ProcessEvent(event);
- else
- return true;
-}
-
-/*
-* Property frame
-*/
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyFormFrame, wxFrame)
-
-BEGIN_EVENT_TABLE(wxPropertyFormFrame, wxFrame)
-EVT_CLOSE(wxPropertyFormFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-void wxPropertyFormFrame::OnCloseWindow(wxCloseEvent& event)
-{
- if (m_view && m_view->OnClose())
- this->Destroy();
- else
- event.Veto();
-}
-
-wxPanel *wxPropertyFormFrame::OnCreatePanel(wxFrame *parent, wxPropertyFormView *v)
-{
- return new wxPropertyFormPanel(v, parent);
-}
-
-bool wxPropertyFormFrame::Initialize(void)
-{
- m_propertyPanel = OnCreatePanel(this, m_view);
- if (m_propertyPanel)
- {
- m_view->AssociatePanel(m_propertyPanel);
- m_view->SetManagedWindow(this);
- return true;
- }
- else
- return false;
-}
-
-/*
-* Property form specific validator
-*/
-
-IMPLEMENT_ABSTRACT_CLASS(wxPropertyFormValidator, wxPropertyValidator)
-
-
-/*
-* Default validators
-*/
-
-IMPLEMENT_DYNAMIC_CLASS(wxRealFormValidator, wxPropertyFormValidator)
-
-///
-/// Real number form validator
-///
-bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *parentWindow)
-{
- if (m_realMin == 0.0 && m_realMax == 0.0)
- return true;
-
- // The item used for viewing the real number: should be a text item.
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
- return false;
-
- wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
-
- float val = 0.0;
- if (!StringToFloat(WXSTRINGCAST value, &val))
- {
- wxChar buf[200];
- wxSprintf(buf, wxT("Value %s is not a valid real number!"), (const wxChar *)value);
- wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
-
- if (val < m_realMin || val > m_realMax)
- {
- wxChar buf[200];
- wxSprintf(buf, wxT("Value must be a real number between %.2f and %.2f!"), m_realMin, m_realMax);
- wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
- return true;
-}
-
-bool wxRealFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow) )
-{
- // The item used for viewing the real number: should be a text item.
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
- return false;
-
- wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
-
- if (value.Length() == 0)
- return false;
-
- float f = (float)wxAtof((const wxChar *)value);
- property->GetValue() = f;
- return true;
-}
-
-bool wxRealFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow) )
-{
- // The item used for viewing the real number: should be a text item.
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
- return false;
-
- wxTextCtrl *textItem = (wxTextCtrl *)m_propertyWindow;
- textItem->SetValue(FloatToString(property->GetValue().RealValue()));
- return true;
-}
-
-///
-/// Integer validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxIntegerFormValidator, wxPropertyFormValidator)
-
-bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *parentWindow)
-{
- if (m_integerMin == 0.0 && m_integerMax == 0.0)
- return true;
-
- // The item used for viewing the real number: should be a text item or a slider
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow)
- return false;
-
- long val = 0;
-
- if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
- {
- wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
-
- if (!StringToLong(WXSTRINGCAST value, &val))
- {
- wxChar buf[200];
- wxSprintf(buf, wxT("Value %s is not a valid integer!"), (const wxChar *)value);
- wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
- }
- else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
- {
- val = (long)((wxSlider *)m_propertyWindow)->GetValue();
- }
- else
- return false;
-
- if (val < m_integerMin || val > m_integerMax)
- {
- wxChar buf[200];
- wxSprintf(buf, wxT("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
- wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
- return true;
-}
-
-bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow))
-{
- // The item used for viewing the real number: should be a text item or a slider
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow)
- return false;
-
- if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
- {
- wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
-
- if (value.Length() == 0)
- return false;
-
- long i = wxAtol((const wxChar *)value);
- property->GetValue() = i;
- }
- else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
- {
- property->GetValue() = (long)((wxSlider *)m_propertyWindow)->GetValue();
- }
- else
- return false;
-
- return true;
-}
-
-bool wxIntegerFormValidator::OnDisplayValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow))
-{
- // The item used for viewing the real number: should be a text item or a slider
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow)
- return false;
-
- if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
- {
- wxTextCtrl *textItem = (wxTextCtrl *)m_propertyWindow;
- textItem->SetValue(LongToString(property->GetValue().IntegerValue()));
- }
- else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
- {
- ((wxSlider *)m_propertyWindow)->SetValue((int)property->GetValue().IntegerValue());
- }
- else
- return false;
- return true;
-}
-
-///
-/// Boolean validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxBoolFormValidator, wxPropertyFormValidator)
-
-bool wxBoolFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow))
-{
- // The item used for viewing the boolean: should be a checkbox
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
- return false;
-
- return true;
-}
-
-bool wxBoolFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow) )
-{
- // The item used for viewing the boolean: should be a checkbox.
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
- return false;
-
- wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow;
-
- property->GetValue() = (bool)checkBox->GetValue();
- return true;
-}
-
-bool wxBoolFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow))
-{
- // The item used for viewing the boolean: should be a checkbox.
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
- return false;
-
- wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow;
- checkBox->SetValue((bool)property->GetValue().BoolValue());
- return true;
-}
-
-///
-/// String validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxStringFormValidator, wxPropertyFormValidator)
-
-wxStringFormValidator::wxStringFormValidator(wxStringList *list, long flags):
-wxPropertyFormValidator(flags)
-{
- m_strings = list;
-}
-
-bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *parentWindow )
-{
- if (!m_strings)
- return true;
-
- // The item used for viewing the string: should be a text item, choice item or listbox.
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow)
- return false;
- if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
- {
- wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
- if (!m_strings->Member(text->GetValue()))
- {
- wxString str( wxT("Value ") );
- str += text->GetValue();
- str += wxT(" is not valid.");
- wxMessageBox(str, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
- }
- else
- {
- // Any other item constrains the string value,
- // so we don't have to check it.
- }
- return true;
-}
-
-bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow) )
-{
- // The item used for viewing the string: should be a text item, choice item or listbox.
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow)
- return false;
- if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
- {
- wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
- property->GetValue() = text->GetValue();
- }
- else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
- {
- wxListBox *lbox = (wxListBox *)m_propertyWindow;
- if (lbox->GetSelection() != wxNOT_FOUND)
- property->GetValue() = lbox->GetStringSelection();
- }
- /*
- else if (m_propertyWindow->IsKindOf(CLASSINFO(wxRadioBox)))
- {
- wxRadioBox *rbox = (wxRadioBox *)m_propertyWindow;
- int n = 0;
- if ((n = rbox->GetSelection()) != wxNOT_FOUND)
- property->GetValue() = rbox->GetString(n);
- }
- */
- else if (m_propertyWindow->IsKindOf(CLASSINFO(wxChoice)))
- {
- wxChoice *choice = (wxChoice *)m_propertyWindow;
- if (choice->GetSelection() != wxNOT_FOUND)
- property->GetValue() = choice->GetStringSelection();
- }
- else
- return false;
- return true;
-}
-
-bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
- wxWindow *WXUNUSED(parentWindow) )
-{
- // The item used for viewing the string: should be a text item, choice item or listbox.
- wxWindow *m_propertyWindow = property->GetWindow();
- if (!m_propertyWindow)
- return false;
- if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
- {
- wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
- text->SetValue(property->GetValue().StringValue());
- }
- else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
- {
- wxListBox *lbox = (wxListBox *)m_propertyWindow;
- if (lbox->GetCount() == 0 && m_strings)
- {
- // Try to initialize the listbox from 'strings'
- wxStringList::Node *node = m_strings->GetFirst();
- while (node)
- {
- wxChar *s = node->GetData();
- lbox->Append(s);
- node = node->GetNext();
- }
- }
- lbox->SetStringSelection(property->GetValue().StringValue());
- }
- /*
- else if (m_propertyWindow->IsKindOf(CLASSINFO(wxRadioBox)))
- {
- wxRadioBox *rbox = (wxRadioBox *)m_propertyWindow;
- rbox->SetStringSelection(property->GetValue().StringValue());
- }
- */
- else if (m_propertyWindow->IsKindOf(CLASSINFO(wxChoice)))
- {
- wxChoice *choice = (wxChoice *)m_propertyWindow;
- if (choice->GetCount() == 0 && m_strings)
- {
- // Try to initialize the choice item from 'strings'
- // XView doesn't allow this kind of thing.
- wxStringList::Node *node = m_strings->GetFirst();
- while (node)
- {
- wxChar *s = node->GetData();
- choice->Append(s);
- node = node->GetNext();
- }
- }
- choice->SetStringSelection(property->GetValue().StringValue());
- }
- else
- return false;
- return true;
-}
-
-#endif // wxUSE_PROPSHEET
diff --git a/contrib/src/deprecated/proplist.cpp b/contrib/src/deprecated/proplist.cpp
deleted file mode 100644
index 29c17d30f2..0000000000
--- a/contrib/src/deprecated/proplist.cpp
+++ /dev/null
@@ -1,1819 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/src/deprecated/proplist.cpp
-// Purpose: Property list classes
-// Author: Julian Smart
-// Modified by:
-// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROPSHEET
-
-#ifndef WX_PRECOMP
- #include "wx/window.h"
- #include "wx/font.h"
- #include "wx/button.h"
- #include "wx/bmpbuttn.h"
- #include "wx/textctrl.h"
- #include "wx/listbox.h"
- #include "wx/settings.h"
- #include "wx/msgdlg.h"
- #include "wx/filedlg.h"
-#endif
-
-#include "wx/sizer.h"
-#include "wx/module.h"
-#include "wx/intl.h"
-#include "wx/artprov.h"
-
-#include "wx/colordlg.h"
-#include "wx/deprecated/proplist.h"
-
-#include
-#include
-#include
-#include
-
-#if !WXWIN_COMPATIBILITY_2_4
-static inline wxChar* copystring(const wxChar* s)
- { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
-#endif
-
-// ----------------------------------------------------------------------------
-// Property text edit control
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyTextEdit, wxTextCtrl)
-
-wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView *v, wxWindow *parent,
- const wxWindowID id, const wxString& value,
- const wxPoint& pos, const wxSize& size,
- long style, const wxString& name):
- wxTextCtrl(parent, id, value, pos, size, style, wxDefaultValidator, name)
-{
- m_view = v;
-}
-
-void wxPropertyTextEdit::OnSetFocus()
-{
-}
-
-void wxPropertyTextEdit::OnKillFocus()
-{
-}
-
-// ----------------------------------------------------------------------------
-// Property list view
-// ----------------------------------------------------------------------------
-
-bool wxPropertyListView::sm_dialogCancelled = false;
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyListView, wxPropertyView)
-
-BEGIN_EVENT_TABLE(wxPropertyListView, wxPropertyView)
- EVT_BUTTON(wxID_OK, wxPropertyListView::OnOk)
- EVT_BUTTON(wxID_CANCEL, wxPropertyListView::OnCancel)
- EVT_BUTTON(wxID_HELP, wxPropertyListView::OnHelp)
- EVT_BUTTON(wxID_PROP_CROSS, wxPropertyListView::OnCross)
- EVT_BUTTON(wxID_PROP_CHECK, wxPropertyListView::OnCheck)
- EVT_BUTTON(wxID_PROP_EDIT, wxPropertyListView::OnEdit)
- EVT_TEXT_ENTER(wxID_PROP_TEXT, wxPropertyListView::OnText)
- EVT_LISTBOX(wxID_PROP_SELECT, wxPropertyListView::OnPropertySelect)
- EVT_COMMAND(wxID_PROP_SELECT, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED,
- wxPropertyListView::OnPropertyDoubleClick)
- EVT_LISTBOX(wxID_PROP_VALUE_SELECT, wxPropertyListView::OnValueListSelect)
-END_EVENT_TABLE()
-
-wxPropertyListView::wxPropertyListView(wxPanel *propPanel, long flags):wxPropertyView(flags)
-{
- m_propertyScrollingList = NULL;
- m_valueList = NULL;
- m_valueText = NULL;
- m_editButton = NULL;
- m_confirmButton = NULL;
- m_cancelButton = NULL;
- m_propertyWindow = propPanel;
- m_managedWindow = NULL;
-
- m_windowCloseButton = NULL;
- m_windowCancelButton = NULL;
- m_windowHelpButton = NULL;
-
- m_detailedEditing = false;
-}
-
-wxPropertyListView::~wxPropertyListView()
-{
-}
-
-void wxPropertyListView::ShowView(wxPropertySheet *ps, wxPanel *panel)
-{
- m_propertySheet = ps;
-
- AssociatePanel(panel);
- CreateControls();
-
- UpdatePropertyList();
- panel->Layout();
-}
-
-// Update this view of the viewed object, called e.g. by
-// the object itself.
-bool wxPropertyListView::OnUpdateView()
-{
- return true;
-}
-
-bool wxPropertyListView::UpdatePropertyList(bool clearEditArea)
-{
- if (!m_propertyScrollingList || !m_propertySheet)
- return false;
-
- m_propertyScrollingList->Clear();
- if (clearEditArea)
- {
- m_valueList->Clear();
- m_valueText->SetValue(wxEmptyString);
- }
- wxNode *node = m_propertySheet->GetProperties().GetFirst();
-
- // Should sort them... later...
- while (node)
- {
- wxProperty *property = (wxProperty *)node->GetData();
- wxString stringValueRepr(property->GetValue().GetStringRepresentation());
- wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr));
- m_propertyScrollingList->Append(paddedString.GetData(), (void *)property);
- node = node->GetNext();
- }
- return true;
-}
-
-bool wxPropertyListView::UpdatePropertyDisplayInList(wxProperty *property)
-{
- if (!m_propertyScrollingList || !m_propertySheet)
- return false;
-
-#ifdef __WXMSW__
- int currentlySelected = m_propertyScrollingList->GetSelection();
-#endif
-// #ifdef __WXMSW__
- wxString stringValueRepr(property->GetValue().GetStringRepresentation());
- wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr));
- int sel = FindListIndexForProperty(property);
-
- if (sel > -1)
- {
- // Don't update the listbox unnecessarily because it can cause
- // ugly flashing.
-
- if (paddedString != m_propertyScrollingList->GetString(sel))
- m_propertyScrollingList->SetString(sel, paddedString.GetData());
- }
-//#else
-// UpdatePropertyList(false);
-//#endif
-
- // TODO: why is this necessary?
-#ifdef __WXMSW__
- if (currentlySelected > -1)
- m_propertyScrollingList->SetSelection(currentlySelected);
-#endif
-
- return true;
-}
-
-// Find the wxListBox index corresponding to this property
-int wxPropertyListView::FindListIndexForProperty(wxProperty *property)
-{
- int n = m_propertyScrollingList->GetCount();
- for (int i = 0; i < n; i++)
- {
- if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))
- return i;
- }
- return wxNOT_FOUND;
-}
-
-wxString wxPropertyListView::MakeNameValueString(wxString name, wxString value)
-{
- wxString theString(name);
-
- int nameWidth = 25;
- int padWith = nameWidth - theString.length();
- if (padWith < 0)
- padWith = 0;
-
- if (GetFlags() & wxPROP_SHOWVALUES)
- {
- // Want to pad with spaces
- theString.Append( wxT(' '), padWith);
- theString += value;
- }
-
- return theString;
-}
-
-// Select and show string representation in validator the given
-// property. NULL resets to show no property.
-bool wxPropertyListView::ShowProperty(wxProperty *property, bool select)
-{
- if (m_currentProperty)
- {
- EndShowingProperty(m_currentProperty);
- m_currentProperty = NULL;
- }
-
- m_valueList->Clear();
- m_valueText->SetValue(wxEmptyString);
-
- if (property)
- {
- m_currentProperty = property;
- BeginShowingProperty(property);
- }
- if (select)
- {
- int sel = FindListIndexForProperty(property);
- if (sel != wxNOT_FOUND)
- m_propertyScrollingList->SetSelection(sel);
- }
- return true;
-}
-
-// Find appropriate validator and load property into value controls
-bool wxPropertyListView::BeginShowingProperty(wxProperty *property)
-{
- m_currentValidator = FindPropertyValidator(property);
- if (!m_currentValidator)
- return false;
-
- if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
- return false;
-
- wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
- listValidator->OnPrepareControls(property, this, m_propertyWindow);
- DisplayProperty(property);
- return true;
-}
-
-// Find appropriate validator and unload property from value controls
-bool wxPropertyListView::EndShowingProperty(wxProperty *property)
-{
- if (!m_currentValidator)
- return false;
-
- RetrieveProperty(property);
-
- if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
- return false;
-
- wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
- listValidator->OnClearControls(property, this, m_propertyWindow);
- if (m_detailedEditing)
- {
- listValidator->OnClearDetailControls(property, this, m_propertyWindow);
- m_detailedEditing = false;
- }
- return true;
-}
-
-void wxPropertyListView::BeginDetailedEditing()
-{
- if (!m_currentValidator)
- return;
- if (!m_currentProperty)
- return;
- if (m_detailedEditing)
- return;
- if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
- return;
- if (!m_currentProperty->IsEnabled())
- return;
-
- wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
- if (listValidator->OnPrepareDetailControls(m_currentProperty, this, m_propertyWindow))
- m_detailedEditing = true;
-}
-
-void wxPropertyListView::EndDetailedEditing()
-{
- if (!m_currentValidator)
- return;
- if (!m_currentProperty)
- return;
-
- RetrieveProperty(m_currentProperty);
-
- if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
- return;
-
- wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
- if (m_detailedEditing)
- {
- listValidator->OnClearDetailControls(m_currentProperty, this, m_propertyWindow);
- m_detailedEditing = false;
- }
-}
-
-bool wxPropertyListView::DisplayProperty(wxProperty *property)
-{
- if (!m_currentValidator)
- return false;
-
- if (((m_currentValidator->GetFlags() & wxPROP_ALLOW_TEXT_EDITING) == 0) || !property->IsEnabled())
- m_valueText->SetEditable(false);
- else
- m_valueText->SetEditable(true);
-
- if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
- return false;
-
- wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
- listValidator->OnDisplayValue(property, this, m_propertyWindow);
- return true;
-}
-
-bool wxPropertyListView::RetrieveProperty(wxProperty *property)
-{
- if (!m_currentValidator)
- return false;
- if (!property->IsEnabled())
- return false;
-
- if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
- return false;
-
- wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
- if (listValidator->OnCheckValue(property, this, m_propertyWindow))
- {
- if (listValidator->OnRetrieveValue(property, this, m_propertyWindow))
- {
- UpdatePropertyDisplayInList(property);
- OnPropertyChanged(property);
- }
- }
- else
- {
- // Revert to old value
- listValidator->OnDisplayValue(property, this, m_propertyWindow);
- }
- return true;
-}
-
-
-bool wxPropertyListView::EditProperty(wxProperty *WXUNUSED(property))
-{
- return true;
-}
-
-// Called by the listbox callback
-void wxPropertyListView::OnPropertySelect(wxCommandEvent& WXUNUSED(event))
-{
- int sel = m_propertyScrollingList->GetSelection();
- if (sel != wxNOT_FOUND)
- {
- wxProperty *newSel = (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(sel);
- if (newSel && newSel != m_currentProperty)
- {
- ShowProperty(newSel, false);
- }
- }
-}
-
-bool wxPropertyListView::CreateControls()
-{
- wxPanel *panel = (wxPanel *)m_propertyWindow;
-
- wxSize largeButtonSize( 70, 25 );
- wxSize smallButtonSize( 23, 23 );
-
- if (m_valueText)
- return true;
-
- if (!panel)
- return false;
-
- wxFont guiFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-
-#ifdef __WXMSW__
- wxFont *boringFont =
- wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxMODERN,
- wxNORMAL, wxNORMAL, false, _T("Courier New"));
-#else
- wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxTELETYPE, wxNORMAL, wxNORMAL);
-#endif
-
- // May need to be changed in future to eliminate clashes with app.
- // WHAT WAS THIS FOR?
-// panel->SetClientData((char *)this);
-
- wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
-
- // top row with optional buttons and input line
-
- wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL );
- int buttonborder = 3;
-
- if (m_buttonFlags & wxPROP_BUTTON_CHECK_CROSS)
- {
- wxBitmap tickBitmap = wxArtProvider::GetBitmap(wxART_TICK_MARK);
- wxBitmap crossBitmap = wxArtProvider::GetBitmap(wxART_CROSS_MARK);
-
- if ( tickBitmap.Ok() && crossBitmap.Ok() )
- {
- m_confirmButton = new wxBitmapButton(panel, wxID_PROP_CHECK, tickBitmap, wxDefaultPosition, smallButtonSize );
- m_cancelButton = new wxBitmapButton(panel, wxID_PROP_CROSS, crossBitmap, wxDefaultPosition, smallButtonSize );
- }
- else
- {
- m_confirmButton = new wxButton(panel, wxID_PROP_CHECK, _T(":-)"), wxDefaultPosition, smallButtonSize );
- m_cancelButton = new wxButton(panel, wxID_PROP_CROSS, _T("X"), wxDefaultPosition, smallButtonSize );
- }
-
- topsizer->Add( m_confirmButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
- topsizer->Add( m_cancelButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
- }
-
- m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, wxEmptyString,
- wxDefaultPosition, wxSize(wxDefaultCoord, smallButtonSize.y), wxTE_PROCESS_ENTER);
- m_valueText->Disable();
- topsizer->Add( m_valueText, 1, wxALL | wxEXPAND, buttonborder );
-
- if (m_buttonFlags & wxPROP_PULLDOWN)
- {
- m_editButton = new wxButton(panel, wxID_PROP_EDIT, _T("..."), wxDefaultPosition, smallButtonSize);
- m_editButton->Disable();
- topsizer->Add( m_editButton, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
- }
-
- mainsizer->Add( topsizer, 0, wxEXPAND );
-
- // middle section with two list boxes
-
- m_middleSizer = new wxBoxSizer( wxVERTICAL );
-
- m_valueList = new wxListBox(panel, wxID_PROP_VALUE_SELECT, wxDefaultPosition, wxSize(wxDefaultCoord, 60));
- m_valueList->Show(false);
-
- m_propertyScrollingList = new wxListBox(panel, wxID_PROP_SELECT, wxDefaultPosition, wxSize(100, 100));
- m_propertyScrollingList->SetFont(* boringFont);
- m_middleSizer->Add( m_propertyScrollingList, 1, wxALL|wxEXPAND, buttonborder );
-
- mainsizer->Add( m_middleSizer, 1, wxEXPAND );
-
- // bottom row with buttons
-
- if ((m_buttonFlags & wxPROP_BUTTON_OK) ||
- (m_buttonFlags & wxPROP_BUTTON_CLOSE) ||
- (m_buttonFlags & wxPROP_BUTTON_CANCEL) ||
- (m_buttonFlags & wxPROP_BUTTON_HELP))
- {
- wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
- buttonborder = 5;
-
- if (m_buttonFlags & wxPROP_BUTTON_OK)
- {
- m_windowCloseButton = new wxButton(panel, wxID_OK, _("OK"), wxDefaultPosition, largeButtonSize );
- m_windowCloseButton->SetDefault();
- m_windowCloseButton->SetFocus();
- bottomsizer->Add( m_windowCloseButton, 0, wxALL, buttonborder );
- }
- else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
- {
- m_windowCloseButton = new wxButton(panel, wxID_OK, _("Close"), wxDefaultPosition, largeButtonSize );
- bottomsizer->Add( m_windowCloseButton, 0, wxALL, buttonborder );
- }
- if (m_buttonFlags & wxPROP_BUTTON_CANCEL)
- {
- m_windowCancelButton = new wxButton(panel, wxID_CANCEL, _("Cancel"), wxDefaultPosition, largeButtonSize );
- bottomsizer->Add( m_windowCancelButton, 0, wxALL, buttonborder );
- }
- if (m_buttonFlags & wxPROP_BUTTON_HELP)
- {
- m_windowHelpButton = new wxButton(panel, wxID_HELP, _("Help"), wxDefaultPosition, largeButtonSize );
- bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
- }
-
- mainsizer->Add( bottomsizer, 0, wxALIGN_RIGHT | wxEXPAND );
- }
-
- panel->SetSizer( mainsizer );
-
- return true;
-}
-
-void wxPropertyListView::ShowTextControl(bool show)
-{
- if (m_valueText)
- m_valueText->Show(show);
-}
-
-void wxPropertyListView::ShowListBoxControl(bool show)
-{
- if (!m_valueList) return;
-
- m_valueList->Show(show);
-
- if (m_buttonFlags & wxPROP_DYNAMIC_VALUE_FIELD)
- {
- if (show)
- m_middleSizer->Prepend( m_valueList, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 3 );
- else
- m_middleSizer->Remove( 0 );
-
- m_propertyWindow->Layout();
- }
-}
-
-void wxPropertyListView::EnableCheck(bool show)
-{
- if (m_confirmButton)
- m_confirmButton->Enable(show);
-}
-
-void wxPropertyListView::EnableCross(bool show)
-{
- if (m_cancelButton)
- m_cancelButton->Enable(show);
-}
-
-bool wxPropertyListView::OnClose()
-{
- // Retrieve the value if any
- wxCommandEvent event;
- OnCheck(event);
-
- delete this;
- return true;
-}
-
-void wxPropertyListView::OnValueListSelect(wxCommandEvent& WXUNUSED(event))
-{
- if (m_currentProperty && m_currentValidator)
- {
- if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
- return;
-
- wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
- listValidator->OnValueListSelect(m_currentProperty, this, m_propertyWindow);
- }
-}
-
-void wxPropertyListView::OnOk(wxCommandEvent& event)
-{
- // Retrieve the value if any
- OnCheck(event);
-
- m_managedWindow->Close(true);
- sm_dialogCancelled = false;
-}
-
-void wxPropertyListView::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-// SetReturnCode(wxID_CANCEL);
- m_managedWindow->Close(true);
- sm_dialogCancelled = true;
-}
-
-void wxPropertyListView::OnHelp(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void wxPropertyListView::OnCheck(wxCommandEvent& WXUNUSED(event))
-{
- if (m_currentProperty)
- {
- RetrieveProperty(m_currentProperty);
- }
-}
-
-void wxPropertyListView::OnCross(wxCommandEvent& WXUNUSED(event))
-{
- if (m_currentProperty && m_currentValidator)
- {
- if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
- return;
-
- wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
- // Revert to old value
- listValidator->OnDisplayValue(m_currentProperty, this, m_propertyWindow);
- }
-}
-
-void wxPropertyListView::OnPropertyDoubleClick(wxCommandEvent& WXUNUSED(event))
-{
- if (m_currentProperty && m_currentValidator)
- {
- if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
- return;
-
- wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
- // Revert to old value
- listValidator->OnDoubleClick(m_currentProperty, this, m_propertyWindow);
- }
-}
-
-void wxPropertyListView::OnEdit(wxCommandEvent& WXUNUSED(event))
-{
- if (m_currentProperty && m_currentValidator)
- {
- if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
- return;
-
- wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
- listValidator->OnEdit(m_currentProperty, this, m_propertyWindow);
- }
-}
-
-void wxPropertyListView::OnText(wxCommandEvent& event)
-{
- if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
- {
- OnCheck(event);
- }
-}
-
-// ----------------------------------------------------------------------------
-// Property dialog box
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyListDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(wxPropertyListDialog, wxDialog)
- EVT_BUTTON(wxID_CANCEL, wxPropertyListDialog::OnCancel)
- EVT_CLOSE(wxPropertyListDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-wxPropertyListDialog::wxPropertyListDialog(wxPropertyListView *v, wxWindow *parent,
- const wxString& title, const wxPoint& pos,
- const wxSize& size, long style, const wxString& name):
- wxDialog(parent, wxID_ANY, title, pos, size, style, name)
-{
- m_view = v;
- m_view->AssociatePanel( ((wxPanel*)this) );
- m_view->SetManagedWindow(this);
- SetAutoLayout(true);
-}
-
-void wxPropertyListDialog::OnCloseWindow(wxCloseEvent& event)
-{
- if (m_view)
- {
- SetReturnCode(wxID_CANCEL);
- m_view->OnClose();
- m_view = NULL;
- this->Destroy();
- }
- else
- {
- event.Veto();
- }
-}
-
-void wxPropertyListDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
- SetReturnCode(wxID_CANCEL);
- this->Close();
-}
-
-void wxPropertyListDialog::OnDefaultAction(wxControl *WXUNUSED(item))
-{
-/*
- if (item == m_view->GetPropertyScrollingList())
- view->OnDoubleClick();
-*/
-}
-
-// Extend event processing to search the view's event table
-bool wxPropertyListDialog::ProcessEvent(wxEvent& event)
-{
- if ( !m_view || ! m_view->ProcessEvent(event) )
- return wxEvtHandler::ProcessEvent(event);
- else
- return true;
-}
-
-// ----------------------------------------------------------------------------
-// Property panel
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyListPanel, wxPanel)
-
-BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
- EVT_SIZE(wxPropertyListPanel::OnSize)
-END_EVENT_TABLE()
-
-wxPropertyListPanel::~wxPropertyListPanel()
-{
-}
-
-void wxPropertyListPanel::OnDefaultAction(wxControl *WXUNUSED(item))
-{
-/*
- if (item == view->GetPropertyScrollingList())
- view->OnDoubleClick();
-*/
-}
-
-// Extend event processing to search the view's event table
-bool wxPropertyListPanel::ProcessEvent(wxEvent& event)
-{
- if ( !m_view || ! m_view->ProcessEvent(event) )
- return wxEvtHandler::ProcessEvent(event);
- else
- return true;
-}
-
-void wxPropertyListPanel::OnSize(wxSizeEvent& WXUNUSED(event))
-{
- Layout();
-}
-
-// ----------------------------------------------------------------------------
-// Property frame
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyListFrame, wxFrame)
-
-BEGIN_EVENT_TABLE(wxPropertyListFrame, wxFrame)
- EVT_CLOSE(wxPropertyListFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-void wxPropertyListFrame::OnCloseWindow(wxCloseEvent& event)
-{
- if (m_view)
- {
- if (m_propertyPanel)
- m_propertyPanel->SetView(NULL);
- m_view->OnClose();
- m_view = NULL;
- this->Destroy();
- }
- else
- {
- event.Veto();
- }
-}
-
-wxPropertyListPanel *wxPropertyListFrame::OnCreatePanel(wxFrame *parent, wxPropertyListView *v)
-{
- return new wxPropertyListPanel(v, parent);
-}
-
-bool wxPropertyListFrame::Initialize()
-{
- m_propertyPanel = OnCreatePanel(this, m_view);
- if (m_propertyPanel)
- {
- m_view->AssociatePanel(m_propertyPanel);
- m_view->SetManagedWindow(this);
- m_propertyPanel->SetAutoLayout(true);
- return true;
- }
- else
- return false;
-}
-
-// ----------------------------------------------------------------------------
-// Property list specific validator
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPropertyListValidator, wxPropertyValidator)
-
-bool wxPropertyListValidator::OnSelect(bool select, wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
-// view->GetValueText()->Show(true);
- if (select)
- OnDisplayValue(property, view, parentWindow);
-
- return true;
-}
-
-bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- wxString s(view->GetValueList()->GetStringSelection());
- if ( !s.empty() )
- {
- view->GetValueText()->SetValue(s);
- view->RetrieveProperty(property);
- }
- return true;
-}
-
-bool wxPropertyListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-// view->GetValueText()->Show(true);
- wxString str(property->GetValue().GetStringRepresentation());
-
- view->GetValueText()->SetValue(str);
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxPropertyListValidator::OnRetrieveValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
- return false;
-}
-
-void wxPropertyListValidator::OnEdit(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (view->GetDetailedEditing())
- view->EndDetailedEditing();
- else
- view->BeginDetailedEditing();
-}
-
-bool wxPropertyListValidator::OnClearControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (view->GetConfirmButton())
- view->GetConfirmButton()->Disable();
- if (view->GetCancelButton())
- view->GetCancelButton()->Disable();
- if (view->GetEditButton())
- view->GetEditButton()->Disable();
- return true;
-}
-
-// ----------------------------------------------------------------------------
-// Default validators
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxRealListValidator, wxPropertyListValidator)
-
-///
-/// Real number validator
-///
-bool wxRealListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)
-{
- if (m_realMin == 0.0 && m_realMax == 0.0)
- return true;
-
- if (!view->GetValueText())
- return false;
- wxString value(view->GetValueText()->GetValue());
-
- float val = 0.0;
- if (!StringToFloat(WXSTRINGCAST value, &val))
- {
- wxChar buf[200];
- wxSprintf(buf, wxT("Value %s is not a valid real number!"), value.GetData());
- wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
-
- if (val < m_realMin || val > m_realMax)
- {
- wxChar buf[200];
- wxSprintf(buf, wxT("Value must be a real number between %.2f and %.2f!"), m_realMin, m_realMax);
- wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxRealListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
-
- if (wxStrlen(view->GetValueText()->GetValue()) == 0)
- return false;
-
- wxString value(view->GetValueText()->GetValue());
- float f = (float)wxAtof(value.GetData());
- property->GetValue() = f;
- return true;
-}
-
-bool wxRealListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (view->GetConfirmButton())
- view->GetConfirmButton()->Enable();
- if (view->GetCancelButton())
- view->GetCancelButton()->Enable();
- if (view->GetEditButton())
- view->GetEditButton()->Disable();
- if (view->GetValueText())
- view->GetValueText()->Enable();
- return true;
-}
-
-///
-/// Integer validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxIntegerListValidator, wxPropertyListValidator)
-
-bool wxIntegerListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)
-{
- if (m_integerMin == 0 && m_integerMax == 0)
- return true;
-
- if (!view->GetValueText())
- return false;
- wxString value(view->GetValueText()->GetValue());
-
- long val = 0;
- if (!StringToLong(WXSTRINGCAST value, &val))
- {
- wxChar buf[200];
- wxSprintf(buf, wxT("Value %s is not a valid integer!"), value.GetData());
- wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
- if (val < m_integerMin || val > m_integerMax)
- {
- wxChar buf[200];
- wxSprintf(buf, wxT("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
- wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxIntegerListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
-
- if (wxStrlen(view->GetValueText()->GetValue()) == 0)
- return false;
-
- wxString value(view->GetValueText()->GetValue());
- long val = (long)wxAtoi(value.GetData());
- property->GetValue() = (long)val;
- return true;
-}
-
-bool wxIntegerListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (view->GetConfirmButton())
- view->GetConfirmButton()->Enable();
- if (view->GetCancelButton())
- view->GetCancelButton()->Enable();
- if (view->GetEditButton())
- view->GetEditButton()->Disable();
- if (view->GetValueText())
- view->GetValueText()->Enable();
- return true;
-}
-
-///
-/// boolean validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxBoolListValidator, wxPropertyListValidator)
-
-bool wxBoolListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)
-{
- if (!view->GetValueText())
- return false;
- wxString value(view->GetValueText()->GetValue());
- if (value != wxT("True") && value != wxT("False"))
- {
- wxMessageBox(wxT("Value must be True or False!"), wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxBoolListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
-
- if (wxStrlen(view->GetValueText()->GetValue()) == 0)
- return false;
-
- wxString value(view->GetValueText()->GetValue());
- bool boolValue = (value == wxT("True"));
- property->GetValue() = boolValue;
- return true;
-}
-
-bool wxBoolListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
- wxString str(property->GetValue().GetStringRepresentation());
-
- view->GetValueText()->SetValue(str);
-
- if (view->GetValueList()->IsShown())
- {
- view->GetValueList()->SetStringSelection(str);
- }
- return true;
-}
-
-bool wxBoolListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (view->GetConfirmButton())
- view->GetConfirmButton()->Disable();
- if (view->GetCancelButton())
- view->GetCancelButton()->Disable();
- if (view->GetEditButton())
- view->GetEditButton()->Enable();
- if (view->GetValueText())
- view->GetValueText()->Disable();
- return true;
-}
-
-bool wxBoolListValidator::OnPrepareDetailControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (view->GetValueList())
- {
- view->ShowListBoxControl(true);
- view->GetValueList()->Enable();
-
- view->GetValueList()->Append(wxT("True"));
- view->GetValueList()->Append(wxT("False"));
- wxChar *currentString = copystring(view->GetValueText()->GetValue());
- view->GetValueList()->SetStringSelection(currentString);
- delete[] currentString;
- }
- return true;
-}
-
-bool wxBoolListValidator::OnClearDetailControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (view->GetValueList())
- {
- view->GetValueList()->Clear();
- view->ShowListBoxControl(false);
- view->GetValueList()->Disable();
- }
- return true;
-}
-
-// Called when the property is double clicked. Extra functionality can be provided,
-// cycling through possible values.
-bool wxBoolListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
- if (property->GetValue().BoolValue())
- property->GetValue() = false;
- else
- property->GetValue() = true;
- view->DisplayProperty(property);
- view->UpdatePropertyDisplayInList(property);
- view->OnPropertyChanged(property);
- return true;
-}
-
-///
-/// String validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxStringListValidator, wxPropertyListValidator)
-
-wxStringListValidator::wxStringListValidator(wxStringList *list, long flags):
- wxPropertyListValidator(flags)
-{
- m_strings = list;
- // If no constraint, we just allow the string to be edited.
- if (!m_strings && ((m_validatorFlags & wxPROP_ALLOW_TEXT_EDITING) == 0))
- m_validatorFlags |= wxPROP_ALLOW_TEXT_EDITING;
-}
-
-bool wxStringListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)
-{
- if (!m_strings)
- return true;
-
- if (!view->GetValueText())
- return false;
- wxString value(view->GetValueText()->GetValue());
-
- if (!m_strings->Member(value.GetData()))
- {
- wxString str( wxT("Value ") );
- str += value.GetData();
- str += wxT(" is not valid.");
- wxMessageBox( str.GetData(), wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
- return false;
- }
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxStringListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
- wxString value(view->GetValueText()->GetValue());
- property->GetValue() = value ;
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxStringListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
- wxString str(property->GetValue().GetStringRepresentation());
- view->GetValueText()->SetValue(str);
- if (m_strings && view->GetValueList() && view->GetValueList()->IsShown() && view->GetValueList()->GetCount() > 0)
- {
- view->GetValueList()->SetStringSelection(str);
- }
- return true;
-}
-
-bool wxStringListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- // Unconstrained
- if (!m_strings)
- {
- if (view->GetEditButton())
- view->GetEditButton()->Disable();
- if (view->GetConfirmButton())
- view->GetConfirmButton()->Enable();
- if (view->GetCancelButton())
- view->GetCancelButton()->Enable();
- if (view->GetValueText())
- view->GetValueText()->Enable();
- return true;
- }
-
- // Constrained
- if (view->GetValueText())
- view->GetValueText()->Disable();
-
- if (view->GetEditButton())
- view->GetEditButton()->Enable();
-
- if (view->GetConfirmButton())
- view->GetConfirmButton()->Disable();
- if (view->GetCancelButton())
- view->GetCancelButton()->Disable();
- return true;
-}
-
-bool wxStringListValidator::OnPrepareDetailControls( wxProperty *property,
- wxPropertyListView *view,
- wxWindow *WXUNUSED(parentWindow) )
-{
- if (view->GetValueList())
- {
- view->ShowListBoxControl(true);
- view->GetValueList()->Enable();
- wxStringList::Node *node = m_strings->GetFirst();
- while (node)
- {
- wxChar *s = node->GetData();
- view->GetValueList()->Append(s);
- node = node->GetNext();
- }
- wxChar *currentString = property->GetValue().StringValue();
- view->GetValueList()->SetStringSelection(currentString);
- }
- return true;
-}
-
-bool wxStringListValidator::OnClearDetailControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!m_strings)
- {
- return true;
- }
-
- if (view->GetValueList())
- {
- view->GetValueList()->Clear();
- view->ShowListBoxControl(false);
- view->GetValueList()->Disable();
- }
- return true;
-}
-
-// Called when the property is double clicked. Extra functionality can be provided,
-// cycling through possible values.
-bool wxStringListValidator::OnDoubleClick( wxProperty *property,
- wxPropertyListView *view,
- wxWindow *WXUNUSED(parentWindow) )
-{
- if (!view->GetValueText())
- return false;
- if (!m_strings)
- return false;
-
- wxStringList::Node *node = m_strings->GetFirst();
- wxChar *currentString = property->GetValue().StringValue();
- while (node)
- {
- wxChar *s = node->GetData();
- if (wxStrcmp(s, currentString) == 0)
- {
- wxChar *nextString;
- if (node->GetNext())
- nextString = node->GetNext()->GetData();
- else
- nextString = m_strings->GetFirst()->GetData();
- property->GetValue() = wxString(nextString);
- view->DisplayProperty(property);
- view->UpdatePropertyDisplayInList(property);
- view->OnPropertyChanged(property);
- return true;
- }
- else node = node->GetNext();
- }
- return true;
-}
-
-///
-/// Filename validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxFilenameListValidator, wxPropertyListValidator)
-
-wxFilenameListValidator::wxFilenameListValidator(wxString message , wxString wildcard, long flags):
- wxPropertyListValidator(flags), m_filenameWildCard(wildcard), m_filenameMessage(message)
-{
-}
-
-wxFilenameListValidator::~wxFilenameListValidator()
-{
-}
-
-bool wxFilenameListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))
-{
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxFilenameListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
- wxString value(view->GetValueText()->GetValue());
- property->GetValue() = value ;
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxFilenameListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
- wxString str(property->GetValue().GetStringRepresentation());
- view->GetValueText()->SetValue(str);
- return true;
-}
-
-// Called when the property is double clicked. Extra functionality can be provided,
-// cycling through possible values.
-bool wxFilenameListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
- if (!view->GetValueText())
- return false;
- OnEdit(property, view, parentWindow);
- return true;
-}
-
-bool wxFilenameListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (view->GetConfirmButton())
- view->GetConfirmButton()->Enable();
- if (view->GetCancelButton())
- view->GetCancelButton()->Enable();
- if (view->GetEditButton())
- view->GetEditButton()->Enable();
- if (view->GetValueText())
- view->GetValueText()->Enable((GetFlags() & wxPROP_ALLOW_TEXT_EDITING) == wxPROP_ALLOW_TEXT_EDITING);
- return true;
-}
-
-void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
- if (!view->GetValueText())
- return;
-
-#if wxUSE_FILEDLG
- wxString s = wxFileSelector(
- m_filenameMessage.GetData(),
- wxPathOnly(property->GetValue().StringValue()),
- wxFileNameFromPath(property->GetValue().StringValue()),
- NULL,
- m_filenameWildCard.GetData(),
- 0,
- parentWindow);
- if ( !s.empty() )
- {
- property->GetValue() = s;
- view->DisplayProperty(property);
- view->UpdatePropertyDisplayInList(property);
- view->OnPropertyChanged(property);
- }
-#else
- wxUnusedVar(property);
- wxUnusedVar(view);
- wxUnusedVar(parentWindow);
-#endif
-}
-
-///
-/// Colour validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxColourListValidator, wxPropertyListValidator)
-
-wxColourListValidator::wxColourListValidator(long flags):
- wxPropertyListValidator(flags)
-{
-}
-
-wxColourListValidator::~wxColourListValidator()
-{
-}
-
-bool wxColourListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))
-{
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxColourListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
- wxString value(view->GetValueText()->GetValue());
-
- property->GetValue() = value ;
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxColourListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
- wxString str(property->GetValue().GetStringRepresentation());
- view->GetValueText()->SetValue(str);
- return true;
-}
-
-// Called when the property is double clicked. Extra functionality can be provided,
-// cycling through possible values.
-bool wxColourListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
- if (!view->GetValueText())
- return false;
- OnEdit(property, view, parentWindow);
- return true;
-}
-
-bool wxColourListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (view->GetConfirmButton())
- view->GetConfirmButton()->Enable();
-
- if (view->GetCancelButton())
- view->GetCancelButton()->Enable();
-
- if (view->GetEditButton())
- view->GetEditButton()->Enable();
-
- if (view->GetValueText())
- view->GetValueText()->Enable((GetFlags() & wxPROP_ALLOW_TEXT_EDITING) == wxPROP_ALLOW_TEXT_EDITING);
-
- return true;
-}
-
-void wxColourListValidator::OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
- if (!view->GetValueText())
- return;
-
- wxChar *s = property->GetValue().StringValue();
- unsigned char r = 0;
- unsigned char g = 0;
- unsigned char b = 0;
- if (s)
- {
- r = (unsigned char)wxHexToDec(s);
- g = (unsigned char)wxHexToDec(s+2);
- b = (unsigned char)wxHexToDec(s+4);
- }
-
- wxColour col(r,g,b);
-
- wxColourData data;
- data.SetChooseFull(true);
- data.SetColour(col);
-
- for (int i = 0; i < 16; i++)
- {
- wxColour colour((unsigned char)(i*16),
- (unsigned char)(i*16),
- (unsigned char)(i*16));
- data.SetCustomColour(i, colour);
- }
-
- wxColourDialog dialog(parentWindow, &data);
- if (dialog.ShowModal() != wxID_CANCEL)
- {
- wxColourData retData = dialog.GetColourData();
- col = retData.GetColour();
-
- wxChar buf[7];
- wxDecToHex(col.Red(), buf);
- wxDecToHex(col.Green(), buf+2);
- wxDecToHex(col.Blue(), buf+4);
-
- property->GetValue() = wxString(buf);
- view->DisplayProperty(property);
- view->UpdatePropertyDisplayInList(property);
- view->OnPropertyChanged(property);
- }
-}
-
-///
-/// List of strings validator. For this we need more user interface than
-/// we get with a property list; so create a new dialog for editing the list.
-///
-IMPLEMENT_DYNAMIC_CLASS(wxListOfStringsListValidator, wxPropertyListValidator)
-
-wxListOfStringsListValidator::wxListOfStringsListValidator(long flags):
- wxPropertyListValidator(flags)
-{
-}
-
-bool wxListOfStringsListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))
-{
- // No constraints for an arbitrary, user-editable list of strings.
- return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself.
-// In this case, the user cannot directly edit the string list.
-bool wxListOfStringsListValidator::OnRetrieveValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))
-{
- return true;
-}
-
-bool wxListOfStringsListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (!view->GetValueText())
- return false;
- wxString str(property->GetValue().GetStringRepresentation());
- view->GetValueText()->SetValue(str);
- return true;
-}
-
-bool wxListOfStringsListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
- if (view->GetEditButton())
- view->GetEditButton()->Enable();
- if (view->GetValueText())
- view->GetValueText()->Disable();
-
- if (view->GetConfirmButton())
- view->GetConfirmButton()->Disable();
- if (view->GetCancelButton())
- view->GetCancelButton()->Disable();
- return true;
-}
-
-// Called when the property is double clicked. Extra functionality can be provided,
-// cycling through possible values.
-bool wxListOfStringsListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
- OnEdit(property, view, parentWindow);
- return true;
-}
-
-void wxListOfStringsListValidator::OnEdit( wxProperty *property,
- wxPropertyListView *view,
- wxWindow *parentWindow )
-{
- // Convert property value to a list of strings for editing
- wxStringList *stringList = new wxStringList;
-
- wxPropertyValue *expr = property->GetValue().GetFirst();
- while (expr)
- {
- wxChar *s = expr->StringValue();
- if (s)
- stringList->Add(s);
- expr = expr->GetNext();
- }
-
- wxString title(wxT("Editing "));
- title += property->GetName();
-
- if (EditStringList(parentWindow, stringList, title.GetData()))
- {
- wxPropertyValue& oldValue = property->GetValue();
- oldValue.ClearList();
- wxStringList::Node *node = stringList->GetFirst();
- while (node)
- {
- wxChar *s = node->GetData();
- oldValue.Append(new wxPropertyValue(s));
-
- node = node->GetNext();
- }
-
- view->DisplayProperty(property);
- view->UpdatePropertyDisplayInList(property);
- view->OnPropertyChanged(property);
- }
- delete stringList;
-}
-
-class wxPropertyStringListEditorDialog: public wxDialog
-{
-public:
- wxPropertyStringListEditorDialog(wxWindow *parent, const wxString& title,
- const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- long windowStyle = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("stringEditorDialogBox")):
- wxDialog(parent, wxID_ANY, title, pos, size, windowStyle, name)
- {
- m_stringList = NULL;
- m_stringText = NULL;
- m_listBox = NULL;
- sm_dialogCancelled = false;
- m_currentSelection = -1;
- }
- ~wxPropertyStringListEditorDialog(void) {}
- void OnCloseWindow(wxCloseEvent& event);
- void SaveCurrentSelection(void);
- void ShowCurrentSelection(void);
-
- void OnOK(wxCommandEvent& event);
- void OnCancel(wxCommandEvent& event);
- void OnAdd(wxCommandEvent& event);
- void OnDelete(wxCommandEvent& event);
- void OnStrings(wxCommandEvent& event);
- void OnText(wxCommandEvent& event);
-
-public:
- wxStringList* m_stringList;
- wxListBox* m_listBox;
- wxTextCtrl* m_stringText;
- static bool sm_dialogCancelled;
- int m_currentSelection;
-DECLARE_EVENT_TABLE()
-};
-
-#define wxID_PROP_SL_ADD 3000
-#define wxID_PROP_SL_DELETE 3001
-#define wxID_PROP_SL_STRINGS 3002
-#define wxID_PROP_SL_TEXT 3003
-
-BEGIN_EVENT_TABLE(wxPropertyStringListEditorDialog, wxDialog)
- EVT_BUTTON(wxID_OK, wxPropertyStringListEditorDialog::OnOK)
- EVT_BUTTON(wxID_CANCEL, wxPropertyStringListEditorDialog::OnCancel)
- EVT_BUTTON(wxID_PROP_SL_ADD, wxPropertyStringListEditorDialog::OnAdd)
- EVT_BUTTON(wxID_PROP_SL_DELETE, wxPropertyStringListEditorDialog::OnDelete)
- EVT_LISTBOX(wxID_PROP_SL_STRINGS, wxPropertyStringListEditorDialog::OnStrings)
- EVT_TEXT_ENTER(wxID_PROP_SL_TEXT, wxPropertyStringListEditorDialog::OnText)
- EVT_CLOSE(wxPropertyStringListEditorDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-class wxPropertyStringListEditorText: public wxTextCtrl
-{
- public:
- wxPropertyStringListEditorText(wxWindow *parent, wxWindowID id, const wxString& val,
- const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- long windowStyle = 0, const wxString& name = wxT("text")):
- wxTextCtrl(parent, id, val, pos, size, windowStyle, wxDefaultValidator, name)
- {
- }
- void OnKillFocus()
- {
- wxPropertyStringListEditorDialog *dialog = (wxPropertyStringListEditorDialog *)GetParent();
- dialog->SaveCurrentSelection();
- }
-};
-
-bool wxPropertyStringListEditorDialog::sm_dialogCancelled = false;
-
-// Edit the string list.
-bool wxListOfStringsListValidator::EditStringList(wxWindow *parent, wxStringList *stringList, const wxChar *title)
-{
- int largeButtonWidth = 60;
- int largeButtonHeight = 25;
-
- wxBeginBusyCursor();
- wxPropertyStringListEditorDialog *dialog = new wxPropertyStringListEditorDialog(parent,
- title, wxPoint(10, 10), wxSize(400, 400));
-
- dialog->m_stringList = stringList;
-
- dialog->m_listBox = new wxListBox(dialog, wxID_PROP_SL_STRINGS,
- wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE);
-
- dialog->m_stringText = new wxPropertyStringListEditorText(dialog,
- wxID_PROP_SL_TEXT, wxEmptyString, wxPoint(5, 240),
- wxSize(300, wxDefaultCoord), wxTE_PROCESS_ENTER);
- dialog->m_stringText->Disable();
-
- wxButton *addButton = new wxButton(dialog, wxID_PROP_SL_ADD, wxT("Add"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
- wxButton *deleteButton = new wxButton(dialog, wxID_PROP_SL_DELETE, wxT("Delete"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
- wxButton *cancelButton = new wxButton(dialog, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
- wxButton *okButton = new wxButton(dialog, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
-
-#ifndef __WXGTK__
- okButton->SetDefault();
-#endif
-
- wxBoxSizer *m_bottom_sizer = new wxBoxSizer( wxHORIZONTAL );
- m_bottom_sizer->Add(addButton, 0, wxALL | wxALIGN_LEFT, 2 );
- m_bottom_sizer->Add(deleteButton, 0, wxALL | wxALIGN_LEFT, 2 );
- m_bottom_sizer->Add(1, 1, 1, wxEXPAND | wxALL);
- m_bottom_sizer->Add(cancelButton, 0, wxALL | wxALIGN_RIGHT, 2 );
- m_bottom_sizer->Add(okButton, 0, wxALL | wxALIGN_RIGHT, 2 );
-
- wxBoxSizer *m_sizer = new wxBoxSizer( wxVERTICAL );
- m_sizer->Add(dialog->m_listBox, 1, wxEXPAND | wxALL, 2 );
- m_sizer->Add(dialog->m_stringText, 0, wxEXPAND | wxALL, 2 );
- m_sizer->Add(m_bottom_sizer, 0, wxEXPAND | wxALL , 0 );
-
- dialog->SetSizer( m_sizer );
- m_sizer->SetSizeHints( dialog );
-
- wxStringList::Node *node = stringList->GetFirst();
- while (node)
- {
- wxChar *str = node->GetData();
- // Save node as client data for each listbox item
- dialog->m_listBox->Append(str, (wxChar *)node);
- node = node->GetNext();
- }
-
- dialog->SetClientSize(310, 305);
- dialog->Layout();
-
- dialog->Centre(wxBOTH);
- wxEndBusyCursor();
- if (dialog->ShowModal() == wxID_CANCEL)
- return false;
- else
- return true;
-}
-
-/*
- * String list editor callbacks
- *
- */
-
-void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& WXUNUSED(event))
-{
- int sel = m_listBox->GetSelection();
- if (sel != wxNOT_FOUND)
- {
- m_currentSelection = sel;
-
- ShowCurrentSelection();
- }
-}
-
-void wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent& WXUNUSED(event))
-{
- int sel = m_listBox->GetSelection();
- if (sel == wxNOT_FOUND)
- return;
-
- wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(sel);
- if (!node)
- return;
-
- m_listBox->Delete(sel);
- delete[] (wxChar *)node->GetData();
- delete node;
- m_currentSelection = -1;
- m_stringText->SetValue(wxEmptyString);
-}
-
-void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))
-{
- SaveCurrentSelection();
-
- wxString initialText;
- wxNode *node = m_stringList->Add(initialText);
- m_listBox->Append(initialText, (void *)node);
- m_currentSelection = m_stringList->GetCount() - 1;
- m_listBox->SetSelection(m_currentSelection);
- ShowCurrentSelection();
- m_stringText->SetFocus();
-}
-
-void wxPropertyStringListEditorDialog::OnOK(wxCommandEvent& WXUNUSED(event))
-{
- SaveCurrentSelection();
- EndModal(wxID_OK);
-// Close(true);
- this->Destroy();
-}
-
-void wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
- sm_dialogCancelled = true;
- EndModal(wxID_CANCEL);
-// Close(true);
- this->Destroy();
-}
-
-void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
-{
- if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
- {
- SaveCurrentSelection();
- }
-}
-
-void
-wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
- SaveCurrentSelection();
-
- Destroy();
-}
-
-void wxPropertyStringListEditorDialog::SaveCurrentSelection()
-{
- if (m_currentSelection == -1)
- return;
-
- wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(m_currentSelection);
- if (!node)
- return;
-
- wxString txt(m_stringText->GetValue());
- if (node->GetData())
- delete[] (wxChar *)node->GetData();
- node->SetData((wxObject *)wxStrdup(txt));
-
- m_listBox->SetString(m_currentSelection, (wxChar *)node->GetData());
-}
-
-void wxPropertyStringListEditorDialog::ShowCurrentSelection()
-{
- if (m_currentSelection == -1)
- {
- m_stringText->SetValue(wxEmptyString);
- return;
- }
- wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(m_currentSelection);
- wxChar *txt = (wxChar *)node->GetData();
- m_stringText->SetValue(txt);
- m_stringText->Enable();
-}
-
-
-#endif // wxUSE_PROPSHEET
diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
deleted file mode 100644
index 40a9acfb40..0000000000
--- a/contrib/src/deprecated/resource.cpp
+++ /dev/null
@@ -1,3297 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/src/deprecated/resource.cpp
-// Purpose: Resource system
-// Author: Julian Smart
-// Modified by:
-// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_WX_RESOURCES
-
-#ifdef __VISUALC__
-#pragma warning(disable:4706) // assignment within conditional expression
-#endif // VC++
-
-#ifndef WX_PRECOMP
- #include "wx/panel.h"
- #include "wx/list.h"
- #include "wx/hash.h"
- #include "wx/gdicmn.h"
- #include "wx/utils.h"
- #include "wx/types.h"
- #include "wx/menu.h"
- #include "wx/stattext.h"
- #include "wx/button.h"
- #include "wx/bmpbuttn.h"
- #include "wx/radiobox.h"
- #include "wx/listbox.h"
- #include "wx/choice.h"
- #include "wx/checkbox.h"
- #include "wx/settings.h"
- #include "wx/slider.h"
- #include "wx/icon.h"
- #include "wx/statbox.h"
- #include "wx/statbmp.h"
- #include "wx/gauge.h"
- #include "wx/textctrl.h"
- #include "wx/msgdlg.h"
- #include "wx/intl.h"
-#endif
-
-#include "wx/treebase.h"
-#include "wx/listctrl.h"
-
-#if wxUSE_RADIOBTN
-#include "wx/radiobut.h"
-#endif
-
-#if wxUSE_SCROLLBAR
-#include "wx/scrolbar.h"
-#endif
-
-#if wxUSE_COMBOBOX
-#include "wx/combobox.h"
-#endif
-
-#include "wx/splitter.h"
-#include "wx/toolbar.h"
-
-#include "wx/validate.h"
-#include "wx/log.h"
-#include "wx/module.h"
-
-#include
-#include
-#include
-#include
-
-#include "wx/string.h"
-#include "wx/settings.h"
-#include "wx/stream.h"
-
-#include "wx/deprecated/resource.h"
-#include "wx/deprecated/wxexpr.h"
-
-#if !WXWIN_COMPATIBILITY_2_4
-static inline wxChar* copystring(const wxChar* s)
- { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
-#endif
-
-// Forward (private) declarations
-bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
-wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = false);
-wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr);
-wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr);
-wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr);
-wxItemResource *wxResourceInterpretString(wxResourceTable& table, wxExpr *expr);
-wxItemResource *wxResourceInterpretBitmap(wxResourceTable& table, wxExpr *expr);
-wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr);
-// Interpret list expression
-wxFont wxResourceInterpretFontSpec(wxExpr *expr);
-
-bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table = (wxResourceTable *) NULL);
-bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table) ;
-bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table = (wxResourceTable *) NULL);
-
-wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
-
-char *wxResourceBuffer = (char *) NULL;
-long wxResourceBufferSize = 0;
-long wxResourceBufferCount = 0;
-int wxResourceStringPtr = 0;
-
-void wxInitializeResourceSystem()
-{
- if (!wxDefaultResourceTable)
- wxDefaultResourceTable = new wxResourceTable;
-}
-
-void wxCleanUpResourceSystem()
-{
- delete wxDefaultResourceTable;
- if (wxResourceBuffer)
- delete[] wxResourceBuffer;
-}
-
-// Module to ensure the resource system data gets initialized
-// and cleaned up.
-
-class wxResourceModule: public wxModule
-{
-public:
- wxResourceModule() : wxModule() {}
- virtual bool OnInit() { wxInitializeResourceSystem(); return true; }
- virtual void OnExit() { wxCleanUpResourceSystem(); }
-
- DECLARE_DYNAMIC_CLASS(wxResourceModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxResourceModule, wxModule)
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
-
-wxItemResource::wxItemResource()
-{
- m_itemType = wxEmptyString;
- m_title = wxEmptyString;
- m_name = wxEmptyString;
- m_windowStyle = 0;
- m_x = m_y = m_width = m_height = 0;
- m_value1 = m_value2 = m_value3 = m_value5 = 0;
- m_value4 = wxEmptyString;
- m_windowId = 0;
- m_exStyle = 0;
-}
-
-wxItemResource::~wxItemResource()
-{
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxItemResource *item = (wxItemResource *)node->GetData();
- delete item;
- delete node;
- node = m_children.GetFirst();
- }
-}
-
-/*
-* Resource table
-*/
-
-wxResourceTable::wxResourceTable():wxHashTable(wxKEY_STRING), identifiers(wxKEY_STRING)
-{
-}
-
-wxResourceTable::~wxResourceTable()
-{
- ClearTable();
-}
-
-wxItemResource *wxResourceTable::FindResource(const wxString& name) const
-{
- wxItemResource *item = (wxItemResource *)Get(WXSTRINGCAST name);
- return item;
-}
-
-void wxResourceTable::AddResource(wxItemResource *item)
-{
- wxString name = item->GetName();
- if (name.empty())
- name = item->GetTitle();
- if (name.empty())
- name = wxT("no name");
-
- // Delete existing resource, if any.
- Delete(name);
-
- Put(name, item);
-}
-
-bool wxResourceTable::DeleteResource(const wxString& name)
-{
- wxItemResource *item = (wxItemResource *)Delete(WXSTRINGCAST name);
- if (item)
- {
- // See if any resource has this as its child; if so, delete from
- // parent's child list.
- BeginFind();
- wxHashTable::Node *node = Next();
- while (node != NULL)
- {
- wxItemResource *parent = (wxItemResource *)node->GetData();
- if (parent->GetChildren().Member(item))
- {
- parent->GetChildren().DeleteObject(item);
- break;
- }
- node = Next();
- }
-
- delete item;
- return true;
- }
- else
- return false;
-}
-
-bool wxResourceTable::ParseResourceFile( wxInputStream *is )
-{
- wxExprDatabase db;
- int len = is->GetSize() ;
-
- bool eof = false;
- while ( is->TellI() + 10 < len) // it's a hack because the streams dont support EOF
- {
- wxResourceReadOneResource(is, db, &eof, this) ;
- }
- return wxResourceInterpretResources(*this, db);
-}
-
-bool wxResourceTable::ParseResourceFile(const wxString& filename)
-{
- wxExprDatabase db;
-
- FILE *fd = wxFopen(filename, wxT("r"));
- if (!fd)
- return false;
- bool eof = false;
- while (wxResourceReadOneResource(fd, db, &eof, this) && !eof)
- {
- // Loop
- }
- fclose(fd);
- return wxResourceInterpretResources(*this, db);
-}
-
-bool wxResourceTable::ParseResourceData(const wxString& data)
-{
- wxExprDatabase db;
- if (!db.ReadFromString(data))
- {
- wxLogWarning(_("Ill-formed resource file syntax."));
- return false;
- }
-
- return wxResourceInterpretResources(*this, db);
-}
-
-bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char bits[], int width, int height)
-{
- // Register pre-loaded bitmap data
- wxItemResource *item = new wxItemResource;
- // item->SetType(wxRESOURCE_TYPE_XBM_DATA);
- item->SetType(wxT("wxXBMData"));
- item->SetName(name);
- item->SetValue1((long)bits);
- item->SetValue2((long)width);
- item->SetValue3((long)height);
- AddResource(item);
- return true;
-}
-
-bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char **data)
-{
- // Register pre-loaded bitmap data
- wxItemResource *item = new wxItemResource;
- // item->SetType(wxRESOURCE_TYPE_XPM_DATA);
- item->SetType(wxT("wxXPMData"));
- item->SetName(name);
- item->SetValue1((long)data);
- AddResource(item);
- return true;
-}
-
-bool wxResourceTable::SaveResource(const wxString& WXUNUSED(filename))
-{
- return false;
-}
-
-void wxResourceTable::ClearTable()
-{
- BeginFind();
- wxHashTable::Node *node = Next();
- while (node)
- {
- wxHashTable::Node *next = Next();
- wxItemResource *item = (wxItemResource *)node->GetData();
- delete item;
- delete node;
- node = next;
- }
-}
-
-wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* childResource, const wxItemResource* parentResource) const
-{
- int id = childResource->GetId();
- if ( id == 0 )
- id = wxID_ANY;
-
- bool dlgUnits = ((parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0);
-
- wxControl *control = (wxControl *) NULL;
- wxString itemType(childResource->GetType());
-
- wxPoint pos;
- wxSize size;
- if (dlgUnits)
- {
- pos = parent->ConvertDialogToPixels(wxPoint(childResource->GetX(), childResource->GetY()));
- size = parent->ConvertDialogToPixels(wxSize(childResource->GetWidth(), childResource->GetHeight()));
- }
- else
- {
- pos = wxPoint(childResource->GetX(), childResource->GetY());
- size = wxSize(childResource->GetWidth(), childResource->GetHeight());
- }
-
- if (itemType == wxString(wxT("wxButton")) || itemType == wxString(wxT("wxBitmapButton")))
- {
- if (!childResource->GetValue4().empty())
- {
- // Bitmap button
- wxBitmap bitmap = childResource->GetBitmap();
- if (!bitmap.Ok())
- {
- bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this);
- ((wxItemResource*) childResource)->SetBitmap(bitmap);
- }
- if (!bitmap.Ok())
-#if defined(__WXPM__)
- //
- // OS/2 uses integer id's to access resources, not file name strings
- //
- bitmap.LoadFile(wxCROSS_BITMAP, wxBITMAP_TYPE_BMP_RESOURCE);
-#else
- bitmap.LoadFile(wxT("cross_bmp"), wxBITMAP_TYPE_BMP_RESOURCE);
-#endif
- control = new wxBitmapButton(parent, id, bitmap, pos, size,
- childResource->GetStyle() | wxBU_AUTODRAW, wxDefaultValidator, childResource->GetName());
- }
- else
- // Normal, text button
- control = new wxButton(parent, id, childResource->GetTitle(), pos, size,
- childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
- }
- else if (itemType == wxString(wxT("wxMessage")) || itemType == wxString(wxT("wxStaticText")) ||
- itemType == wxString(wxT("wxStaticBitmap")))
- {
- if (!childResource->GetValue4().empty() || itemType == wxString(wxT("wxStaticBitmap")) )
- {
- // Bitmap message
- wxBitmap bitmap = childResource->GetBitmap();
- if (!bitmap.Ok())
- {
- bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this);
- ((wxItemResource*) childResource)->SetBitmap(bitmap);
- }
-#if wxUSE_BITMAP_MESSAGE
-#ifdef __WXMSW__
- // Use a default bitmap
- if (!bitmap.Ok())
- bitmap.LoadFile(wxT("cross_bmp"), wxBITMAP_TYPE_BMP_RESOURCE);
-#endif
-
- if (bitmap.Ok())
- control = new wxStaticBitmap(parent, id, bitmap, pos, size,
- childResource->GetStyle(), childResource->GetName());
-#endif
- }
- else
- {
- control = new wxStaticText(parent, id, childResource->GetTitle(), pos, size,
- childResource->GetStyle(), childResource->GetName());
- }
- }
- else if (itemType == wxString(wxT("wxText")) || itemType == wxString(wxT("wxTextCtrl")) || itemType == wxString(wxT("wxMultiText")))
- {
- control = new wxTextCtrl(parent, id, childResource->GetValue4(), pos, size,
- childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
- }
- else if (itemType == wxString(wxT("wxCheckBox")))
- {
- control = new wxCheckBox(parent, id, childResource->GetTitle(), pos, size,
- childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-
- ((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
- }
-#if wxUSE_GAUGE
- else if (itemType == wxString(wxT("wxGauge")))
- {
- control = new wxGauge(parent, id, (int)childResource->GetValue2(), pos, size,
- childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-
- ((wxGauge *)control)->SetValue((int)childResource->GetValue1());
- }
-#endif
-#if wxUSE_RADIOBTN
- else if (itemType == wxString(wxT("wxRadioButton")))
- {
- control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(),
- pos, size,
- childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
- }
-#endif
-#if wxUSE_SCROLLBAR
- else if (itemType == wxString(wxT("wxScrollBar")))
- {
- control = new wxScrollBar(parent, id, pos, size,
- childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
- /*
- ((wxScrollBar *)control)->SetValue((int)childResource->GetValue1());
- ((wxScrollBar *)control)->SetPageSize((int)childResource->GetValue2());
- ((wxScrollBar *)control)->SetObjectLength((int)childResource->GetValue3());
- ((wxScrollBar *)control)->SetViewLength((int)(long)childResource->GetValue5());
- */
- ((wxScrollBar *)control)->SetScrollbar((int)childResource->GetValue1(),(int)childResource->GetValue2(),
- (int)childResource->GetValue3(),(int)(long)childResource->GetValue5(),false);
-
- }
-#endif
- else if (itemType == wxString(wxT("wxSlider")))
- {
- control = new wxSlider(parent, id, (int)childResource->GetValue1(),
- (int)childResource->GetValue2(), (int)childResource->GetValue3(), pos, size,
- childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
- }
- else if (itemType == wxString(wxT("wxGroupBox")) || itemType == wxString(wxT("wxStaticBox")))
- {
- control = new wxStaticBox(parent, id, childResource->GetTitle(), pos, size,
- childResource->GetStyle(), childResource->GetName());
- }
- else if (itemType == wxString(wxT("wxListBox")))
- {
- wxStringList& stringList = childResource->GetStringValues();
- wxString *strings = (wxString *) NULL;
- int noStrings = 0;
- if (stringList.GetCount() > 0)
- {
- noStrings = stringList.GetCount();
- strings = new wxString[noStrings];
- wxStringListNode *node = stringList.GetFirst();
- int i = 0;
- while (node)
- {
- strings[i] = (wxChar *)node->GetData();
- i ++;
- node = node->GetNext();
- }
- }
- control = new wxListBox(parent, id, pos, size,
- noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-
- if (strings)
- delete[] strings;
- }
- else if (itemType == wxString(wxT("wxChoice")))
- {
- wxStringList& stringList = childResource->GetStringValues();
- wxString *strings = (wxString *) NULL;
- int noStrings = 0;
- if (stringList.GetCount() > 0)
- {
- noStrings = stringList.GetCount();
- strings = new wxString[noStrings];
- wxStringListNode *node = stringList.GetFirst();
- int i = 0;
- while (node)
- {
- strings[i] = (wxChar *)node->GetData();
- i ++;
- node = node->GetNext();
- }
- }
- control = new wxChoice(parent, id, pos, size,
- noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-
- if (strings)
- delete[] strings;
- }
-#if wxUSE_COMBOBOX
- else if (itemType == wxString(wxT("wxComboBox")))
- {
- wxStringList& stringList = childResource->GetStringValues();
- wxString *strings = (wxString *) NULL;
- int noStrings = 0;
- if (stringList.GetCount() > 0)
- {
- noStrings = stringList.GetCount();
- strings = new wxString[noStrings];
- wxStringListNode *node = stringList.GetFirst();
- int i = 0;
- while (node)
- {
- strings[i] = (wxChar *)node->GetData();
- i ++;
- node = node->GetNext();
- }
- }
- control = new wxComboBox(parent, id, childResource->GetValue4(), pos, size,
- noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-
- if (strings)
- delete[] strings;
- }
-#endif
- else if (itemType == wxString(wxT("wxRadioBox")))
- {
- wxStringList& stringList = childResource->GetStringValues();
- wxString *strings = (wxString *) NULL;
- int noStrings = 0;
- if (stringList.GetCount() > 0)
- {
- noStrings = stringList.GetCount();
- strings = new wxString[noStrings];
- wxStringListNode *node = stringList.GetFirst();
- int i = 0;
- while (node)
- {
- strings[i] = (wxChar *)node->GetData();
- i ++;
- node = node->GetNext();
- }
- }
- control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), pos, size,
- noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator,
- childResource->GetName());
-
- if (strings)
- delete[] strings;
- }
-
- if ((parentResource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
- {
- // Don't set font; will be inherited from parent.
- }
- else
- {
- if (control && childResource->GetFont().Ok())
- {
- control->SetFont(childResource->GetFont());
-
-#ifdef __WXMSW__
- // Force the layout algorithm since the size changes the layout
- if (control->IsKindOf(CLASSINFO(wxRadioBox)))
- {
- control->SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
- }
-#endif
- }
- }
- return control;
-}
-
-/*
-* Interpret database as a series of resources
-*/
-
-bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
-{
- wxNode *node = db.GetFirst();
- while (node)
- {
- wxExpr *clause = (wxExpr *)node->GetData();
- wxString functor(clause->Functor());
-
- wxItemResource *item = (wxItemResource *) NULL;
- if (functor == wxT("dialog"))
- item = wxResourceInterpretDialog(table, clause);
- else if (functor == wxT("panel"))
- item = wxResourceInterpretDialog(table, clause, true);
- else if (functor == wxT("menubar"))
- item = wxResourceInterpretMenuBar(table, clause);
- else if (functor == wxT("menu"))
- item = wxResourceInterpretMenu(table, clause);
- else if (functor == wxT("string"))
- item = wxResourceInterpretString(table, clause);
- else if (functor == wxT("bitmap"))
- item = wxResourceInterpretBitmap(table, clause);
- else if (functor == wxT("icon"))
- item = wxResourceInterpretIcon(table, clause);
-
- if (item)
- {
- // Remove any existing resource of same name
- if (!item->GetName().empty())
- table.DeleteResource(item->GetName());
- table.AddResource(item);
- }
- node = node->GetNext();
- }
- return true;
-}
-
-static const wxChar *g_ValidControlClasses[] =
-{
- wxT("wxButton"),
- wxT("wxBitmapButton"),
- wxT("wxMessage"),
- wxT("wxStaticText"),
- wxT("wxStaticBitmap"),
- wxT("wxText"),
- wxT("wxTextCtrl"),
- wxT("wxMultiText"),
- wxT("wxListBox"),
- wxT("wxRadioBox"),
- wxT("wxRadioButton"),
- wxT("wxCheckBox"),
- wxT("wxBitmapCheckBox"),
- wxT("wxGroupBox"),
- wxT("wxStaticBox"),
- wxT("wxSlider"),
- wxT("wxGauge"),
- wxT("wxScrollBar"),
- wxT("wxChoice"),
- wxT("wxComboBox")
-};
-
-static bool wxIsValidControlClass(const wxString& c)
-{
- for ( size_t i = 0; i < WXSIZEOF(g_ValidControlClasses); i++ )
- {
- if ( c == g_ValidControlClasses[i] )
- return true;
- }
- return false;
-}
-
-wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel)
-{
- wxItemResource *dialogItem = new wxItemResource;
- if (isPanel)
- dialogItem->SetType(wxT("wxPanel"));
- else
- dialogItem->SetType(wxT("wxDialog"));
- wxString style = wxEmptyString;
- wxString title = wxEmptyString;
- wxString name = wxEmptyString;
- wxString backColourHex = wxEmptyString;
- wxString labelColourHex = wxEmptyString;
- wxString buttonColourHex = wxEmptyString;
-
- long windowStyle = wxDEFAULT_DIALOG_STYLE;
- if (isPanel)
- windowStyle = 0;
-
- int x = 0; int y = 0; int width = wxDefaultCoord; int height = wxDefaultCoord;
- int isModal = 0;
- wxExpr *labelFontExpr = (wxExpr *) NULL;
- wxExpr *buttonFontExpr = (wxExpr *) NULL;
- wxExpr *fontExpr = (wxExpr *) NULL;
- expr->GetAttributeValue(wxT("style"), style);
- expr->GetAttributeValue(wxT("name"), name);
- expr->GetAttributeValue(wxT("title"), title);
- expr->GetAttributeValue(wxT("x"), x);
- expr->GetAttributeValue(wxT("y"), y);
- expr->GetAttributeValue(wxT("width"), width);
- expr->GetAttributeValue(wxT("height"), height);
- expr->GetAttributeValue(wxT("modal"), isModal);
- expr->GetAttributeValue(wxT("label_font"), &labelFontExpr);
- expr->GetAttributeValue(wxT("button_font"), &buttonFontExpr);
- expr->GetAttributeValue(wxT("font"), &fontExpr);
- expr->GetAttributeValue(wxT("background_colour"), backColourHex);
- expr->GetAttributeValue(wxT("label_colour"), labelColourHex);
- expr->GetAttributeValue(wxT("button_colour"), buttonColourHex);
-
- int useDialogUnits = 0;
- expr->GetAttributeValue(wxT("use_dialog_units"), useDialogUnits);
- if (useDialogUnits != 0)
- dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_DIALOG_UNITS);
-
- int useDefaults = 0;
- expr->GetAttributeValue(wxT("use_system_defaults"), useDefaults);
- if (useDefaults != 0)
- dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_USE_DEFAULTS);
-
- int id = 0;
- expr->GetAttributeValue(wxT("id"), id);
- dialogItem->SetId(id);
-
- if (!style.empty())
- {
- windowStyle = wxParseWindowStyle(style);
- }
- dialogItem->SetStyle(windowStyle);
- dialogItem->SetValue1(isModal);
-
-#if WXWIN_COMPATIBILITY_2_6
-
-#ifdef __VMS
-#pragma message disable CODCAUUNR
-#endif
- if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
- dialogItem->SetValue1(true);
-#ifdef __VMS
-#pragma message enable CODCAUUNR
-#endif
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
- dialogItem->SetName(name);
- dialogItem->SetTitle(title);
- dialogItem->SetSize(x, y, width, height);
-
- // Check for wxWin 1.68-style specifications
- if (style.Find(wxT("VERTICAL_LABEL")) != wxNOT_FOUND)
- dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);
- else if (style.Find(wxT("HORIZONTAL_LABEL")) != wxNOT_FOUND)
- dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);
-
- if (!backColourHex.empty())
- {
- int r = 0;
- int g = 0;
- int b = 0;
- r = wxHexToDec(backColourHex.Mid(0, 2));
- g = wxHexToDec(backColourHex.Mid(2, 2));
- b = wxHexToDec(backColourHex.Mid(4, 2));
- dialogItem->SetBackgroundColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
- }
- if (!labelColourHex.empty())
- {
- int r = 0;
- int g = 0;
- int b = 0;
- r = wxHexToDec(labelColourHex.Mid(0, 2));
- g = wxHexToDec(labelColourHex.Mid(2, 2));
- b = wxHexToDec(labelColourHex.Mid(4, 2));
- dialogItem->SetLabelColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
- }
- if (!buttonColourHex.empty())
- {
- int r = 0;
- int g = 0;
- int b = 0;
- r = wxHexToDec(buttonColourHex.Mid(0, 2));
- g = wxHexToDec(buttonColourHex.Mid(2, 2));
- b = wxHexToDec(buttonColourHex.Mid(4, 2));
- dialogItem->SetButtonColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
- }
-
- if (fontExpr)
- dialogItem->SetFont(wxResourceInterpretFontSpec(fontExpr));
- else if (buttonFontExpr)
- dialogItem->SetFont(wxResourceInterpretFontSpec(buttonFontExpr));
- else if (labelFontExpr)
- dialogItem->SetFont(wxResourceInterpretFontSpec(labelFontExpr));
-
- // Now parse all controls
- wxExpr *controlExpr = expr->GetFirst();
- while (controlExpr)
- {
- if (controlExpr->Number() == 3)
- {
- wxString controlKeyword(controlExpr->Nth(1)->StringValue());
- if (!controlKeyword.empty() && controlKeyword == wxT("control"))
- {
- // The value part: always a list.
- wxExpr *listExpr = controlExpr->Nth(2);
- if (listExpr->Type() == PrologList)
- {
- wxItemResource *controlItem = wxResourceInterpretControl(table, listExpr);
- if (controlItem)
- {
- dialogItem->GetChildren().Append(controlItem);
- }
- }
- }
- }
- controlExpr = controlExpr->GetNext();
- }
- return dialogItem;
-}
-
-wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
-{
- wxItemResource *controlItem = new wxItemResource;
-
- // First, find the standard features of a control definition:
- // [optional integer/string id], control name, title, style, name, x, y, width, height
-
- wxString controlType;
- wxString style;
- wxString title;
- wxString name;
- int id = 0;
- long windowStyle = 0;
- int x = 0; int y = 0; int width = wxDefaultCoord; int height = wxDefaultCoord;
- int count = 0;
-
- wxExpr *expr1 = expr->Nth(0);
-
- if ( expr1->Type() == PrologString || expr1->Type() == PrologWord )
- {
- if ( wxIsValidControlClass(expr1->StringValue()) )
- {
- count = 1;
- controlType = expr1->StringValue();
- }
- else
- {
- wxString str(expr1->StringValue());
- id = wxResourceGetIdentifier(str, &table);
- if (id == 0)
- {
- wxLogWarning(_("Could not resolve control class or id '%s'. Use (non-zero) integer instead\n or provide #define (see manual for caveats)"),
- (const wxChar*) expr1->StringValue());
- delete controlItem;
- return (wxItemResource *) NULL;
- }
- else
- {
- // Success - we have an id, so the 2nd element must be the control class.
- controlType = expr->Nth(1)->StringValue();
- count = 2;
- }
- }
- }
- else if (expr1->Type() == PrologInteger)
- {
- id = (int)expr1->IntegerValue();
- // Success - we have an id, so the 2nd element must be the control class.
- controlType = expr->Nth(1)->StringValue();
- count = 2;
- }
-
- expr1 = expr->Nth(count);
- count ++;
- if ( expr1 )
- title = expr1->StringValue();
-
- expr1 = expr->Nth(count);
- count ++;
- if (expr1)
- {
- style = expr1->StringValue();
- windowStyle = wxParseWindowStyle(style);
- }
-
- expr1 = expr->Nth(count);
- count ++;
- if (expr1)
- name = expr1->StringValue();
-
- expr1 = expr->Nth(count);
- count ++;
- if (expr1)
- x = (int)expr1->IntegerValue();
-
- expr1 = expr->Nth(count);
- count ++;
- if (expr1)
- y = (int)expr1->IntegerValue();
-
- expr1 = expr->Nth(count);
- count ++;
- if (expr1)
- width = (int)expr1->IntegerValue();
-
- expr1 = expr->Nth(count);
- count ++;
- if (expr1)
- height = (int)expr1->IntegerValue();
-
- controlItem->SetStyle(windowStyle);
- controlItem->SetName(name);
- controlItem->SetTitle(title);
- controlItem->SetSize(x, y, width, height);
- controlItem->SetType(controlType);
- controlItem->SetId(id);
-
- // Check for wxWin 1.68-style specifications
- if (style.Find(wxT("VERTICAL_LABEL")) != wxNOT_FOUND)
- controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);
- else if (style.Find(wxT("HORIZONTAL_LABEL")) != wxNOT_FOUND)
- controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);
-
- if (controlType == wxT("wxButton"))
- {
- // Check for bitmap resource name (in case loading old-style resource file)
- if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
- {
- wxString str(expr->Nth(count)->StringValue());
- count ++;
-
- if (!str.empty())
- {
- controlItem->SetValue4(str);
- controlItem->SetType(wxT("wxBitmapButton"));
- }
- }
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- else if (controlType == wxT("wxBitmapButton"))
- {
- // Check for bitmap resource name
- if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
- {
- wxString str(expr->Nth(count)->StringValue());
- controlItem->SetValue4(str);
- count ++;
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- else if (controlType == wxT("wxCheckBox"))
- {
- // Check for default value
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
-#if wxUSE_RADIOBTN
- else if (controlType == wxT("wxRadioButton"))
- {
- // Check for default value
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
-#endif
- else if (controlType == wxT("wxText") || controlType == wxT("wxTextCtrl") || controlType == wxT("wxMultiText"))
- {
- // Check for default value
- if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
- {
- wxString str(expr->Nth(count)->StringValue());
- controlItem->SetValue4(str);
- count ++;
-
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
- // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- // Skip past the obsolete label font spec if there are two consecutive specs
- if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
- count ++;
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
- else if (controlType == wxT("wxMessage") || controlType == wxT("wxStaticText"))
- {
- // Check for bitmap resource name (in case it's an old-style .wxr file)
- if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
- {
- wxString str(expr->Nth(count)->StringValue());
- controlItem->SetValue4(str);
- count ++;
- controlItem->SetType(wxT("wxStaticText"));
- }
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- else if (controlType == wxT("wxStaticBitmap"))
- {
- // Check for bitmap resource name
- if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
- {
- wxString str(expr->Nth(count)->StringValue());
- controlItem->SetValue4(str);
- count ++;
- }
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- else if (controlType == wxT("wxGroupBox") || controlType == wxT("wxStaticBox"))
- {
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- else if (controlType == wxT("wxGauge"))
- {
- // Check for default value
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
-
- // Check for range
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue2(expr->Nth(count)->IntegerValue());
- count ++;
-
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
- // Skip past the obsolete label font spec if there are two consecutive specs
- if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
- count ++;
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
- }
- else if (controlType == wxT("wxSlider"))
- {
- // Check for default value
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
-
- // Check for min
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue2(expr->Nth(count)->IntegerValue());
- count ++;
-
- // Check for max
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue3(expr->Nth(count)->IntegerValue());
- count ++;
-
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
- // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- // do nothing
- count ++;
-
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
- }
- }
- else if (controlType == wxT("wxScrollBar"))
- {
- // DEFAULT VALUE
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
-
- // PAGE LENGTH
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue2(expr->Nth(count)->IntegerValue());
- count ++;
-
- // OBJECT LENGTH
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue3(expr->Nth(count)->IntegerValue());
- count ++;
-
- // VIEW LENGTH
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- controlItem->SetValue5(expr->Nth(count)->IntegerValue());
- }
- }
- }
- }
- else if (controlType == wxT("wxListBox"))
- {
- wxExpr *valueList = (wxExpr *) NULL;
-
- if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))
- {
- wxStringList stringList;
- wxExpr *stringExpr = valueList->GetFirst();
- while (stringExpr)
- {
- stringList.Add(stringExpr->StringValue());
- stringExpr = stringExpr->GetNext();
- }
- controlItem->SetStringValues(stringList);
- count ++;
- // This is now obsolete: it's in the window style.
- // Check for wxSINGLE/wxMULTIPLE
- wxExpr *mult = (wxExpr *) NULL;
- /*
- controlItem->SetValue1(wxLB_SINGLE);
- */
- if (((mult = expr->Nth(count)) != 0) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))
- {
- /*
- wxString m(mult->StringValue());
- if (m == "wxLB_MULTIPLE")
- controlItem->SetValue1(wxLB_MULTIPLE);
- else if (m == "wxLB_EXTENDED")
- controlItem->SetValue1(wxLB_EXTENDED);
- */
- // Ignore the value
- count ++;
- }
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
- // Skip past the obsolete label font spec if there are two consecutive specs
- if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
- count ++;
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
- else if (controlType == wxT("wxChoice"))
- {
- wxExpr *valueList = (wxExpr *) NULL;
- // Check for default value list
- if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))
- {
- wxStringList stringList;
- wxExpr *stringExpr = valueList->GetFirst();
- while (stringExpr)
- {
- stringList.Add(stringExpr->StringValue());
- stringExpr = stringExpr->GetNext();
- }
- controlItem->SetStringValues(stringList);
-
- count ++;
-
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
- // Skip past the obsolete label font spec if there are two consecutive specs
- if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
- count ++;
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
-#if wxUSE_COMBOBOX
- else if (controlType == wxT("wxComboBox"))
- {
- wxExpr *textValue = expr->Nth(count);
- if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord))
- {
- wxString str(textValue->StringValue());
- controlItem->SetValue4(str);
-
- count ++;
-
- wxExpr *valueList = (wxExpr *) NULL;
- // Check for default value list
- if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))
- {
- wxStringList stringList;
- wxExpr *stringExpr = valueList->GetFirst();
- while (stringExpr)
- {
- stringList.Add(stringExpr->StringValue());
- stringExpr = stringExpr->GetNext();
- }
- controlItem->SetStringValues(stringList);
-
- count ++;
-
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
- // Skip past the obsolete label font spec if there are two consecutive specs
- if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
- count ++;
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
- }
-#endif
-#if 1
- else if (controlType == wxT("wxRadioBox"))
- {
- wxExpr *valueList = (wxExpr *) NULL;
- // Check for default value list
- if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))
- {
- wxStringList stringList;
- wxExpr *stringExpr = valueList->GetFirst();
- while (stringExpr)
- {
- stringList.Add(stringExpr->StringValue());
- stringExpr = stringExpr->GetNext();
- }
- controlItem->SetStringValues(stringList);
- count ++;
-
- // majorDim (number of rows or cols)
- if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
- {
- controlItem->SetValue1(expr->Nth(count)->IntegerValue());
- count ++;
- }
- else
- controlItem->SetValue1(0);
-
- if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
- {
- // Skip past the obsolete label font spec if there are two consecutive specs
- if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
- count ++;
- controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
- }
- }
- }
-#endif
- else
- {
- delete controlItem;
- return (wxItemResource *) NULL;
- }
- return controlItem;
-}
-
-// Forward declaration
-wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr);
-
-/*
-* Interpet a menu item
-*/
-
-wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, wxExpr *expr)
-{
- wxItemResource *item = new wxItemResource;
-
- wxExpr *labelExpr = expr->Nth(0);
- wxExpr *idExpr = expr->Nth(1);
- wxExpr *helpExpr = expr->Nth(2);
- wxExpr *checkableExpr = expr->Nth(3);
-
- // Further keywords/attributes to follow sometime...
- if (expr->Number() == 0)
- {
- // item->SetType(wxRESOURCE_TYPE_SEPARATOR);
- item->SetType(wxT("wxMenuSeparator"));
- return item;
- }
- else
- {
- // item->SetType(wxTYPE_MENU); // Well, menu item, but doesn't matter.
- item->SetType(wxT("wxMenu")); // Well, menu item, but doesn't matter.
- if (labelExpr)
- {
- wxString str(labelExpr->StringValue());
- item->SetTitle(str);
- }
- if (idExpr)
- {
- int id = 0;
- // If a string or word, must look up in identifier table.
- if ((idExpr->Type() == PrologString) || (idExpr->Type() == PrologWord))
- {
- wxString str(idExpr->StringValue());
- id = wxResourceGetIdentifier(str, &table);
- if (id == 0)
- {
- wxLogWarning(_("Could not resolve menu id '%s'. Use (non-zero) integer instead\nor provide #define (see manual for caveats)"),
- (const wxChar*) idExpr->StringValue());
- }
- }
- else if (idExpr->Type() == PrologInteger)
- id = (int)idExpr->IntegerValue();
- item->SetValue1(id);
- }
- if (helpExpr)
- {
- wxString str(helpExpr->StringValue());
- item->SetValue4(str);
- }
- if (checkableExpr)
- item->SetValue2(checkableExpr->IntegerValue());
-
- // Find the first expression that's a list, for submenu
- wxExpr *subMenuExpr = expr->GetFirst();
- while (subMenuExpr && (subMenuExpr->Type() != PrologList))
- subMenuExpr = subMenuExpr->GetNext();
-
- while (subMenuExpr)
- {
- wxItemResource *child = wxResourceInterpretMenuItem(table, subMenuExpr);
- item->GetChildren().Append(child);
- subMenuExpr = subMenuExpr->GetNext();
- }
- }
- return item;
-}
-
-/*
-* Interpret a nested list as a menu
-*/
-/*
-wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr)
-{
-wxItemResource *menu = new wxItemResource;
-// menu->SetType(wxTYPE_MENU);
-menu->SetType("wxMenu");
-wxExpr *element = expr->GetFirst();
-while (element)
-{
-wxItemResource *item = wxResourceInterpretMenuItem(table, element);
-if (item)
-menu->GetChildren().Append(item);
-element = element->GetNext();
-}
-return menu;
-}
-*/
-
-wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)
-{
- wxExpr *listExpr = (wxExpr *) NULL;
- expr->GetAttributeValue(wxT("menu"), &listExpr);
- if (!listExpr)
- return (wxItemResource *) NULL;
-
- wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);
-
- if (!menuResource)
- return (wxItemResource *) NULL;
-
- wxString name;
- if (expr->GetAttributeValue(wxT("name"), name))
- {
- menuResource->SetName(name);
- }
-
- return menuResource;
-}
-
-wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
-{
- wxExpr *listExpr = (wxExpr *) NULL;
- expr->GetAttributeValue(wxT("menu"), &listExpr);
- if (!listExpr)
- return (wxItemResource *) NULL;
-
- wxItemResource *resource = new wxItemResource;
- resource->SetType(wxT("wxMenu"));
- // resource->SetType(wxTYPE_MENU);
-
- wxExpr *element = listExpr->GetFirst();
- while (element)
- {
- wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);
- resource->GetChildren().Append(menuResource);
- element = element->GetNext();
- }
-
- wxString name;
- if (expr->GetAttributeValue(wxT("name"), name))
- {
- resource->SetName(name);
- }
-
- return resource;
-}
-
-wxItemResource *wxResourceInterpretString(wxResourceTable& WXUNUSED(table), wxExpr *WXUNUSED(expr))
-{
- return (wxItemResource *) NULL;
-}
-
-wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxExpr *expr)
-{
- wxItemResource *bitmapItem = new wxItemResource;
- // bitmapItem->SetType(wxTYPE_BITMAP);
- bitmapItem->SetType(wxT("wxBitmap"));
- wxString name;
- if (expr->GetAttributeValue(wxT("name"), name))
- {
- bitmapItem->SetName(name);
- }
- // Now parse all bitmap specifications
- wxExpr *bitmapExpr = expr->GetFirst();
- while (bitmapExpr)
- {
- if (bitmapExpr->Number() == 3)
- {
- wxString bitmapKeyword(bitmapExpr->Nth(1)->StringValue());
- if (bitmapKeyword == wxT("bitmap") || bitmapKeyword == wxT("icon"))
- {
- // The value part: always a list.
- wxExpr *listExpr = bitmapExpr->Nth(2);
- if (listExpr->Type() == PrologList)
- {
- wxItemResource *bitmapSpec = new wxItemResource;
- // bitmapSpec->SetType(wxTYPE_BITMAP);
- bitmapSpec->SetType(wxT("wxBitmap"));
-
- // List is of form: [filename, bitmaptype, platform, colours, xresolution, yresolution]
- // where everything after 'filename' is optional.
- wxExpr *nameExpr = listExpr->Nth(0);
- wxExpr *typeExpr = listExpr->Nth(1);
- wxExpr *platformExpr = listExpr->Nth(2);
- wxExpr *coloursExpr = listExpr->Nth(3);
- wxExpr *xresExpr = listExpr->Nth(4);
- wxExpr *yresExpr = listExpr->Nth(5);
- if (nameExpr && !nameExpr->StringValue().empty())
- {
- bitmapSpec->SetName(nameExpr->StringValue());
- }
- if (typeExpr && !typeExpr->StringValue().empty())
- {
- bitmapSpec->SetValue1(wxParseWindowStyle(typeExpr->StringValue()));
- }
- else
- bitmapSpec->SetValue1(0);
-
- if (platformExpr && !platformExpr->StringValue().empty())
- {
- wxString plat(platformExpr->StringValue());
- if (plat == wxT("windows") || plat == wxT("WINDOWS"))
- bitmapSpec->SetValue2(RESOURCE_PLATFORM_WINDOWS);
- else if (plat == wxT("x") || plat == wxT("X"))
- bitmapSpec->SetValue2(RESOURCE_PLATFORM_X);
- else if (plat == wxT("mac") || plat == wxT("MAC"))
- bitmapSpec->SetValue2(RESOURCE_PLATFORM_MAC);
- else
- bitmapSpec->SetValue2(RESOURCE_PLATFORM_ANY);
- }
- else
- bitmapSpec->SetValue2(RESOURCE_PLATFORM_ANY);
-
- if (coloursExpr)
- bitmapSpec->SetValue3(coloursExpr->IntegerValue());
- int xres = 0;
- int yres = 0;
- if (xresExpr)
- xres = (int)xresExpr->IntegerValue();
- if (yresExpr)
- yres = (int)yresExpr->IntegerValue();
- bitmapSpec->SetSize(0, 0, xres, yres);
-
- bitmapItem->GetChildren().Append(bitmapSpec);
- }
- }
- }
- bitmapExpr = bitmapExpr->GetNext();
- }
-
- return bitmapItem;
-}
-
-wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr)
-{
- wxItemResource *item = wxResourceInterpretBitmap(table, expr);
- if (item)
- {
- // item->SetType(wxTYPE_ICON);
- item->SetType(wxT("wxIcon"));
- return item;
- }
- else
- return (wxItemResource *) NULL;
-}
-
-// Interpret list expression as a font
-wxFont wxResourceInterpretFontSpec(wxExpr *expr)
-{
- if (expr->Type() != PrologList)
- return wxNullFont;
-
- int point = 10;
- int family = wxSWISS;
- int style = wxNORMAL;
- int weight = wxNORMAL;
- int underline = 0;
- wxString faceName;
-
- wxExpr *pointExpr = expr->Nth(0);
- wxExpr *familyExpr = expr->Nth(1);
- wxExpr *styleExpr = expr->Nth(2);
- wxExpr *weightExpr = expr->Nth(3);
- wxExpr *underlineExpr = expr->Nth(4);
- wxExpr *faceNameExpr = expr->Nth(5);
- if (pointExpr)
- point = (int)pointExpr->IntegerValue();
-
- wxString str;
- if (familyExpr)
- {
- str = familyExpr->StringValue();
- family = (int)wxParseWindowStyle(str);
- }
- if (styleExpr)
- {
- str = styleExpr->StringValue();
- style = (int)wxParseWindowStyle(str);
- }
- if (weightExpr)
- {
- str = weightExpr->StringValue();
- weight = (int)wxParseWindowStyle(str);
- }
- if (underlineExpr)
- underline = (int)underlineExpr->IntegerValue();
- if (faceNameExpr)
- faceName = faceNameExpr->StringValue();
-
- return *wxTheFontList->FindOrCreateFont(point, family, style, weight,
- (underline != 0), faceName);
-}
-
-/*
-* (Re)allocate buffer for reading in from resource file
-*/
-
-bool wxReallocateResourceBuffer()
-{
- if (!wxResourceBuffer)
- {
- wxResourceBufferSize = 1000;
- wxResourceBuffer = new char[wxResourceBufferSize];
- return true;
- }
- if (wxResourceBuffer)
- {
- long newSize = wxResourceBufferSize + 1000;
- char *tmp = new char[(int)newSize];
- strncpy(tmp, wxResourceBuffer, (int)wxResourceBufferCount);
- delete[] wxResourceBuffer;
- wxResourceBuffer = tmp;
- wxResourceBufferSize = newSize;
- }
- return true;
-}
-
-static bool wxEatWhiteSpace(FILE *fd)
-{
- int ch;
-
- while ((ch = getc(fd)) != EOF)
- {
- switch (ch)
- {
- case ' ':
- case 0x0a:
- case 0x0d:
- case 0x09:
- break;
- case '/':
- {
- int prev_ch = ch;
- ch = getc(fd);
- if (ch == EOF)
- {
- ungetc(prev_ch, fd);
- return true;
- }
-
- if (ch == '*')
- {
- // Eat C comment
- prev_ch = 0;
- while ((ch = getc(fd)) != EOF)
- {
- if (ch == '/' && prev_ch == '*')
- break;
- prev_ch = ch;
- }
- }
- else if (ch == '/')
- {
- // Eat C++ comment
- static char buffer[255];
- fgets(buffer, 255, fd);
- }
- else
- {
- ungetc(prev_ch, fd);
- ungetc(ch, fd);
- return true;
- }
- }
- break;
- default:
- ungetc(ch, fd);
- return true;
-
- }
- }
- return false;
-}
-static bool wxEatWhiteSpace(wxInputStream *is)
-{
- char ch = is->GetC() ;
- if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
- {
- is->Ungetch(ch);
- return true;
- }
-
- // Eat whitespace
- while (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
- ch = is->GetC();
- // Check for comment
- if (ch == '/')
- {
- ch = is->GetC();
- if (ch == '*')
- {
- bool finished = false;
- while (!finished)
- {
- ch = is->GetC();
- if (is->LastRead() == 0)
- return false;
- if (ch == '*')
- {
- int newCh = is->GetC();
- if (newCh == '/')
- finished = true;
- else
- {
- is->Ungetch(ch);
- }
- }
- }
- }
- else // False alarm
- return false;
- }
- else
- is->Ungetch(ch);
- return wxEatWhiteSpace(is);
-}
-
-bool wxGetResourceToken(FILE *fd)
-{
- if (!wxResourceBuffer)
- wxReallocateResourceBuffer();
- wxResourceBuffer[0] = 0;
- wxEatWhiteSpace(fd);
-
- int ch = getc(fd);
- if (ch == '"')
- {
- // Get string
- wxResourceBufferCount = 0;
- ch = getc(fd);
- while (ch != '"')
- {
- int actualCh = ch;
- if (ch == EOF)
- {
- wxResourceBuffer[wxResourceBufferCount] = 0;
- return false;
- }
- // Escaped characters
- else if (ch == '\\')
- {
- int newCh = getc(fd);
- if (newCh == '"')
- actualCh = '"';
- else if (newCh == 10)
- actualCh = 10;
- else
- {
- ungetc(newCh, fd);
- }
- }
-
- if (wxResourceBufferCount >= wxResourceBufferSize-1)
- wxReallocateResourceBuffer();
- wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
- wxResourceBufferCount ++;
- ch = getc(fd);
- }
- wxResourceBuffer[wxResourceBufferCount] = 0;
- }
- else
- {
- wxResourceBufferCount = 0;
- // Any other token
- while (ch != ' ' && ch != EOF && ch != ' ' && ch != 13 && ch != 9 && ch != 10)
- {
- if (wxResourceBufferCount >= wxResourceBufferSize-1)
- wxReallocateResourceBuffer();
- wxResourceBuffer[wxResourceBufferCount] = (char)ch;
- wxResourceBufferCount ++;
-
- ch = getc(fd);
- }
- wxResourceBuffer[wxResourceBufferCount] = 0;
- if (ch == EOF)
- return false;
- }
- return true;
-}
-
-bool wxGetResourceToken(wxInputStream *is)
-{
- if (!wxResourceBuffer)
- wxReallocateResourceBuffer();
- wxResourceBuffer[0] = 0;
- wxEatWhiteSpace(is);
-
- int ch = is->GetC() ;
- if (ch == '"')
- {
- // Get string
- wxResourceBufferCount = 0;
- ch = is->GetC();
- while (ch != '"')
- {
- int actualCh = ch;
- if (ch == EOF)
- {
- wxResourceBuffer[wxResourceBufferCount] = 0;
- return false;
- }
- // Escaped characters
- else if (ch == '\\')
- {
- char newCh = is->GetC();
- if (newCh == '"')
- actualCh = '"';
- else if (newCh == 10)
- actualCh = 10;
- else if (newCh == 13) // mac
- actualCh = 10;
- else
- {
- is->Ungetch(newCh);
- }
- }
-
- if (wxResourceBufferCount >= wxResourceBufferSize-1)
- wxReallocateResourceBuffer();
- wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
- wxResourceBufferCount ++;
- ch = is->GetC();
- }
- wxResourceBuffer[wxResourceBufferCount] = 0;
- }
- else
- {
- wxResourceBufferCount = 0;
- // Any other token
- while (ch != ' ' && ch != EOF && ch != ' ' && ch != 13 && ch != 9 && ch != 10)
- {
- if (wxResourceBufferCount >= wxResourceBufferSize-1)
- wxReallocateResourceBuffer();
- wxResourceBuffer[wxResourceBufferCount] = (char)ch;
- wxResourceBufferCount ++;
-
- ch = is->GetC();
- }
- wxResourceBuffer[wxResourceBufferCount] = 0;
- if (ch == EOF)
- return false;
- }
- return true;
-}
-
-/*
-* Files are in form:
-static char *name = "....";
-with possible comments.
-*/
-
-bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- // static or #define
- if (!wxGetResourceToken(fd))
- {
- *eof = true;
- return false;
- }
-
- if (strcmp(wxResourceBuffer, "#define") == 0)
- {
- wxGetResourceToken(fd);
- wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
- wxGetResourceToken(fd);
- wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
- if (wxIsdigit(value[0]))
- {
- int val = (int)wxAtol(value);
- wxResourceAddIdentifier(name, val, table);
- }
- else
- {
- wxLogWarning(_("#define %s must be an integer."), name);
- delete[] name;
- delete[] value;
- return false;
- }
- delete[] name;
- delete[] value;
-
- return true;
- }
- else if (strcmp(wxResourceBuffer, "#include") == 0)
- {
- wxGetResourceToken(fd);
- wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
- wxChar *actualName = name;
- if (name[0] == wxT('"'))
- actualName = name + 1;
- int len = wxStrlen(name);
- if ((len > 0) && (name[len-1] == wxT('"')))
- name[len-1] = 0;
- if (!wxResourceParseIncludeFile(actualName, table))
- {
- wxLogWarning(_("Could not find resource include file %s."), actualName);
- }
- delete[] name;
- return true;
- }
- else if (strcmp(wxResourceBuffer, "static") != 0)
- {
- wxChar buf[300];
- wxStrcpy(buf, _("Found "));
- wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
- wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));
- wxLogWarning(buf);
- return false;
- }
-
- // char
- if (!wxGetResourceToken(fd))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
-
- if (strcmp(wxResourceBuffer, "char") != 0)
- {
- wxLogWarning(_("Expected 'char' while parsing resource."));
- return false;
- }
-
- // *name
- if (!wxGetResourceToken(fd))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
-
- if (wxResourceBuffer[0] != '*')
- {
- wxLogWarning(_("Expected '*' while parsing resource."));
- return false;
- }
- wxChar nameBuf[100];
- wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
- nameBuf[99] = 0;
-
- // =
- if (!wxGetResourceToken(fd))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
-
- if (strcmp(wxResourceBuffer, "=") != 0)
- {
- wxLogWarning(_("Expected '=' while parsing resource."));
- return false;
- }
-
- // String
- if (!wxGetResourceToken(fd))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
- else
- {
- if (!db.ReadPrologFromString(wxResourceBuffer))
- {
- wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
- return false;
- }
- }
- // Semicolon
- if (!wxGetResourceToken(fd))
- {
- *eof = true;
- }
- return true;
-}
-
-bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- // static or #define
- if (!wxGetResourceToken(fd))
- {
- *eof = true;
- return false;
- }
-
- if (strcmp(wxResourceBuffer, "#define") == 0)
- {
- wxGetResourceToken(fd);
- wxChar *name = copystring(wxConvLibc.cMB2WX(wxResourceBuffer));
- wxGetResourceToken(fd);
- wxChar *value = copystring(wxConvLibc.cMB2WX(wxResourceBuffer));
- if (wxIsalpha(value[0]))
- {
- int val = (int)wxAtol(value);
- wxResourceAddIdentifier(name, val, table);
- }
- else
- {
- wxLogWarning(_("#define %s must be an integer."), name);
- delete[] name;
- delete[] value;
- return false;
- }
- delete[] name;
- delete[] value;
-
- return true;
- }
- else if (strcmp(wxResourceBuffer, "#include") == 0)
- {
- wxGetResourceToken(fd);
- wxChar *name = copystring(wxConvLibc.cMB2WX(wxResourceBuffer));
- wxChar *actualName = name;
- if (name[0] == wxT('"'))
- actualName = name + 1;
- int len = wxStrlen(name);
- if ((len > 0) && (name[len-1] == wxT('"')))
- name[len-1] = 0;
- if (!wxResourceParseIncludeFile(actualName, table))
- {
- wxLogWarning(_("Could not find resource include file %s."), actualName);
- }
- delete[] name;
- return true;
- }
- else if (strcmp(wxResourceBuffer, "static") != 0)
- {
- wxChar buf[300];
- wxStrcpy(buf, _("Found "));
- wxStrncat(buf, wxConvLibc.cMB2WX(wxResourceBuffer), 30);
- wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));
- wxLogWarning(buf);
- return false;
- }
-
- // char
- if (!wxGetResourceToken(fd))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
-
- if (strcmp(wxResourceBuffer, "char") != 0)
- {
- wxLogWarning(_("Expected 'char' while parsing resource."));
- return false;
- }
-
- // *name
- if (!wxGetResourceToken(fd))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
-
- if (wxResourceBuffer[0] != '*')
- {
- wxLogWarning(_("Expected '*' while parsing resource."));
- return false;
- }
- char nameBuf[100];
- strncpy(nameBuf, wxResourceBuffer+1, 99);
-
- // =
- if (!wxGetResourceToken(fd))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
-
- if (strcmp(wxResourceBuffer, "=") != 0)
- {
- wxLogWarning(_("Expected '=' while parsing resource."));
- return false;
- }
-
- // String
- if (!wxGetResourceToken(fd))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
- else
- {
- if (!db.ReadPrologFromString(wxResourceBuffer))
- {
- wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
- return false;
- }
- }
- // Semicolon
- if (!wxGetResourceToken(fd))
- {
- *eof = true;
- }
- return true;
-}
-
-/*
-* Parses string window style into integer window style
-*/
-
-/*
-* Style flag parsing, e.g.
-* "wxSYSTEM_MENU | wxBORDER" -> integer
-*/
-
-wxChar* wxResourceParseWord(wxChar*s, int *i)
-{
- if (!s)
- return (wxChar*) NULL;
-
- static wxChar buf[150];
- int len = wxStrlen(s);
- int j = 0;
- int ii = *i;
- while ((ii < len) && (wxIsalpha(s[ii]) || (s[ii] == wxT('_'))))
- {
- buf[j] = s[ii];
- j ++;
- ii ++;
- }
- buf[j] = 0;
-
- // Eat whitespace and conjunction characters
- while ((ii < len) &&
- ((s[ii] == wxT(' ')) || (s[ii] == wxT('|')) || (s[ii] == wxT(','))))
- {
- ii ++;
- }
- *i = ii;
- if (j == 0)
- return (wxChar*) NULL;
- else
- return buf;
-}
-
-struct wxResourceBitListStruct
-{
- const wxChar *word;
- long bits;
-};
-
-static wxResourceBitListStruct wxResourceBitListTable[] =
-{
- /* wxListBox */
- { wxT("wxSINGLE"), wxLB_SINGLE },
- { wxT("wxMULTIPLE"), wxLB_MULTIPLE },
- { wxT("wxEXTENDED"), wxLB_EXTENDED },
- { wxT("wxLB_SINGLE"), wxLB_SINGLE },
- { wxT("wxLB_MULTIPLE"), wxLB_MULTIPLE },
- { wxT("wxLB_EXTENDED"), wxLB_EXTENDED },
- { wxT("wxLB_NEEDED_SB"), wxLB_NEEDED_SB },
- { wxT("wxLB_ALWAYS_SB"), wxLB_ALWAYS_SB },
- { wxT("wxLB_SORT"), wxLB_SORT },
- { wxT("wxLB_OWNERDRAW"), wxLB_OWNERDRAW },
- { wxT("wxLB_HSCROLL"), wxLB_HSCROLL },
-
- /* wxComboxBox */
- { wxT("wxCB_SIMPLE"), wxCB_SIMPLE },
- { wxT("wxCB_DROPDOWN"), wxCB_DROPDOWN },
- { wxT("wxCB_READONLY"), wxCB_READONLY },
- { wxT("wxCB_SORT"), wxCB_SORT },
-
- /* wxGauge */
-#if WXWIN_COMPATIBILITY_2_6
- { wxT("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
-#endif // WXWIN_COMPATIBILITY_2_6
- { wxT("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
- { wxT("wxGA_VERTICAL"), wxGA_VERTICAL },
-
- /* wxTextCtrl */
-#if WXWIN_COMPATIBILITY_2_6
- { wxT("wxPASSWORD"), wxTE_PASSWORD},
- { wxT("wxPROCESS_ENTER"), wxTE_PROCESS_ENTER},
-#endif
- { wxT("wxTE_PASSWORD"), wxTE_PASSWORD},
- { wxT("wxTE_READONLY"), wxTE_READONLY},
- { wxT("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER},
- { wxT("wxTE_MULTILINE"), wxTE_MULTILINE},
- { wxT("wxTE_NO_VSCROLL"), wxTE_NO_VSCROLL},
-
- /* wxRadioBox/wxRadioButton */
- { wxT("wxRB_GROUP"), wxRB_GROUP },
- { wxT("wxRA_SPECIFY_COLS"), wxRA_SPECIFY_COLS },
- { wxT("wxRA_SPECIFY_ROWS"), wxRA_SPECIFY_ROWS },
- { wxT("wxRA_HORIZONTAL"), wxRA_HORIZONTAL },
- { wxT("wxRA_VERTICAL"), wxRA_VERTICAL },
-
- /* wxSlider */
- { wxT("wxSL_HORIZONTAL"), wxSL_HORIZONTAL },
- { wxT("wxSL_VERTICAL"), wxSL_VERTICAL },
- { wxT("wxSL_AUTOTICKS"), wxSL_AUTOTICKS },
- { wxT("wxSL_LABELS"), wxSL_LABELS },
- { wxT("wxSL_LEFT"), wxSL_LEFT },
- { wxT("wxSL_TOP"), wxSL_TOP },
- { wxT("wxSL_RIGHT"), wxSL_RIGHT },
- { wxT("wxSL_BOTTOM"), wxSL_BOTTOM },
- { wxT("wxSL_BOTH"), wxSL_BOTH },
- { wxT("wxSL_SELRANGE"), wxSL_SELRANGE },
-
- /* wxScrollBar */
- { wxT("wxSB_HORIZONTAL"), wxSB_HORIZONTAL },
- { wxT("wxSB_VERTICAL"), wxSB_VERTICAL },
-
- /* wxButton */
- { wxT("wxBU_AUTODRAW"), wxBU_AUTODRAW },
- { wxT("wxBU_NOAUTODRAW"), wxBU_NOAUTODRAW },
-
- /* wxTreeCtrl */
- { wxT("wxTR_HAS_BUTTONS"), wxTR_HAS_BUTTONS },
- { wxT("wxTR_EDIT_LABELS"), wxTR_EDIT_LABELS },
- { wxT("wxTR_LINES_AT_ROOT"), wxTR_LINES_AT_ROOT },
-
- /* wxListCtrl */
- { wxT("wxLC_ICON"), wxLC_ICON },
- { wxT("wxLC_SMALL_ICON"), wxLC_SMALL_ICON },
- { wxT("wxLC_LIST"), wxLC_LIST },
- { wxT("wxLC_REPORT"), wxLC_REPORT },
- { wxT("wxLC_ALIGN_TOP"), wxLC_ALIGN_TOP },
- { wxT("wxLC_ALIGN_LEFT"), wxLC_ALIGN_LEFT },
- { wxT("wxLC_AUTOARRANGE"), wxLC_AUTOARRANGE },
- { wxT("wxLC_USER_TEXT"), wxLC_USER_TEXT },
- { wxT("wxLC_EDIT_LABELS"), wxLC_EDIT_LABELS },
- { wxT("wxLC_NO_HEADER"), wxLC_NO_HEADER },
- { wxT("wxLC_NO_SORT_HEADER"), wxLC_NO_SORT_HEADER },
- { wxT("wxLC_SINGLE_SEL"), wxLC_SINGLE_SEL },
- { wxT("wxLC_SORT_ASCENDING"), wxLC_SORT_ASCENDING },
- { wxT("wxLC_SORT_DESCENDING"), wxLC_SORT_DESCENDING },
-
- /* wxSpinButton */
- { wxT("wxSP_VERTICAL"), wxSP_VERTICAL},
- { wxT("wxSP_HORIZONTAL"), wxSP_HORIZONTAL},
- { wxT("wxSP_ARROW_KEYS"), wxSP_ARROW_KEYS},
- { wxT("wxSP_WRAP"), wxSP_WRAP},
-
- /* wxSplitterWnd */
- { wxT("wxSP_NOBORDER"), wxSP_NOBORDER},
- { wxT("wxSP_3D"), wxSP_3D},
- { wxT("wxSP_BORDER"), wxSP_BORDER},
-
- /* wxTabCtrl */
- { wxT("wxTC_MULTILINE"), wxTC_MULTILINE},
- { wxT("wxTC_RIGHTJUSTIFY"), wxTC_RIGHTJUSTIFY},
- { wxT("wxTC_FIXEDWIDTH"), wxTC_FIXEDWIDTH},
- { wxT("wxTC_OWNERDRAW"), wxTC_OWNERDRAW},
-
- /* wxStatusBar95 */
- { wxT("wxST_SIZEGRIP"), wxST_SIZEGRIP},
-
- /* wxControl */
- { wxT("wxFIXED_LENGTH"), wxFIXED_LENGTH},
- { wxT("wxALIGN_LEFT"), wxALIGN_LEFT},
- { wxT("wxALIGN_CENTER"), wxALIGN_CENTER},
- { wxT("wxALIGN_CENTRE"), wxALIGN_CENTRE},
- { wxT("wxALIGN_RIGHT"), wxALIGN_RIGHT},
- { wxT("wxCOLOURED"), wxCOLOURED},
-
- /* wxToolBar */
- { wxT("wxTB_3DBUTTONS"), wxTB_3DBUTTONS},
- { wxT("wxTB_HORIZONTAL"), wxTB_HORIZONTAL},
- { wxT("wxTB_VERTICAL"), wxTB_VERTICAL},
- { wxT("wxTB_FLAT"), wxTB_FLAT},
-
-#if WXWIN_COMPATIBILITY_2_6
- /* wxDialog */
- { wxT("wxDIALOG_MODAL"), wxDIALOG_MODAL },
-#endif // WXWIN_COMPATIBILITY_2_6
-
- /* Generic */
- { wxT("wxVSCROLL"), wxVSCROLL },
- { wxT("wxHSCROLL"), wxHSCROLL },
- { wxT("wxCAPTION"), wxCAPTION },
- { wxT("wxSTAY_ON_TOP"), wxSTAY_ON_TOP},
- { wxT("wxICONIZE"), wxICONIZE},
- { wxT("wxMINIMIZE"), wxICONIZE},
- { wxT("wxMAXIMIZE"), wxMAXIMIZE},
- { wxT("wxSDI"), 0},
- { wxT("wxMDI_PARENT"), 0},
- { wxT("wxMDI_CHILD"), 0},
- { wxT("wxTHICK_FRAME"), wxRESIZE_BORDER},
- { wxT("wxRESIZE_BORDER"), wxRESIZE_BORDER},
- { wxT("wxSYSTEM_MENU"), wxSYSTEM_MENU},
- { wxT("wxMINIMIZE_BOX"), wxMINIMIZE_BOX},
- { wxT("wxMAXIMIZE_BOX"), wxMAXIMIZE_BOX},
-#if WXWIN_COMPATIBILITY_2_6
- { wxT("wxRESIZE_BOX"), wxRESIZE_BOX},
-#endif // WXWIN_COMPATIBILITY_2_6
- { wxT("wxDEFAULT_FRAME_STYLE"), wxDEFAULT_FRAME_STYLE},
- { wxT("wxDEFAULT_FRAME"), wxDEFAULT_FRAME_STYLE},
- { wxT("wxDEFAULT_DIALOG_STYLE"), wxDEFAULT_DIALOG_STYLE},
- { wxT("wxBORDER"), wxBORDER},
- { wxT("wxRETAINED"), wxRETAINED},
- { wxT("wxNATIVE_IMPL"), 0},
- { wxT("wxEXTENDED_IMPL"), 0},
- { wxT("wxBACKINGSTORE"), wxBACKINGSTORE},
- // { wxT("wxFLAT"), wxFLAT},
- // { wxT("wxMOTIF_RESIZE"), wxMOTIF_RESIZE},
- { wxT("wxFIXED_LENGTH"), 0},
- { wxT("wxDOUBLE_BORDER"), wxDOUBLE_BORDER},
- { wxT("wxSUNKEN_BORDER"), wxSUNKEN_BORDER},
- { wxT("wxRAISED_BORDER"), wxRAISED_BORDER},
- { wxT("wxSIMPLE_BORDER"), wxSIMPLE_BORDER},
- { wxT("wxSTATIC_BORDER"), wxSTATIC_BORDER},
- { wxT("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
- { wxT("wxNO_BORDER"), wxNO_BORDER},
- { wxT("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
- { wxT("wxCLIP_SIBLINGS"), wxCLIP_SIBLINGS},
- { wxT("wxTAB_TRAVERSAL"), 0}, // Compatibility only
-
- { wxT("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
- { wxT("wxTINY_CAPTION_VERT"), wxTINY_CAPTION_VERT},
-
- // Text font families
- { wxT("wxDEFAULT"), wxDEFAULT},
- { wxT("wxDECORATIVE"), wxDECORATIVE},
- { wxT("wxROMAN"), wxROMAN},
- { wxT("wxSCRIPT"), wxSCRIPT},
- { wxT("wxSWISS"), wxSWISS},
- { wxT("wxMODERN"), wxMODERN},
- { wxT("wxTELETYPE"), wxTELETYPE},
- { wxT("wxVARIABLE"), wxVARIABLE},
- { wxT("wxFIXED"), wxFIXED},
- { wxT("wxNORMAL"), wxNORMAL},
- { wxT("wxLIGHT"), wxLIGHT},
- { wxT("wxBOLD"), wxBOLD},
- { wxT("wxITALIC"), wxITALIC},
- { wxT("wxSLANT"), wxSLANT},
- { wxT("wxSOLID"), wxSOLID},
- { wxT("wxDOT"), wxDOT},
- { wxT("wxLONG_DASH"), wxLONG_DASH},
- { wxT("wxSHORT_DASH"), wxSHORT_DASH},
- { wxT("wxDOT_DASH"), wxDOT_DASH},
- { wxT("wxUSER_DASH"), wxUSER_DASH},
- { wxT("wxTRANSPARENT"), wxTRANSPARENT},
- { wxT("wxSTIPPLE"), wxSTIPPLE},
- { wxT("wxBDIAGONAL_HATCH"), wxBDIAGONAL_HATCH},
- { wxT("wxCROSSDIAG_HATCH"), wxCROSSDIAG_HATCH},
- { wxT("wxFDIAGONAL_HATCH"), wxFDIAGONAL_HATCH},
- { wxT("wxCROSS_HATCH"), wxCROSS_HATCH},
- { wxT("wxHORIZONTAL_HATCH"), wxHORIZONTAL_HATCH},
- { wxT("wxVERTICAL_HATCH"), wxVERTICAL_HATCH},
- { wxT("wxJOIN_BEVEL"), wxJOIN_BEVEL},
- { wxT("wxJOIN_MITER"), wxJOIN_MITER},
- { wxT("wxJOIN_ROUND"), wxJOIN_ROUND},
- { wxT("wxCAP_ROUND"), wxCAP_ROUND},
- { wxT("wxCAP_PROJECTING"), wxCAP_PROJECTING},
- { wxT("wxCAP_BUTT"), wxCAP_BUTT},
-
- // Logical ops
- { wxT("wxCLEAR"), wxCLEAR},
- { wxT("wxXOR"), wxXOR},
- { wxT("wxINVERT"), wxINVERT},
- { wxT("wxOR_REVERSE"), wxOR_REVERSE},
- { wxT("wxAND_REVERSE"), wxAND_REVERSE},
- { wxT("wxCOPY"), wxCOPY},
- { wxT("wxAND"), wxAND},
- { wxT("wxAND_INVERT"), wxAND_INVERT},
- { wxT("wxNO_OP"), wxNO_OP},
- { wxT("wxNOR"), wxNOR},
- { wxT("wxEQUIV"), wxEQUIV},
- { wxT("wxSRC_INVERT"), wxSRC_INVERT},
- { wxT("wxOR_INVERT"), wxOR_INVERT},
- { wxT("wxNAND"), wxNAND},
- { wxT("wxOR"), wxOR},
- { wxT("wxSET"), wxSET},
-
- { wxT("wxFLOOD_SURFACE"), wxFLOOD_SURFACE},
- { wxT("wxFLOOD_BORDER"), wxFLOOD_BORDER},
- { wxT("wxODDEVEN_RULE"), wxODDEVEN_RULE},
- { wxT("wxWINDING_RULE"), wxWINDING_RULE},
- { wxT("wxHORIZONTAL"), wxHORIZONTAL},
- { wxT("wxVERTICAL"), wxVERTICAL},
- { wxT("wxBOTH"), wxBOTH},
- { wxT("wxCENTER_FRAME"), wxCENTER_FRAME},
- { wxT("wxOK"), wxOK},
- { wxT("wxYES_NO"), wxYES_NO},
- { wxT("wxCANCEL"), wxCANCEL},
- { wxT("wxYES"), wxYES},
- { wxT("wxNO"), wxNO},
- { wxT("wxICON_EXCLAMATION"), wxICON_EXCLAMATION},
- { wxT("wxICON_HAND"), wxICON_HAND},
- { wxT("wxICON_QUESTION"), wxICON_QUESTION},
- { wxT("wxICON_INFORMATION"), wxICON_INFORMATION},
- { wxT("wxICON_STOP"), wxICON_STOP},
- { wxT("wxICON_ASTERISK"), wxICON_ASTERISK},
- { wxT("wxICON_MASK"), wxICON_MASK},
- { wxT("wxCENTRE"), wxCENTRE},
- { wxT("wxCENTER"), wxCENTRE},
-#if WXWIN_COMPATIBILITY_2_6
- { wxT("wxUSER_COLOURS"), wxUSER_COLOURS},
-#endif // WXWIN_COMPATIBILITY_2_6
- { wxT("wxVERTICAL_LABEL"), 0},
- { wxT("wxHORIZONTAL_LABEL"), 0},
-
- // Bitmap types (not strictly styles)
- { wxT("wxBITMAP_TYPE_XPM"), wxBITMAP_TYPE_XPM},
- { wxT("wxBITMAP_TYPE_XBM"), wxBITMAP_TYPE_XBM},
- { wxT("wxBITMAP_TYPE_BMP"), wxBITMAP_TYPE_BMP},
- { wxT("wxBITMAP_TYPE_RESOURCE"), wxBITMAP_TYPE_BMP_RESOURCE},
- { wxT("wxBITMAP_TYPE_BMP_RESOURCE"), wxBITMAP_TYPE_BMP_RESOURCE},
- { wxT("wxBITMAP_TYPE_GIF"), wxBITMAP_TYPE_GIF},
- { wxT("wxBITMAP_TYPE_TIF"), wxBITMAP_TYPE_TIF},
- { wxT("wxBITMAP_TYPE_ICO"), wxBITMAP_TYPE_ICO},
- { wxT("wxBITMAP_TYPE_ICO_RESOURCE"), wxBITMAP_TYPE_ICO_RESOURCE},
- { wxT("wxBITMAP_TYPE_CUR"), wxBITMAP_TYPE_CUR},
- { wxT("wxBITMAP_TYPE_CUR_RESOURCE"), wxBITMAP_TYPE_CUR_RESOURCE},
- { wxT("wxBITMAP_TYPE_XBM_DATA"), wxBITMAP_TYPE_XBM_DATA},
- { wxT("wxBITMAP_TYPE_XPM_DATA"), wxBITMAP_TYPE_XPM_DATA},
- { wxT("wxBITMAP_TYPE_ANY"), wxBITMAP_TYPE_ANY}
-};
-
-static int wxResourceBitListCount = (sizeof(wxResourceBitListTable)/sizeof(wxResourceBitListStruct));
-
-long wxParseWindowStyle(const wxString& bitListString)
-{
- int i = 0;
- wxChar *word;
- long bitList = 0;
- word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
- while (word != NULL)
- {
- bool found = false;
- int j;
- for (j = 0; j < wxResourceBitListCount; j++)
- if (wxStrcmp(wxResourceBitListTable[j].word, word) == 0)
- {
- bitList |= wxResourceBitListTable[j].bits;
- found = true;
- break;
- }
- if (!found)
- {
- wxLogWarning(_("Unrecognized style %s while parsing resource."), word);
- return 0;
- }
- word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
- }
- return bitList;
-}
-
-/*
-* Load a bitmap from a wxWidgets resource, choosing an optimum
-* depth and appropriate type.
-*/
-
-wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- wxItemResource *item = table->FindResource(resource);
- if (item)
- {
- if ((item->GetType().empty()) || (item->GetType() != wxT("wxBitmap")))
- {
- wxLogWarning(_("%s not a bitmap resource specification."), (const wxChar*) resource);
- return wxNullBitmap;
- }
- int thisDepth = wxDisplayDepth();
- long thisNoColours = (long)pow(2.0, (double)thisDepth);
-
- wxItemResource *optResource = (wxItemResource *) NULL;
-
- // Try to find optimum bitmap for this platform/colour depth
- wxNode *node = item->GetChildren().GetFirst();
- while (node)
- {
- wxItemResource *child = (wxItemResource *)node->GetData();
- int platform = (int)child->GetValue2();
- int noColours = (int)child->GetValue3();
- /*
- char *name = child->GetName();
- int bitmapType = (int)child->GetValue1();
- int xRes = child->GetWidth();
- int yRes = child->GetHeight();
- */
-
- switch (platform)
- {
- case RESOURCE_PLATFORM_ANY:
- {
- if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
- optResource = child;
- else
- {
- // Maximise the number of colours.
- // If noColours is zero (unspecified), then assume this
- // is the right one.
- if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
- optResource = child;
- }
- break;
- }
-#ifdef __WXMSW__
- case RESOURCE_PLATFORM_WINDOWS:
- {
- if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
- optResource = child;
- else
- {
- // Maximise the number of colours
- if ((noColours > 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
- optResource = child;
- }
- break;
- }
-#endif
-#ifdef __WXGTK__
- case RESOURCE_PLATFORM_X:
- {
- if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
- optResource = child;
- else
- {
- // Maximise the number of colours
- if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
- optResource = child;
- }
- break;
- }
-#endif
-#ifdef wx_max
- case RESOURCE_PLATFORM_MAC:
- {
- if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
- optResource = child;
- else
- {
- // Maximise the number of colours
- if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
- optResource = child;
- }
- break;
- }
-#endif
- default:
- break;
- }
- node = node->GetNext();
- }
- // If no matching resource, fail.
- if (!optResource)
- return wxNullBitmap;
-
- wxString name = optResource->GetName();
- int bitmapType = (int)optResource->GetValue1();
- switch (bitmapType)
- {
- case wxBITMAP_TYPE_XBM_DATA:
- {
-#ifdef __WXGTK__
- wxItemResource *item = table->FindResource(name);
- if (!item)
- {
- wxLogWarning(_("Failed to find XBM resource %s.\n"
- "Forgot to use wxResourceLoadBitmapData?"), (const wxChar*) name);
- return wxNullBitmap;
- }
- return wxBitmap(item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()) ;
-#else
- wxLogWarning(_("No XBM facility available!"));
- break;
-#endif
- }
- case wxBITMAP_TYPE_XPM_DATA:
- {
- wxItemResource *item = table->FindResource(name);
- if (!item)
- {
- wxLogWarning(_("Failed to find XPM resource %s.\nForgot to use wxResourceLoadBitmapData?"), (const wxChar*) name);
- return wxNullBitmap;
- }
- return wxBitmap((char **)item->GetValue1());
- }
- default:
- {
-#if defined(__WXPM__)
- return wxNullBitmap;
-#else
- return wxBitmap(name, (wxBitmapType)bitmapType);
-#endif
- }
- }
-#ifndef __WXGTK__
- return wxNullBitmap;
-#endif
- }
- else
- {
- wxLogWarning(_("Bitmap resource specification %s not found."), (const wxChar*) resource);
- return wxNullBitmap;
- }
-}
-
-/*
-* Load an icon from a wxWidgets resource, choosing an optimum
-* depth and appropriate type.
-*/
-
-wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- wxItemResource *item = table->FindResource(resource);
- if (item)
- {
- if ((item->GetType().empty()) || wxStrcmp(item->GetType(), wxT("wxIcon")) != 0)
- {
- wxLogWarning(_("%s not an icon resource specification."), (const wxChar*) resource);
- return wxNullIcon;
- }
- int thisDepth = wxDisplayDepth();
- long thisNoColours = (long)pow(2.0, (double)thisDepth);
-
- wxItemResource *optResource = (wxItemResource *) NULL;
-
- // Try to find optimum icon for this platform/colour depth
- wxNode *node = item->GetChildren().GetFirst();
- while (node)
- {
- wxItemResource *child = (wxItemResource *)node->GetData();
- int platform = (int)child->GetValue2();
- int noColours = (int)child->GetValue3();
- /*
- char *name = child->GetName();
- int bitmapType = (int)child->GetValue1();
- int xRes = child->GetWidth();
- int yRes = child->GetHeight();
- */
-
- switch (platform)
- {
- case RESOURCE_PLATFORM_ANY:
- {
- if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
- optResource = child;
- else
- {
- // Maximise the number of colours.
- // If noColours is zero (unspecified), then assume this
- // is the right one.
- if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
- optResource = child;
- }
- break;
- }
-#ifdef __WXMSW__
- case RESOURCE_PLATFORM_WINDOWS:
- {
- if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
- optResource = child;
- else
- {
- // Maximise the number of colours
- if ((noColours > 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
- optResource = child;
- }
- break;
- }
-#endif
-#ifdef __WXGTK__
- case RESOURCE_PLATFORM_X:
- {
- if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
- optResource = child;
- else
- {
- // Maximise the number of colours
- if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
- optResource = child;
- }
- break;
- }
-#endif
-#ifdef wx_max
- case RESOURCE_PLATFORM_MAC:
- {
- if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
- optResource = child;
- else
- {
- // Maximise the number of colours
- if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
- optResource = child;
- }
- break;
- }
-#endif
- default:
- break;
- }
- node = node->GetNext();
- }
- // If no matching resource, fail.
- if (!optResource)
- return wxNullIcon;
-
- wxString name = optResource->GetName();
- int bitmapType = (int)optResource->GetValue1();
- switch (bitmapType)
- {
- case wxBITMAP_TYPE_XBM_DATA:
- {
-#ifdef __WXGTK__
- wxItemResource *item = table->FindResource(name);
- if (!item)
- {
- wxLogWarning(_("Failed to find XBM resource %s.\n"
- "Forgot to use wxResourceLoadIconData?"), (const wxChar*) name);
- return wxNullIcon;
- }
- return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
-#else
- wxLogWarning(_("No XBM facility available!"));
- break;
-#endif
- }
- case wxBITMAP_TYPE_XPM_DATA:
- {
- // *** XPM ICON NOT YET IMPLEMENTED IN wxWidgets ***
- /*
- wxItemResource *item = table->FindResource(name);
- if (!item)
- {
- char buf[400];
- sprintf(buf, _("Failed to find XPM resource %s.\nForgot to use wxResourceLoadIconData?"), name);
- wxLogWarning(buf);
- return NULL;
- }
- return wxIcon((char **)item->GetValue1());
- */
- wxLogWarning(_("No XPM icon facility available!"));
- break;
- }
- default:
- {
-#if defined( __WXGTK__ ) || defined( __WXMOTIF__ )
- wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
- break;
-#else
- return wxIcon(name, (wxBitmapType) bitmapType);
-#endif
- }
- }
- return wxNullIcon;
- }
- else
- {
- wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
- return wxNullIcon;
- }
-}
-
-#if wxUSE_MENUS
-
-wxMenu *wxResourceCreateMenu(wxItemResource *item)
-{
- wxMenu *menu = new wxMenu;
- wxNode *node = item->GetChildren().GetFirst();
- while (node)
- {
- wxItemResource *child = (wxItemResource *)node->GetData();
- if ((!child->GetType().empty()) && (child->GetType() == wxT("wxMenuSeparator")))
- menu->AppendSeparator();
- else if (child->GetChildren().GetCount() > 0)
- {
- wxMenu *subMenu = wxResourceCreateMenu(child);
- if (subMenu)
- menu->Append((int)child->GetValue1(), child->GetTitle(), subMenu, child->GetValue4());
- }
- else
- {
- menu->Append((int)child->GetValue1(), child->GetTitle(), child->GetValue4(), (child->GetValue2() != 0));
- }
- node = node->GetNext();
- }
- return menu;
-}
-
-wxMenuBar *wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *table, wxMenuBar *menuBar)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- wxItemResource *menuResource = table->FindResource(resource);
- if (menuResource && (!menuResource->GetType().empty()) && (menuResource->GetType() == wxT("wxMenu")))
- {
- if (!menuBar)
- menuBar = new wxMenuBar;
- wxNode *node = menuResource->GetChildren().GetFirst();
- while (node)
- {
- wxItemResource *child = (wxItemResource *)node->GetData();
- wxMenu *menu = wxResourceCreateMenu(child);
- if (menu)
- menuBar->Append(menu, child->GetTitle());
- node = node->GetNext();
- }
- return menuBar;
- }
- return (wxMenuBar *) NULL;
-}
-
-wxMenu *wxResourceCreateMenu(const wxString& resource, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- wxItemResource *menuResource = table->FindResource(resource);
- if (menuResource && (!menuResource->GetType().empty()) && (menuResource->GetType() == wxT("wxMenu")))
- // if (menuResource && (menuResource->GetType() == wxTYPE_MENU))
- return wxResourceCreateMenu(menuResource);
- return (wxMenu *) NULL;
-}
-
-#endif // wxUSE_MENUS
-
-// Global equivalents (so don't have to refer to default table explicitly)
-bool wxResourceParseData(const wxString& resource, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- return table->ParseResourceData(resource);
-}
-
-bool wxResourceParseData(const char* resource, wxResourceTable *table)
-{
- wxString str(resource, wxConvLibc);
- if (!table)
- table = wxDefaultResourceTable;
-
- return table->ParseResourceData(str);
-}
-
-bool wxResourceParseFile(const wxString& filename, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- return table->ParseResourceFile(filename);
-}
-
-// Register XBM/XPM data
-bool wxResourceRegisterBitmapData(const wxString& name, char bits[], int width, int height, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- return table->RegisterResourceBitmapData(name, bits, width, height);
-}
-
-bool wxResourceRegisterBitmapData(const wxString& name, char **data, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- return table->RegisterResourceBitmapData(name, data);
-}
-
-void wxResourceClear(wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- table->ClearTable();
-}
-
-/*
-* Identifiers
-*/
-
-bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- table->identifiers.Put(name, (wxObject *)(long)value);
- return true;
-}
-
-int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- return (int)(long)table->identifiers.Get(name);
-}
-
-/*
-* Parse #include file for #defines (only)
-*/
-
-bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- FILE *fd = wxFopen(f, wxT("r"));
- if (!fd)
- {
- return false;
- }
- while (wxGetResourceToken(fd))
- {
- if (strcmp(wxResourceBuffer, "#define") == 0)
- {
- wxGetResourceToken(fd);
- wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
- wxGetResourceToken(fd);
- wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
- if (wxIsdigit(value[0]))
- {
- int val = (int)wxAtol(value);
- wxResourceAddIdentifier(name, val, table);
- }
- delete[] name;
- delete[] value;
- }
- }
- fclose(fd);
- return true;
-}
-
-/*
-* Reading strings as if they were .wxr files
-*/
-
-static int getc_string(char *s)
-{
- int ch = s[wxResourceStringPtr];
- if (ch == 0)
- return EOF;
- else
- {
- wxResourceStringPtr ++;
- return ch;
- }
-}
-
-static int ungetc_string()
-{
- wxResourceStringPtr --;
- return 0;
-}
-
-bool wxEatWhiteSpaceString(char *s)
-{
- int ch;
-
- while ((ch = getc_string(s)) != EOF)
- {
- switch (ch)
- {
- case ' ':
- case 0x0a:
- case 0x0d:
- case 0x09:
- break;
- case '/':
- {
- ch = getc_string(s);
- if (ch == EOF)
- {
- ungetc_string();
- return true;
- }
-
- if (ch == '*')
- {
- // Eat C comment
- int prev_ch = 0;
- while ((ch = getc_string(s)) != EOF)
- {
- if (ch == '/' && prev_ch == '*')
- break;
- prev_ch = ch;
- }
- }
- else
- {
- ungetc_string();
- ungetc_string();
- return true;
- }
- }
- break;
- default:
- ungetc_string();
- return true;
-
- }
- }
- return false;
-}
-
-bool wxGetResourceTokenString(char *s)
-{
- if (!wxResourceBuffer)
- wxReallocateResourceBuffer();
- wxResourceBuffer[0] = 0;
- wxEatWhiteSpaceString(s);
-
- int ch = getc_string(s);
- if (ch == '"')
- {
- // Get string
- wxResourceBufferCount = 0;
- ch = getc_string(s);
- while (ch != '"')
- {
- int actualCh = ch;
- if (ch == EOF)
- {
- wxResourceBuffer[wxResourceBufferCount] = 0;
- return false;
- }
- // Escaped characters
- else if (ch == '\\')
- {
- int newCh = getc_string(s);
- if (newCh == '"')
- actualCh = '"';
- else if (newCh == 10)
- actualCh = 10;
- else
- {
- ungetc_string();
- }
- }
-
- if (wxResourceBufferCount >= wxResourceBufferSize-1)
- wxReallocateResourceBuffer();
- wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
- wxResourceBufferCount ++;
- ch = getc_string(s);
- }
- wxResourceBuffer[wxResourceBufferCount] = 0;
- }
- else
- {
- wxResourceBufferCount = 0;
- // Any other token
- while (ch != ' ' && ch != EOF && ch != ' ' && ch != 13 && ch != 9 && ch != 10)
- {
- if (wxResourceBufferCount >= wxResourceBufferSize-1)
- wxReallocateResourceBuffer();
- wxResourceBuffer[wxResourceBufferCount] = (char)ch;
- wxResourceBufferCount ++;
-
- ch = getc_string(s);
- }
- wxResourceBuffer[wxResourceBufferCount] = 0;
- if (ch == EOF)
- return false;
- }
- return true;
-}
-
-/*
-* Files are in form:
-static char *name = "....";
-with possible comments.
-*/
-
-bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- // static or #define
- if (!wxGetResourceTokenString(s))
- {
- *eof = true;
- return false;
- }
-
- if (strcmp(wxResourceBuffer, "#define") == 0)
- {
- wxGetResourceTokenString(s);
- wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
- wxGetResourceTokenString(s);
- wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
- if (wxIsdigit(value[0]))
- {
- int val = (int)wxAtol(value);
- wxResourceAddIdentifier(name, val, table);
- }
- else
- {
- wxLogWarning(_("#define %s must be an integer."), name);
- delete[] name;
- delete[] value;
- return false;
- }
- delete[] name;
- delete[] value;
-
- return true;
- }
- /*
- else if (strcmp(wxResourceBuffer, "#include") == 0)
- {
- wxGetResourceTokenString(s);
- char *name = copystring(wxResourceBuffer);
- char *actualName = name;
- if (name[0] == '"')
- actualName = name + 1;
- int len = strlen(name);
- if ((len > 0) && (name[len-1] == '"'))
- name[len-1] = 0;
- if (!wxResourceParseIncludeFile(actualName, table))
- {
- char buf[400];
- sprintf(buf, _("Could not find resource include file %s."), actualName);
- wxLogWarning(buf);
- }
- delete[] name;
- return true;
- }
- */
- else if (strcmp(wxResourceBuffer, "static") != 0)
- {
- wxChar buf[300];
- wxStrcpy(buf, _("Found "));
- wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
- wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));
- wxLogWarning(buf);
- return false;
- }
-
- // char
- if (!wxGetResourceTokenString(s))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
-
- if (strcmp(wxResourceBuffer, "char") != 0)
- {
- wxLogWarning(_("Expected 'char' while parsing resource."));
- return false;
- }
-
- // *name
- if (!wxGetResourceTokenString(s))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
-
- if (wxResourceBuffer[0] != '*')
- {
- wxLogWarning(_("Expected '*' while parsing resource."));
- return false;
- }
- wxChar nameBuf[100];
- wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
- nameBuf[99] = 0;
-
- // =
- if (!wxGetResourceTokenString(s))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
-
- if (strcmp(wxResourceBuffer, "=") != 0)
- {
- wxLogWarning(_("Expected '=' while parsing resource."));
- return false;
- }
-
- // String
- if (!wxGetResourceTokenString(s))
- {
- wxLogWarning(_("Unexpected end of file while parsing resource."));
- *eof = true;
- return false;
- }
- else
- {
- if (!db.ReadPrologFromString(wxResourceBuffer))
- {
- wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
- return false;
- }
- }
- // Semicolon
- if (!wxGetResourceTokenString(s))
- {
- *eof = true;
- }
- return true;
-}
-
-bool wxResourceParseString(const wxString& s, wxResourceTable *WXUNUSED(table))
-{
-#if wxUSE_UNICODE
- return wxResourceParseString( (char*)s.mb_str().data() );
-#else
- return wxResourceParseString( (char*)s.c_str() );
-#endif
-}
-
-bool wxResourceParseString(char *s, wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- if (!s)
- return false;
-
- // Turn backslashes into spaces
- if (s)
- {
- int len = strlen(s);
- int i;
- for (i = 0; i < len; i++)
- if (s[i] == 92 && s[i+1] == 13)
- {
- s[i] = ' ';
- s[i+1] = ' ';
- }
- }
-
- wxExprDatabase db;
- wxResourceStringPtr = 0;
-
- bool eof = false;
- while (wxResourceReadOneResourceString(s, db, &eof, table) && !eof)
- {
- // Loop
- }
- return wxResourceInterpretResources(*table, db);
-}
-
-/*
-* resource loading facility
-*/
-
-bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString& resourceName, const wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
-
- wxItemResource *resource = table->FindResource((const wxChar *)resourceName);
- // if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
- if (!resource || (resource->GetType().empty()) ||
- ! ((resource->GetType() == wxT("wxDialog")) || (resource->GetType() == wxT("wxPanel"))))
- return false;
-
- wxString title(resource->GetTitle());
- long theWindowStyle = resource->GetStyle();
- bool isModal = (resource->GetValue1() != 0) ;
- int x = resource->GetX();
- int y = resource->GetY();
- int width = resource->GetWidth();
- int height = resource->GetHeight();
- wxString name = resource->GetName();
-
- // this is used for loading wxWizard pages from WXR
- if ( parent != thisWindow )
- {
- if (thisWindow->IsKindOf(CLASSINFO(wxDialog)))
- {
- wxDialog *dialogBox = (wxDialog *)thisWindow;
- long modalStyle = isModal ?
-#if WXWIN_COMPATIBILITY_2_6
- wxDIALOG_MODAL
-#else
- 0
-#endif // WXWIN_COMPATIBILITY_2_6
- : 0;
- if (!dialogBox->Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
- return false;
-
- // Only reset the client size if we know we're not going to do it again below.
- if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) == 0)
- dialogBox->SetClientSize(width, height);
- }
- else if (thisWindow->IsKindOf(CLASSINFO(wxPanel)))
- {
- wxPanel* panel = (wxPanel *)thisWindow;
- if (!panel->Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), theWindowStyle | wxTAB_TRAVERSAL, name))
- return false;
- }
- else
- {
- if (!((wxWindow *)thisWindow)->Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
- return false;
- }
- }
-
- if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
- {
- // No need to do this since it's done in wxPanel or wxDialog constructor.
- // SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- }
- else
- {
- if (resource->GetFont().Ok())
- thisWindow->SetFont(resource->GetFont());
- if (resource->GetBackgroundColour().Ok())
- thisWindow->SetBackgroundColour(resource->GetBackgroundColour());
- }
-
- // Should have some kind of font at this point
- if (!thisWindow->GetFont().Ok())
- thisWindow->SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- if (!thisWindow->GetBackgroundColour().Ok())
- thisWindow->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-
- // Only when we've created the window and set the font can we set the correct size,
- // if based on dialog units.
- if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0)
- {
- wxSize sz = thisWindow->ConvertDialogToPixels(wxSize(width, height));
- thisWindow->SetClientSize(sz.x, sz.y);
-
- wxPoint pt = thisWindow->ConvertDialogToPixels(wxPoint(x, y));
- thisWindow->Move(pt.x, pt.y);
- }
-
- // Now create children
- wxNode *node = resource->GetChildren().GetFirst();
- while (node)
- {
- wxItemResource *childResource = (wxItemResource *)node->GetData();
-
- (void) wxCreateItem(thisWindow, childResource, resource, table);
-
- node = node->GetNext();
- }
- return true;
-}
-
-wxControl *wxCreateItem(wxWindow* thisWindow, const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table)
-{
- if (!table)
- table = wxDefaultResourceTable;
- return table->CreateItem(thisWindow, resource, parentResource);
-}
-
-#ifdef __VISUALC__
-#pragma warning(default:4706) // assignment within conditional expression
-#endif // VC++
-
-#endif // wxUSE_WX_RESOURCES
diff --git a/contrib/src/deprecated/tbarsmpl.cpp b/contrib/src/deprecated/tbarsmpl.cpp
deleted file mode 100644
index d87379de75..0000000000
--- a/contrib/src/deprecated/tbarsmpl.cpp
+++ /dev/null
@@ -1,1007 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: contrib/src/deprecated//tbarsmpl.cpp
-// Purpose: wxToolBarSimple
-// Author: Julian Smart
-// Modified by: VZ on 14.12.99 during wxToolBarSimple reorganization
-// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
-
-#ifndef WX_PRECOMP
- #include "wx/settings.h"
- #include "wx/window.h"
- #include "wx/dcclient.h"
- #include "wx/dcmemory.h"
-#endif
-
-#include "wx/toolbar.h"
-#include "wx/deprecated/tbarsmpl.h"
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_DEPRECATED wxToolBarToolSimple : public wxToolBarToolBase
-{
-public:
- wxToolBarToolSimple(wxToolBarSimple *tbar,
- int id,
- const wxString& label,
- const wxBitmap& bmpNormal,
- const wxBitmap& bmpDisabled,
- wxItemKind kind,
- wxObject *clientData,
- const wxString& shortHelp,
- const wxString& longHelp)
- : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
- clientData, shortHelp, longHelp)
- {
- }
-
- wxToolBarToolSimple(wxToolBarSimple *tbar, wxControl *control)
- : wxToolBarToolBase(tbar, control)
- {
- }
-
- void SetSize(const wxSize& size)
- {
- m_width = size.x;
- m_height = size.y;
- }
-
- wxCoord GetWidth() const { return m_width; }
- wxCoord GetHeight() const { return m_height; }
-
- wxCoord m_x;
- wxCoord m_y;
- wxCoord m_width;
- wxCoord m_height;
-
- DECLARE_NO_COPY_CLASS(wxToolBarToolSimple)
-};
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxControl)
-
-#if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
- IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
-#endif
-
-BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
- EVT_SIZE(wxToolBarSimple::OnSize)
- EVT_SCROLL(wxToolBarSimple::OnScroll)
- EVT_PAINT(wxToolBarSimple::OnPaint)
- EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus)
- EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
-END_EVENT_TABLE()
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// tool bar tools creation
-// ----------------------------------------------------------------------------
-
-wxToolBarToolBase *wxToolBarSimple::CreateTool(int id,
- const wxString& label,
- const wxBitmap& bmpNormal,
- const wxBitmap& bmpDisabled,
- wxItemKind kind,
- wxObject *clientData,
- const wxString& shortHelp,
- const wxString& longHelp)
-{
- return new wxToolBarToolSimple(this, id, label, bmpNormal, bmpDisabled,
- kind, clientData, shortHelp, longHelp);
-}
-
-wxToolBarToolBase *wxToolBarSimple::CreateTool(wxControl *control)
-{
- return new wxToolBarToolSimple(this, control);
-}
-
-// ----------------------------------------------------------------------------
-// wxToolBarSimple creation
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::Init()
-{
- m_currentRowsOrColumns = 0;
-
- m_lastX =
- m_lastY = 0;
-
- m_maxWidth =
- m_maxHeight = 0;
-
- m_pressedTool =
- m_currentTool = -1;
-
- m_xPos =
- m_yPos = wxDefaultCoord;
-
- m_toolPacking = 1;
- m_toolSeparation = 5;
-
- m_defaultWidth = 16;
- m_defaultHeight = 15;
-
- m_xScrollPixelsPerLine = 1;
- m_yScrollPixelsPerLine = 1;
- m_xScrollingEnabled = false;
- m_yScrollingEnabled = false;
- m_xScrollPosition = 0;
- m_yScrollPosition = 0;
- m_xScrollLines = 0;
- m_yScrollLines = 0;
- m_xScrollLinesPerPage = 0;
- m_yScrollLinesPerPage = 0;
-}
-
-wxToolBarToolBase *wxToolBarSimple::DoAddTool(int id,
- const wxString& label,
- const wxBitmap& bitmap,
- const wxBitmap& bmpDisabled,
- wxItemKind kind,
- const wxString& shortHelp,
- const wxString& longHelp,
- wxObject *clientData,
- wxCoord xPos,
- wxCoord yPos)
-{
- // rememeber the position for DoInsertTool()
- m_xPos = xPos;
- m_yPos = yPos;
-
- return wxToolBarBase::DoAddTool(id, label, bitmap, bmpDisabled, kind,
- shortHelp, longHelp,
- clientData, xPos, yPos);
-}
-
-bool wxToolBarSimple::DoInsertTool(size_t WXUNUSED(pos),
- wxToolBarToolBase *toolBase)
-{
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
-
- wxCHECK_MSG( !tool->IsControl(), false,
- _T("generic wxToolBarSimple doesn't support controls") );
-
- tool->m_x = m_xPos;
- if ( tool->m_x == wxDefaultCoord )
- tool->m_x = m_xMargin;
-
- tool->m_y = m_yPos;
- if ( tool->m_y == wxDefaultCoord )
- tool->m_y = m_yMargin;
-
- tool->SetSize(GetToolSize());
-
- if ( tool->IsButton() )
- {
- // Calculate reasonable max size in case Layout() not called
- if ((tool->m_x + tool->GetNormalBitmap().GetWidth() + m_xMargin) > m_maxWidth)
- m_maxWidth = (wxCoord)((tool->m_x + tool->GetWidth() + m_xMargin));
-
- if ((tool->m_y + tool->GetNormalBitmap().GetHeight() + m_yMargin) > m_maxHeight)
- m_maxHeight = (wxCoord)((tool->m_y + tool->GetHeight() + m_yMargin));
- }
-
- return true;
-}
-
-bool wxToolBarSimple::DoDeleteTool(size_t WXUNUSED(pos),
- wxToolBarToolBase *tool)
-{
- // VZ: didn't test whether it works, but why not...
- tool->Detach();
-
- Refresh();
-
- return true;
-}
-
-bool wxToolBarSimple::Create(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- if ( !wxWindow::Create(parent, id, pos, size, style, name) )
- return false;
-
- // Set it to grey (or other 3D face colour)
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-
- if ( GetWindowStyleFlag() & wxTB_VERTICAL )
- {
- m_lastX = 7;
- m_lastY = 3;
-
- m_maxRows = 32000; // a lot
- m_maxCols = 1;
- }
- else
- {
- m_lastX = 3;
- m_lastY = 7;
-
- m_maxRows = 1;
- m_maxCols = 32000; // a lot
- }
-
- SetCursor(*wxSTANDARD_CURSOR);
-
- return true;
-}
-
-wxToolBarSimple::~wxToolBarSimple()
-{
-}
-
-bool wxToolBarSimple::Realize()
-{
- m_currentRowsOrColumns = 0;
- m_lastX = m_xMargin;
- m_lastY = m_yMargin;
- m_maxWidth = 0;
- m_maxHeight = 0;
-
- int maxToolWidth = 0;
- int maxToolHeight = 0;
-
- // Find the maximum tool width and height
- wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
- while ( node )
- {
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
- if ( tool->GetWidth() > maxToolWidth )
- maxToolWidth = tool->GetWidth();
- if (tool->GetHeight() > maxToolHeight)
- maxToolHeight = tool->GetHeight();
-
- node = node->GetNext();
- }
-
- int separatorSize = m_toolSeparation;
-
- node = m_tools.GetFirst();
- while ( node )
- {
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
- if ( tool->IsSeparator() )
- {
- if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
- {
- if (m_currentRowsOrColumns >= m_maxCols)
- m_lastY += separatorSize;
- else
- m_lastX += separatorSize;
- }
- else
- {
- if (m_currentRowsOrColumns >= m_maxRows)
- m_lastX += separatorSize;
- else
- m_lastY += separatorSize;
- }
- }
- else if ( tool->IsButton() )
- {
- if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
- {
- if (m_currentRowsOrColumns >= m_maxCols)
- {
- m_currentRowsOrColumns = 0;
- m_lastX = m_xMargin;
- m_lastY += maxToolHeight + m_toolPacking;
- }
- tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
- tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
-
- m_lastX += maxToolWidth + m_toolPacking;
- }
- else
- {
- if (m_currentRowsOrColumns >= m_maxRows)
- {
- m_currentRowsOrColumns = 0;
- m_lastX += (maxToolWidth + m_toolPacking);
- m_lastY = m_yMargin;
- }
- tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
- tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
-
- m_lastY += maxToolHeight + m_toolPacking;
- }
- m_currentRowsOrColumns ++;
- }
- else
- {
- // TODO: support the controls
- }
-
- if (m_lastX > m_maxWidth)
- m_maxWidth = m_lastX;
- if (m_lastY > m_maxHeight)
- m_maxHeight = m_lastY;
-
- node = node->GetNext();
- }
-
- if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
- m_maxHeight += maxToolHeight;
- else
- m_maxWidth += maxToolWidth;
-
- m_maxWidth += m_xMargin;
- m_maxHeight += m_yMargin;
-
- SetSize(m_maxWidth, m_maxHeight);
-
- return true;
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::OnPaint (wxPaintEvent& WXUNUSED(event))
-{
- wxPaintDC dc(this);
- PrepareDC(dc);
-
- static int count = 0;
- // Prevent reentry of OnPaint which would cause wxMemoryDC errors.
- if ( count > 0 )
- return;
- count++;
-
- for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
- node;
- node = node->GetNext() )
- {
- wxToolBarToolBase *tool = node->GetData();
- if ( tool->IsButton() )
- DrawTool(dc, tool);
- }
-
- count--;
-}
-
-void wxToolBarSimple::OnSize (wxSizeEvent& WXUNUSED(event))
-{
- if (GetAutoLayout())
- Layout();
-
- AdjustScrollbars();
-}
-
-void wxToolBarSimple::OnKillFocus(wxFocusEvent& WXUNUSED(event))
-{
- OnMouseEnter(m_pressedTool = m_currentTool = -1);
-}
-
-void wxToolBarSimple::OnMouseEvent(wxMouseEvent & event)
-{
- wxCoord x, y;
- event.GetPosition(&x, &y);
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)FindToolForPosition(x, y);
-
- if (event.LeftDown())
- {
- CaptureMouse();
- }
- if (event.LeftUp())
- {
- ReleaseMouse();
- }
-
- if (!tool)
- {
- if (m_currentTool > -1)
- {
- if (event.LeftIsDown())
- SpringUpButton(m_currentTool);
- m_currentTool = -1;
- OnMouseEnter(-1);
- }
- return;
- }
-
- if (!event.IsButton())
- {
- if ( tool->GetId() != m_currentTool )
- {
- // If the left button is kept down and moved over buttons,
- // press those buttons.
- if ( event.LeftIsDown() && tool->IsEnabled() )
- {
- SpringUpButton(m_currentTool);
-
- if ( tool->CanBeToggled() )
- {
- tool->Toggle();
- }
-
- DrawTool(tool);
- }
-
- m_currentTool = tool->GetId();
- OnMouseEnter(m_currentTool);
- }
- return;
- }
-
- // Left button pressed.
- if ( event.LeftDown() && tool->IsEnabled() )
- {
- if ( tool->CanBeToggled() )
- {
- tool->Toggle();
- }
-
- DrawTool(tool);
- }
- else if (event.RightDown())
- {
- OnRightClick(tool->GetId(), x, y);
- }
-
- // Left Button Released. Only this action confirms selection.
- // If the button is enabled and it is not a toggle tool and it is
- // in the pressed state, then raise the button and call OnLeftClick.
- //
- if ( event.LeftUp() && tool->IsEnabled() )
- {
- // Pass the OnLeftClick event to tool
- if ( !OnLeftClick(tool->GetId(), tool->IsToggled()) &&
- tool->CanBeToggled() )
- {
- // If it was a toggle, and OnLeftClick says No Toggle allowed,
- // then change it back
- tool->Toggle();
- }
-
- DrawTool(tool);
- }
-}
-
-// ----------------------------------------------------------------------------
-// drawing
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::DrawTool(wxToolBarToolBase *tool)
-{
- wxClientDC dc(this);
- DrawTool(dc, tool);
-}
-
-void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
-{
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
-
- wxMemoryDC memDC;
- PrepareDC(dc);
-
- wxPen dark_grey_pen(wxColour( 85,85,85 ), 1, wxSOLID);
- wxPen white_pen(wxT("WHITE"), 1, wxSOLID);
- wxPen black_pen(wxT("BLACK"), 1, wxSOLID);
-
- wxBitmap bitmap = tool->GetNormalBitmap();
- if (!bitmap.Ok())
- return;
-
- if ( !tool->IsToggled() )
- {
-#if wxUSE_PALETTE
-#ifndef __WXGTK__
- if (bitmap.GetPalette())
- memDC.SetPalette(*bitmap.GetPalette());
-#endif
-#endif // wxUSE_PALETTE
-
- int ax = (int)tool->m_x,
- ay = (int)tool->m_y,
- bx = (int)(tool->m_x+tool->GetWidth()),
- by = (int)(tool->m_y+tool->GetHeight());
-
- memDC.SelectObject(bitmap);
- if (m_windowStyle & wxTB_3DBUTTONS)
- {
- dc.SetClippingRegion(ax, ay, (bx-ax+1), (by-ay+1));
- dc.Blit((ax+1), (ay+1), (bx-ax-2), (by-ay-2), &memDC, 0, 0);
- wxPen * old_pen = & dc.GetPen();
- dc.SetPen( white_pen );
- dc.DrawLine(ax,(by-1),ax,ay);
- dc.DrawLine(ax,ay,(bx-1),ay);
- dc.SetPen( dark_grey_pen );
- dc.DrawLine((bx-1),(ay+1),(bx-1),(by-1));
- dc.DrawLine((bx-1),(by-1),(ax+1),(by-1));
- dc.SetPen( black_pen );
- dc.DrawLine(bx,ay,bx,by);
- dc.DrawLine(bx,by,ax,by);
- dc.SetPen( *old_pen );
- dc.DestroyClippingRegion();
- // Select bitmap out of the DC
- }
- else
- {
- dc.Blit(tool->m_x, tool->m_y,
- bitmap.GetWidth(), bitmap.GetHeight(),
- &memDC, 0, 0);
- }
- memDC.SelectObject(wxNullBitmap);
-
-#if wxUSE_PALETTE
-#ifndef __WXGTK__
- if (bitmap.GetPalette())
- memDC.SetPalette(wxNullPalette);
-#endif
-#endif // wxUSE_PALETTE
- }
- // No second bitmap, so draw a thick line around bitmap, or invert if mono
- else if ( tool->IsToggled() )
- {
- bool drawBorder = false;
-#ifdef __X__ // X doesn't invert properly on colour
- drawBorder = wxColourDisplay();
-#else // Inversion works fine under Windows
- drawBorder = false;
-#endif
-
- if (!drawBorder)
- {
- memDC.SelectObject(tool->GetNormalBitmap());
- dc.Blit(tool->m_x, tool->m_y, tool->GetWidth(), tool->GetHeight(),
- &memDC, 0, 0, wxSRC_INVERT);
- memDC.SelectObject(wxNullBitmap);
- }
- else
- {
- bitmap = tool->GetNormalBitmap();
-
- if (m_windowStyle & wxTB_3DBUTTONS)
- {
- int ax = (int)tool->m_x,
- ay = (int)tool->m_y,
- bx = (int)(tool->m_x+tool->GetWidth()),
- by = (int)(tool->m_y+tool->GetHeight());
-
- memDC.SelectObject(bitmap);
- dc.SetClippingRegion(ax, ay, (bx-ax+1), (by-ay+1));
- dc.Blit((ax+2), (ay+2), (bx-ax-2), (by-ay-2), &memDC, 0, 0);
- wxPen * old_pen = & dc.GetPen();
- dc.SetPen( black_pen );
- dc.DrawLine(ax,(by-1),ax,ay);
- dc.DrawLine(ax,ay,(bx-1),ay);
- dc.SetPen( dark_grey_pen );
- dc.DrawLine((ax+1),(by-2),(ax+1),(ay+1));
- dc.DrawLine((ax+1),(ay+1),(bx-2),(ay+1));
- dc.SetPen( white_pen );
- dc.DrawLine(bx,ay,bx,by);
- dc.DrawLine(bx,by,ax,by);
- dc.SetPen( *old_pen );
- dc.DestroyClippingRegion();
- memDC.SelectObject(wxNullBitmap);
- }
- else
- {
- wxCoord x = tool->m_x;
- wxCoord y = tool->m_y;
- wxCoord w = bitmap.GetWidth();
- wxCoord h = bitmap.GetHeight();
- wxPen thick_black_pen(wxT("BLACK"), 3, wxSOLID);
-
- memDC.SelectObject(bitmap);
- dc.SetClippingRegion(tool->m_x, tool->m_y, w, h);
- dc.Blit(tool->m_x, tool->m_y, w, h,
- &memDC, 0, 0);
- dc.SetPen(thick_black_pen);
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
- dc.DrawRectangle(x, y, w-1, h-1);
- dc.DestroyClippingRegion();
- memDC.SelectObject(wxNullBitmap);
- }
- }
- }
-}
-
-// ----------------------------------------------------------------------------
-// toolbar geometry
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::SetRows(int nRows)
-{
- wxCHECK_RET( nRows != 0, _T("max number of rows must be > 0") );
-
- m_maxCols = (GetToolsCount() + nRows - 1) / nRows;
-
- AdjustScrollbars();
- Refresh();
-}
-
-wxToolBarToolBase *wxToolBarSimple::FindToolForPosition(wxCoord x,
- wxCoord y) const
-{
- wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
- while (node)
- {
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
- if ((x >= tool->m_x) && (y >= tool->m_y) &&
- (x <= (tool->m_x + tool->GetWidth())) &&
- (y <= (tool->m_y + tool->GetHeight())))
- {
- return tool;
- }
-
- node = node->GetNext();
- }
-
- return (wxToolBarToolBase *)NULL;
-}
-
-// ----------------------------------------------------------------------------
-// tool state change handlers
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::DoEnableTool(wxToolBarToolBase *tool,
- bool WXUNUSED(enable))
-{
- DrawTool(tool);
-}
-
-void wxToolBarSimple::DoToggleTool(wxToolBarToolBase *tool,
- bool WXUNUSED(toggle))
-{
- DrawTool(tool);
-}
-
-void wxToolBarSimple::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
- bool WXUNUSED(toggle))
-{
- // nothing to do
-}
-
-// Okay, so we've left the tool we're in ... we must check if the tool we're
-// leaving was a 'sprung push button' and if so, spring it back to the up
-// state.
-void wxToolBarSimple::SpringUpButton(int id)
-{
- wxToolBarToolBase *tool = FindById(id);
-
- if ( tool && tool->CanBeToggled() )
- {
- if (tool->IsToggled())
- tool->Toggle();
-
- DrawTool(tool);
- }
-}
-
-// ----------------------------------------------------------------------------
-// scrolling implementation
-// ----------------------------------------------------------------------------
-
-/*
- * pixelsPerUnitX/pixelsPerUnitY: number of pixels per unit (e.g. pixels per text line)
- * noUnitsX/noUnitsY: : no. units per scrollbar
- */
-void wxToolBarSimple::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
- int noUnitsX, int noUnitsY,
- int xPos, int yPos)
-{
- m_xScrollPixelsPerLine = pixelsPerUnitX;
- m_yScrollPixelsPerLine = pixelsPerUnitY;
- m_xScrollLines = noUnitsX;
- m_yScrollLines = noUnitsY;
-
- int w, h;
- GetSize(&w, &h);
-
- // Recalculate scroll bar range and position
- if (m_xScrollLines > 0)
- {
- m_xScrollPosition = xPos;
- SetScrollPos (wxHORIZONTAL, m_xScrollPosition, true);
- }
- else
- {
- SetScrollbar(wxHORIZONTAL, 0, 0, 0, false);
- m_xScrollPosition = 0;
- }
-
- if (m_yScrollLines > 0)
- {
- m_yScrollPosition = yPos;
- SetScrollPos (wxVERTICAL, m_yScrollPosition, true);
- }
- else
- {
- SetScrollbar(wxVERTICAL, 0, 0, 0, false);
- m_yScrollPosition = 0;
- }
- AdjustScrollbars();
- Refresh();
-
-#if 0 //def __WXMSW__
- ::UpdateWindow ((HWND) GetHWND());
-#endif
-}
-
-void wxToolBarSimple::OnScroll(wxScrollEvent& event)
-{
- int orient = event.GetOrientation();
-
- int nScrollInc = CalcScrollInc(event);
- if (nScrollInc == 0)
- return;
-
- if (orient == wxHORIZONTAL)
- {
- int newPos = m_xScrollPosition + nScrollInc;
- SetScrollPos(wxHORIZONTAL, newPos, true );
- }
- else
- {
- int newPos = m_yScrollPosition + nScrollInc;
- SetScrollPos(wxVERTICAL, newPos, true );
- }
-
- if (orient == wxHORIZONTAL)
- {
- if (m_xScrollingEnabled)
- ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, NULL);
- else
- Refresh();
- }
- else
- {
- if (m_yScrollingEnabled)
- ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, NULL);
- else
- Refresh();
- }
-
- if (orient == wxHORIZONTAL)
- {
- m_xScrollPosition += nScrollInc;
- }
- else
- {
- m_yScrollPosition += nScrollInc;
- }
-
-}
-
-int wxToolBarSimple::CalcScrollInc(wxScrollEvent& event)
-{
- int pos = event.GetPosition();
- int orient = event.GetOrientation();
-
- int nScrollInc = 0;
- if (event.GetEventType() == wxEVT_SCROLL_TOP)
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = - m_xScrollPosition;
- else
- nScrollInc = - m_yScrollPosition;
- } else
- if (event.GetEventType() == wxEVT_SCROLL_BOTTOM)
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = m_xScrollLines - m_xScrollPosition;
- else
- nScrollInc = m_yScrollLines - m_yScrollPosition;
- } else
- if (event.GetEventType() == wxEVT_SCROLL_LINEUP)
- {
- nScrollInc = -1;
- } else
- if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN)
- {
- nScrollInc = 1;
- } else
- if (event.GetEventType() == wxEVT_SCROLL_PAGEUP)
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
- else
- nScrollInc = -GetScrollPageSize(wxVERTICAL);
- } else
- if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = GetScrollPageSize(wxHORIZONTAL);
- else
- nScrollInc = GetScrollPageSize(wxVERTICAL);
- } else
- if ((event.GetEventType() == wxEVT_SCROLL_THUMBTRACK) ||
- (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE))
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = pos - m_xScrollPosition;
- else
- nScrollInc = pos - m_yScrollPosition;
- }
-
- if (orient == wxHORIZONTAL)
- {
- int w, h;
- GetClientSize(&w, &h);
-
- int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
- int noPositions = (int) ( ((nMaxWidth - w)/(float)m_xScrollPixelsPerLine) + 0.5 );
- if (noPositions < 0)
- noPositions = 0;
-
- if ( (m_xScrollPosition + nScrollInc) < 0 )
- nScrollInc = -m_xScrollPosition; // As -ve as we can go
- else if ( (m_xScrollPosition + nScrollInc) > noPositions )
- nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
-
- return nScrollInc;
- }
- else
- {
- int w, h;
- GetClientSize(&w, &h);
-
- int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
- int noPositions = (int) ( ((nMaxHeight - h)/(float)m_yScrollPixelsPerLine) + 0.5 );
- if (noPositions < 0)
- noPositions = 0;
-
- if ( (m_yScrollPosition + nScrollInc) < 0 )
- nScrollInc = -m_yScrollPosition; // As -ve as we can go
- else if ( (m_yScrollPosition + nScrollInc) > noPositions )
- nScrollInc = noPositions - m_yScrollPosition; // As +ve as we can go
-
- return nScrollInc;
- }
-}
-
-// Adjust the scrollbars - new version.
-void wxToolBarSimple::AdjustScrollbars()
-{
- int w, h;
- GetClientSize(&w, &h);
-
- // Recalculate scroll bar range and position
- if (m_xScrollLines > 0)
- {
- int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
- int newRange = (int) ( ((nMaxWidth)/(float)m_xScrollPixelsPerLine) + 0.5 );
- if (newRange < 0)
- newRange = 0;
-
- m_xScrollPosition = wxMin(newRange, m_xScrollPosition);
-
- // Calculate page size i.e. number of scroll units you get on the
- // current client window
- int noPagePositions = (int) ( (w/(float)m_xScrollPixelsPerLine) + 0.5 );
- if (noPagePositions < 1)
- noPagePositions = 1;
-
- SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, newRange);
- SetScrollPageSize(wxHORIZONTAL, noPagePositions);
- }
- if (m_yScrollLines > 0)
- {
- int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
- int newRange = (int) ( ((nMaxHeight)/(float)m_yScrollPixelsPerLine) + 0.5 );
- if (newRange < 0)
- newRange = 0;
-
- m_yScrollPosition = wxMin(newRange, m_yScrollPosition);
-
- // Calculate page size i.e. number of scroll units you get on the
- // current client window
- int noPagePositions = (int) ( (h/(float)m_yScrollPixelsPerLine) + 0.5 );
- if (noPagePositions < 1)
- noPagePositions = 1;
-
- SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, newRange);
- SetScrollPageSize(wxVERTICAL, noPagePositions);
- }
-}
-
-// Prepare the DC by translating it according to the current scroll position
-void wxToolBarSimple::PrepareDC(wxDC& dc)
-{
- dc.SetDeviceOrigin(- m_xScrollPosition * m_xScrollPixelsPerLine, - m_yScrollPosition * m_yScrollPixelsPerLine);
-}
-
-void wxToolBarSimple::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
-{
- *x_unit = m_xScrollPixelsPerLine;
- *y_unit = m_yScrollPixelsPerLine;
-}
-
-int wxToolBarSimple::GetScrollPageSize(int orient) const
-{
- if ( orient == wxHORIZONTAL )
- return m_xScrollLinesPerPage;
- else
- return m_yScrollLinesPerPage;
-}
-
-void wxToolBarSimple::SetScrollPageSize(int orient, int pageSize)
-{
- if ( orient == wxHORIZONTAL )
- m_xScrollLinesPerPage = pageSize;
- else
- m_yScrollLinesPerPage = pageSize;
-}
-
-/*
- * Scroll to given position (scroll position, not pixel position)
- */
-void wxToolBarSimple::Scroll (int x_pos, int y_pos)
-{
- int old_x, old_y;
- ViewStart (&old_x, &old_y);
- if (((x_pos == wxDefaultCoord) || (x_pos == old_x)) && ((y_pos == wxDefaultCoord) || (y_pos == old_y)))
- return;
-
- if (x_pos != wxDefaultCoord)
- {
- m_xScrollPosition = x_pos;
- SetScrollPos (wxHORIZONTAL, x_pos, true);
- }
- if (y_pos != wxDefaultCoord)
- {
- m_yScrollPosition = y_pos;
- SetScrollPos (wxVERTICAL, y_pos, true);
- }
- Refresh();
-
-#if 0 //def __WXMSW__
- UpdateWindow ((HWND) GetHWND());
-#endif
-}
-
-void wxToolBarSimple::EnableScrolling (bool x_scroll, bool y_scroll)
-{
- m_xScrollingEnabled = x_scroll;
- m_yScrollingEnabled = y_scroll;
-}
-
-void wxToolBarSimple::GetVirtualSize (int *x, int *y) const
-{
- *x = m_xScrollPixelsPerLine * m_xScrollLines;
- *y = m_yScrollPixelsPerLine * m_yScrollLines;
-}
-
-// Where the current view starts from
-void wxToolBarSimple::ViewStart (int *x, int *y) const
-{
- *x = m_xScrollPosition;
- *y = m_yScrollPosition;
-}
-
-#endif // wxUSE_TOOLBAR_SIMPLE
-
diff --git a/contrib/src/deprecated/treelay.cpp b/contrib/src/deprecated/treelay.cpp
deleted file mode 100644
index 28c4207bfd..0000000000
--- a/contrib/src/deprecated/treelay.cpp
+++ /dev/null
@@ -1,469 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name: treelay.h
-// Purpose: wxTreeLayout class
-// Author: Julian Smart
-// Modified by:
-// Created: 7/4/98
-// RCS-ID: $Id$
-// Copyright: (c) 1998 Julian Smart
-// Licence: wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/dc.h"
-#include "wx/event.h"
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_TREELAYOUT
-
-#include "wx/deprecated/treelay.h"
-
-/*
- * Abstract tree
- *
- */
-
-IMPLEMENT_ABSTRACT_CLASS(wxTreeLayout, wxObject)
-
-wxTreeLayout::wxTreeLayout()
-{
- m_xSpacing = 16;
- m_ySpacing = 20;
- m_topMargin = 5;
- m_leftMargin = 5;
- m_orientation = false;
- m_parentNode = 0;
-}
-
-void wxTreeLayout::DoLayout(wxDC& dc, long topId)
-{
- if (topId != wxID_ANY)
- SetTopNode(topId);
-
- long actualTopId = GetTopNode();
- long id = actualTopId;
- while (id != wxID_ANY)
- {
- SetNodeX(id, 0);
- SetNodeY(id, 0);
- ActivateNode(id, false);
- id = GetNextNode(id);
- }
- m_lastY = m_topMargin;
- m_lastX = m_leftMargin;
- CalcLayout(actualTopId, 0, dc);
-}
-
-void wxTreeLayout::Draw(wxDC& dc)
-{
- dc.Clear();
- DrawBranches(dc);
- DrawNodes(dc);
-}
-
-void wxTreeLayout::DrawNodes(wxDC& dc)
-{
- long id = GetTopNode();
- while (id != wxID_ANY)
- {
- if (NodeActive(id))
- DrawNode(id, dc);
- id = GetNextNode(id);
- }
-}
-
-void wxTreeLayout::DrawBranches(wxDC& dc)
-{
- long id = GetTopNode();
- while (id != wxID_ANY)
- {
- if (GetNodeParent(id) != wxID_ANY)
- {
- long parent = GetNodeParent(id);
- if (NodeActive(parent))
- DrawBranch(parent, id, dc);
- }
- id = GetNextNode(id);
- }
-}
-
-void wxTreeLayout::DrawNode(long id, wxDC& dc)
-{
- wxChar buf[80];
- wxString name(GetNodeName(id));
- if (name != wxT(""))
- wxSprintf(buf, wxT("%s"), (const wxChar*) name);
- else
- wxSprintf(buf, wxT(""));
-
- long x = 80;
- long y = 20;
- dc.GetTextExtent(buf, &x, &y);
- dc.DrawText(buf, GetNodeX(id), (long)(GetNodeY(id) - (y/2.0)));
-}
-
-void wxTreeLayout::DrawBranch(long from, long to, wxDC& dc)
-{
- long w, h;
- GetNodeSize(from, &w, &h, dc);
- dc.DrawLine(GetNodeX(from)+w, GetNodeY(from),
- GetNodeX(to), GetNodeY(to));
-}
-
-void wxTreeLayout::Initialize(void)
-{
-}
-
-void wxTreeLayout::GetNodeSize(long id, long *x, long *y, wxDC& dc)
-{
- wxString name(GetNodeName(id));
- if (name != wxT(""))
- dc.GetTextExtent(name, x, y);
- else
- {
- *x = 70; *y = 20;
- }
-}
-
-void wxTreeLayout::CalcLayout(long nodeId, int level, wxDC& dc)
-{
- wxList children;
- GetChildren(nodeId, children);
- int n = children.GetCount();
-
- if (m_orientation == false)
- {
- // Left to right
- // X Calculations
- if (level == 0)
- SetNodeX(nodeId, m_leftMargin);
- else
- {
- long x = 0;
- long y = 0;
- long parentId = GetNodeParent(nodeId);
- if (parentId != wxID_ANY)
- GetNodeSize(parentId, &x, &y, dc);
- SetNodeX(nodeId, (long)(GetNodeX(parentId) + m_xSpacing + x));
- }
-
- wxList::compatibility_iterator node = children.GetFirst();
- while (node)
- {
- CalcLayout((long)node->GetData(), level+1, dc);
- node = node->GetNext();
- }
-
- // Y Calculations
- long averageY;
- ActivateNode(nodeId, true);
-
- if (n > 0)
- {
- averageY = 0;
- node = children.GetFirst();
- while (node)
- {
- averageY += GetNodeY((long)node->GetData());
- node = node->GetNext();
- }
- averageY = averageY / n;
- SetNodeY(nodeId, averageY);
- }
- else
- {
- SetNodeY(nodeId, m_lastY);
- long x, y;
- GetNodeSize(nodeId, &x, &y, dc);
-
- m_lastY = m_lastY + y + m_ySpacing;
- }
- }
- else
- {
- // Top to bottom
-
- // Y Calculations
- if (level == 0)
- SetNodeY(nodeId, m_topMargin);
- else
- {
- long x = 0;
- long y = 0;
- long parentId = GetNodeParent(nodeId);
- if (parentId != wxID_ANY)
- GetNodeSize(parentId, &x, &y, dc);
- SetNodeY(nodeId, (long)(GetNodeY(parentId) + m_ySpacing + y));
- }
-
- wxList::compatibility_iterator node = children.GetFirst();
- while (node)
- {
- CalcLayout((long)node->GetData(), level+1, dc);
- node = node->GetNext();
- }
-
- // X Calculations
- long averageX;
- ActivateNode(nodeId, true);
-
- if (n > 0)
- {
- averageX = 0;
- node = children.GetFirst();
- while (node)
- {
- averageX += GetNodeX((long)node->GetData());
- node = node->GetNext();
- }
- averageX = averageX / n;
- SetNodeX(nodeId, averageX);
- }
- else
- {
- SetNodeX(nodeId, m_lastX);
- long x, y;
- GetNodeSize(nodeId, &x, &y, dc);
-
- m_lastX = m_lastX + x + m_xSpacing;
- }
- }
-}
-
-/*
- * Tree with storage
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxTreeLayoutStored, wxTreeLayout)
-
-wxTreeLayoutStored::wxTreeLayoutStored(int n):wxTreeLayout()
-{
- m_nodes = NULL;
- m_maxNodes = 0;
- Initialize(n);
-}
-
-wxTreeLayoutStored::~wxTreeLayoutStored(void)
-{
- if (m_nodes)
- delete[] m_nodes;
-}
-
-void wxTreeLayoutStored::Initialize(int n)
-{
- m_maxNodes = n;
- wxTreeLayout::Initialize();
- if (m_nodes) delete[] m_nodes;
- m_nodes = new wxStoredNode[m_maxNodes];
- int i;
- for (i = 0; i < n; i++)
- {
- m_nodes[i].m_name = wxT("");
- m_nodes[i].m_active = false;
- m_nodes[i].m_parentId = wxID_ANY;
- m_nodes[i].m_x = 0;
- m_nodes[i].m_y = 0;
- }
- m_num = 0;
-}
-
-long wxTreeLayoutStored::AddChild(const wxString& name, const wxString& parent)
-{
- if (m_num < (m_maxNodes -1 ))
- {
- long i = -1;
- if (parent != wxT(""))
- i = NameToId(parent);
- else m_parentNode = m_num;
-
- m_nodes[m_num].m_parentId = i;
- m_nodes[m_num].m_name = name;
- m_nodes[m_num].m_x = m_nodes[m_num].m_y = 0;
- m_nodes[m_num].m_clientData = 0;
- m_num ++;
-
- return (m_num - 1);
- }
- else
- return -1;
-}
-
-long wxTreeLayoutStored::AddChild(const wxString& name, long parent)
-{
- if (m_num < (m_maxNodes -1 ) && parent < m_num)
- {
- long i = -1;
- if (parent != -1)
- {
- i = parent;
- }
- else
- {
- m_parentNode = m_num;
- }
-
- m_nodes[m_num].m_parentId = i;
- m_nodes[m_num].m_name = name;
- m_nodes[m_num].m_x = m_nodes[m_num].m_y = 0;
- m_nodes[m_num].m_clientData = 0;
- m_num ++;
-
- return (m_num - 1);
- }
- else
- return -1;
-}
-
-long wxTreeLayoutStored::NameToId(const wxString& name)
-{
- long i;
- for (i = 0; i < m_num; i++)
- if (name == m_nodes[i].m_name)
- return i;
- return -1;
-}
-
-void wxTreeLayoutStored::GetChildren(long id, wxList& list)
-{
- long currentId = GetTopNode();
- while (currentId != wxID_ANY)
- {
- if (id == GetNodeParent(currentId))
- list.Append((wxObject *)currentId);
- currentId = GetNextNode(currentId);
- }
-}
-
-wxStoredNode* wxTreeLayoutStored::GetNode(long idx) const
-{
- wxASSERT(idx < m_num);
-
- return &m_nodes[idx];
-};
-
-long wxTreeLayoutStored::GetNodeX(long id)
-{
- wxASSERT(id < m_num);
-
- return (long)m_nodes[id].m_x;
-}
-
-long wxTreeLayoutStored::GetNodeY(long id)
-{
- wxASSERT(id < m_num);
-
- return (long)m_nodes[id].m_y;
-}
-
-void wxTreeLayoutStored::SetNodeX(long id, long x)
-{
- wxASSERT(id < m_num);
-
- m_nodes[id].m_x = (int)x;
-}
-
-void wxTreeLayoutStored::SetNodeY(long id, long y)
-{
- wxASSERT(id < m_num);
-
- m_nodes[id].m_y = (int)y;
-}
-
-void wxTreeLayoutStored::SetNodeName(long id, const wxString& name)
-{
- wxASSERT(id < m_num);
-
- m_nodes[id].m_name = name;
-}
-
-wxString wxTreeLayoutStored::GetNodeName(long id)
-{
- wxASSERT(id < m_num);
-
- return m_nodes[id].m_name;
-}
-
-long wxTreeLayoutStored::GetNodeParent(long id)
-{
- if (id != wxID_ANY)
- {
- wxASSERT(id < m_num);
-
- return m_nodes[id].m_parentId;
- }
- else
- return wxNOT_FOUND;
-}
-
-long wxTreeLayoutStored::GetNextNode(long id)
-{
- wxASSERT(id < m_num);
-
- if ((id != wxID_ANY) && (id < (m_num - 1)))
- return id + 1;
- else
- return wxNOT_FOUND;
-}
-
-void wxTreeLayoutStored::SetClientData(long id, long clientData)
-{
- wxASSERT(id < m_num);
-
- m_nodes[id].m_clientData = clientData;
-}
-
-long wxTreeLayoutStored::GetClientData(long id) const
-{
- wxASSERT(id < m_num);
-
- return m_nodes[id].m_clientData;
-}
-
-void wxTreeLayoutStored::ActivateNode(long id, bool active)
-{
- wxASSERT(id < m_num);
-
- m_nodes[id].m_active = active;
-}
-
-bool wxTreeLayoutStored::NodeActive(long id)
-{
- wxASSERT(id < m_num);
-
- return m_nodes[id].m_active;
-}
-
-wxString wxTreeLayoutStored::HitTest(wxMouseEvent& event, wxDC& dc)
-{
- wxPoint pt = event.GetPosition();
- wxCoord x = pt.x;
- wxCoord y = pt.y;
-
- int i;
- for (i = 0; i < m_maxNodes; i++)
- {
- long width, height;
- dc.GetTextExtent(m_nodes[i].m_name, &width, &height);
-
- if ( (x >= (m_nodes[i].m_x-10)) && (x < (m_nodes[i].m_x + width+10)) &&
- (y >= m_nodes[i].m_y-10) && (y < (m_nodes[i].m_y + height+10)) )
- {
- return m_nodes[i].m_name;
- }
- }
-
- return wxString( wxT("") );
-}
-
-#endif
- // wxUSE_TREELAYOUT
diff --git a/contrib/src/deprecated/wxexpr.cpp b/contrib/src/deprecated/wxexpr.cpp
deleted file mode 100644
index c1345a610e..0000000000
--- a/contrib/src/deprecated/wxexpr.cpp
+++ /dev/null
@@ -1,1281 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: wxexpr.cpp
-// Purpose: wxExpr
-// Author: Julian Smart
-// Modified by:
-// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROLOGIO
-
-#include
-#include
-#include
-
-#include "wx/utils.h"
-#include "wx/deprecated/expr.h"
-#include "wx/deprecated/wxexpr.h"
-
-#if !WXWIN_COMPATIBILITY_2_4
-static inline wxChar* copystring(const wxChar* s)
- { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
-#endif
-
-extern "C" void add_expr(char *);
-extern "C" void LexFromFile(FILE *fd);
-extern "C" void LexFromString(char *buf);
-
-
-
-/* Rename all YACC/LEX stuff or we'll conflict with other
- * applications
- */
-
-#define yyback PROIO_yyback
-#define yylook PROIO_yylook
-#define yywrap PROIO_yywrap
-#define yyoutput PROIO_yyoutput
-#define yylex PROIO_yylex
-#define yyerror PROIO_yyerror
-#define yyleng PROIO_yyleng
-#define yytext PROIO_yytext
-#define yymorfg PROIO_yymorfg
-#define yylineno PROIO_yylineno
-#define yytchar PROIO_yytchar
-#define yyin PROIO_yyin
-#define yyout PROIO_yyout
-#define yysvf PROIO_yysvf
-#define yyestate PROIO_yyestate
-#define yysvec PROIO_yysvec
-#define yybgin PROIO_yybgin
-#define yyprevious PROIO_yyprevious
-#define yylhs PROIO_yylhs
-#define yylen PROIO_yylen
-#define yydefred PROIO_yydefred
-#define yydgoto PROIO_yydgoto
-#define yysindex PROIO_yysindex
-#define yyrindex PROIO_yyrindex
-#define yygindex PROIO_yygindex
-#define yytable PROIO_yytable
-#define yycheck PROIO_yycheck
-#define yyname PROIO_yyname
-#define yyrule PROIO_yyrule
-#define yydebug PROIO_yydebug
-#define yynerrs PROIO_yynerrs
-#define yyerrflag PROIO_yyerrflag
-#define yychar PROIO_yychar
-#define yyvsp PROIO_yyvsp
-#define yyssp PROIO_yyssp
-#define yyval PROIO_yyval
-#define yylval PROIO_yylval
-#define yyss PROIO_yyss
-#define yyvs PROIO_yyvs
-#define yyparse PROIO_yyparse
-
-/* +++steve162e: more defines necessary */
-#define yy_init_buffer PROIO_yy_init_buffer
-#define yy_create_buffer PROIO_yy_create_buffer
-#define yy_load_buffer_state PROIO_yy_load_buffer_state
-#define yyrestart PROIO_yyrestart
-#define yy_switch_to_buffer PROIO_yy_switch_to_buffer
-#define yy_delete_buffer PROIO_yy_delete_buffer
-/* ---steve162e */
-
-/* WG 1/96: still more for flex 2.5 */
-#define yy_scan_buffer PROIO_scan_buffer
-#define yy_scan_string PROIO_scan_string
-#define yy_scan_bytes PROIO_scan_bytes
-#define yy_flex_debug PROIO_flex_debug
-#define yy_flush_buffer PROIO_flush_buffer
-#if !defined(__VISAGECPP__)
-/* multiply defined??? */
-#define yyleng PROIO_yyleng
-#define yytext PROIO_yytext
-#endif
-
-extern "C" WXDLLIMPEXP_DATA_DEPRECATED(FILE*) yyin;
-extern "C" WXDLLIMPEXP_DEPRECATED int yyparse(void);
-
-
-wxExprDatabase *thewxExprDatabase = NULL;
-wxExprErrorHandler currentwxExprErrorHandler;
-
-wxExpr::wxExpr(const wxString& functor)
-{
- type = wxExprList;
- next = NULL;
- last = NULL;
- value.first = NULL;
-
- wxExpr *pfunctor = new wxExpr(wxExprWord, functor);
- Append(pfunctor);
- client_data = NULL;
-}
-
-wxExpr::wxExpr(wxExprType the_type, const wxString& word_or_string)
-{
- type = the_type;
-
- switch (the_type)
- {
- case wxExprWord:
- value.word = copystring((const wxChar *)word_or_string);
- break;
- case wxExprString:
- value.string = copystring((const wxChar *)word_or_string);
- break;
- case wxExprList:
- last = NULL;
- value.first = NULL;
- break;
- case wxExprReal:
- case wxExprInteger:
- case wxExprNull:
- break;
- }
- client_data = NULL;
- next = NULL;
-}
-
-wxExpr::wxExpr(wxExprType the_type, wxChar *word_or_string, bool allocate)
-{
- type = the_type;
-
- switch (the_type)
- {
- case wxExprWord:
- value.word = allocate ? copystring(word_or_string) : word_or_string;
- break;
- case wxExprString:
- value.string = allocate ? copystring(word_or_string) : word_or_string;
- break;
- case wxExprList:
- last = NULL;
- value.first = NULL;
- break;
- case wxExprReal:
- case wxExprInteger:
- case wxExprNull:
- break;
- }
- client_data = NULL;
- next = NULL;
-}
-
-wxExpr::wxExpr(long the_integer)
-{
- type = wxExprInteger;
- value.integer = the_integer;
- client_data = NULL;
- next = NULL;
-}
-
-wxExpr::wxExpr(double the_real)
-{
- type = wxExprReal;
- value.real = the_real;
- client_data = NULL;
- next = NULL;
-}
-
-wxExpr::wxExpr(wxList *the_list)
-{
- type = wxExprList;
- client_data = NULL;
- last = NULL;
- value.first = NULL;
-
- wxExpr *listExpr = new wxExpr(wxExprList);
-
- wxNode *node = the_list->GetFirst();
- while (node)
- {
- wxExpr *expr = (wxExpr *)node->GetData();
- listExpr->Append(expr);
- node = node->GetNext();
- }
- Append(listExpr);
-
- delete the_list;
-}
-
-wxExpr::~wxExpr(void)
-{
- switch (type)
- {
- case wxExprInteger:
- case wxExprReal:
- {
- break;
- }
- case wxExprString:
- {
- delete[] value.string;
- break;
- }
- case wxExprWord:
- {
- delete[] value.word;
- break;
- }
- case wxExprList:
- {
- wxExpr *expr = value.first;
- while (expr)
- {
- wxExpr *expr1 = expr->next;
-
- delete expr;
- expr = expr1;
- }
- break;
- }
- case wxExprNull: break;
- }
-}
-
-void wxExpr::Append(wxExpr *expr)
-{
- if (!value.first)
- value.first = expr;
-
- if (last)
- last->next = expr;
- last = expr;
-}
-
-void wxExpr::Insert(wxExpr *expr)
-{
- expr->next = value.first;
- value.first = expr;
-
- if (!last)
- last = expr;
-}
-
-wxExpr *wxExpr::Copy(void) const
-{
- // This seems to get round an optimizer bug when
- // using Watcom C++ 10a in WIN32 compilation mode.
- // If these lines not present, the type seems to be
- // interpreted wrongly as an integer.
- // I don't want to turn optimization off since it's needed
- // for reading in files quickly.
-#if defined(__WATCOMC__)
- char buf[2];
- sprintf(buf, "");
-#endif
-
- switch (type)
- {
- case wxExprInteger:
- return new wxExpr(value.integer);
- case wxExprReal:
- return new wxExpr(value.real);
- case wxExprString:
- return new wxExpr(wxExprString, wxString(value.string));
- case wxExprWord:
- return new wxExpr(wxExprWord, wxString(value.word));
- case wxExprList:
- {
- wxExpr *expr = value.first;
- wxExpr *new_list = new wxExpr(wxExprList);
- while (expr)
- {
- wxExpr *expr2 = expr->Copy();
- new_list->Append(expr2);
- expr = expr->next;
- }
- return new_list;
- }
- case wxExprNull:
- break;
- }
- return NULL;
-}
-
-
-// Get the wxExpr (containing (= wxExpr Value) form) for the given word
-// or string, assuming that we have Attribute=Value, ...
-wxExpr *wxExpr::GetAttributeValueNode(const wxString& word) const // Use only for a clause or list
-{
- if (type != wxExprList)
- return NULL;
-
- wxExpr *expr = value.first;
- while (expr)
- {
- if (expr->type == wxExprList)
- {
- wxExpr *firstNode = expr->value.first;
- if ((firstNode->type == wxExprWord) && (firstNode->value.word[0] == '='))
- {
- wxExpr *secondNode = firstNode->next;
- if ((secondNode->type == wxExprWord) &&
- (wxStrcmp((const wxChar *)word, secondNode->value.word) == 0))
- {
- return expr;
- }
- }
- }
- expr = expr->next;
- }
- return NULL;
-}
-
-// Get the value (in wxExpr form) for the given word or string, assuming
-// that we have Attribute=Value, ...
-wxExpr *wxExpr::AttributeValue(const wxString& word) const // Use only for a clause or list
-{
- if (type != wxExprList)
- return NULL;
-
- wxExpr *attExpr = GetAttributeValueNode(word);
- if (attExpr && attExpr->value.first && attExpr->value.first->next)
- return attExpr->value.first->next->next;
- else return NULL;
-}
-
-wxString wxExpr::Functor(void) const // Use only for a clause
-{
- if ((type != wxExprList) || !value.first)
- return wxString(wxT(""));
-
- if (value.first->type == wxExprWord)
- return wxString(value.first->value.word);
- else
- return wxString(wxT(""));
-}
-
-bool wxExpr::IsFunctor(const wxString& f) const // Use only for a clause
-{
- if ((type != wxExprList) || !value.first)
- return false;
-
- return (value.first->type == wxExprWord &&
- (wxStrcmp((const wxChar *)f, value.first->value.word) == 0));
-}
-
-// Return nth argument of a clause (starting from 1)
-wxExpr *wxExpr::Arg(wxExprType theType, int arg) const
-{
- wxExpr *expr = value.first;
- int i;
- for (i = 1; i < arg; i++)
- if (expr)
- expr = expr->next;
-
- if (expr && (expr->type == theType))
- return expr;
- else
- return NULL;
-}
-
-// Return nth argument of a list expression (starting from zero)
-wxExpr *wxExpr::Nth(int arg) const
-{
- if (type != wxExprList)
- return NULL;
-
- wxExpr *expr = value.first;
- int i;
- for (i = 0; i < arg; i++)
- if (expr)
- expr = expr->next;
- else return NULL;
-
- if (expr)
- return expr;
- else
- return NULL;
-}
-
- // Returns the number of elements in a list expression
-int wxExpr::Number(void) const
-{
- if (type != wxExprList)
- return 0;
-
- int i = 0;
- wxExpr *expr = value.first;
- while (expr)
- {
- expr = expr->next;
- i ++;
- }
- return i;
-}
-
-void wxExpr::DeleteAttributeValue(const wxString& attribute)
-{
- if (type != wxExprList)
- return;
-
- wxExpr *expr = value.first;
- wxExpr *lastExpr = this;
- while (expr)
- {
- if (expr->type == wxExprList)
- {
- wxExpr *firstNode = expr->value.first;
- if ((firstNode->type == wxExprWord) && (firstNode->value.word[0] == '='))
- {
- wxExpr *secondNode = firstNode->next;
- if ((secondNode->type == wxExprWord) &&
- (wxStrcmp((const wxChar *)attribute, secondNode->value.word) == 0))
- {
- wxExpr *nextExpr = expr->next;
- delete expr;
-
- lastExpr->next = nextExpr;
-
- if (last == expr)
- last = lastExpr;
-
- return;
- }
- }
- }
- lastExpr = expr;
- expr = expr->next;
- }
- return;
-}
-
-void wxExpr::AddAttributeValue(const wxString& attribute, wxExpr *val)
-{
- if (type != wxExprList)
- {
-// cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
- return;
- }
- // Warning - existing code may assume that any existing value
- // is deleted first. For efficiency, we leave this to the application.
-// DeleteAttributeValue(attribute);
-
- wxExpr *patt = new wxExpr(wxExprWord, attribute);
- wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
- wxExpr *listExpr = new wxExpr(wxExprList);
-
- listExpr->Append(pequals);
- listExpr->Append(patt);
- listExpr->Append(val);
-
- Append(listExpr);
-}
-
-void wxExpr::AddAttributeValue(const wxString& attribute, long val)
-{
- if (type != wxExprList)
- {
-// cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
- return;
- }
- // Warning - existing code may assume that any existing value
- // is deleted first. For efficiency, we leave this to the application.
-// DeleteAttributeValue(attribute);
-
- wxExpr *patt = new wxExpr(wxExprWord, attribute);
- wxExpr *pval = new wxExpr(val);
- wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
- wxExpr *listExpr = new wxExpr(wxExprList);
-
- listExpr->Append(pequals);
- listExpr->Append(patt);
- listExpr->Append(pval);
-
- Append(listExpr);
-}
-
-void wxExpr::AddAttributeValue(const wxString& attribute, double val)
-{
- if (type != wxExprList)
- {
-// cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
- return;
- }
-
-// DeleteAttributeValue(attribute);
- wxExpr *patt = new wxExpr(wxExprWord, attribute);
- wxExpr *pval = new wxExpr(val);
- wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
- wxExpr *listExpr = new wxExpr(wxExprList);
-
- listExpr->Append(pequals);
- listExpr->Append(patt);
- listExpr->Append(pval);
-
- Append(listExpr);
-}
-
-void wxExpr::AddAttributeValueString(const wxString& attribute, const wxString& val)
-{
- if (type != wxExprList)
- {
-// cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
- return;
- }
-
-// DeleteAttributeValue(attribute);
-
- wxExpr *patt = new wxExpr(wxExprWord, attribute);
- wxExpr *pval = new wxExpr(wxExprString, val);
- wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
- wxExpr *listExpr = new wxExpr(wxExprList);
-
- listExpr->Append(pequals);
- listExpr->Append(patt);
- listExpr->Append(pval);
-
- Append(listExpr);
-}
-
-void wxExpr::AddAttributeValueWord(const wxString& attribute, const wxString& val)
-{
- if (type != wxExprList)
- {
-// cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
- return;
- }
-
-// DeleteAttributeValue(attribute);
-
- wxExpr *patt = new wxExpr(wxExprWord, attribute);
- wxExpr *pval = new wxExpr(wxExprWord, val);
- wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
- wxExpr *listExpr = new wxExpr(wxExprList);
-
- listExpr->Append(pequals);
- listExpr->Append(patt);
- listExpr->Append(pval);
-
- Append(listExpr);
-}
-
-void wxExpr::AddAttributeValue(const wxString& attribute, wxList *val)
-{
- if (type != wxExprList)
- {
-// cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
- return;
- }
- if (!val)
- return;
-
-// DeleteAttributeValue(attribute);
-
- wxExpr *patt = new wxExpr(wxExprWord, attribute);
- wxExpr *pval = new wxExpr(val);
- wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
- wxExpr *listExpr = new wxExpr(wxExprList);
-
- listExpr->Append(pequals);
- listExpr->Append(patt);
- listExpr->Append(pval);
-
- Append(listExpr);
-}
-
-void wxExpr::AddAttributeValueStringList(const wxString& attribute, wxList *string_list)
-{
- if (type != wxExprList)
- {
-// cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
- return;
- }
- if (!string_list)
- return;
-
-// DeleteAttributeValue(attribute);
-
- // First make a list of wxExpr strings
- wxExpr *listExpr = new wxExpr(wxExprList);
- wxNode *node = string_list->GetFirst();
- while (node)
- {
- wxChar *string = (wxChar*)node->GetData();
- wxExpr *expr = new wxExpr(wxExprString, wxString(string));
- listExpr->Append(expr);
- node = node->GetNext();
- }
-
- // Now make an (=, Att, Value) triple
- wxExpr *patt = new wxExpr(wxExprWord, attribute);
- wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
- wxExpr *listExpr2 = new wxExpr(wxExprList);
-
- listExpr2->Append(pequals);
- listExpr2->Append(patt);
- listExpr2->Append(listExpr);
-
- Append(listExpr2);
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, int& var) const
-{
- wxExpr *expr = AttributeValue(att);
-
- if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
- {
- var = (int)(expr->IntegerValue());
- return true;
- }
- else
- return false;
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, long& var) const
-{
- wxExpr *expr = AttributeValue(att);
-
- if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
- {
- var = expr->IntegerValue();
- return true;
- }
- else
- return false;
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, float& var) const
-{
- wxExpr *expr = AttributeValue(att);
- if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
- {
- var = (float) expr->RealValue();
- return true;
- }
- else
- return false;
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, double& var) const
-{
- wxExpr *expr = AttributeValue(att);
- if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
- {
- var = expr->RealValue();
- return true;
- }
- else
- return false;
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, wxString& var) const // Word OR string -> string
-{
- wxExpr *expr = AttributeValue(att);
- if (expr && expr->Type() == wxExprWord)
- {
- var = expr->WordValue();
- return true;
- }
- else if (expr && expr->Type() == wxExprString)
- {
- var = expr->StringValue();
- return true;
- }
- else
- return false;
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, wxExpr **var) const
-{
- wxExpr *expr = AttributeValue(att);
- if (expr)
- {
- *var = expr;
- return true;
- }
- else
- return false;
-}
-
-bool wxExpr::GetAttributeValueStringList(const wxString& att, wxList *var) const
-{
- wxExpr *expr = AttributeValue(att);
- if (expr && expr->Type() == wxExprList)
- {
- wxExpr *string_expr = expr->value.first;
- while (string_expr)
- {
- if (string_expr->Type() == wxExprString)
- var->Append((wxObject *)copystring(string_expr->StringValue()));
-
- string_expr = string_expr->next;
- }
- return true;
- }
- else
- return false;
-}
-
-// Compatibility
-void wxExpr::AssignAttributeValue(wxChar *att, wxChar **var) const
-{
- wxString str;
- if (GetAttributeValue(att, str))
- {
- if (*var)
- delete[] *var;
- *var = copystring((const wxChar *) str);
- }
-}
-
-void wxExpr::WriteClause(FILE* stream) // Write this expression as a top-level clause
-{
- if (type != wxExprList)
- return;
-
- wxExpr *node = value.first;
- if (node)
- {
- node->WriteExpr(stream);
- fprintf( stream, "(" );
- node = node->next;
- bool first = true;
- while (node)
- {
- if (!first)
- fprintf( stream, " " );
- node->WriteExpr(stream);
- node = node->next;
- if (node)
- fprintf( stream, ",\n" );
- first = false;
- }
- fprintf( stream, ").\n\n" );
- }
-}
-
-void wxExpr::WriteExpr(FILE* stream) // Write as any other subexpression
-{
- // This seems to get round an optimizer bug when
- // using Watcom C++ 10a in WIN32 compilation mode.
- // If these lines not present, the type seems to be
- // interpreted wrongly as an integer.
- // I don't want to turn optimization off since it's needed
- // for reading in files quickly.
-#if defined(__WATCOMC__)
- char buf[2];
- sprintf(buf, "");
-#endif
-
- switch (type)
- {
- case wxExprInteger:
- {
- fprintf( stream, "%ld", value.integer );
- break;
- }
- case wxExprReal:
- {
- double f = value.real;
- fprintf( stream, "%.6g", f);
- break;
- }
- case wxExprString:
- {
- fprintf( stream, "\"" );
- size_t i;
- const wxWX2MBbuf val = wxConvLibc.cWX2MB(value.string);
- size_t len = strlen(val);
- for (i = 0; i < len; i++)
- {
- char ch = val[i];
- if (ch == '"' || ch == '\\')
- fprintf( stream, "\\" );
- char tmp[2];
- tmp[0] = ch;
- tmp[1] = 0;
- fprintf( stream, tmp );
- }
- fprintf( stream, "\"" );
- break;
- }
- case wxExprWord:
- {
- bool quote_it = false;
- const wxWX2MBbuf val = wxConvLibc.cWX2MB(value.word);
- size_t len = strlen(val);
- if ((len == 0) || (len > 0 && (val[(size_t) 0] > 64 && val[(size_t) 0] < 91)))
- quote_it = true;
- else
- {
- size_t i;
- for (i = 0; i < len; i++)
- if ((!isalpha(val[i])) && (!isdigit(val[i])) &&
- (val[i] != '_'))
- { quote_it = true; i = len; }
- }
-
- if (quote_it)
- fprintf( stream ,"'" );
-
- fprintf( stream, val );
-
- if (quote_it)
- fprintf( stream, "'" );
-
- break;
- }
- case wxExprList:
- {
- if (!value.first)
- fprintf( stream, "[]" );
- else
- {
- wxExpr *expr = value.first;
-
- if ((expr->Type() == wxExprWord) && (wxStrcmp(expr->WordValue(), wxT("=")) == 0))
- {
- wxExpr *arg1 = expr->next;
- wxExpr *arg2 = arg1->next;
- arg1->WriteExpr(stream);
- fprintf( stream, " = " );
- arg2->WriteExpr(stream);
- }
- else
- {
- fprintf( stream, "[" );
- while (expr)
- {
- expr->WriteExpr(stream);
- expr = expr->next;
- if (expr)
- fprintf( stream, ", " );
- }
- fprintf( stream, "]" );
- }
- }
- break;
- }
- case wxExprNull: break;
- }
-}
-
-/*
- * wxExpr 'database' (list of expressions)
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
-
-wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
-{
- position = NULL;
- hash_table = NULL;
- currentwxExprErrorHandler = handler;
- noErrors = 0;
-}
-
-wxExprDatabase::wxExprDatabase(wxExprType type, const wxString& attribute, int size,
- wxExprErrorHandler handler)
-{
- position = NULL;
- attribute_to_hash = attribute;
- if (type == wxExprString)
- hash_table = new wxHashTable(wxKEY_STRING, size);
- else if (type == wxExprInteger)
- hash_table = new wxHashTable(wxKEY_INTEGER, size);
- else hash_table = NULL;
-
- currentwxExprErrorHandler = handler;
- noErrors = 0;
-}
-
-wxExprDatabase::~wxExprDatabase(void)
-{
- ClearDatabase();
- if (hash_table)
- delete hash_table;
-}
-
-void wxExprDatabase::BeginFind(void) // Initialise a search
-{
- position = GetFirst();
-}
-
-wxExpr *wxExprDatabase::FindClause(long id) // Find a term based on an integer id attribute
- // e.g. node(id=23, type=rectangle, ....).
-{
- wxExpr *found = NULL;
- while (position && !found)
- {
- wxExpr *term = (wxExpr *)position->GetData();
-
- if (term->Type() == wxExprList)
- {
- wxExpr *value = term->AttributeValue(wxT("id"));
- if (value->Type() == wxExprInteger && value->IntegerValue() == id)
- found = term;
- }
- position = position->GetNext();
- }
- return found;
-}
-
-// Find on basis of attribute/value pairs, e.g. type=rectangle
-wxExpr *wxExprDatabase::FindClause(const wxString& word, const wxString& val)
-{
- wxExpr *found = NULL;
- while (position && !found)
- {
- wxExpr *term = (wxExpr *)position->GetData();
-
- if (term->Type() == wxExprList)
- {
- wxExpr *value = term->AttributeValue(word);
- if ((value->Type() == wxExprWord && value->WordValue() == val) ||
- (value->Type() == wxExprString && value->StringValue() == val))
- found = term;
- }
- position = position->GetNext();
- }
- return found;
-}
-
-wxExpr *wxExprDatabase::FindClause(const wxString& word, long val)
-{
- wxExpr *found = NULL;
- while (position && !found)
- {
- wxExpr *term = (wxExpr *)position->GetData();
-
- if (term->Type() == wxExprList)
- {
- wxExpr *value = term->AttributeValue(word);
- if ((value->Type() == wxExprInteger) && (value->IntegerValue() == val))
- found = term;
- }
- position = position->GetNext();
- }
- return found;
-}
-
-wxExpr *wxExprDatabase::FindClause(const wxString& word, double val)
-{
- wxExpr *found = NULL;
- while (position && !found)
- {
- wxExpr *term = (wxExpr *)position->GetData();
-
- if (term->Type() == wxExprList)
- {
- wxExpr *value = term->AttributeValue(word);
- if ((value->Type() == wxExprReal) && (value->RealValue() == val))
- found = term;
- }
- position = position->GetNext();
- }
- return found;
-}
-
-wxExpr *wxExprDatabase::FindClauseByFunctor(const wxString& functor)
-{
- wxExpr *found = NULL;
- while (position && !found)
- {
- wxExpr *term = (wxExpr *)position->GetData();
-
- if (term->Type() == wxExprList)
- {
- if (term->Functor() == functor)
- found = term;
- }
- position = position->GetNext();
- }
- return found;
-}
-
-// If hashing is on, must store in hash table too
-void wxExprDatabase::Append(wxExpr *clause)
-{
- wxList::Append((wxObject *)clause);
- if (hash_table)
- {
- wxString functor(clause->Functor());
- wxExpr *expr = clause->AttributeValue(attribute_to_hash);
- if (expr)
- {
- long functor_key = hash_table->MakeKey(WXSTRINGCAST functor);
- long value_key;
- if (expr && expr->Type() == wxExprString)
- {
- value_key = hash_table->MakeKey(WXSTRINGCAST expr->StringValue());
- hash_table->Put(functor_key + value_key, WXSTRINGCAST expr->StringValue(), (wxObject *)clause);
- }
- else if (expr && expr->Type() == wxExprInteger)
- {
- value_key = expr->IntegerValue();
- hash_table->Put(functor_key + value_key, expr->IntegerValue(), (wxObject *)clause);
- }
-
- }
- }
-}
-
-wxExpr *wxExprDatabase::HashFind(const wxString& functor, long value) const
-{
- long key = hash_table->MakeKey(WXSTRINGCAST functor) + value;
-
- // The key alone isn't guaranteed to be unique:
- // must supply value too. Let's assume the value of the
- // id is going to be reasonably unique.
- return (wxExpr *)hash_table->Get(key, value);
-}
-
-wxExpr *wxExprDatabase::HashFind(const wxString& functor, const wxString& value) const
-{
- long key = hash_table->MakeKey(WXSTRINGCAST functor) + hash_table->MakeKey(WXSTRINGCAST value);
- return (wxExpr *)hash_table->Get(key, WXSTRINGCAST value);
-}
-
-void wxExprDatabase::ClearDatabase(void)
-{
- noErrors = 0;
- wxNode *node = GetFirst();
- while (node)
- {
- wxExpr *expr = (wxExpr *)node->GetData();
- delete expr;
- delete node;
- node = GetFirst();
- }
-
- if (hash_table)
- hash_table->Clear();
-}
-
-bool wxExprDatabase::Read(const wxString& filename)
-{
- noErrors = 0;
-
- FILE *f = wxFopen(filename, _T("r"));
- if (f)
- {
- thewxExprDatabase = this;
-
- LexFromFile(f);
- yyparse();
- fclose(f);
-
- wxExprCleanUp();
- return (noErrors == 0);
- }
- else
- {
- return false;
- }
-}
-
-bool wxExprDatabase::ReadFromString(const wxString& buffer)
-{
- noErrors = 0;
- thewxExprDatabase = this;
-
- const wxWX2MBbuf buf = buffer.mb_str();
- LexFromString(wxMBSTRINGCAST buf);
- yyparse();
- wxExprCleanUp();
- return (noErrors == 0);
-}
-
-bool wxExprDatabase::Write(const wxString& fileName)
-{
- FILE *stream = wxFopen( fileName, _T("w+"));
-
- if (!stream)
- return false;
-
- bool success = Write(stream);
- fclose(stream);
- return success;
-}
-
-bool wxExprDatabase::Write(FILE *stream)
-{
- noErrors = 0;
- wxNode *node = GetFirst();
- while (node)
- {
- wxExpr *expr = (wxExpr *)node->GetData();
- expr->WriteClause(stream);
- node = node->GetNext();
- }
- return (noErrors == 0);
-}
-
-void add_expr(wxExpr * expr)
-{
- thewxExprDatabase->Append(expr);
-}
-
-// Checks functor
-bool wxExprIsFunctor(wxExpr *expr, const wxString& functor)
-{
- if (expr && (expr->Type() == wxExprList))
- {
- wxExpr *first_expr = expr->value.first;
-
- if (first_expr && (first_expr->Type() == wxExprWord) &&
- (first_expr->WordValue() == functor))
- return true;
- else
- return false;
- }
- else
- return false;
-}
-
-/*
- * Called from parser
- *
- */
-
-char *wxmake_integer(char *str)
-{
- wxExpr *x = new wxExpr(atol(str));
-
- return (char *)x;
-}
-
-char *wxmake_real(char *str1, char *str2)
-{
- char buf[50];
-
- sprintf(buf, "%s.%s", str1, str2);
- double f = (double)atof(buf);
- wxExpr *x = new wxExpr(f);
-
- return (char *)x;
-}
-
-// extern "C" double exp10(double);
-
-char *wxmake_exp(char *str1, char *str2)
-{
- double mantissa = (double)atoi(str1);
- double exponent = (double)atoi(str2);
-
- double d = mantissa * pow(10.0, exponent);
-
- wxExpr *x = new wxExpr(d);
-
- return (char *)x;
-}
-
-char *wxmake_exp2(char *str1, char *str2, char *str3)
-{
- char buf[50];
-
- sprintf(buf, "%s.%s", str1, str2);
- double mantissa = (double)atof(buf);
- double exponent = (double)atoi(str3);
-
- double d = mantissa * pow(10.0, exponent);
-
- wxExpr *x = new wxExpr(d);
-
- return (char *)x;
-}
-
-char *wxmake_word(char *str)
-{
- wxExpr *x = new wxExpr(wxExprWord, wxString(str, wxConvLibc).c_str());
- return (char *)x;
-}
-
-char *wxmake_string(char *str)
-{
- wxChar *s, *t;
- size_t len, i;
- const wxMB2WXbuf sbuf = wxConvLibc.cMB2WX(str);
-
-// str++; /* skip leading quote */
- len = wxStrlen(sbuf) - 1; /* ignore trailing quote */
-
- s = new wxChar[len + 1];
-
- t = s;
- for(i=1; iInsert(car);
- return (char *)cdr;
-}
-
-void process_command(char * cexpr)
-{
- wxExpr *expr = (wxExpr *)cexpr;
- add_expr(expr);
-}
-
-void syntax_error(char *WXUNUSED(s))
-{
- if (currentwxExprErrorHandler)
- (void)(*(currentwxExprErrorHandler))(WXEXPR_ERROR_SYNTAX, (char *)"syntax error");
- if (thewxExprDatabase) thewxExprDatabase->noErrors += 1;
-}
-
-#if 0
-#ifdef _WINDLL
-// char *__cdecl strdup(const char *s)
-WXDLLEXPORT char *strdup(const char *s)
-{
- int len = strlen(s);
- char *new_s = (char *)malloc(sizeof(char)*(len+1));
- strcpy(new_s, s);
- return new_s;
-}
-#endif
-#endif
-
-#endif
- // wxUSE_PROLOGIO
diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in
deleted file mode 100644
index 43315bbf52..0000000000
--- a/contrib/src/fl/Makefile.in
+++ /dev/null
@@ -1,418 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-LIBEXT = @LIBEXT@
-LIBPREFIX = @LIBPREFIX@
-SO_SUFFIX = @SO_SUFFIX@
-DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
-LN_S = @LN_S@
-WINDRES = @WINDRES@
-PIC_FLAG = @PIC_FLAG@
-SONAME_FLAG = @SONAME_FLAG@
-STRIP = @STRIP@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = @INSTALL_DIR@
-BK_DEPS = @BK_DEPS@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-libdir = @libdir@
-includedir = @includedir@
-DLLPREFIX = @DLLPREFIX@
-LIBS = @LIBS@
-AR = @AR@
-AROPTIONS = @AROPTIONS@
-RANLIB = @RANLIB@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-VENDOR = @VENDOR@
-WX_FLAVOUR = @WX_FLAVOUR@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-FLDLL_CXXFLAGS = $(__fldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_FL $(PIC_FLAG) \
- $(CPPFLAGS) $(CXXFLAGS)
-FLDLL_OBJECTS = \
- $(__fldll___win32rc) \
- fldll_antiflickpl.o \
- fldll_bardragpl.o \
- fldll_barhintspl.o \
- fldll_cbcustom.o \
- fldll_controlbar.o \
- fldll_dyntbar.o \
- fldll_dyntbarhnd.o \
- fldll_frmview.o \
- fldll_garbagec.o \
- fldll_gcupdatesmgr.o \
- fldll_hintanimpl.o \
- fldll_newbmpbtn.o \
- fldll_panedrawpl.o \
- fldll_rowdragpl.o \
- fldll_rowlayoutpl.o \
- fldll_toolwnd.o \
- fldll_updatesmgr.o
-FLDLL_ODEP = $(___pch_wxprec_fldll_wx_wxprec_h_gch___depname)
-FLLIB_CXXFLAGS = $(__fllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-FLLIB_OBJECTS = \
- fllib_antiflickpl.o \
- fllib_bardragpl.o \
- fllib_barhintspl.o \
- fllib_cbcustom.o \
- fllib_controlbar.o \
- fllib_dyntbar.o \
- fllib_dyntbarhnd.o \
- fllib_frmview.o \
- fllib_garbagec.o \
- fllib_gcupdatesmgr.o \
- fllib_hintanimpl.o \
- fllib_newbmpbtn.o \
- fllib_panedrawpl.o \
- fllib_rowdragpl.o \
- fllib_rowlayoutpl.o \
- fllib_toolwnd.o \
- fllib_updatesmgr.o
-FLLIB_ODEP = $(___pch_wxprec_fllib_wx_wxprec_h_gch___depname)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
-@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-COND_SHARED_1___fldll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
-@COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___depname)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-@COND_SHARED_1@__install_fldll___depname = install_fldll
-@COND_SHARED_1@__uninstall_fldll___depname = uninstall_fldll
-COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd = -install_name \
- $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__fldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd)
-COND_PLATFORM_OS2_1___fldll___importlib = -import \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__fldll___importlib = $(COND_PLATFORM_OS2_1___fldll___importlib)
-COND_WINDOWS_IMPLIB_1___fldll___importlib = \
- -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__fldll___importlib = $(COND_WINDOWS_IMPLIB_1___fldll___importlib)
-@COND_GCC_PCH_1@__fldll_PCH_INC = -I.pch/wxprec_fldll
-@COND_ICC_PCH_1@__fldll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_fldll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_fldll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_fldll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__fldll___targetsuf2 = .$(SO_SUFFIX)
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__fldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__fldll___targetsuf3 \
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__fldll___targetsuf3 = .$(SO_SUFFIX)
-COND_USE_SOVERLINUX_1___fldll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__fldll___soname_flags = $(COND_USE_SOVERLINUX_1___fldll___soname_flags)
-COND_USE_SOVERSOLARIS_1___fldll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__fldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___fldll___soname_flags)
-COND_USE_SOSYMLINKS_1___fldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd = rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___fldll___so_symlinks_uninst_cmd = rm -f \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__fldll___win32rc = fldll_version_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_SHARED_0___fllib___depname = \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__fllib___depname = $(COND_SHARED_0___fllib___depname)
-@COND_SHARED_0@__install_fllib___depname = install_fllib
-@COND_SHARED_0@__uninstall_fllib___depname = uninstall_fllib
-@COND_GCC_PCH_1@__fllib_PCH_INC = -I.pch/wxprec_fllib
-@COND_ICC_PCH_1@__fllib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_fllib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_fllib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_fllib/wx/wxprec.h.gch
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-
-### Targets: ###
-
-all: $(__fldll___depname) $(__fllib___depname)
-
-install: all $(__install_fldll___depname) $(__install_fllib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
- fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-uninstall: $(__uninstall_fldll___depname) $(__uninstall_fllib___depname)
- for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
- rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-install-strip: install
- $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS) $(__fldll___win32rc)
-@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
-@COND_SHARED_1@
-@COND_SHARED_1@ $(__fldll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_fldll:
-@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_fldll:
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_fldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(FLLIB_OBJECTS)
-@COND_SHARED_0@ rm -f $@
-@COND_SHARED_0@ $(AR) $(AROPTIONS) $@ $(FLLIB_OBJECTS)
-@COND_SHARED_0@ $(RANLIB) $@
-
-@COND_SHARED_0@install_fllib:
-@COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_fllib:
-@COND_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS)
-
-fldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FLDLL_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-fldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/antiflickpl.cpp
-
-fldll_bardragpl.o: $(srcdir)/bardragpl.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/bardragpl.cpp
-
-fldll_barhintspl.o: $(srcdir)/barhintspl.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/barhintspl.cpp
-
-fldll_cbcustom.o: $(srcdir)/cbcustom.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/cbcustom.cpp
-
-fldll_controlbar.o: $(srcdir)/controlbar.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/controlbar.cpp
-
-fldll_dyntbar.o: $(srcdir)/dyntbar.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/dyntbar.cpp
-
-fldll_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/dyntbarhnd.cpp
-
-fldll_frmview.o: $(srcdir)/frmview.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/frmview.cpp
-
-fldll_garbagec.o: $(srcdir)/garbagec.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/garbagec.cpp
-
-fldll_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/gcupdatesmgr.cpp
-
-fldll_hintanimpl.o: $(srcdir)/hintanimpl.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/hintanimpl.cpp
-
-fldll_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/newbmpbtn.cpp
-
-fldll_panedrawpl.o: $(srcdir)/panedrawpl.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/panedrawpl.cpp
-
-fldll_rowdragpl.o: $(srcdir)/rowdragpl.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/rowdragpl.cpp
-
-fldll_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/rowlayoutpl.cpp
-
-fldll_toolwnd.o: $(srcdir)/toolwnd.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/toolwnd.cpp
-
-fldll_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(FLDLL_ODEP)
- $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/updatesmgr.cpp
-
-fllib_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/antiflickpl.cpp
-
-fllib_bardragpl.o: $(srcdir)/bardragpl.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/bardragpl.cpp
-
-fllib_barhintspl.o: $(srcdir)/barhintspl.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/barhintspl.cpp
-
-fllib_cbcustom.o: $(srcdir)/cbcustom.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/cbcustom.cpp
-
-fllib_controlbar.o: $(srcdir)/controlbar.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/controlbar.cpp
-
-fllib_dyntbar.o: $(srcdir)/dyntbar.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/dyntbar.cpp
-
-fllib_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/dyntbarhnd.cpp
-
-fllib_frmview.o: $(srcdir)/frmview.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/frmview.cpp
-
-fllib_garbagec.o: $(srcdir)/garbagec.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/garbagec.cpp
-
-fllib_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/gcupdatesmgr.cpp
-
-fllib_hintanimpl.o: $(srcdir)/hintanimpl.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/hintanimpl.cpp
-
-fllib_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/newbmpbtn.cpp
-
-fllib_panedrawpl.o: $(srcdir)/panedrawpl.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/panedrawpl.cpp
-
-fllib_rowdragpl.o: $(srcdir)/rowdragpl.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/rowdragpl.cpp
-
-fllib_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/rowlayoutpl.cpp
-
-fllib_toolwnd.o: $(srcdir)/toolwnd.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/toolwnd.cpp
-
-fllib_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(FLLIB_ODEP)
- $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/updatesmgr.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_fldll uninstall_fldll install_fllib uninstall_fllib
diff --git a/contrib/src/fl/antiflickpl.cpp b/contrib/src/fl/antiflickpl.cpp
deleted file mode 100644
index 5b15365040..0000000000
--- a/contrib/src/fl/antiflickpl.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: antiflickpl.cpp
-// Purpose: Double-buffering plugin class for reducing flickering.
-// Author: Aleksandras Gluchovas (@Lithuania)
-// Modified by:
-// Created: 23/10/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/antiflickpl.h"
-
-/***** Implementation for class cbAntiflickerPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbAntiflickerPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbAntiflickerPlugin, cbPluginBase )
-
- EVT_PL_START_DRAW_IN_AREA ( cbAntiflickerPlugin::OnStartDrawInArea )
- EVT_PL_FINISH_DRAW_IN_AREA ( cbAntiflickerPlugin::OnFinishDrawInArea )
-
-END_EVENT_TABLE()
-
-// initialization of static members
-
-int cbAntiflickerPlugin::mRefCount = 0;
-
-wxBitmap* cbAntiflickerPlugin::mpVertBuf = 0;
-wxBitmap* cbAntiflickerPlugin::mpHorizBuf = 0;
-wxMemoryDC* cbAntiflickerPlugin::mpVertBufDc = 0;
-wxMemoryDC* cbAntiflickerPlugin::mpHorizBufDc = 0;
-
-// constructors
-
-cbAntiflickerPlugin::cbAntiflickerPlugin(void)
- : mpLRUBufDc ( NULL ),
- mLRUArea ( -1,-1, -1,-1 )
-{
- ++mRefCount;
-}
-
-cbAntiflickerPlugin::cbAntiflickerPlugin( wxFrameLayout* pPanel, int paneMask )
-
- : cbPluginBase( pPanel, paneMask ),
- mpLRUBufDc ( NULL ),
- mLRUArea ( -1,-1, -1,-1 )
-{
- ++mRefCount;
-}
-
-cbAntiflickerPlugin::~cbAntiflickerPlugin()
-{
- if ( --mRefCount == 0 )
- {
- if ( mpHorizBuf )
- {
- mpHorizBufDc->SelectObject( wxNullBitmap );
- delete mpHorizBuf;
- delete mpHorizBufDc;
- mpHorizBuf = 0;
- mpHorizBufDc = 0;
- }
-
- if ( mpVertBuf )
- {
- mpVertBufDc->SelectObject( wxNullBitmap );
- delete mpVertBuf;
- delete mpVertBufDc;
- mpVertBuf = 0;
- mpVertBufDc = 0;
- }
- }
-}
-
-wxDC* cbAntiflickerPlugin::FindSuitableBuffer( const wxRect& forArea )
-{
- if ( mpVertBuf )
- {
- if ( mpVertBuf->GetHeight() >= forArea.height &&
- mpVertBuf->GetWidth() >= forArea.width )
- return mpVertBufDc;
- }
- else
- if ( mpHorizBuf )
- {
- if ( mpHorizBuf->GetHeight() >= forArea.height &&
- mpHorizBuf->GetWidth() >= forArea.width )
- return mpHorizBufDc;
- }
-
- return 0;
-}
-
-wxDC* cbAntiflickerPlugin::AllocNewBuffer( const wxRect& forArea )
-{
- // TBD:: preallocate bit larger bitmap at once, to avoid
- // excessive realocations later
-
- // check whether the given area is oriented horizontally
- // or vertically and choose corresponding bitmap to create or
- // recreate
-
- if ( forArea.height > forArea.width )
- {
- wxSize prevDim( 0,0 );
-
- if ( mpVertBuf )
- {
- prevDim.x = mpVertBuf->GetWidth();
- prevDim.y = mpVertBuf->GetHeight();
-
- mpVertBufDc->SelectObject( wxNullBitmap );
- delete mpVertBuf;
- }
- else
- mpVertBufDc = new wxMemoryDC();
-
- mpVertBuf = new wxBitmap( int( wxMax(forArea.width, prevDim.x ) ),
- int( wxMax(forArea.height, prevDim.y ) )
- );
-
- mpVertBufDc->SelectObject( *mpVertBuf );
-
- return mpVertBufDc;
- }
- else
- {
- wxSize prevDim( 0,0 );
-
- if ( mpHorizBuf )
- {
- prevDim.x = mpHorizBuf->GetWidth();
- prevDim.y = mpHorizBuf->GetHeight();
-
- mpHorizBufDc->SelectObject( wxNullBitmap );
- delete mpHorizBuf;
- }
- else
- mpHorizBufDc = new wxMemoryDC();
-
- mpHorizBuf = new wxBitmap( int( wxMax(forArea.width, prevDim.x ) ),
- int( wxMax(forArea.height, prevDim.y ) )
- );
-
- mpHorizBufDc->SelectObject( *mpHorizBuf );
-
- return mpHorizBufDc;
- }
-}
-
-void cbAntiflickerPlugin::OnStartDrawInArea( cbStartDrawInAreaEvent& event )
-{
- wxASSERT( mpLRUBufDc == NULL ); // DBG:: see comments in OnFinishDrawInArea(..) method
-
- // short-cut
- wxRect& area = event.mArea;
-
- if ( event.mArea.width < 0 ||
- event.mArea.height < 0 ) return;
-
- // memorize given area
- mLRUArea.x = area.x;
- mLRUArea.y = area.y;
- mLRUArea.width = area.width;
- mLRUArea.height = area.height;
-
- wxDC* pBufDc = FindSuitableBuffer( area );
-
- if ( !pBufDc )
- pBufDc = AllocNewBuffer( area );
-
- pBufDc->SetDeviceOrigin( -area.x, -area.y );
-
- pBufDc->SetClippingRegion( area.x, area.y,
- area.width, area.height );
-
- wxClientDC clntDc( &mpLayout->GetParentFrame() );
-
- (*event.mppDc) = pBufDc;
-
- mpLRUBufDc = pBufDc; // memorize buffer, which will be flushed to screen
- // upon "commiting" the drawing
-
- /*
- // OLD STUFF::
- mpLRUBufDc->Blit( pos.x, pos.y, size.x, size.y,
- &clntDc, pos.x, pos.y, wxCOPY );
- */
-}
-
-void cbAntiflickerPlugin::OnFinishDrawInArea( cbFinishDrawInAreaEvent& event )
-{
- wxRect& area = event.mArea;
-
- if ( event.mArea.width < 0 ||
- event.mArea.height < 0 ) return;
-
- wxASSERT( mpLRUBufDc ); // DBG:: OnStartDrawInArea should be called first
-
- // FOR NOW:: OnStartDrawInArea(..) should be immediately followed
- // by OnFinishDrawInArea(..) for the same area
-
- wxASSERT( mLRUArea.x == area.x );
- wxASSERT( mLRUArea.y == area.y );
- wxASSERT( mLRUArea.width == area.width );
- wxASSERT( mLRUArea.height == area.height );
-
- wxClientDC clntDc( &mpLayout->GetParentFrame() );
-
- // "commit" drawings in one-shot
- clntDc.Blit( area.x, area.y, area.width, area.height,
- mpLRUBufDc, area.x, area.y, wxCOPY );
-
- mpLRUBufDc->DestroyClippingRegion();
- mpLRUBufDc = 0;
-}
-
diff --git a/contrib/src/fl/bardragpl.cpp b/contrib/src/fl/bardragpl.cpp
deleted file mode 100644
index 3139bf3b1c..0000000000
--- a/contrib/src/fl/bardragpl.cpp
+++ /dev/null
@@ -1,934 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: bardragpl.cpp
-// Purpose: cbBarDragPlugin implementation
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 23/09/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/bardragpl.h"
-
-#define POS_UNDEFINED -32768
-
-// helpers, FOR NOW:: static
-
-static inline bool rect_hits_rect( const wxRect& r1, const wxRect& r2 )
-{
- if ( ( r2.x >= r1.x && r2.x <= r1.x + r1.width ) ||
- ( r1.x >= r2.x && r1.x <= r2.x + r2.width ) )
- if ( ( r2.y >= r1.y && r2.y <= r1.y + r1.height ) ||
- ( r1.y >= r2.y && r1.y <= r2.y + r2.height ) )
- return true;
- return false;
-}
-
-static inline bool rect_contains_point( const wxRect& rect, int x, int y )
-{
- return ( x >= rect.x &&
- y >= rect.y &&
- x < rect.x + rect.width &&
- y < rect.y + rect.height );
-}
-
-/***** Implementation for class cbBarDragPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbBarDragPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbBarDragPlugin, cbPluginBase )
-
- //EVT_PL_LEFT_DOWN ( cbBarDragPlugin::OnLButtonDown )
- EVT_PL_LEFT_UP ( cbBarDragPlugin::OnLButtonUp )
- EVT_PL_MOTION ( cbBarDragPlugin::OnMouseMove )
- EVT_PL_DRAW_HINT_RECT ( cbBarDragPlugin::OnDrawHintRect )
- EVT_PL_START_BAR_DRAGGING ( cbBarDragPlugin::OnStartBarDragging )
- EVT_PL_LEFT_DCLICK ( cbBarDragPlugin::OnLDblClick )
-
-END_EVENT_TABLE()
-
-cbBarDragPlugin::cbBarDragPlugin(void)
-
- : mBarDragStarted ( false ),
- mCanStick ( true ),
- mpScrDc ( NULL ),
- mpCurCursor ( NULL ),
- mpDraggedBar ( NULL ),
- mInClientHintBorder( 4 )
-{}
-
-cbBarDragPlugin::cbBarDragPlugin( wxFrameLayout* pPanel, int paneMask )
-
- : cbPluginBase( pPanel, paneMask ),
-
- mBarDragStarted ( false ),
- mCanStick ( true ),
- mpScrDc ( NULL ),
- mpCurCursor ( NULL ),
- mpDraggedBar ( NULL ),
- mInClientHintBorder( 4 )
-{}
-
-cbBarDragPlugin::~cbBarDragPlugin()
-{
- // nothing
-}
-
-// helper methods (protected)
-
-// clips (top/bottom) or (right/left) edges against the frame's bounding rect.
-
-void do_clip_edges( int len, int& rectPos, int& rectLen )
-{
- if ( rectPos < 0 )
- {
- rectLen += rectPos;
- rectPos = 0;
- if ( rectLen < 0 )
- rectLen = 1;
- }
- else
- if ( rectPos > len-1 )
- {
- rectPos = len-1;
- rectLen = 1;
- }
- else
- if ( rectPos + rectLen - 1 > len )
- rectLen -= (rectPos + rectLen) - len + 1;
-}
-
-void cbBarDragPlugin::ClipRectInFrame( wxRect& rect )
-{
- int w, h;
- mpLayout->GetParentFrame().GetClientSize( &w, &h );
-
- do_clip_edges( w, rect.x, rect.width );
- do_clip_edges( h, rect.y, rect.height );
-}
-
-void cbBarDragPlugin::ClipPosInFrame( wxPoint& pos )
-{
- int w, h;
- mpLayout->GetParentFrame().GetClientSize( &w, &h );
-
- if ( pos.x < 0 )
- pos.x = 0;
- if ( pos.y < 0 )
- pos.y = 0;
- if ( pos.x > w )
- pos.x = w-1;
- if ( pos.y > h )
- pos.y = h-1;
-}
-
-void cbBarDragPlugin::AdjustHintRect( wxPoint& mousePos )
-{
- mHintRect.x = mousePos.x - mMouseInRectX;
- mHintRect.y = mousePos.y - mMouseInRectY;
-}
-
-cbDockPane* cbBarDragPlugin::HitTestPanes( wxRect& rect )
-{
- //wxRect clipped = rect;
-
- //ClipRectInFrame( clipped );
-
- cbDockPane** pPanes = mpLayout->GetPanesArray();
-
- for( int i = 0; i != MAX_PANES; ++i )
- if ( rect_hits_rect( pPanes[i]->mBoundsInParent, rect ) )
- return pPanes[i];
-
- return NULL;
-}
-
-cbDockPane* cbBarDragPlugin::HitTestPanes( wxPoint& pos )
-{
- wxPoint clipped = pos;
-
- //ClipPosInFrame( pos );
-
- cbDockPane** pPanes = mpLayout->GetPanesArray();
-
- for( int i = 0; i != MAX_PANES; ++i )
- if ( rect_contains_point( pPanes[i]->mBoundsInParent, clipped.x, clipped.y ) )
- return pPanes[i];
-
- return NULL;
-}
-
-bool cbBarDragPlugin::HitsPane( cbDockPane* pPane, wxRect& rect )
-{
- return rect_hits_rect( pPane->mBoundsInParent, rect );
-}
-
-int cbBarDragPlugin::GetDistanceToPane( cbDockPane* pPane, wxPoint& mousePos )
-{
- wxRect& bounds = pPane->mBoundsInParent;
-
- switch( pPane->mAlignment )
- {
- case FL_ALIGN_TOP : return mousePos.y - ( bounds.y + bounds.height );
- case FL_ALIGN_BOTTOM : return bounds.y - mousePos.y;
- case FL_ALIGN_LEFT : return mousePos.x - ( bounds.x + bounds.width );
- case FL_ALIGN_RIGHT : return bounds.x - mousePos.x;
- default : return 0; // never reached
- }
-
-// return 0;
-}
-
-bool cbBarDragPlugin::IsInOtherPane( wxPoint& mousePos )
-{
- cbDockPane* pPane = HitTestPanes( mousePos );
-
- if ( pPane && pPane != mpCurPane ) return true;
- else return false;
-}
-
-bool cbBarDragPlugin::IsInClientArea( wxPoint& mousePos )
-{
- return ( HitTestPanes( mousePos ) == NULL );
-}
-
-bool cbBarDragPlugin::IsInClientArea( wxRect& rect )
-{
- return ( HitTestPanes( rect ) == NULL );
-}
-
-void cbBarDragPlugin::CalcOnScreenDims( wxRect& rect )
-{
- if ( !mpCurPane || mpDraggedBar->IsFixed() ) return;
-
- wxRect inPane = rect;
-
- mpCurPane->FrameToPane( &inPane );
-
- int rowNo = mpCurPane->GetRowAt( inPane.y, inPane.y + inPane.height );
-
- bool isMaximized = ( rowNo >= (int)mpCurPane->GetRowList().Count() || rowNo < 0 );
-
- if ( isMaximized )
- {
- inPane.x = 0;
- inPane.width = mpCurPane->mPaneWidth;
-
- mpCurPane->PaneToFrame( &inPane );
-
- rect = inPane;
- }
-}
-
-// helpers
-
-static inline void check_upper_overrun( int& pos, int width, int mousePos )
-{
- if ( mousePos >= pos + width )
- pos = mousePos - width/2;
-}
-
-static inline void check_lower_overrun( int& pos, int width, int mousePos )
-{
- if ( mousePos <= pos )
- pos = mousePos - width/2;
-}
-
-void cbBarDragPlugin::StickToPane( cbDockPane* pPane, wxPoint& mousePos )
-{
- int wInPane = GetBarWidthInPane ( pPane );
- int hInPane = GetBarHeightInPane( pPane );
-
- // adjsut hint-rect horizontally (in pane's orientation)
-
- if ( pPane->IsHorizontal() )
- {
- mHintRect.width = wInPane;
- mHintRect.height = hInPane;
- }
- else
- {
- mHintRect.height = wInPane;
- mHintRect.width = hInPane;
- }
-
- // adjsut hint-rect vertically (in pane's orientation)
-
- wxRect& bounds = pPane->mBoundsInParent;
-
- // true, if hint enters the pane through it's lower edge
-
- bool fromLowerEdge = ( pPane->IsHorizontal() )
- ? mousePos.y > bounds.y
- : mousePos.x > bounds.x;
-
- // NOTE:: about all the below min/max things: they are meant to ensure
- // that the mouse pointer doesn't overrun (leave) the hint-rectangle
- // when its dimensions are recalculated upon sticking it to the pane
-
- if ( pPane->IsHorizontal() && fromLowerEdge )
- {
- int paneBottomEdgeY = bounds.y + bounds.height;
-
- mHintRect.y = wxMin( paneBottomEdgeY, mousePos.y );
-
- check_lower_overrun( mHintRect.y, hInPane, mousePos.y );
-
- }
- else
- if ( pPane->IsHorizontal() && !fromLowerEdge )
- {
- int paneTopEdgeY = bounds.y;
-
- mHintRect.y = wxMax( paneTopEdgeY - hInPane, mousePos.y - hInPane );
-
- check_upper_overrun( mHintRect.y, hInPane, mousePos.y );
- }
- else
- if ( !pPane->IsHorizontal() && fromLowerEdge )
- {
- int paneRightEdgeX = bounds.x + bounds.width;
-
- mHintRect.x = wxMin( paneRightEdgeX, mousePos.x );
-
- check_lower_overrun( mHintRect.x, hInPane, mousePos.x );
- }
- else
- if ( !pPane->IsHorizontal() && !fromLowerEdge )
- {
- int paneLeftEdgeX = bounds.x;
-
- mHintRect.x = wxMax( paneLeftEdgeX - hInPane, mousePos.x - hInPane );
-
- check_upper_overrun( mHintRect.x, hInPane, mousePos.x );
- }
-
- mMouseInRectX = mousePos.x - mHintRect.x;
- mMouseInRectY = mousePos.y - mHintRect.y;
-
- mpCurPane = pPane; // memorize pane to which the hint is currently sticked
-}
-
-void cbBarDragPlugin::UnstickFromPane( cbDockPane* pPane, wxPoint& mousePos )
-{
- // unsticking causes rectangle to get the shape in which
- // dragged control-bar would be when floated
-
- int newWidth = mpDraggedBar->mDimInfo.mSizes[wxCBAR_FLOATING].x;
- int newHeight = mpDraggedBar->mDimInfo.mSizes[wxCBAR_FLOATING].y;
-
- wxRect& flBounds = mpDraggedBar->mDimInfo.mBounds[wxCBAR_FLOATING];
-
- if ( flBounds.width != -1 )
- {
- newWidth = flBounds.width;
- newHeight = flBounds.height;
- }
-
- mHintRect.width = newWidth;
- mHintRect.height = newHeight;
-
- wxRect& bounds = pPane->mBoundsInParent;
-
- // true, if hint leaves the pane through it's lower edge
-
- bool fromLowerEdge = ( pPane->IsHorizontal() )
- ? mousePos.y > bounds.y
- : mousePos.x > bounds.x;
-
- // NOTE:: ...all the below min/max things - see comments about it in StickToPane(..)
-
- if ( pPane->IsHorizontal() && fromLowerEdge )
- {
- // bool fromLowerEdge = mousePos.y > bounds.y;
-
- mHintRect.y = wxMax( bounds.y + bounds.height + 1, mousePos.y - newHeight );
-
- check_upper_overrun( mHintRect.y, newHeight, mousePos.y );
-
- // this is how MFC's hint behaves:
-
- if ( mMouseInRectX > newWidth )
- mHintRect.x = mousePos.x - ( newWidth / 2 );
- }
- else
- if ( pPane->IsHorizontal() && !fromLowerEdge )
- {
- mHintRect.y = wxMin( bounds.y - newHeight - 1, mousePos.y );
-
- // -/-
-
- if ( mMouseInRectX > newWidth )
- mHintRect.x = mousePos.x - ( newWidth / 2 );
-
- check_lower_overrun( mHintRect.y, newHeight, mousePos.y );
- }
- else
- if ( !pPane->IsHorizontal() && fromLowerEdge )
- {
- mHintRect.x = wxMax( bounds.x + bounds.width, mousePos.x - newWidth );
-
- // -/-
-
- if ( mMouseInRectY > newHeight )
- mHintRect.y = mousePos.y - ( newHeight / 2 );
-
- check_upper_overrun( mHintRect.x, newWidth, mousePos.x );
- }
- else
- if ( !pPane->IsHorizontal() && !fromLowerEdge )
- {
- mHintRect.x = wxMin( bounds.x - newWidth - 1, mousePos.x );
-
- // -/-
-
- if ( mMouseInRectY > newHeight )
- mHintRect.y = mousePos.y - ( newHeight / 2 );
-
- check_lower_overrun( mHintRect.x, newWidth, mousePos.x );
- }
-
- mMouseInRectX = mousePos.x - mHintRect.x;
- mMouseInRectY = mousePos.y - mHintRect.y;
-
- mpCurPane = NULL;
-}
-
-int cbBarDragPlugin::GetBarWidthInPane( cbDockPane* pPane )
-{
- if ( pPane == mpSrcPane )
- return mBarWidthInSrcPane;
-
- // this is how MFC's bars behave:
-
- if ( pPane->IsHorizontal() )
- return mpDraggedBar->mDimInfo.mSizes[wxCBAR_DOCKED_HORIZONTALLY].x;
- else
- return mpDraggedBar->mDimInfo.mSizes[wxCBAR_DOCKED_VERTICALLY ].x;
-}
-
-int cbBarDragPlugin::GetBarHeightInPane( cbDockPane* pPane )
-{
- if ( pPane->IsHorizontal() )
- return mpDraggedBar->mDimInfo.mSizes[wxCBAR_DOCKED_HORIZONTALLY].y;
- else
- return mpDraggedBar->mDimInfo.mSizes[wxCBAR_DOCKED_VERTICALLY ].y;
-}
-
-void cbBarDragPlugin::ShowHint( bool prevWasInClient )
-{
- bool wasDocked = false;
-
- if ( mpSrcPane->mProps.mRealTimeUpdatesOn == false )
- {
- // do heavy calculations first
-
- wxRect actualRect = mHintRect; // will be adjusted depending on drag-settings
-
- if ( mpSrcPane->mProps.mExactDockPredictionOn && mpCurPane )
- {
-#ifdef __WXDEBUG__
- bool success =
-#endif
- mpLayout->RedockBar( mpDraggedBar, mHintRect, mpCurPane, false );
-
- wxASSERT( success ); // DBG::
-
- actualRect = mpDraggedBar->mBounds;
-
- mpCurPane->PaneToFrame( &actualRect );
- }
- else
- CalcOnScreenDims( actualRect );
-
- // release previous hint
-
- if ( mPrevHintRect.x != POS_UNDEFINED )
- {
- // erase previous rectangle
-
- cbDrawHintRectEvent evt( mPrevHintRect, prevWasInClient, true, false );
-
- mpLayout->FirePluginEvent( evt );
- }
-
- // draw new hint
-
- cbDrawHintRectEvent evt( actualRect, mpCurPane == NULL, false, false );
-
- mpLayout->FirePluginEvent( evt );
-
- mPrevHintRect = actualRect;
- }
- else
- {
- // otherwise, if real-time updates option is ON
-
- if ( mpDraggedBar->mState != wxCBAR_FLOATING && !mpCurPane )
- {
- mpLayout->SetBarState( mpDraggedBar, wxCBAR_FLOATING, true );
- }
- else
- if ( mpDraggedBar->mState == wxCBAR_FLOATING && mpCurPane )
- {
- mpLayout->SetBarState( mpDraggedBar, wxCBAR_DOCKED_HORIZONTALLY, false );
-
- wasDocked = true;
- }
-
- if ( mpCurPane )
- {
- mpLayout->GetUpdatesManager().OnStartChanges();
-
- if ( wasDocked )
-
- mpDraggedBar->mUMgrData.SetDirty( true );
-
-#ifdef __WXDEBUG__
- bool success =
-#endif
- mpLayout->RedockBar( mpDraggedBar, mHintRect, mpCurPane, false );
-
- wxASSERT( success ); // DBG ::
-
- mpLayout->GetUpdatesManager().OnFinishChanges();
- mpLayout->GetUpdatesManager().UpdateNow();
- }
- else
- {
- if ( mpLayout->mFloatingOn )
- {
- // move the top-most floated bar around as user drags the hint
-
- mpDraggedBar->mDimInfo.mBounds[ wxCBAR_FLOATING ] = mHintRect;
-
- mpLayout->ApplyBarProperties( mpDraggedBar );
- }
- }
- }
-}
-
-/*** event handlers ***/
-
-void cbBarDragPlugin::OnMouseMove( cbMotionEvent& event )
-{
- // calculate postion in frame's coordiantes
-
- if ( !mBarDragStarted )
- {
- event.Skip(); // pass event to the next plugin
- return;
- }
-
- wxPoint mousePos = event.mPos;
-
- event.mpPane->PaneToFrame( &mousePos.x, &mousePos.y );
-
- bool prevIsInClient = ( mpCurPane == 0 );
-
- AdjustHintRect( mousePos );
-
- // if the hint-rect is not "tempted" to any pane yet
-
- if ( mpCurPane == NULL )
- {
- cbDockPane* pPane = HitTestPanes( mHintRect );
-
- // enable sticking again, if we've left the pane completely
- if ( !pPane )
- mCanStick = true;
-
- if ( mCanStick && pPane &&
- GetDistanceToPane( pPane, mousePos ) < GetBarHeightInPane( pPane ) )
- StickToPane( pPane, mousePos );
- else
- if ( pPane && HitTestPanes( mousePos ) == pPane && 0 ) // FOR NOW:: disabled
-
- StickToPane( pPane, mousePos );
- }
- else
- {
- // otherwise, when rect is now sticked to some of the panes
- // check if it should still remain in this pane
-
- mCanStick = true;
-
- bool mouseInOther = IsInOtherPane( mousePos );
-
- if ( mouseInOther )
- {
- cbDockPane* pPane = HitTestPanes( mousePos );
-
- StickToPane( pPane, mousePos );
- }
- else
- {
- if ( IsInClientArea( mousePos ) )
- {
- cbDockPane* pPane = HitTestPanes( mHintRect );
-
- if ( pPane &&
- pPane != mpCurPane &&
- GetDistanceToPane( pPane, mousePos ) < GetBarHeightInPane( pPane ) )
- StickToPane( pPane, mousePos );
- else
- if ( !pPane )
- {
- UnstickFromPane( mpCurPane, mousePos );
-
- // FOR NOW:: disabled, would cause some mess
- // mCanStick = false; // prevents from sticking to this
- // pane again, flag is reset when hint-rect
- // leaves the pane completely
- }
- else
- if ( GetDistanceToPane( pPane, mousePos ) > GetBarHeightInPane( pPane ) )
- {
- if ( !HitsPane( mpCurPane, mHintRect ) )
- {
- UnstickFromPane( mpCurPane, mousePos );
-
- // FOR NOW:: disabled, would cause some mess
- // mCanStick = false; // prevents from sticking to this
- // pane again, flag is reset when hint-rect
- // leaves the pane completely
- }
- }
-
- }
- }
- }
-
- ShowHint( prevIsInClient );
-
- wxCursor* pPrevCurs = mpCurCursor;
-
- if ( mpCurPane )
- {
- mpCurCursor = mpLayout->mpNormalCursor;
- }
- else
- {
- // if floating is off, and we are in the client
- // area, the cursor will be invalid, otherwise
- // it will be the normal cursor
-
- if (mpLayout->mFloatingOn)
- {
- mpCurCursor = mpLayout->mpNormalCursor;
- }
- else
- {
- mpCurCursor = mpLayout->mpNECursor;
- }
-
- }
- if ( pPrevCurs != mpCurCursor )
- mpLayout->GetParentFrame().SetCursor( *mpCurCursor );
-}
-
-void cbBarDragPlugin::OnLButtonDown( cbLeftDownEvent& event )
-{
- if ( mBarDragStarted )
- {
- wxMessageBox(wxT("DblClick!"));
- }
-
- event.Skip();
-}
-
-void cbBarDragPlugin::OnLButtonUp( cbLeftUpEvent& event )
-{
- if ( mBarDragStarted )
- {
- if ( mpSrcPane->mProps.mRealTimeUpdatesOn == false )
- {
- // erase current rectangle, and finsih on-screen drawing session
-
- cbDrawHintRectEvent evt( mPrevHintRect, mpCurPane == NULL, true, true );
-
- mpLayout->FirePluginEvent( evt );
-
- if ( mpCurPane != NULL )
- {
- if ( mpSrcPane->mProps.mExactDockPredictionOn )
- {
- mpLayout->RedockBar( mpDraggedBar, mHintRect, mpCurPane, false );
-
- mpLayout->GetUpdatesManager().OnFinishChanges();
- mpLayout->GetUpdatesManager().UpdateNow();
- }
- else
- {
- if (mpDraggedBar->mState == wxCBAR_FLOATING)
- {
- mpLayout->SetBarState( mpDraggedBar, wxCBAR_DOCKED_HORIZONTALLY, true);
- }
-
- mpLayout->RedockBar( mpDraggedBar, mHintRect, mpCurPane );
- }
- }
- else
- {
- if (mpDraggedBar->mState != wxCBAR_FLOATING)
- {
- mpLayout->SetBarState(mpDraggedBar, wxCBAR_FLOATING, true);
- }
-
- mpDraggedBar->mDimInfo.mBounds[ wxCBAR_FLOATING ] = mHintRect;
- mpLayout->ApplyBarProperties( mpDraggedBar );
- }
- }
-
- mHintRect.width = -1;
-
- // In Windows, at least, the frame needs to have a null cursor
- // else child windows (such as text windows) inherit the cursor
-#if 1
- mpLayout->GetParentFrame().SetCursor( wxNullCursor );
-#else
- mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
-#endif
-
- mpLayout->ReleaseEventsFromPane( event.mpPane );
- mpLayout->ReleaseEventsFromPlugin( this );
-
- mBarDragStarted = false;
-
- if ( mBarWasFloating && mpDraggedBar->mState != wxCBAR_FLOATING )
- {
- // save bar's floating position before it was docked
-
- mpDraggedBar->mDimInfo.mBounds[ wxCBAR_FLOATING ] = mFloatedBarBounds;
- }
- }
- else
- event.Skip(); // pass event to the next plugin
-}
-
-void cbBarDragPlugin::OnLDblClick( cbLeftDClickEvent& event )
-{
- int avoidCompilerWarning = 1;
- if ( avoidCompilerWarning )
- {
- cbBarInfo* pHittedBar;
- cbRowInfo* pRow;
-
- if ( event.mpPane->HitTestPaneItems( event.mPos, // in pane's coordiantes
- &pRow,
- &pHittedBar ) == CB_BAR_CONTENT_HITTED
- )
- {
- mpLayout->SetBarState( pHittedBar, wxCBAR_FLOATING, true );
-
- mpLayout->RepositionFloatedBar( pHittedBar );
-
- return; // event is "eaten" by this plugin
- }
-
- mBarDragStarted = false;
-
- event.Skip();
- }
-
- //wxMessageBox("Hi, dblclick arrived!");
-}
-
-void cbBarDragPlugin::OnStartBarDragging( cbStartBarDraggingEvent& event )
-{
- mpDraggedBar = event.mpBar;
- mpSrcPane = event.mpPane;
-
- mpLayout->CaptureEventsForPane( event.mpPane );
- mpLayout->CaptureEventsForPlugin( this );
-
- mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
-
- mBarDragStarted = true;
-
- wxRect inParent = mpDraggedBar->mBounds;
-
- mBarWasFloating = mpDraggedBar->mState == wxCBAR_FLOATING;
-
- if ( mBarWasFloating )
- {
- inParent = mpDraggedBar->mDimInfo.mBounds[ wxCBAR_FLOATING ];
- mFloatedBarBounds = inParent;
- }
- else
- event.mpPane->PaneToFrame( &inParent );
-
- mHintRect.x = POS_UNDEFINED;
-
- mHintRect.width = inParent.width;
- mHintRect.height = inParent.height;
-
- mMouseInRectX = event.mPos.x - inParent.x;
- mMouseInRectY = event.mPos.y - inParent.y;
-
- mpSrcPane = event.mpPane;
-
- if ( mpDraggedBar->mState == wxCBAR_FLOATING )
-
- mpCurPane = NULL;
- else
- mpCurPane = event.mpPane;
-
- mPrevHintRect.x = POS_UNDEFINED;
-
- mCanStick = false; // we're not stuck into any pane now -
- // there's nowhere to "stick-twice"
-
- mBarWidthInSrcPane = mpDraggedBar->mDimInfo.mSizes[ mpDraggedBar->mState ].x;
-
- if ( mpSrcPane->mProps.mRealTimeUpdatesOn == false &&
- mpSrcPane->mProps.mExactDockPredictionOn )
- mpLayout->GetUpdatesManager().OnStartChanges(); // capture initial state of layout
-
- // simulate the first mouse movement
-
- int x = event.mPos.x, y = event.mPos.y;
- mpSrcPane->FrameToPane( &x, &y );
-
- wxPoint pt(x,y);
- cbMotionEvent motionEvt( pt, event.mpPane );
- this->OnMouseMove( motionEvt );
-
- return; // event is "eaten" by this plugin
-}
-
-/*** on-screen hint-tracking related methods ***/
-
-void cbBarDragPlugin::OnDrawHintRect( cbDrawHintRectEvent& event )
-{
- if ( !mpScrDc ) StartTracking();
-
- DoDrawHintRect( event.mRect, event.mIsInClient );
-
- if ( event.mLastTime )
- FinishTracking();
-}
-
-#define _IMG_A 0xAA // Note: modified from _A to _IMG_A, _A was already defined (cygwin)
-#define _IMG_B 0x00 // Note: modified from _B to _IMG_A, _B was already defined (cygwin)
-#define _IMG_C 0x55 // Note: modified from _C to _IMG_C, for consistency reasons.
-#define _IMG_D 0x00 // Note: modified from _D to _IMG_D, for consistency reasons.
-
-// FOR NOW:: static
-
-static const unsigned char _gCheckerImg[16] = { _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D
- };
-
-void cbBarDragPlugin::StartTracking()
-{
- mpScrDc = new wxScreenDC;
-
- wxScreenDC::StartDrawingOnTop(&mpLayout->GetParentFrame());
-}
-
-void cbBarDragPlugin::DoDrawHintRect( wxRect& rect, bool isInClientRect)
-{
- wxRect scrRect;
-
- RectToScr( rect, scrRect );
-
- int prevLF = mpScrDc->GetLogicalFunction();
-
- mpScrDc->SetLogicalFunction( wxINVERT );
-
- if ( isInClientRect )
- {
- // BUG BUG BUG (wx):: somehow stippled brush works only
- // when the bitmap created on stack, not
- // as a member of the class
-
- wxBitmap checker( (const char*)_gCheckerImg, 8,8 );
-
- wxBrush checkerBrush( checker );
-
- mpScrDc->SetPen( mpLayout->mNullPen );
- mpScrDc->SetBrush( checkerBrush );
-
- int half = mInClientHintBorder / 2;
-
- mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y - half,
- scrRect.width + 2*half, mInClientHintBorder );
-
- mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y + scrRect.height - half,
- scrRect.width + 2*half, mInClientHintBorder );
-
- mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y + half - 1,
- mInClientHintBorder, scrRect.height - 2*half + 2);
-
- mpScrDc->DrawRectangle( scrRect.x + scrRect.width - half,
- scrRect.y + half - 1,
- mInClientHintBorder, scrRect.height - 2*half + 2);
-
- mpScrDc->SetBrush( wxNullBrush );
- }
- else
- {
- mpScrDc->SetPen( mpLayout->mBlackPen );
-
- mpScrDc->DrawLine( scrRect.x, scrRect.y,
- scrRect.x + scrRect.width, scrRect.y );
-
- mpScrDc->DrawLine( scrRect.x, scrRect.y + 1,
- scrRect.x, scrRect.y + scrRect.height );
-
- mpScrDc->DrawLine( scrRect.x+1, scrRect.y + scrRect.height,
- scrRect.x + scrRect.width, scrRect.y + scrRect.height );
-
- mpScrDc->DrawLine( scrRect.x + scrRect.width , scrRect.y,
- scrRect.x + scrRect.width, scrRect.y + scrRect.height + 1);
- }
-
- mpScrDc->SetLogicalFunction( prevLF );
-}
-
-void cbBarDragPlugin::DrawHintRect ( wxRect& rect, bool isInClientRect)
-{
- DoDrawHintRect( rect, isInClientRect );
-}
-
-void cbBarDragPlugin::EraseHintRect( wxRect& rect, bool isInClientRect)
-{
- DoDrawHintRect( rect, isInClientRect );
-}
-
-void cbBarDragPlugin::FinishTracking()
-{
- wxScreenDC::EndDrawingOnTop();
-
- delete mpScrDc;
-
- mpScrDc = NULL;
-}
-
-void cbBarDragPlugin::RectToScr( wxRect& frameRect, wxRect& scrRect )
-{
- scrRect = frameRect;
-
- int x = frameRect.x, y = frameRect.y;
-
- mpLayout->GetParentFrame().ClientToScreen( &x, &y );
-
- scrRect.x = x;
- scrRect.y = y;
-}
-
diff --git a/contrib/src/fl/barhintspl.cpp b/contrib/src/fl/barhintspl.cpp
deleted file mode 100644
index 411a3e4fa3..0000000000
--- a/contrib/src/fl/barhintspl.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: barhintspl.h
-// Purpose: Implementation for cbBarHintsPlugin
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 30/11/98 (my 22th birthday :-)
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/utils.h"
-#include "wx/fl/barhintspl.h"
-
-// fixed settings
-
-#define GROOVE_WIDTH 3 // left shade + middle line + right shade
-#define GROOVE_TO_GROOVE_GAP 1
-#define BOX_T_BOX_GAP 2
-#define BOX_TO_GROOVE_GAP 3
-
-#define BOXES_IN_HINT 2
-#define CLOSE_BOX_IDX 0
-#define COLLAPSE_BOX_IDX 1
-
-// used interally
-
-#define CLOSE_BOX_HITTED 1
-#define COLLAPSE_BOX_HITTED 2
-
-/***** Implementation fro class cbBarHintsPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbBarHintsPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbBarHintsPlugin, cbPluginBase )
-
- EVT_PL_SIZE_BAR_WND ( cbBarHintsPlugin::OnSizeBarWindow )
- EVT_PL_DRAW_BAR_DECOR( cbBarHintsPlugin::OnDrawBarDecorations )
-
- EVT_PL_LEFT_DOWN( cbBarHintsPlugin::OnLeftDown )
- EVT_PL_LEFT_UP ( cbBarHintsPlugin::OnLeftUp )
- EVT_PL_MOTION ( cbBarHintsPlugin::OnMotion )
-
-END_EVENT_TABLE()
-
-cbBarHintsPlugin::cbBarHintsPlugin(void)
-
- : mpPane( 0 ),
- mBtnPressed ( false ),
- mCloseBoxOn ( true ),
- mCollapseBoxOn( true ),
- mGrooveCount ( 2 ),
- mHintGap ( 4 ),
- mXWeight ( 2 )
-{
- mBoxes[CLOSE_BOX_IDX] = NULL;
- mBoxes[COLLAPSE_BOX_IDX] = NULL;
-}
-
-cbBarHintsPlugin::cbBarHintsPlugin( wxFrameLayout* pLayout, int paneMask )
-
- : cbPluginBase( pLayout, paneMask ),
- mpPane( 0 ),
- mBtnPressed ( false ),
- mCloseBoxOn ( true ),
- mCollapseBoxOn( true ),
- mGrooveCount ( 2 ),
- mHintGap ( 5 ),
- mXWeight ( 2 )
-{
- mBoxes[CLOSE_BOX_IDX] = NULL;
- mBoxes[COLLAPSE_BOX_IDX] = NULL;
-}
-
-
-cbBarHintsPlugin::~cbBarHintsPlugin()
-{
- if (mBoxes[CLOSE_BOX_IDX])
- delete mBoxes[CLOSE_BOX_IDX];
-
- if (mBoxes[COLLAPSE_BOX_IDX])
- delete mBoxes[COLLAPSE_BOX_IDX];
-} // cbBarHintsPlugin destructor
-
-
-void cbBarHintsPlugin::SetGrooveCount( int nGrooves )
-{
- mGrooveCount = nGrooves;
-}
-
-void cbBarHintsPlugin::CreateBoxes()
-{
- cbCloseBox* box1 = new cbCloseBox();
- cbCollapseBox* box2 = new cbCollapseBox();
-
- mBoxes[CLOSE_BOX_IDX] = box1;
- mBoxes[COLLAPSE_BOX_IDX] = box2;
-
- int i;
- for ( i = 0; i != BOXES_IN_HINT; ++i )
- {
- mBoxes[i]->mpLayout = mpLayout;
- mBoxes[i]->mpPlugin = this;
- mBoxes[i]->mpWnd = NULL;
- }
-}
-
-
-void cbBarHintsPlugin::Draw3DBox( wxDC& WXUNUSED(dc), const wxPoint& WXUNUSED(pos), bool WXUNUSED(pressed) )
-{
-}
-
-void cbBarHintsPlugin::DrawCloseBox( wxDC& WXUNUSED(dc), const wxPoint& WXUNUSED(pos), bool WXUNUSED(pressed) )
-{
-}
-
-void cbBarHintsPlugin::DrawCollapseBox( wxDC& WXUNUSED(dc), const wxPoint& WXUNUSED(pos),
- bool WXUNUSED(atLeft), bool WXUNUSED(disabled), bool WXUNUSED(pressed) )
-{
-}
-
-void cbBarHintsPlugin::DrawGrooves( wxDC& dc, const wxPoint& pos, int length )
-{
- int ofs = 0;
-
- int i;
- for ( i = 0; i != mGrooveCount; ++i, ofs += ( GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP ) )
- {
- if ( mpPane->IsHorizontal() )
- {
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawLine( pos.x + ofs, pos.y, pos.x + ofs, pos.y + length - 1 );
- dc.DrawPoint( pos.x + ofs + 1, pos.y );
-
- dc.SetPen( mpLayout->mDarkPen );
- dc.DrawLine( pos.x + ofs + 2, pos.y, pos.x + ofs + 2, pos.y + length );
- dc.DrawPoint( pos.x + ofs + 1, pos.y + length - 1 );
- dc.DrawPoint( pos.x + ofs, pos.y + length - 1 );
- }
- else
- {
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawLine( pos.x, pos.y + ofs, pos.x + length - 1, pos.y + ofs );
- dc.DrawPoint( pos.x, pos.y + ofs + 1 );
-
- dc.SetPen( mpLayout->mDarkPen );
- dc.DrawLine( pos.x, pos.y + ofs + 2, pos.x + length, pos.y + ofs + 2 );
- dc.DrawPoint( pos.x + length - 1, pos.y + ofs + 1 );
- dc.DrawPoint( pos.x + length - 1, pos.y + ofs );
- }
- }
-}
-
-void cbBarHintsPlugin::ExcludeHints( wxRect& rect, cbBarInfo& info )
-{
- int boxHeight = BTN_BOX_HEIGHT;
-
- // collapse and close box are not placed on fixed bars
-
- if ( info.IsFixed() || ( !mCloseBoxOn && !mCollapseBoxOn ) )
-
- boxHeight = 0;
-
- int height = wxMax( mGrooveCount*(GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP)
- - GROOVE_TO_GROOVE_GAP,
- boxHeight
- );
-
- if ( mpPane->IsHorizontal() )
- {
- rect.x += ( mHintGap*2 + height );
- rect.width -= (height + 2*mHintGap);
-
- rect.x -= info.mDimInfo.mHorizGap + 2;
- rect.width += info.mDimInfo.mHorizGap + 2;
- }
- else
- {
- rect.y += (mHintGap*2 + height);
- rect.height -= (height + 2*mHintGap);
-
- rect.y -= info.mDimInfo.mVertGap + 2;
- rect.height += info.mDimInfo.mVertGap + 2;
- }
-}
-
-void cbBarHintsPlugin::DoDrawHint( wxDC& dc, wxRect& rect,
- int pos, int WXUNUSED(boxOfs), int grooveOfs,
- bool isFixed )
-{
- if ( !isFixed )
- {
- if ( mpPane->IsHorizontal() )
- {
- if ( mCloseBoxOn )
-
- mBoxes[CLOSE_BOX_IDX]->Draw( dc );
-
- if ( mCollapseBoxOn )
-
- mBoxes[COLLAPSE_BOX_IDX]->Draw( dc );
- }
- else
- {
- if ( mCloseBoxOn )
-
- mBoxes[CLOSE_BOX_IDX]->Draw( dc );
-
- if ( mCollapseBoxOn )
-
- mBoxes[COLLAPSE_BOX_IDX]->Draw( dc );
- }
- }
-
- if ( mpPane->IsHorizontal() )
-
- DrawGrooves( dc, wxPoint( rect.x + mHintGap + grooveOfs, pos ),
- rect.height - (pos - rect.y) - mHintGap );
- else
- DrawGrooves( dc, wxPoint( rect.x + mHintGap, rect.y + mHintGap + grooveOfs ),
- (pos - rect.x) - mHintGap );
-}
-
-void cbBarHintsPlugin::GetHintsLayout( wxRect& rect, cbBarInfo& info,
- int& boxOfs, int& grooveOfs, int& pos )
-{
- int boxHeight = BTN_BOX_HEIGHT;
-// int boxWidth = BTN_BOX_WIDTH + BOX_TO_GROOVE_GAP + BTN_BOX_WIDTH;
-
- // collapse and close box are not placed on fixed bars
-
- if ( info.IsFixed() || ( !mCloseBoxOn && !mCollapseBoxOn ) )
- {
- boxHeight = 0;
-// boxWidth = 0;
- }
-/*
- else
- if ( !mCloseBoxOn || !mCollapseBoxOn )
-
- boxWidth = BTN_BOX_WIDTH;
-*/
- int grooveHeight = mGrooveCount*(GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP)
- - GROOVE_TO_GROOVE_GAP;
-
- int height = wxMax( grooveHeight, boxHeight );
-
- // center boxs and groves with respect to each other
-
- boxOfs = ( height - boxHeight ) / 2;
- grooveOfs = ( height - grooveHeight ) / 2;
-
- pos = ( mpPane->IsHorizontal() ) ? rect.y + mHintGap
- : rect.x + rect.width - mHintGap;
-
- // setup positions for boxes
-
- if ( !info.IsFixed() )
- {
- // what direction "collapse-triangle" should look at?
-
- bool& isAtLeft = ((cbCollapseBox*)(mBoxes[COLLAPSE_BOX_IDX]))->mIsAtLeft;
-
- isAtLeft= info.mBounds.x <= mpPane->mPaneWidth - ( info.mBounds.x + info.mBounds.width );
-
- if ( info.IsExpanded() )
- {
- isAtLeft = false;
-
- cbBarInfo* pCur = info.mpPrev;
-
- while( pCur )
- {
- if ( !pCur->IsFixed() )
- {
- isAtLeft = true; break;
- }
-
- pCur = pCur->mpPrev;
- }
- }
-
- // collapse/expand works only when more not-fixed bars are present in the same row
-
- mBoxes[COLLAPSE_BOX_IDX]->Enable( info.mpRow->mNotFixedBarsCnt > 1 );
-
- int i;
- for ( i = 0; i != BOXES_IN_HINT; ++i )
- {
- mBoxes[i]->mpPane = mpPane;
- }
-
- if ( mpPane->IsHorizontal() )
- {
- if ( mCloseBoxOn )
- {
- mBoxes[CLOSE_BOX_IDX]->mPos = wxPoint( rect.x + mHintGap + boxOfs, pos );
-
- pos += BTN_BOX_HEIGHT;
- }
-
- if ( mCollapseBoxOn )
- {
- if ( mCloseBoxOn ) pos += BOX_T_BOX_GAP;
-
- mBoxes[COLLAPSE_BOX_IDX]->mPos = wxPoint( rect.x + mHintGap + boxOfs, pos );
-
- pos += BTN_BOX_HEIGHT;
-
- pos += BOX_TO_GROOVE_GAP;
- }
- }
- else
- {
- if ( mCloseBoxOn )
- {
- pos -= BTN_BOX_WIDTH;
-
- mBoxes[CLOSE_BOX_IDX]->mPos = wxPoint( pos , rect.y + mHintGap + boxOfs );
- }
-
- if ( mCollapseBoxOn )
- {
- if ( mCloseBoxOn ) pos -= BOX_T_BOX_GAP;
-
- pos -= BTN_BOX_WIDTH;
-
- mBoxes[COLLAPSE_BOX_IDX]->mPos = wxPoint( pos, rect.y + mHintGap + boxOfs );
-
- pos -= BOX_TO_GROOVE_GAP;
- }
- }
- }
-}
-
-static inline bool is_in_box( const wxPoint& rectPos, const wxPoint& mousePos )
-{
- return ( mousePos.x >= rectPos.x &&
- mousePos.y >= rectPos.y &&
- mousePos.x < rectPos.x + BTN_BOX_WIDTH &&
- mousePos.y < rectPos.y + BTN_BOX_HEIGHT );
-}
-
-int cbBarHintsPlugin::HitTestHints( cbBarInfo& info, const wxPoint& pos )
-{
- wxPoint inPane = pos;
- mpPane->PaneToFrame( &inPane.x, &inPane.y );
-
- wxRect& rect = info.mBoundsInParent;
-
- if ( info.IsFixed() ) return false;
-
- int boxOfs, grooveOfs, coord;
-
- GetHintsLayout( rect, info, boxOfs, grooveOfs, coord );
-
- if ( mpPane->IsHorizontal() )
- {
- if ( mCloseBoxOn )
- {
- if ( is_in_box( wxPoint( rect.x + mHintGap + boxOfs, coord ), inPane ) )
-
- return CLOSE_BOX_HITTED;
-
- coord += BTN_BOX_HEIGHT;
- }
-
- if ( mCollapseBoxOn )
- {
- if ( mCloseBoxOn ) coord += BOX_T_BOX_GAP;
-
- if ( is_in_box( wxPoint( rect.x + mHintGap + boxOfs, coord ), inPane ) )
-
- return COLLAPSE_BOX_HITTED;
-
- coord += BTN_BOX_HEIGHT;
- }
- }
- else
- {
- if ( mCloseBoxOn )
- {
- coord -= BTN_BOX_WIDTH;
-
- if ( is_in_box( wxPoint( coord , rect.y + mHintGap + boxOfs ), inPane ) )
-
- return CLOSE_BOX_HITTED;
- }
-
- if ( mCollapseBoxOn )
- {
- if ( mCloseBoxOn ) coord -= BOX_T_BOX_GAP;
- coord -= BTN_BOX_WIDTH;
-
- if ( is_in_box( wxPoint( coord, rect.y + mHintGap + boxOfs ), inPane ) )
-
- return COLLAPSE_BOX_HITTED;
- }
- }
-
- return false;
-}
-
-// handlers for plugin-events
-
-void cbBarHintsPlugin::OnSizeBarWindow( cbSizeBarWndEvent& event )
-{
- wxRect& rect = event.mBoundsInParent;
- mpPane = event.mpPane;
-
- ExcludeHints( rect, *event.mpBar );
-
- event.Skip(); // pass event to the next plugin in the chain
-}
-
-void cbBarHintsPlugin::OnDrawBarDecorations( cbDrawBarDecorEvent& event )
-{
- wxRect& rect = event.mBoundsInParent;
- mpPane = event.mpPane;
-
- int boxOfs, grooveOfs, pos;
-
- GetHintsLayout( rect, *event.mpBar, boxOfs, grooveOfs, pos );
-
- DoDrawHint( *event.mpDc, rect, pos, boxOfs, grooveOfs, event.mpBar->IsFixed() );
-
- // let other plugins add on their decorations
-
- event.Skip();
-}
-
-void cbBarHintsPlugin::OnLeftDown( cbLeftDownEvent& event )
-{
- mpPane = event.mpPane;
- wxPoint inFrame = event.mPos;
-
- mpPane->PaneToFrame( &inFrame.x, &inFrame.y );
-
- wxBarIterator iter( mpPane->GetRowList() );
-
- mpClickedBar = NULL;
-
- while ( iter.Next() )
- {
- cbBarInfo& bar = iter.BarInfo();
-
- int boxOfs, grooveOfs, pos;
-
- GetHintsLayout( bar.mBoundsInParent, bar, boxOfs, grooveOfs, pos );
-
- if ( !bar.IsFixed() )
- {
- int i;
- for ( i = 0; i != BOXES_IN_HINT; ++i )
- {
- mBoxes[i]->mPressed = false;
- mBoxes[i]->mWasClicked = false;
- }
- for ( i = 0; i != BOXES_IN_HINT; ++i )
- {
- mBoxes[i]->OnLeftDown( inFrame );
-
- if ( mBoxes[i]->mPressed )
- {
- mBtnPressed = true;
- mpClickedBar = &bar;
-
- return; // event handled
- }
- }
- }
- }
-
- event.Skip();
-}
-
-void cbBarHintsPlugin::OnLeftUp( cbLeftUpEvent& event )
-{
- if ( mBtnPressed )
- {
- wxPoint inFrame = event.mPos;
- mpPane->PaneToFrame( &inFrame.x, &inFrame.y );
-
- int boxOfs, grooveOfs, pos;
-
- GetHintsLayout( mpClickedBar->mBoundsInParent, *mpClickedBar, boxOfs, grooveOfs, pos );
-
- HitTestHints( *mpClickedBar, event.mPos );
-
- int i;
- for ( i = 0; i != BOXES_IN_HINT; ++i )
- {
- mBoxes[i]->OnLeftUp( inFrame );
-
- if ( mBoxes[i]->WasClicked() )
- {
- if ( i == 0 )
- {
- mpLayout->SetBarState( mpClickedBar, wxCBAR_HIDDEN, true );
- // Notify bar child window of close event:
- if(mpClickedBar->mpBarWnd!=NULL)
- mpClickedBar->mpBarWnd->Close();
- }
- else
- {
- if ( mpClickedBar->IsExpanded() )
- mpPane->ContractBar( mpClickedBar );
- else
- mpPane->ExpandBar( mpClickedBar );
- }
- }
- }
-
- mBtnPressed = false;
- return;
- }
- else
- event.Skip();
-}
-
-void cbBarHintsPlugin::OnMotion( cbMotionEvent& event )
-{
- if ( mBtnPressed )
- {
- wxPoint inFrame = event.mPos;
- mpPane->PaneToFrame( &inFrame.x, &inFrame.y );
-
- mpPane = event.mpPane;
-
- int i;
- for ( i = 0; i != BOXES_IN_HINT; ++i )
- {
- mBoxes[i]->OnMotion( inFrame );
- }
- }
- else
- event.Skip();
-}
-
-void cbBarHintsPlugin::OnInitPlugin()
-{
- cbPluginBase::OnInitPlugin();
-
- cbDockPane** panes = mpLayout->GetPanesArray();
-
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- {
- if ( panes[i]->MatchesMask( mPaneMask ) )
- {
- panes[i]->mProps.mMinCBarDim.x = 25;
- panes[i]->mProps.mMinCBarDim.y = 16;
- }
- }
- CreateBoxes();
-}
diff --git a/contrib/src/fl/cbcustom.cpp b/contrib/src/fl/cbcustom.cpp
deleted file mode 100644
index 42dd52651d..0000000000
--- a/contrib/src/fl/cbcustom.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: cbcustom.cpp
-// Purpose: cbSimpleCustomizationPlugin class declaration
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 06/09/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/cbcustom.h"
-
-// helper class to receive menu customization event
-
-class cbContextMenuHandler : public wxEvtHandler
-{
-public:
- cbSimpleCustomizationPlugin* mpBackRef;
-
-public:
- void OnCommandEvents( wxCommandEvent& evt );
-
- DECLARE_EVENT_TABLE()
-};
-
-// FIXME:: is this "safe" ?
-
-#define CB_CUSTOMIZE_MENU_FIRST_ITEM_ID 17500
-
-/***** Implementation for helper class cbContextMenuHandler *****/
-
-BEGIN_EVENT_TABLE( cbContextMenuHandler, wxEvtHandler )
-
- // FIXME:: what is the right range for these ids ? so that they
- // would not collide with user commands?
-
- EVT_COMMAND_RANGE( CB_CUSTOMIZE_MENU_FIRST_ITEM_ID,
- CB_CUSTOMIZE_MENU_FIRST_ITEM_ID + 300,
- wxEVT_COMMAND_MENU_SELECTED,
- cbContextMenuHandler::OnCommandEvents )
-
-END_EVENT_TABLE()
-
-void cbContextMenuHandler::OnCommandEvents( wxCommandEvent& evt )
-{
- //wxMessageBox("Wowwwww, Yeah!");
-
- mpBackRef->OnMenuItemSelected( evt );
-}
-
-/***** Implementation for class cbSimpleCustomizationPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbSimpleCustomizationPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbSimpleCustomizationPlugin, cbPluginBase )
-
- EVT_PL_CUSTOMIZE_BAR ( cbSimpleCustomizationPlugin::OnCustomizeBar )
- EVT_PL_CUSTOMIZE_LAYOUT( cbSimpleCustomizationPlugin::OnCustomizeLayout )
-
-END_EVENT_TABLE()
-
-cbSimpleCustomizationPlugin::cbSimpleCustomizationPlugin(void)
-{}
-
-cbSimpleCustomizationPlugin::cbSimpleCustomizationPlugin( wxFrameLayout* pPanel, int paneMask )
-
- : cbPluginBase( pPanel, paneMask )
-{}
-
-void cbSimpleCustomizationPlugin::OnCustomizeBar( cbCustomizeBarEvent& event )
-{
- // ingnore bar customization, treat it
- // as layout-customization...ugly, eh?
-
- cbCustomizeLayoutEvent clEvt( event.mClickPos );
-
- OnCustomizeLayout( clEvt );
-}
-
-void cbSimpleCustomizationPlugin::OnCustomizeLayout( cbCustomizeLayoutEvent& event )
-{
- wxString helpStr1 = wxT("Select this item to show the corresponding control bar");
- wxString helpStr2 = wxT("Select this itme to hide the corresponding control bar");
-
- int id = CB_CUSTOMIZE_MENU_FIRST_ITEM_ID;
-
- wxMenu* pMenu = new wxMenu();
-
- BarArrayT& bars = mpLayout->GetBars();
-
- for( size_t i = 0; i != bars.GetCount(); ++i )
- {
- cbBarInfo& bar = *bars[i];
-
- bool isHidden = ( bar.mState == wxCBAR_HIDDEN );
-
- wxString* pHelpStr = ( isHidden ) ? &helpStr1 : &helpStr2;
-
- pMenu->Append( id, bar.mName, *pHelpStr, true );
-
- pMenu->Check( id, (isHidden == false) );
-
- ++id;
- }
-
- // Customization dialog not implemented, so don't show the menu item
-#if 0
- pMenu->AppendSeparator();
- pMenu->Append( id, "Customize...", "Show layout customization dialog", false );
-#endif
- mCustMenuItemId = id;
-
- cbContextMenuHandler* pHandler = new cbContextMenuHandler();
- pHandler->mpBackRef = this;
-
- wxWindow* pFrm = &mpLayout->GetParentFrame();
-
- // FOR NOW FOR NOW:: to work-around wxFrame's (MSW) nasty event-handling bugs!!!
-
- wxWindow* pTmpWnd = new wxWindow( pFrm, wxID_ANY, event.mClickPos, wxSize(0,0) );
-
- pMenu->SetEventHandler( pHandler );
-
- pTmpWnd->PopupMenu( pMenu, 0,0 );
-
- pTmpWnd->Destroy();
-
- delete pMenu;
- delete pHandler;
-
- // event is "eaten" by this plugin
-}
-
-void cbSimpleCustomizationPlugin::OnMenuItemSelected( wxCommandEvent& event )
-{
- if ( event.GetId() == mCustMenuItemId )
- {
- wxMessageBox(wxT("Customization dialog box is not supported by this plugin yet"));
-
- return;
- }
- else
- {
- cbBarInfo* pBar = mpLayout->GetBars()[ event.GetId() - CB_CUSTOMIZE_MENU_FIRST_ITEM_ID ];
-
- wxASSERT( pBar ); // DBG::
-
- // "inverse" bar-visibility of the selected bar
-
- int newState;
-
- if ( pBar->mState == wxCBAR_HIDDEN )
- {
- if ( pBar->mAlignment == -1 )
- {
- pBar->mAlignment = 0; // just remove "-1" marking
- newState = wxCBAR_FLOATING;
- }
- else
- if ( pBar->mAlignment == FL_ALIGN_TOP ||
- pBar->mAlignment == FL_ALIGN_BOTTOM )
-
- newState = wxCBAR_DOCKED_HORIZONTALLY;
- else
- newState = wxCBAR_DOCKED_VERTICALLY;
- }
- else
- {
- newState = wxCBAR_HIDDEN;
-
- if ( pBar->mState == wxCBAR_FLOATING )
-
- pBar->mAlignment = -1;
- }
-
- mpLayout->SetBarState( pBar, newState, true );
-
- if ( newState == wxCBAR_FLOATING )
- mpLayout->RepositionFloatedBar( pBar );
- }
-
- // menu-item-selected event is "eaten"
-}
diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp
deleted file mode 100644
index 4023c60b19..0000000000
--- a/contrib/src/fl/controlbar.cpp
+++ /dev/null
@@ -1,3515 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: controlbar.cpp
-// Purpose: Implementation for main controlbar classes.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 06/09/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include
-#include
-
-#include "wx/string.h"
-#include "wx/utils.h" // import wxMin,wxMax macros
-#include "wx/minifram.h"
-
-#include "wx/fl/controlbar.h"
-
-// import classes of default plugins
-
-#include "wx/fl/panedrawpl.h"
-#include "wx/fl/rowlayoutpl.h"
-#include "wx/fl/antiflickpl.h"
-#include "wx/fl/bardragpl.h"
-#include "wx/fl/cbcustom.h"
-
-#include "wx/fl/gcupdatesmgr.h" // import default updates manager class ("garbage-collecting" one)
-#include "wx/fl/updatesmgr.h"
-
-#include "wx/fl/toolwnd.h"
-
-// These are the event IDs being initialized to a value to
-// meet the new event paradigm as of wx2.3.0. Probably we
-// should find a way to make these be non-global, but this
-// works for right now.
- wxEventType cbEVT_PL_LEFT_DOWN = wxNewEventType();
- wxEventType cbEVT_PL_LEFT_UP = wxNewEventType();
- wxEventType cbEVT_PL_RIGHT_DOWN = wxNewEventType();
- wxEventType cbEVT_PL_RIGHT_UP = wxNewEventType();
- wxEventType cbEVT_PL_MOTION = wxNewEventType();
-
- wxEventType cbEVT_PL_LEFT_DCLICK = wxNewEventType();
-
- wxEventType cbEVT_PL_LAYOUT_ROW = wxNewEventType();
- wxEventType cbEVT_PL_RESIZE_ROW = wxNewEventType();
- wxEventType cbEVT_PL_LAYOUT_ROWS = wxNewEventType();
- wxEventType cbEVT_PL_INSERT_BAR = wxNewEventType();
- wxEventType cbEVT_PL_RESIZE_BAR = wxNewEventType();
- wxEventType cbEVT_PL_REMOVE_BAR = wxNewEventType();
- wxEventType cbEVT_PL_SIZE_BAR_WND = wxNewEventType();
-
- wxEventType cbEVT_PL_DRAW_BAR_DECOR = wxNewEventType();
- wxEventType cbEVT_PL_DRAW_ROW_DECOR = wxNewEventType();
- wxEventType cbEVT_PL_DRAW_PANE_DECOR = wxNewEventType();
- wxEventType cbEVT_PL_DRAW_BAR_HANDLES = wxNewEventType();
- wxEventType cbEVT_PL_DRAW_ROW_HANDLES = wxNewEventType();
- wxEventType cbEVT_PL_DRAW_ROW_BKGROUND = wxNewEventType();
- wxEventType cbEVT_PL_DRAW_PANE_BKGROUND = wxNewEventType();
-
- wxEventType cbEVT_PL_START_BAR_DRAGGING = wxNewEventType();
- wxEventType cbEVT_PL_DRAW_HINT_RECT = wxNewEventType();
-
- wxEventType cbEVT_PL_START_DRAW_IN_AREA = wxNewEventType();
- wxEventType cbEVT_PL_FINISH_DRAW_IN_AREA = wxNewEventType();
-
- wxEventType cbEVT_PL_CUSTOMIZE_BAR = wxNewEventType();
- wxEventType cbEVT_PL_CUSTOMIZE_LAYOUT = wxNewEventType();
-
- wxEventType wxCUSTOM_CB_PLUGIN_EVENTS_START_AT = wxNewEventType();
-
-// some ascii-art, still can't get these *nice* cursors working on wx... :-(
-
-/*
-// FIXME:: see places where _gHorizCursorImg is used
-
-static const char* _gHorizCursorImg[] =
-{
- "............XX....XX............",
- "............XX....XX............",
- "............XX....XX............",
- "............XX....XX............",
- "............XX....XX............",
- "...X........XX....XX........X...",
- "..XX........XX....XX........XX..",
- ".XXX........XX....XX........XXX.",
- "XXXXXXXXXXXXXX....XXXXXXXXXXXXXX",
- ".XXX........XX....XX........XXX.",
- "..XX........XX....XX........XX..",
- "...X........XX....XX........X...",
- "............XX....XX............",
- "............XX....XX............",
- "............XX....XX............",
- "............XX....XX............"
-};
-
-static const char* _gVertCursorImg[] =
-{
- "................X...............",
- "...............XXX..............",
- "..............XXXXX.............",
- ".............XXXXXXX............",
- "................X...............",
- "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
- "................................",
- "................................",
- "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
- "................X...............",
- ".............XXXXXXX............",
- "..............XXXXX.............",
- "...............XXX..............",
- "................X..............."
-};
-*/
-
-// helper inline functions
-
-static inline bool rect_contains_point( const wxRect& rect, int x, int y )
-{
- return ( x >= rect.x &&
- y >= rect.y &&
- x < rect.x + rect.width &&
- y < rect.y + rect.height );
-}
-
-static inline bool rect_hits_rect( const wxRect& r1, const wxRect& r2 )
-{
- if ( ( r2.x >= r1.x && r2.x <= r1.x + r1.width ) ||
- ( r1.x >= r2.x && r1.x <= r2.x + r2.width ) )
-
- if ( ( r2.y >= r1.y && r2.y <= r1.y + r1.height ) ||
- ( r1.y >= r2.y && r1.y <= r2.y + r2.height ) )
-
- return 1;
-
- return 0;
-}
-
-static inline void hide_rect( wxRect& r )
-{
- r.x = 32768;
- r.y = 32768;
- r.width = 1;
- r.height = 1;
-}
-
-static inline void clip_rect_against_rect( wxRect& r1, const wxRect& r2 )
-{
- if ( r1.x < r2.x ||
- r1.y < r2.y ||
- r1.x >= r2.x + r2.width ||
- r1.y >= r2.y + r2.height
- )
- {
- hide_rect( r1 );
- return;
- }
- else
- {
- if ( r1.x + r1.width > r2.x + r2.width )
-
- r1.width = r2.x + r2.width - r1.x;
-
- if ( r1.y + r1.height > r2.y + r2.height )
-
- r1.height = r2.y + r2.height - r1.y;
- }
-}
-
-/***** Implementation for class cbBarSpy *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbBarSpy, wxEvtHandler )
-
-cbBarSpy::cbBarSpy(void)
- : mpLayout(0),
- mpBarWnd(0)
-{}
-
-cbBarSpy::cbBarSpy( wxFrameLayout* pPanel )
-
- : mpLayout(pPanel),
- mpBarWnd(0)
-{}
-
-void cbBarSpy::SetBarWindow( wxWindow* pWnd )
-{
- mpBarWnd = pWnd;
-}
-
-bool cbBarSpy::ProcessEvent(wxEvent& event)
-{
- bool handled = wxEvtHandler::ProcessEvent( event );
-
- int type = event.GetEventType();
-
- if ( !handled && ( type == wxEVT_LEFT_DOWN ||
- type == wxEVT_LEFT_DCLICK ) )
- {
- wxMouseEvent& mevent = *((wxMouseEvent*)&event);
-
- int x = mevent.m_x;
- int y = mevent.m_y;
-
- mpBarWnd->ClientToScreen( &x, &y );
- mpLayout->GetParentFrame().ScreenToClient( &x, &y );
-
- mevent.m_x = x;
- mevent.m_y = y;
-
- // forwared not-handled event to frame-layout
-
- if ( type == wxEVT_LEFT_DOWN )
- {
- //mpLayout->OnLButtonDown( mevent );
- event.Skip();
- }
- else
- mpLayout->OnLDblClick( mevent );
-
- //event.Skip(false);
- }
-
- return handled;
-}
-
-/***** Implementation for class wxFrameLayout *****/
-
-IMPLEMENT_DYNAMIC_CLASS( wxFrameLayout, wxEvtHandler )
-
-BEGIN_EVENT_TABLE( wxFrameLayout, wxEvtHandler )
-
- EVT_PAINT ( wxFrameLayout::OnPaint )
- EVT_SIZE ( wxFrameLayout::OnSize )
- EVT_LEFT_DOWN ( wxFrameLayout::OnLButtonDown )
- EVT_LEFT_UP ( wxFrameLayout::OnLButtonUp )
- EVT_RIGHT_DOWN ( wxFrameLayout::OnRButtonDown )
- EVT_RIGHT_UP ( wxFrameLayout::OnRButtonUp )
- EVT_MOTION ( wxFrameLayout::OnMouseMove )
-
- EVT_LEFT_DCLICK( wxFrameLayout::OnLDblClick )
-
- EVT_IDLE ( wxFrameLayout::OnIdle )
-
- EVT_ERASE_BACKGROUND( wxFrameLayout::OnEraseBackground )
-
-END_EVENT_TABLE()
-
-// FIXME:: how to eliminate these cut&pasted constructors?
-
-wxFrameLayout::wxFrameLayout(void)
-
- : mpFrame ( NULL ),
- mpFrameClient( NULL ),
-
- mDarkPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID ),
- mLightPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT), 1, wxSOLID ),
- mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
- mBlackPen ( wxColour( 0, 0, 0), 1, wxSOLID ),
- mBorderPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
-
- mNullPen( wxColour(0,0,0), 1, wxTRANSPARENT ),
-
- mpPaneInFocus( NULL ),
- mpLRUPane ( NULL ),
-
-
- mpTopPlugin ( NULL ),
- mpCaputesInput( NULL ),
-
- mClientWndRefreshPending( false ),
- mRecalcPending( true ),
- mCheckFocusWhenIdle( false )
-{
- CreateCursors();
-
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- mPanes[i] = NULL;
-
- mFloatingOn = CanReparent();
-}
-
-wxFrameLayout::wxFrameLayout( wxWindow* pParentFrame, wxWindow* pFrameClient, bool activateNow )
-
- : mpFrame( pParentFrame ),
- mpFrameClient(pFrameClient),
-
- mDarkPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID ),
- mLightPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT), 1, wxSOLID ),
- mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
- mBlackPen ( wxColour( 0, 0, 0), 1, wxSOLID ),
- mBorderPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
-
- mNullPen( wxColour(0,0,0), 1, wxTRANSPARENT ),
-
- mpPaneInFocus( NULL ),
- mpLRUPane ( NULL ),
-
- mFloatingOn ( true ),
-
- mpTopPlugin ( NULL ),
- mpCaputesInput( NULL ),
-
- mClientWndRefreshPending( false ),
- mRecalcPending( true ),
- mCheckFocusWhenIdle( false ),
-
- mpUpdatesMgr( NULL )
-{
- CreateCursors();
-
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- mPanes[i] = new cbDockPane( i, this );
-
- if ( activateNow )
- {
- HookUpToFrame();
-
- // FOR NOW::
- // DBG:: set RED color of frame's background for the
- // prurpose of tracking engine bugs "visually"
-
- GetParentFrame().SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE) );
- }
-
- mFloatingOn = CanReparent();
-}
-
-// NOTE:: below are the only platform-check "ifdef"s in the docking system!
-
-bool wxFrameLayout::CanReparent()
-{
-#ifdef __WXMSW__
- return true;
-#elif defined(__WXGTK20__)
- return true;
-#elif defined (__WXGTK__)
- //return true;
- return false;
-#else
-
- return false; // reparenting is not yet supported by Motif and others
-#endif
-}
-
-/*
-#ifdef __WXMSW__
- #inlcude "windows.h"
-#endif
-*/
-
-void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
-{
-#if defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXMAC__)
- pChild->Reparent(pNewParent);
-
- return;
-#elif defined(__WXGTK__) || defined(__WXX11__)
- // FOR NOW:: floating with wxGtk still very buggy
-
- return;
-
- //pChild->ReParent( pNewParent );
-
- //return;
-#else
- wxUnusedVar(pChild);
- wxUnusedVar(pNewParent);
- wxMessageBox( _("Sorry, docking is not supported for ports other than wxMSW, wxMac and wxGTK") );
-#endif
-}
-
-void wxFrameLayout::DestroyBarWindows()
-{
- wxObjectList::compatibility_iterator pSpy = mBarSpyList.GetFirst();
-
- while( pSpy )
- {
- cbBarSpy& spy = *((cbBarSpy*)pSpy->GetData());
-
- if ( spy.mpBarWnd->GetEventHandler() == &spy )
-
- spy.mpBarWnd->PopEventHandler();
-
- delete &spy;
-
- pSpy = pSpy->GetNext();
- }
-
- mBarSpyList.Clear();
-
- size_t i;
- for ( i = 0; i != mAllBars.Count(); ++i )
- {
- if ( mAllBars[i]->mpBarWnd )
- {
- mAllBars[i]->mpBarWnd->Destroy();
- mAllBars[i]->mpBarWnd = NULL;
- }
- }
-}
-
-void wxFrameLayout::ShowFloatedWindows( bool show )
-{
- wxObjectList::compatibility_iterator pNode = mFloatedFrames.GetFirst();
-
- while( pNode )
- {
- cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->GetData());
-
- pFFrm->Show( show );
-
- pNode = pNode->GetNext();
- }
-}
-
-wxFrameLayout::~wxFrameLayout()
-{
- size_t i;
-
- UnhookFromFrame();
-
- if ( mpUpdatesMgr )
- delete mpUpdatesMgr;
-
- PopAllPlugins();
-
- // destoy the chain of plugins from left to right
-
- wxEvtHandler* pCur = mpTopPlugin;
-
- if ( pCur )
-
- while ( pCur->GetPreviousHandler() )
-
- pCur = pCur->GetPreviousHandler();
-
- while ( pCur )
- {
- wxEvtHandler* pNext = pCur->GetNextHandler();
-
- delete pCur;
-
- pCur = pNext;
- }
-
- // destroy contents of arrays and lists
-
- for ( i = 0; i != MAX_PANES; ++i )
- {
- if ( mPanes[i] )
- delete mPanes[i];
- }
- if ( mpHorizCursor )
- delete mpHorizCursor;
- if ( mpVertCursor )
- delete mpVertCursor;
- if ( mpNormalCursor )
- delete mpNormalCursor;
- if ( mpDragCursor )
- delete mpDragCursor;
- if ( mpNECursor )
- delete mpNECursor;
-
- wxObjectList::compatibility_iterator pSpy = mBarSpyList.GetFirst();
-
- while( pSpy )
- {
- cbBarSpy& spy = *((cbBarSpy*)pSpy->GetData());
-
- if ( spy.mpBarWnd->GetEventHandler() == &spy )
-
- spy.mpBarWnd->PopEventHandler();
-
- delete &spy;
-
- pSpy = pSpy->GetNext();
- }
-
- for ( i = 0; i != mAllBars.Count(); ++i )
- delete mAllBars[i];
-}
-
-void wxFrameLayout::EnableFloating( bool enable )
-{
- mFloatingOn = enable && CanReparent();
-}
-
-void wxFrameLayout::Activate()
-{
- HookUpToFrame();
-
- RefreshNow( true );
-
- ShowFloatedWindows( true );
-}
-
-void wxFrameLayout::Deactivate()
-{
- ShowFloatedWindows( false );
-
- UnhookFromFrame();
-
- HideBarWindows();
-}
-
-void wxFrameLayout::SetFrameClient( wxWindow* pFrameClient )
-{
- mpFrameClient = pFrameClient;
-}
-
-wxWindow* wxFrameLayout::GetFrameClient()
-{
- return mpFrameClient;
-}
-
-cbUpdatesManagerBase& wxFrameLayout::GetUpdatesManager()
-{
- if ( !mpUpdatesMgr )
- mpUpdatesMgr = CreateUpdatesManager();
-
- return *mpUpdatesMgr;
-}
-
-void wxFrameLayout::SetUpdatesManager( cbUpdatesManagerBase* pUMgr )
-{
- if ( mpUpdatesMgr )
- delete mpUpdatesMgr;
-
- mpUpdatesMgr = pUMgr;
-
- mpUpdatesMgr->SetLayout( this );
-}
-
-cbUpdatesManagerBase* wxFrameLayout::CreateUpdatesManager()
-{
- return new cbGCUpdatesMgr( this );
- //return new cbSimpleUpdatesMgr( this );
-}
-
-void wxFrameLayout::AddBar( wxWindow* pBarWnd,
- const cbDimInfo& dimInfo,
- int alignment,
- int rowNo,
- int columnPos,
- const wxString& name,
- bool spyEvents,
- int state
- )
-{
- if ( pBarWnd && spyEvents )
- {
- // hook up spy to bar window
- cbBarSpy* pSpy = new cbBarSpy( this );
-
- pSpy->SetBarWindow( pBarWnd );
- pBarWnd->PushEventHandler( pSpy );
-
- mBarSpyList.Append( pSpy );
- }
-
- cbBarInfo* pInfo = new cbBarInfo();
-
- pInfo->mName = name;
- pInfo->mpBarWnd = pBarWnd;
- pInfo->mDimInfo = dimInfo;
- pInfo->mDimInfo.mLRUPane = alignment;
- pInfo->mState = state;
- pInfo->mAlignment = alignment;
- pInfo->mRowNo = rowNo;
- pInfo->mBounds.x = columnPos;
-
- mAllBars.Add( pInfo );
-
- DoSetBarState( pInfo );
-}
-
-bool wxFrameLayout::RedockBar( cbBarInfo* pBar,
- const wxRect& shapeInParent,
- cbDockPane* pToPane,
- bool updateNow )
-{
- if ( !pToPane )
-
- pToPane = HitTestPanes( shapeInParent, NULL );
-
- if ( !pToPane )
-
- return false; // bar's shape does not hit any pane
- // - redocking is NOT possible
-
- cbDockPane* pBarPane = GetBarPane( pBar );
-
- if ( updateNow )
-
- GetUpdatesManager().OnStartChanges();
-
- pBarPane->RemoveBar( pBar );
-
- // FIXME FIXME:: the recalculation below may be a *huge* performance
- // hit, it could be eliminated though...
- // but first the "pane-postion-changed" problem
- // has to be fixed
-
- RecalcLayout( false );
-
- pToPane->InsertBar( pBar, shapeInParent );
-
- RecalcLayout( false );
-
- // finish update "transaction"
-
- if ( updateNow )
- {
- GetUpdatesManager().OnFinishChanges();
- GetUpdatesManager().UpdateNow();
- }
-
- return true;
-}
-
-cbBarInfo* wxFrameLayout::FindBarByName( const wxString& name )
-{
- size_t i;
- for ( i = 0; i != mAllBars.Count(); ++i )
- if ( mAllBars[i]->mName == name )
- return mAllBars[i];
-
- return NULL;
-}
-
-cbBarInfo* wxFrameLayout::FindBarByWindow( const wxWindow* pWnd )
-{
- size_t i;
- for ( i = 0; i != mAllBars.Count(); ++i )
- if ( mAllBars[i]->mpBarWnd == pWnd )
- return mAllBars[i];
-
- return NULL;
-}
-
-BarArrayT& wxFrameLayout::GetBars()
-{
- return mAllBars;
-}
-
-void wxFrameLayout::SetBarState( cbBarInfo* pBar, int newState, bool updateNow )
-{
- if ( newState == wxCBAR_FLOATING && !(mFloatingOn && pBar->mFloatingOn))
-
- return;
-
- if ( updateNow )
-
- GetUpdatesManager().OnStartChanges();
-
- pBar->mUMgrData.SetDirty(true);
-
- // check bar's previous state
-
- if ( pBar->mState != wxCBAR_HIDDEN && pBar->mState != wxCBAR_FLOATING )
- {
- cbDockPane* pPane;
- cbRowInfo* pRow;
-
- #ifdef __WXDEBUG__
- bool success =
- #endif
- LocateBar( pBar, &pRow, &pPane );
-
- wxASSERT( success ); // DBG::
-
- // save LRU-dim info before removing bar
-
- pBar->mDimInfo.mLRUPane = pPane->GetAlignment();
- pBar->mDimInfo.mBounds[ pPane->GetAlignment() ] = pBar->mBounds;
-
- // remove it from the pane it was docked on
-
- pPane->RemoveBar( pBar );
-
- }
-
- if ( pBar->mState == wxCBAR_FLOATING && newState != wxCBAR_FLOATING )
- {
- // remove bar's window from the containing mini-frame
- // and set its parent to be layout's parent frame
-
- if ( pBar->mpBarWnd )
- {
- pBar->mpBarWnd->Show(false); // to avoid flicker upon reparenting
-
- wxObjectList::compatibility_iterator pNode = mFloatedFrames.GetFirst();
-
- while( pNode )
- {
- cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->GetData());
-
- if ( pFFrm->GetBar() == pBar )
- {
- pFFrm->Show( false ); // reduces flicker sligthly
-
- ReparentWindow( pBar->mpBarWnd, &GetParentFrame() );
-
- pBar->mBounds = pBar->mDimInfo.mBounds[ pBar->mDimInfo.mLRUPane ];
-
- if ( newState != wxCBAR_HIDDEN )
-
- pBar->mAlignment = pBar->mDimInfo.mLRUPane;
-
- mFloatedFrames.Erase( pNode );
-
- pFFrm->Show( false );
- pFFrm->Destroy(); break;
- }
-
- pNode = pNode->GetNext();
- }
-
- // FOR NOW:: excessive!
- //if ( mpFrameClient ) mpFrameClient->Refresh();
- if ( mpFrameClient )
- mClientWndRefreshPending = true;
- }
- }
-
- if ( pBar->mDimInfo.GetDimHandler() )
- {
- pBar->mDimInfo.GetDimHandler()->OnChangeBarState( pBar, newState );
- }
-
- pBar->mState = newState;
-
- DoSetBarState( pBar );
-
- if ( updateNow )
- {
- RecalcLayout(false);
-
- GetUpdatesManager().OnFinishChanges();
- GetUpdatesManager().UpdateNow();
- }
-}
-
-void wxFrameLayout::InverseVisibility( cbBarInfo* pBar )
-{
- wxASSERT( pBar ); // DBG::
-
- // "inverse" bar-visibility of the selected bar
-
- int newState;
-
- if ( pBar->mState == wxCBAR_HIDDEN )
- {
- if ( pBar->mAlignment == -1 )
- {
- pBar->mAlignment = 0; // just remove "-1" marking
- newState = wxCBAR_FLOATING;
- }
- else
- if ( pBar->mAlignment == FL_ALIGN_TOP ||
- pBar->mAlignment == FL_ALIGN_BOTTOM )
-
- newState = wxCBAR_DOCKED_HORIZONTALLY;
- else
- newState = wxCBAR_DOCKED_VERTICALLY;
- }
- else
- {
- newState = wxCBAR_HIDDEN;
-
- if ( pBar->mState == wxCBAR_FLOATING )
-
- pBar->mAlignment = -1;
- }
-
- this->SetBarState( pBar, newState, true );
-
- if ( newState == wxCBAR_FLOATING )
-
- this->RepositionFloatedBar( pBar );
-}
-
-void wxFrameLayout::ApplyBarProperties( cbBarInfo* pBar )
-{
- if ( pBar->mState == wxCBAR_FLOATING )
- {
- RepositionFloatedBar( pBar );
- }
- else
- if ( pBar->mState == wxCBAR_DOCKED_HORIZONTALLY ||
- pBar->mState == wxCBAR_DOCKED_VERTICALLY
- )
- {
- // FOR NOW:: nothing
- }
-
-}
-
-void wxFrameLayout::RepositionFloatedBar( cbBarInfo* pBar )
-{
- if ( !(mFloatingOn && pBar->mFloatingOn)) return;
-
- wxObjectList::compatibility_iterator pNode = mFloatedFrames.GetFirst();
-
- while( pNode )
- {
- cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->GetData());
-
- if ( pFFrm->GetBar() == pBar )
- {
- wxRect& bounds = pBar->mDimInfo.mBounds[wxCBAR_FLOATING];
-
- int x = bounds.x,
- y = bounds.y;
-
- GetParentFrame().ClientToScreen( &x, &y );
-
- pFFrm->PositionFloatedWnd( x,y,
- bounds.width,
- bounds.height );
-
- break;
- }
-
- pNode = pNode->GetNext();
- }
-}
-
-void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
-{
- if ( pBar->mState != wxCBAR_FLOATING &&
- pBar->mState != wxCBAR_HIDDEN )
-
- // dock it
-
- mPanes[pBar->mAlignment]->InsertBar( pBar );
- else
- if ( pBar->mState == wxCBAR_HIDDEN )
- {
- // hide it
-
- if ( pBar->mpBarWnd )
-
- pBar->mpBarWnd->Show( false );
- }
- else
- {
- if ( !(mFloatingOn && pBar->mFloatingOn) )
- return;
-
- // float it
-
- if ( pBar->mpBarWnd == NULL || !CanReparent() )
- {
- // FOR NOW:: just hide it
-
- if ( pBar->mpBarWnd )
-
- pBar->mpBarWnd->Show( false );
-
- pBar->mState = wxCBAR_HIDDEN;
-
- return;
- }
-
- cbFloatedBarWindow* pMiniFrm = new cbFloatedBarWindow();
-
- pMiniFrm->SetBar( pBar );
- pMiniFrm->SetLayout( this );
-
- pMiniFrm->Create( &GetParentFrame(), wxID_ANY, pBar->mName,
- wxPoint( 50,50 ),
- wxSize ( 0, 0 ),
- wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT
- );
-
- pMiniFrm->SetClient( pBar->mpBarWnd );
-
- ReparentWindow( pBar->mpBarWnd, pMiniFrm );
-
- mFloatedFrames.Append( pMiniFrm );
-
- wxRect& bounds = pBar->mDimInfo.mBounds[wxCBAR_FLOATING];
-
- // check if it wasn't floated anytime before
-
- if ( bounds.width == -1 )
- {
- wxRect& clntRect = GetClientRect();
-
- // adjust position into which the next floated bar will be placed
-
- if ( mNextFloatedWndPos.x + bounds.width > clntRect.width )
-
- mNextFloatedWndPos.x = mFloatingPosStep.x;
-
- if ( mNextFloatedWndPos.y + bounds.height > clntRect.height )
-
- mNextFloatedWndPos.y = mFloatingPosStep.y;
-
- bounds.x = mNextFloatedWndPos.x + clntRect.x;
- bounds.y = mNextFloatedWndPos.y + clntRect.y;
-
- bounds.width = pBar->mDimInfo.mSizes[wxCBAR_FLOATING].x;
- bounds.height = pBar->mDimInfo.mSizes[wxCBAR_FLOATING].y;
-
- mNextFloatedWndPos.x += mFloatingPosStep.x;
- mNextFloatedWndPos.y += mFloatingPosStep.y;
- }
-
- pMiniFrm->Show( true );
- RepositionFloatedBar(pMiniFrm->GetBar());
-
- // FIXME:: this is excessive
- pBar->mpBarWnd->Show(true);
- }
-}
-
-void wxFrameLayout::RemoveBar( cbBarInfo* pBarInfo )
-{
- // first, try to "guess" what was the perviouse state of the bar
-
- cbDockPane* pPane;
- cbRowInfo* pRow;
-
- if ( LocateBar( pBarInfo, &pRow, &pPane ) )
- {
- // ...aha, bar was docked into one of the panes,
- // remove it from there
-
- pPane->RemoveBar( pBarInfo );
- }
-
- size_t i;
- for ( i = 0; i != mAllBars.Count(); ++i )
- {
- if ( mAllBars[i] == pBarInfo )
- {
-#if wxCHECK_VERSION(2,3,2)
- mAllBars.RemoveAt(i);
-#else
- mAllBars.Remove(i);
-#endif
- if ( pBarInfo->mpBarWnd ) // hides it's window
-
- pBarInfo->mpBarWnd->Show( false );
-
- delete pBarInfo;
-
- return;
- }
- }
- wxFAIL_MSG(wxT("bar info should be present in the list of all bars of all panes"));
-}
-
-bool wxFrameLayout::LocateBar( cbBarInfo* pBarInfo,
- cbRowInfo** ppRow,
- cbDockPane** ppPane )
-{
- (*ppRow) = NULL;
- (*ppPane) = NULL;
-
- int n;
- for ( n = 0; n != MAX_PANES; ++n )
- {
- wxBarIterator i( mPanes[n]->GetRowList() );
-
- while ( i.Next() )
-
- if ( &i.BarInfo() == pBarInfo )
- {
- (*ppPane) = mPanes[n];
- (*ppRow ) = &i.RowInfo();
-
- return true;
- }
- }
-
- return false;
-}
-
-void wxFrameLayout::RecalcLayout( bool repositionBarsNow )
-{
- mRecalcPending = false;
-
- int frmWidth, frmHeight;
- mpFrame->GetClientSize( &frmWidth, &frmHeight );
-
- int curY = 0;
- int curX = 0;
- wxRect rect;
-
- // pane positioning priorities in decreasing order:
- // top, bottom, left, right
-
- // setup TOP pane
-
- cbDockPane* pPane = mPanes[ FL_ALIGN_TOP ];
-
- pPane->SetPaneWidth( frmWidth );
- pPane->RecalcLayout();
-
- int paneHeight = pPane->GetPaneHeight();
-
- rect.x = curX;
- rect.y = curY;
- rect.width = frmWidth;
- rect.height = wxMin( paneHeight, frmHeight - curY );
-
- pPane->SetBoundsInParent( rect );
-
- curY += paneHeight;
-
- // setup BOTTOM pane
-
- pPane = mPanes[ FL_ALIGN_BOTTOM ];
-
- pPane->SetPaneWidth( frmWidth );
- pPane->RecalcLayout();
-
- paneHeight = pPane->GetPaneHeight();
-
- rect.x = curX;
- rect.y = wxMax( frmHeight - paneHeight, curY );
- rect.width = frmWidth;
- rect.height = frmHeight - rect.y;
-
- pPane->SetBoundsInParent( rect );
-
- // setup LEFT pane
-
- pPane = mPanes[ FL_ALIGN_LEFT ];
-
- // bottom pane's y
- pPane->SetPaneWidth( rect.y - curY );
-
- pPane->RecalcLayout();
- paneHeight = pPane->GetPaneHeight();
-
- // bottom rect's y
- rect.height = rect.y - curY;
- rect.x = curX;
- rect.y = curY;
- rect.width = wxMin( paneHeight, frmWidth );
-
- pPane->SetBoundsInParent( rect );
-
- curX += rect.width;
-
- // setup RIGHT pane
-
- pPane = mPanes[ FL_ALIGN_RIGHT ];
-
- // left pane's height
- pPane->SetPaneWidth( rect.height );
-
- pPane->RecalcLayout();
- paneHeight = pPane->GetPaneHeight();
-
- // left pane's height
- rect.height = rect.height;
- rect.x = wxMax( frmWidth - paneHeight, curX );
- rect.y = curY;
- rect.width = frmWidth - rect.x;
-
- pPane->SetBoundsInParent( rect );
-
- // recalc bounds of the client-window
-
- mClntWndBounds.x = mPanes[FL_ALIGN_LEFT]->mBoundsInParent.x +
- mPanes[FL_ALIGN_LEFT]->mBoundsInParent.width;
- mClntWndBounds.y = mPanes[FL_ALIGN_TOP ]->mBoundsInParent.y +
- mPanes[FL_ALIGN_TOP ]->mBoundsInParent.height;
-
- mClntWndBounds.width = mPanes[FL_ALIGN_RIGHT]->mBoundsInParent.x -
- mClntWndBounds.x;
- mClntWndBounds.height = mPanes[FL_ALIGN_BOTTOM]->mBoundsInParent.y -
- mClntWndBounds.y;
-
- if ( repositionBarsNow )
-
- PositionPanes();
-}
-
-int wxFrameLayout::GetClientHeight()
-{
- // for better portablility wxWindow::GetSzie() is not used here
-
- return mClntWndBounds.height;
-}
-
-int wxFrameLayout::GetClientWidth()
-{
- // for better portablility wxWindow::GetSzie() is not used here
-
- return mClntWndBounds.width;
-}
-
-void wxFrameLayout::PositionClientWindow()
-{
- if ( mpFrameClient )
- {
- if ( mClntWndBounds.width >= 1 && mClntWndBounds.height >= 1 )
- {
- mpFrameClient->SetSize( mClntWndBounds.x, mClntWndBounds.y,
- mClntWndBounds.width, mClntWndBounds.height, 0 );
-
- if ( !mpFrameClient->IsShown() )
-
- mpFrameClient->Show( true );
- }
- else
- mpFrameClient->Show( false );
- }
-}
-
-void wxFrameLayout::PositionPanes()
-{
- PositionClientWindow();
-
- // FOR NOW:: excessive updates!
- // reposition bars within all panes
-
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- mPanes[i]->SizePaneObjects();
-}
-
-void wxFrameLayout::OnSize( wxSizeEvent& event )
-{
- mpFrame->ProcessEvent( event );
- event.Skip( false ); // stop its progpagation
-
- if ( event.GetEventObject() == (wxObject*) mpFrame )
- {
- GetUpdatesManager().OnStartChanges();
- RecalcLayout(true);
- GetUpdatesManager().OnFinishChanges();
- GetUpdatesManager().UpdateNow();
- }
-
-}
-
-/*** protected members ***/
-
-void wxFrameLayout::HideBarWindows()
-{
- size_t i;
- for ( i = 0; i != mAllBars.Count(); ++i )
- if ( mAllBars[i]->mpBarWnd && mAllBars[i]->mState != wxCBAR_FLOATING )
- mAllBars[i]->mpBarWnd->Show( false );
-
- // then floated frames
-
- ShowFloatedWindows( false );
-
- if ( mpFrameClient )
-
- mpFrameClient->Show( false );
-}
-
-void wxFrameLayout::UnhookFromFrame()
-{
- // NOTE:: the SetEvtHandlerEnabled() method is not used
- // here, since it is assumed that unhooking layout
- // from window may result destroying of the layout itself
- //
- // BUG BUG BUG (wx):: this would not be a problem if
- // wxEvtHandler's destructor checked if
- // this handler is currently the top-most
- // handler of some window, and additionally
- // to the reconnecting itself from the chain.
- // It would also re-setup current event handler
- // of the window using wxWindow::SetEventHandler()
-
- // FOR NOW::
-
- if ( mpFrame->GetEventHandler() == this )
- {
- mpFrame->PopEventHandler();
- return;
- }
-
- if ( mpFrame )
- {
- if ( this == mpFrame->GetEventHandler() )
- {
- mpFrame->SetEventHandler( this->GetNextHandler() );
- }
- else
- {
- wxEvtHandler* pCur = mpFrame->GetEventHandler();
-
- while ( pCur )
- {
- if ( pCur == this )
- break;
-
- pCur = pCur->GetNextHandler();
- }
-
- // do not try to unhook ourselves if we're not hooked yet
- if ( !pCur )
- return;
- }
-
- if ( GetPreviousHandler() )
- GetPreviousHandler()->SetNextHandler( GetNextHandler() );
- else
- {
- mpFrame->PopEventHandler();
- return;
- }
-
- if ( GetNextHandler() )
- GetNextHandler()->SetPreviousHandler( GetPreviousHandler() );
-
- SetNextHandler( NULL );
- SetPreviousHandler( NULL );
- }
-}
-
-void wxFrameLayout::HookUpToFrame()
-{
- // unhook us first, we're already hooked up
-
- UnhookFromFrame();
-
- // put ourselves on top
-
- mpFrame->PushEventHandler( this );
-}
-
-cbDockPane* wxFrameLayout::GetBarPane( cbBarInfo* pBar )
-{
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- if ( mPanes[i]->BarPresent( pBar ) )
- return mPanes[i];
-
- return NULL;
-}
-
-void wxFrameLayout::CreateCursors()
-{
- /*
- // FIXME:: The below code somehow doesn't work - cursors remain unchanged
- char bits[64];
-
- set_cursor_bits( _gHorizCursorImg, bits, 32, 16 );
-
- mpHorizCursor = new wxCursor( bits, 32, 16 );
-
- set_cursor_bits( _gVertCursorImg, bits, 32, 16 );
-
- mpVertCursor = new wxCursor( bits, 32, 16 );
- */
-
- // FOR NOW:: use standard ones
-
- mpHorizCursor = new wxCursor(wxCURSOR_SIZEWE);
- mpVertCursor = new wxCursor(wxCURSOR_SIZENS);
- mpNormalCursor = new wxCursor(wxCURSOR_ARROW );
- mpDragCursor = new wxCursor(wxCURSOR_CROSS );
- mpNECursor = new wxCursor(wxCURSOR_NO_ENTRY);
-
- mFloatingPosStep.x = 25;
- mFloatingPosStep.y = 25;
-
- mNextFloatedWndPos.x = mFloatingPosStep.x;
- mNextFloatedWndPos.y = mFloatingPosStep.y;
-}
-
-bool wxFrameLayout::HitTestPane( cbDockPane* pPane, int x, int y )
-{
- return rect_contains_point( pPane->GetRealRect(), x, y );
-}
-
-cbDockPane* wxFrameLayout::HitTestPanes( const wxRect& rect,
- cbDockPane* pCurPane )
-{
- // first, give the privilege to the current pane
-
- if ( pCurPane && rect_hits_rect( pCurPane->GetRealRect(), rect ) )
-
- return pCurPane;
-
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- {
- if ( pCurPane != mPanes[i] &&
- rect_hits_rect( mPanes[i]->GetRealRect(), rect ) )
- {
- return mPanes[i];
- }
- }
- return 0;
-}
-
-void wxFrameLayout::ForwardMouseEvent( wxMouseEvent& event,
- cbDockPane* pToPane,
- int eventType )
-{
- wxPoint pos( event.m_x, event.m_y );
- pToPane->FrameToPane( &pos.x, &pos.y );
-
- if ( eventType == cbEVT_PL_LEFT_DOWN )
- {
- cbLeftDownEvent evt( pos, pToPane );
- FirePluginEvent( evt );
- }
- else if ( eventType == cbEVT_PL_LEFT_DCLICK )
- {
- cbLeftDClickEvent evt( pos, pToPane );
- FirePluginEvent( evt );
- }
- else if ( eventType == cbEVT_PL_LEFT_UP )
- {
- cbLeftUpEvent evt( pos, pToPane );
- FirePluginEvent( evt );
- }
- else if ( eventType == cbEVT_PL_RIGHT_DOWN )
- {
- cbRightDownEvent evt( pos, pToPane );
- FirePluginEvent( evt );
- }
- else if ( eventType == cbEVT_PL_RIGHT_UP )
- {
- cbRightUpEvent evt( pos, pToPane );
- FirePluginEvent( evt );
- }
- else if ( eventType == cbEVT_PL_MOTION )
- {
- cbMotionEvent evt( pos, pToPane );
- FirePluginEvent( evt );
- }
-} // wxFrameLayout::ForwardMouseEvent()
-
-
-void wxFrameLayout::RouteMouseEvent( wxMouseEvent& event, int pluginEvtType )
-{
- if ( mpPaneInFocus )
-
- ForwardMouseEvent( event, mpPaneInFocus, pluginEvtType );
- else
- {
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- {
- if ( HitTestPane( mPanes[i], event.m_x, event.m_y ) )
- {
- ForwardMouseEvent( event, mPanes[i], pluginEvtType );
- return;
- }
- }
- }
-}
-
-/*** event handlers ***/
-
-void wxFrameLayout::OnRButtonDown( wxMouseEvent& event )
-{
- RouteMouseEvent( event, cbEVT_PL_RIGHT_DOWN );
-}
-
-void wxFrameLayout::OnRButtonUp( wxMouseEvent& event )
-{
- RouteMouseEvent( event, cbEVT_PL_RIGHT_UP );
-}
-
-void wxFrameLayout::OnLButtonDown( wxMouseEvent& event )
-{
- RouteMouseEvent( event, cbEVT_PL_LEFT_DOWN );
-}
-
-void wxFrameLayout::OnLDblClick( wxMouseEvent& event )
-{
- RouteMouseEvent( event, cbEVT_PL_LEFT_DCLICK );
-}
-
-void wxFrameLayout::OnLButtonUp( wxMouseEvent& event )
-{
- RouteMouseEvent( event, cbEVT_PL_LEFT_UP );
-}
-
-void wxFrameLayout::OnMouseMove( wxMouseEvent& event )
-{
- if ( mpPaneInFocus )
-
- ForwardMouseEvent( event, mpPaneInFocus, cbEVT_PL_MOTION );
- else
- {
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- {
- if ( HitTestPane( mPanes[i], event.m_x, event.m_y ) )
- {
- if ( mpLRUPane && mpLRUPane != mPanes[i] )
- {
- // simulate "mouse-leave" event
- ForwardMouseEvent( event, mpLRUPane, cbEVT_PL_MOTION );
- }
-
- ForwardMouseEvent( event, mPanes[i], cbEVT_PL_MOTION );
-
- mpLRUPane = mPanes[i];
-
- return;
- }
- }
- }
-
- if ( mpLRUPane )
- {
- // simulate "mouse-leave" event
- ForwardMouseEvent( event, mpLRUPane, cbEVT_PL_MOTION );
- mpLRUPane = 0;
- }
-}
-
-void wxFrameLayout::OnPaint( wxPaintEvent& event )
-{
- if ( mRecalcPending )
- RecalcLayout( true );
-
- wxPaintDC dc(mpFrame);
-
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- {
- wxRect& rect = mPanes[i]->mBoundsInParent;
-
- dc.SetClippingRegion( rect.x, rect.y, rect.width, rect.height );
-
- mPanes[i]->PaintPane(dc);
-
- dc.DestroyClippingRegion();
- }
-
- event.Skip();
-}
-
-void wxFrameLayout::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
-{
- // do nothing
-}
-
-void wxFrameLayout::OnIdle( wxIdleEvent& event )
-{
- wxWindow* focus = wxWindow::FindFocus();
-
- if ( !focus && mCheckFocusWhenIdle )
- {
- wxMessageBox(wxT("Hi, no more focus in this app!"));
-
- mCheckFocusWhenIdle = false;
- //ShowFloatedWindows( false );
- }
-
- mCheckFocusWhenIdle = false;
-
- event.Skip();
-}
-
-void wxFrameLayout::GetPaneProperties( cbCommonPaneProperties& props, int alignment )
-{
- props = mPanes[alignment]->mProps;
-}
-
-void wxFrameLayout::SetPaneProperties( const cbCommonPaneProperties& props, int paneMask )
-{
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- {
- if ( mPanes[i]->MatchesMask( paneMask ) )
- mPanes[i]->mProps = props;
- }
-}
-
-void wxFrameLayout::SetMargins( int top, int bottom, int left, int right,
- int paneMask )
-{
- int i;
- for ( i = 0; i != MAX_PANES; ++i )
- {
- cbDockPane& pane = *mPanes[i];
-
- if ( pane.MatchesMask( paneMask ) )
- {
- pane.mTopMargin = top;
- pane.mBottomMargin = bottom;
- pane.mLeftMargin = left;
- pane.mRightMargin = right;
- }
- }
-}
-
-void wxFrameLayout::SetPaneBackground( const wxColour& colour )
-{
- mBorderPen.SetColour( colour );
-}
-
-void wxFrameLayout::RefreshNow( bool recalcLayout )
-{
- if ( recalcLayout )
- RecalcLayout( true );
-
- if ( mpFrame )
- mpFrame->Refresh();
-}
-
-/*** plugin-related methods ***/
-
-void wxFrameLayout::FirePluginEvent( cbPluginEvent& event )
-{
- // check state of input capture, before processing the event
-
- if ( mpCaputesInput )
- {
- bool isInputEvt = true;
-#if wxCHECK_VERSION(2,3,0)
- if ( event.GetEventType() != cbEVT_PL_LEFT_DOWN &&
- event.GetEventType() != cbEVT_PL_LEFT_UP &&
- event.GetEventType() != cbEVT_PL_RIGHT_DOWN &&
- event.GetEventType() != cbEVT_PL_RIGHT_UP &&
- event.GetEventType() != cbEVT_PL_MOTION )
- isInputEvt = false;
-#else
- switch ( event.m_eventType )
- {
- case cbEVT_PL_LEFT_DOWN : break;
- case cbEVT_PL_LEFT_UP : break;
- case cbEVT_PL_RIGHT_DOWN : break;
- case cbEVT_PL_RIGHT_UP : break;
- case cbEVT_PL_MOTION : break;
-
- default : isInputEvt = false; break;
- }
-#endif // #if wxCHECK_VERSION(2,3,0)
-
- if ( isInputEvt )
- {
- mpCaputesInput->ProcessEvent( event );
- return;
- }
- }
-
- GetTopPlugin().ProcessEvent( event );
-}
-
-void wxFrameLayout::CaptureEventsForPlugin ( cbPluginBase* pPlugin )
-{
- // cannot capture events for more than one plugin at a time
- wxASSERT( mpCaputesInput == NULL );
-
- mpCaputesInput = pPlugin;
-
-}
-
-void wxFrameLayout::ReleaseEventsFromPlugin( cbPluginBase* WXUNUSED(pPlugin) )
-{
- // events should be captured first
- wxASSERT( mpCaputesInput != NULL );
-
- mpCaputesInput = NULL;
-}
-
-void wxFrameLayout::CaptureEventsForPane( cbDockPane* toPane )
-{
- // cannot capture events twice (without releasing)
- wxASSERT( mpPaneInFocus == NULL );
-
- mpFrame->CaptureMouse();
-
- mpPaneInFocus = toPane;
-}
-
-void wxFrameLayout::ReleaseEventsFromPane( cbDockPane* WXUNUSED(fromPane) )
-{
- // cannot release events without capturing them
- wxASSERT( mpPaneInFocus != NULL );
-
- mpFrame->ReleaseMouse();
-
- mpPaneInFocus = NULL;
-}
-
-cbPluginBase& wxFrameLayout::GetTopPlugin()
-{
- if ( !mpTopPlugin )
-
- PushDefaultPlugins(); // automatic configuration
-
- return *mpTopPlugin;
-}
-
-void wxFrameLayout::SetTopPlugin( cbPluginBase* pPlugin )
-{
- mpTopPlugin = pPlugin;
-}
-
-bool wxFrameLayout::HasTopPlugin()
-{
- return ( mpTopPlugin != NULL );
-}
-
-void wxFrameLayout::PushPlugin( cbPluginBase* pPlugin )
-{
- if ( !mpTopPlugin )
-
- mpTopPlugin = pPlugin;
- else
- {
- pPlugin->SetNextHandler( mpTopPlugin );
-
- mpTopPlugin->SetPreviousHandler( pPlugin );
-
- mpTopPlugin = pPlugin;
- }
-
- mpTopPlugin->OnInitPlugin(); // notification
-}
-
-void wxFrameLayout::PopPlugin()
-{
- wxASSERT( mpTopPlugin ); // DBG:: at least one plugin should be present
-
- cbPluginBase* pPopped = mpTopPlugin;
-
- mpTopPlugin = (cbPluginBase*)mpTopPlugin->GetNextHandler();
-
- delete pPopped;
-}
-
-void wxFrameLayout::PopAllPlugins()
-{
- while( mpTopPlugin ) PopPlugin();
-}
-
-void wxFrameLayout::PushDefaultPlugins()
-{
- // FIXME:: to much of the stuff for the default...
-
- AddPlugin( CLASSINFO( cbRowLayoutPlugin ) );
- AddPlugin( CLASSINFO( cbBarDragPlugin ) );
- AddPlugin( CLASSINFO( cbPaneDrawPlugin ) );
-}
-
-void wxFrameLayout::AddPlugin( wxClassInfo* pPlInfo, int paneMask )
-{
- if ( FindPlugin ( pPlInfo ) ) return; // same type of plugin cannot be added twice
-
- cbPluginBase* pObj = (cbPluginBase*)pPlInfo->CreateObject();
-
- wxASSERT(pObj); // DBG:: plugin's class should be dynamic
-
- pObj->mPaneMask = paneMask;
- pObj->mpLayout = this;
-
- PushPlugin( pObj );
-}
-
-void wxFrameLayout::AddPluginBefore( wxClassInfo* pNextPlInfo, wxClassInfo* pPlInfo,
- int paneMask )
-{
- wxASSERT( pNextPlInfo != pPlInfo ); // DBG:: no sense
-
- cbPluginBase* pNextPl = FindPlugin( pNextPlInfo );
-
- if ( !pNextPl )
- {
- AddPlugin( pPlInfo, paneMask );
-
- return;
- }
-
- // remove existing one if present
-
- cbPluginBase* pExistingPl = FindPlugin( pPlInfo );
-
- if ( pExistingPl ) RemovePlugin( pPlInfo );
-
- // create an instance
-
- cbPluginBase* pNewPl = (cbPluginBase*)pPlInfo->CreateObject();
-
- wxASSERT(pNewPl); // DBG:: plugin's class should be dynamic
-
- // insert it to the chain
-
- if ( pNextPl->GetPreviousHandler() )
- pNextPl->GetPreviousHandler()->SetNextHandler( pNewPl );
- else
- mpTopPlugin = pNewPl;
-
- pNewPl->SetNextHandler( pNextPl );
-
- pNewPl->SetPreviousHandler( pNextPl->GetPreviousHandler() );
-
- pNextPl->SetPreviousHandler( pNewPl );
-
- // set it up
-
- pNewPl->mPaneMask = paneMask;
- pNewPl->mpLayout = this;
-
- pNewPl->OnInitPlugin();
-}
-
-void wxFrameLayout::RemovePlugin( wxClassInfo* pPlInfo )
-{
- cbPluginBase* pPlugin = FindPlugin( pPlInfo );
-
- if ( !pPlugin ) return; // it's OK to remove not-existing plugin ;-)
-
- if ( pPlugin->GetPreviousHandler() == NULL )
-
- mpTopPlugin = (cbPluginBase*)pPlugin->GetNextHandler();
-
- delete pPlugin;
-}
-
-cbPluginBase* wxFrameLayout::FindPlugin( wxClassInfo* pPlInfo )
-{
- cbPluginBase *pCur = mpTopPlugin;
-
- while( pCur )
- {
- // NOTE:: it might appear useful matching plugin
- // classes "polymorphically":
-
- if ( pCur->GetClassInfo()->IsKindOf( pPlInfo ) )
-
- return pCur;
-
- pCur = (cbPluginBase*)pCur->GetNextHandler();
- }
-
- return NULL;
-}
-
-/***** Implementation for class cbUpdateMgrData *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbUpdateMgrData, wxObject )
-
-cbUpdateMgrData::cbUpdateMgrData()
-
- : mPrevBounds( -1,-1,0,0 ),
- mIsDirty( true ), // inidicate initial change
- mpCustomData(0)
-{}
-
-void cbUpdateMgrData::StoreItemState( const wxRect& boundsInParent )
-{
- mPrevBounds = boundsInParent;
-}
-
-void cbUpdateMgrData::SetDirty( bool isDirty )
-{
- mIsDirty = isDirty;
-}
-
-void cbUpdateMgrData::SetCustomData( wxObject* pCustomData )
-{
- mpCustomData = pCustomData;
-}
-
-/***** Implementation for class cbDockPane *****/
-
-void wxBarIterator::Reset()
-{
- mpRow = ( mpRows->Count() ) ? (*mpRows)[0] : NULL;
- mpBar = NULL;
-}
-
-wxBarIterator::wxBarIterator( RowArrayT& rows )
-
- : mpRows( &rows ),
- mpRow ( NULL ),
- mpBar ( NULL )
-{
- Reset();
-}
-
-bool wxBarIterator::Next()
-{
- if ( mpRow )
- {
- if ( mpBar )
- mpBar = mpBar->mpNext;
- else
- {
- if ( mpRow->mBars.GetCount() == 0 )
- {
- return false;
- }
-
- mpBar = mpRow->mBars[0];
- }
-
- if ( !mpBar )
- {
- // skip to the next row
-
- mpRow = mpRow->mpNext;
-
- if ( mpRow )
- mpBar = mpRow->mBars[0];
- else
- return false;
- }
-
- return true;
- }
- else
- return false;
-}
-
-cbBarInfo& wxBarIterator::BarInfo()
-{
- return *mpBar;
-}
-
-cbRowInfo& wxBarIterator::RowInfo()
-{
- return *mpRow;
-}
-
-/***** Implementation for class cbBarDimHandlerBase *****/
-
-IMPLEMENT_ABSTRACT_CLASS( cbBarDimHandlerBase, wxObject )
-
-cbBarDimHandlerBase::cbBarDimHandlerBase()
- : mRefCount(0)
-{}
-
-void cbBarDimHandlerBase::AddRef()
-{
- ++mRefCount;
-}
-
-void cbBarDimHandlerBase::RemoveRef()
-{
- if ( --mRefCount <= 0 ) delete this;
-}
-
-/***** Implementation for class cbDimInfo *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbDimInfo, wxObject )
-
-cbDimInfo::cbDimInfo()
-
- : mVertGap ( 0 ),
- mHorizGap( 0 ),
-
- mIsFixed(true),
- mpHandler( NULL )
-{
- size_t i;
- for ( i = 0; i != MAX_BAR_STATES; ++i )
- {
- mSizes[i].x = 20;
- mSizes[i].y = 20;
-
- mBounds[i] = wxRect( -1,-1,-1,-1 );
- }
-}
-
-cbDimInfo::cbDimInfo( cbBarDimHandlerBase* pDimHandler,
- bool isFixed )
-
- : mVertGap ( 0 ),
- mHorizGap( 0 ),
- mIsFixed ( isFixed ),
-
- mpHandler( pDimHandler )
-{
- if ( mpHandler )
- {
- // int vtad = *((int*)mpHandler);
- mpHandler->AddRef();
- }
-
- size_t i;
- for ( i = 0; i != MAX_BAR_STATES; ++i )
- {
- mSizes[i].x = -1;
- mSizes[i].y = -1;
-
- mBounds[i] = wxRect( -1,-1,-1,-1 );
- }
-}
-
-cbDimInfo::cbDimInfo( int dh_x, int dh_y,
- int dv_x, int dv_y,
- int f_x, int f_y,
-
- bool isFixed,
- int horizGap,
- int vertGap,
-
- cbBarDimHandlerBase* pDimHandler
- )
- : mVertGap ( vertGap ),
- mHorizGap ( horizGap ),
- mIsFixed ( isFixed ),
- mpHandler( pDimHandler )
-{
- if ( mpHandler )
- {
- // int vtad = *((int*)mpHandler);
- mpHandler->AddRef();
- }
-
- mSizes[wxCBAR_DOCKED_HORIZONTALLY].x = dh_x;
- mSizes[wxCBAR_DOCKED_HORIZONTALLY].y = dh_y;
- mSizes[wxCBAR_DOCKED_VERTICALLY ].x = dv_x;
- mSizes[wxCBAR_DOCKED_VERTICALLY ].y = dv_y;
- mSizes[wxCBAR_FLOATING ].x = f_x;
- mSizes[wxCBAR_FLOATING ].y = f_y;
-
- size_t i;
- for ( i = 0; i != MAX_BAR_STATES; ++i )
- mBounds[i] = wxRect( -1,-1,-1,-1 );
-}
-
-cbDimInfo::cbDimInfo( int x, int y,
- bool isFixed, int gap,
- cbBarDimHandlerBase* pDimHandler)
- : mVertGap ( gap ),
- mHorizGap ( gap ),
- mIsFixed ( isFixed ),
- mpHandler( pDimHandler )
-{
- if ( mpHandler )
- {
- // int vtad = *((int*)mpHandler);
- mpHandler->AddRef();
- }
-
- mSizes[wxCBAR_DOCKED_HORIZONTALLY].x = x;
- mSizes[wxCBAR_DOCKED_HORIZONTALLY].y = y;
- mSizes[wxCBAR_DOCKED_VERTICALLY ].x = x;
- mSizes[wxCBAR_DOCKED_VERTICALLY ].y = y;
- mSizes[wxCBAR_FLOATING ].x = x;
- mSizes[wxCBAR_FLOATING ].y = y;
-
- size_t i;
- for ( i = 0; i != MAX_BAR_STATES; ++i )
- mBounds[i] = wxRect( -1,-1,-1,-1 );
-}
-
-cbDimInfo::~cbDimInfo()
-{
- if ( mpHandler )
-
- mpHandler->RemoveRef();
-}
-
-const cbDimInfo& cbDimInfo::operator=( const cbDimInfo& other )
-{
- if ( this == &other )
- return *this;
-
- int i;
- for ( i = 0; i != MAX_BAR_STATES; ++i )
- mSizes[i] = other.mSizes[i];
-
- mIsFixed = other.mIsFixed;
- mpHandler = other.mpHandler;
-
- mVertGap = other.mVertGap;
- mHorizGap = other.mHorizGap;
-
- if ( mpHandler )
-
- mpHandler->AddRef();
-
- return *this;
-}
-
-/***** Implementation for structure cbCommonPaneProperties *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbCommonPaneProperties, wxObject )
-
-cbCommonPaneProperties::cbCommonPaneProperties(void)
-
- : mRealTimeUpdatesOn ( true ),
- mOutOfPaneDragOn ( true ),
- mExactDockPredictionOn( false ),
- mNonDestructFrictionOn( false ),
- mShow3DPaneBorderOn ( true ),
- mBarFloatingOn ( false ),
- mRowProportionsOn ( false ),
- mColProportionsOn ( true ),
- mBarCollapseIconsOn ( false ),
- mBarDragHintsOn ( false ),
-
- mMinCBarDim( 16, 16 ),
- mResizeHandleSize( 4 )
-{}
-
-cbCommonPaneProperties::cbCommonPaneProperties(const cbCommonPaneProperties& props)
-
- : wxObject(),
- mRealTimeUpdatesOn (props.mRealTimeUpdatesOn),
- mOutOfPaneDragOn (props.mOutOfPaneDragOn),
- mExactDockPredictionOn(props.mExactDockPredictionOn),
- mNonDestructFrictionOn(props.mNonDestructFrictionOn),
- mShow3DPaneBorderOn (props.mShow3DPaneBorderOn),
- mBarFloatingOn (props.mBarFloatingOn),
- mRowProportionsOn (props.mRowProportionsOn),
- mColProportionsOn (props.mColProportionsOn),
- mBarCollapseIconsOn (props.mBarCollapseIconsOn),
- mBarDragHintsOn (props.mBarDragHintsOn),
-
- mMinCBarDim(props.mMinCBarDim),
- mResizeHandleSize(props.mResizeHandleSize)
-{}
-
-cbCommonPaneProperties& cbCommonPaneProperties::operator=(const cbCommonPaneProperties& props)
-{
- mRealTimeUpdatesOn = props.mRealTimeUpdatesOn;
- mOutOfPaneDragOn = props.mOutOfPaneDragOn;
- mExactDockPredictionOn = props.mExactDockPredictionOn;
- mNonDestructFrictionOn = props.mNonDestructFrictionOn;
- mShow3DPaneBorderOn = props.mShow3DPaneBorderOn;
- mBarFloatingOn = props.mBarFloatingOn;
- mRowProportionsOn = props.mRowProportionsOn;
- mColProportionsOn = props.mColProportionsOn;
- mBarCollapseIconsOn = props.mBarCollapseIconsOn;
- mBarDragHintsOn = props.mBarDragHintsOn;
-
- mMinCBarDim = props.mMinCBarDim;
- mResizeHandleSize = props.mResizeHandleSize;
-
- return *this;
-}
-
-/***** Implementation for class cbRowInfo *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbRowInfo, wxObject )
-
-cbRowInfo::cbRowInfo(void)
-
- : mNotFixedBarsCnt( false ),
- mpNext ( NULL ),
- mpPrev ( NULL ),
- mpExpandedBar ( NULL )
-{}
-
-cbRowInfo::~cbRowInfo()
-{
- // nothing! all bars are removed using global bar
- // list in wxFrameLayout class
-}
-
-/***** Implementation for class cbBarInfo *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbBarInfo, wxObject )
-
-cbBarInfo::cbBarInfo(void)
-
- : mpRow( NULL ),
- mFloatingOn( true ),
- mpNext( NULL ),
- mpPrev( NULL )
-{}
-
-cbBarInfo::~cbBarInfo()
-{
- // nothing
-}
-
-/***** Implementation for class cbDockPane *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbDockPane, wxObject )
-
-// FIXME:: how to eliminate these cut&pasted constructors?
-
-cbDockPane::cbDockPane(void)
- : mLeftMargin ( 1 ),
- mRightMargin ( 1 ),
- mTopMargin ( 1 ),
- mBottomMargin( 1 ),
- mPaneWidth ( 32768 ), // fake-up very large pane dims,
- // since the real dimensions of the pane may not
- // be known, while inserting bars initially
- mPaneHeight( 32768 ),
- mAlignment ( -1 ),
- mpLayout ( 0 ),
- mpStoredRow( NULL )
-{}
-
-cbDockPane::cbDockPane( int alignment, wxFrameLayout* pPanel )
-
- : mLeftMargin ( 1 ),
- mRightMargin ( 1 ),
- mTopMargin ( 1 ),
- mBottomMargin( 1 ),
- mPaneWidth ( 32768 ), // fake-up very large pane dims,
- // since the real dimensions of the pane may not
- // be known, while inserting bars initially
- mPaneHeight( 32768 ),
- mAlignment ( alignment ),
- mpLayout ( pPanel ),
- mpStoredRow( NULL )
-{}
-
-cbDockPane::~cbDockPane()
-{
- size_t i;
- for ( i = 0; i != mRows.Count(); ++i )
- delete mRows[i];
-
- WX_CLEAR_LIST(wxList,mRowShapeData)
-
- // NOTE:: control bar infromation structures are cleaned-up
- // in wxFrameLayout's destructor, using global control-bar list
-}
-
-void cbDockPane::SetMargins( int top, int bottom, int left, int right )
-{
- mTopMargin = top;
- mBottomMargin = bottom;
- mLeftMargin = left;
- mRightMargin = right;
-}
-
-/*** helpers of cbDockPane ***/
-
-void cbDockPane::PaintBarDecorations( cbBarInfo* pBar, wxDC& dc )
-{
- cbDrawBarDecorEvent evt( pBar, dc, this );
-
- mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::PaintBarHandles( cbBarInfo* pBar, wxDC& dc )
-{
- cbDrawBarHandlesEvent evt( pBar, dc, this );
-
- mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::PaintBar( cbBarInfo* pBar, wxDC& dc )
-{
- PaintBarDecorations( pBar, dc );
- PaintBarHandles( pBar, dc );
-}
-
-void cbDockPane::PaintRowHandles( cbRowInfo* pRow, wxDC& dc )
-{
- cbDrawRowHandlesEvent evt( pRow, dc, this );
-
- mpLayout->FirePluginEvent( evt );
-
- cbDrawRowDecorEvent evt1( pRow, dc, this );
-
- mpLayout->FirePluginEvent( evt1 );
-}
-
-void cbDockPane::PaintRowBackground ( cbRowInfo* pRow, wxDC& dc )
-{
- cbDrawRowBkGroundEvent evt( pRow, dc, this );
-
- mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::PaintRowDecorations( cbRowInfo* pRow, wxDC& dc )
-{
- size_t i;
-
- // decorations first
- for ( i = 0; i != pRow->mBars.Count(); ++i )
-
- PaintBarDecorations( pRow->mBars[i], dc );
-
- // then handles if present
- for ( i = 0; i != pRow->mBars.Count(); ++i )
-
- PaintBarHandles( pRow->mBars[i], dc );
-}
-
-void cbDockPane::PaintRow( cbRowInfo* pRow, wxDC& dc )
-{
- PaintRowBackground ( pRow, dc );
- PaintRowDecorations( pRow, dc );
- PaintRowHandles ( pRow, dc );
-}
-
-void cbDockPane::PaintPaneBackground( wxDC& dc )
-{
- cbDrawPaneBkGroundEvent evt( dc, this );
-
- mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::PaintPaneDecorations( wxDC& dc )
-{
- cbDrawPaneDecorEvent evt( dc, this );
-
- mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::PaintPane( wxDC& dc )
-{
- size_t i;
-
- PaintPaneBackground( dc );
-
- // first decorations
- for ( i = 0; i != mRows.Count(); ++i )
- {
- PaintRowBackground( mRows[i], dc );
- PaintRowDecorations( mRows[i], dc );
- }
-
- // than handles
- for ( i = 0; i != mRows.Count(); ++i )
- PaintRowHandles( mRows[i], dc );
-
- // and finally
- PaintPaneDecorations( dc );
-}
-
-void cbDockPane::SizeBar( cbBarInfo* pBar )
-{
- cbSizeBarWndEvent evt( pBar, this );
-
- mpLayout->FirePluginEvent( evt );
- return;
-}
-
-void cbDockPane::SizeRowObjects( cbRowInfo* pRow )
-{
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- SizeBar( pRow->mBars[i] );
-}
-
-void cbDockPane::SizePaneObjects()
-{
- size_t i;
- for ( i = 0; i != mRows.Count(); ++i )
- SizeRowObjects( mRows[i] );
-}
-
-wxDC* cbDockPane::StartDrawInArea( const wxRect& area )
-{
- wxDC* pDc = 0;
-
- cbStartDrawInAreaEvent evt( area, &pDc, this );
-
- mpLayout->FirePluginEvent( evt );
-
- return pDc;
-}
-
-void cbDockPane::FinishDrawInArea( const wxRect& area )
-{
- cbFinishDrawInAreaEvent evt( area, this );
-
- mpLayout->FirePluginEvent( evt );
-}
-
-bool cbDockPane::IsFixedSize( cbBarInfo* pInfo )
-{
- return ( pInfo->mDimInfo.mIsFixed );
-}
-
-int cbDockPane::GetNotFixedBarsCount( cbRowInfo* pRow )
-{
- int cnt = 0;
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( !pRow->mBars[i]->IsFixed() )
- ++cnt;
- }
-
- return cnt;
-}
-
-void cbDockPane::RemoveBar( cbBarInfo* pBar )
-{
- bool needsRestoring = mProps.mNonDestructFrictionOn &&
- mpStoredRow == pBar->mpRow;
-
- cbRemoveBarEvent evt( pBar, this );
-
- mpLayout->FirePluginEvent( evt );
-
- if ( needsRestoring )
- {
- SetRowShapeData( mpStoredRow, &mRowShapeData );
-
- mpStoredRow = NULL;
- }
-}
-
-void cbDockPane::SyncRowFlags( cbRowInfo* pRow )
-{
- // setup mHasOnlyFixedBars flag for the row information
- pRow->mHasOnlyFixedBars = true;
-
- pRow->mNotFixedBarsCnt = 0;
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- cbBarInfo& bar = *pRow->mBars[i];
-
- bar.mpRow = pRow;
-
- if ( !bar.IsFixed() )
- {
- pRow->mHasOnlyFixedBars = false;
- ++pRow->mNotFixedBarsCnt;
- }
- }
-}
-
-void cbDockPane::FrameToPane( int* x, int* y )
-{
- *x -= mLeftMargin;
- *y -= mTopMargin;
-
- if ( mAlignment == FL_ALIGN_TOP ||
- mAlignment == FL_ALIGN_BOTTOM
- )
- {
- *x -= mBoundsInParent.x;
- *y -= mBoundsInParent.y;
- }
- else
- {
- int rx = *x, ry = *y;
-
- *x = ry - mBoundsInParent.y;
-
- *y = rx - mBoundsInParent.x;
- }
-}
-
-void cbDockPane::PaneToFrame( int* x, int* y )
-{
- if ( mAlignment == FL_ALIGN_TOP ||
- mAlignment == FL_ALIGN_BOTTOM
- )
- {
- *x += mBoundsInParent.x;
- *y += mBoundsInParent.y;
- }
- else
- {
- int rx = *x, ry = *y;
-
- *x = ry + mBoundsInParent.x;
-
- *y = mBoundsInParent.y + rx;
- }
-
- *x += mLeftMargin;
- *y += mTopMargin;
-}
-
-void cbDockPane::FrameToPane( wxRect* pRect )
-{
- wxPoint upperLeft ( pRect->x, pRect->y );
- wxPoint lowerRight( pRect->x + pRect->width,
- pRect->y + pRect->height );
-
- FrameToPane( &upperLeft.x, &upperLeft.y );
- FrameToPane( &lowerRight.x, &lowerRight.y );
-
- pRect->x = wxMin(upperLeft.x,lowerRight.x);
- pRect->y = wxMin(upperLeft.y,lowerRight.y);
-
- pRect->width = abs( lowerRight.x - upperLeft.x );
- pRect->height = abs( lowerRight.y - upperLeft.y );
-}
-
-void cbDockPane::PaneToFrame( wxRect* pRect )
-{
- wxPoint upperLeft ( pRect->x, pRect->y );
- wxPoint lowerRight( pRect->x + pRect->width,
- pRect->y + pRect->height );
-
- PaneToFrame( &upperLeft.x, &upperLeft.y );
- PaneToFrame( &lowerRight.x, &lowerRight.y );
-
- //wxRect newRect = wxRect( upperLeft, lowerRight );
-
- pRect->x = wxMin(upperLeft.x,lowerRight.x);
- pRect->y = wxMin(upperLeft.y,lowerRight.y);
-
- pRect->width = abs( lowerRight.x - upperLeft.x );
- pRect->height = abs( lowerRight.y - upperLeft.y );
-}
-
-int cbDockPane::GetRowAt( int paneY )
-{
- if ( paneY < 0 )
- return -1;
-
- int curY = 0;
-
- size_t i = 0;
-
- for ( ; i != mRows.Count(); ++i )
- {
- int rowHeight = mRows[i]->mRowHeight;
-
- int third = rowHeight/3;
-
- if ( paneY >= curY && paneY < curY + third )
- return i-1;
-
- if ( paneY >= curY + third && paneY < curY + rowHeight - third )
- return i;
-
- curY += rowHeight;
- }
-
- return i;
-}
-
-int cbDockPane::GetRowAt( int upperY, int lowerY )
-{
- /*
- // OLD STUFF::
- int range = lowerY - upperY;
- int oneThird = range / 3;
-
- wxNode* pRow = mRows.GetFirst();
- int row = 0;
- int curY = 0;
-
- if ( lowerY <= 0 ) return -1;
-
- while( pRow )
- {
- int rowHeight = GetRowHeight( (wxList*)pRow->GetData() );
-
- if ( upperY >= curY &&
- lowerY < curY ) return row;
-
- if ( upperY <= curY &&
- lowerY >= curY &&
- curY - upperY >= oneThird ) return row-1;
-
- if ( ( upperY < curY + rowHeight &&
- lowerY >= curY + rowHeight &&
- curY + rowHeight - lowerY >= oneThird )
- )
- return row+1;
-
- if ( lowerY <= curY + rowHeight ) return row;
-
- ++row;
- curY += rowHeight;
- pRow = pRow->GetNext();
- }
- */
-
- int mid = upperY + (lowerY - upperY)/2;
-
- if ( mid < 0 )
- return -1;
-
- int curY = 0;
- size_t i = 0;
-
- for ( ; i != mRows.Count(); ++i )
- {
- int rowHeight = mRows[i]->mRowHeight;
-
- if ( mid >= curY && mid < curY + rowHeight ) return i;
-
- curY += rowHeight;
- }
-
- return i;
-}
-
-int cbDockPane::GetRowY( cbRowInfo* pRow )
-{
- int curY = 0;
-
- size_t i;
- for ( i = 0; i != mRows.Count(); ++i )
- {
- if ( mRows[i] == pRow )
- break;
-
- curY += mRows[i]->mRowHeight;
- }
-
- return curY;
-}
-
-bool cbDockPane::HasNotFixedRowsAbove( cbRowInfo* pRow )
-{
- while ( pRow->mpPrev )
- {
- pRow = pRow->mpPrev;
-
- if ( pRow->mHasOnlyFixedBars )
-
- return true;
- }
-
- return false;
-}
-
-bool cbDockPane::HasNotFixedRowsBelow( cbRowInfo* pRow )
-{
- while( pRow->mpNext )
- {
- pRow = pRow->mpNext;
-
- if ( pRow->mHasOnlyFixedBars )
-
- return true;
- }
-
- return false;
-}
-
-bool cbDockPane::HasNotFixedBarsLeft( cbBarInfo* pBar )
-{
- while( pBar->mpPrev )
- {
- pBar = pBar->mpPrev;
-
- if ( pBar->IsFixed() )
-
- return true;
- }
-
- return false;
-}
-
-bool cbDockPane::HasNotFixedBarsRight( cbBarInfo* pBar )
-{
- while( pBar->mpNext )
- {
- pBar = pBar->mpNext;
-
- if ( pBar->IsFixed() )
-
- return true;
- }
-
- return false;
-}
-
-void cbDockPane::CalcLengthRatios( cbRowInfo* pInRow )
-{
- size_t i;
-
- int totalWidth = 0;
-
- // calc current-maximal-total-length of all maximized bars
-
- for ( i = 0; i != pInRow->mBars.GetCount(); ++i )
- {
- cbBarInfo& bar = *pInRow->mBars[i];
-
- if ( !bar.IsFixed() )
- totalWidth += bar.mBounds.width;
- }
-
- // set up percentages of occupied space for each maximized bar
-
- for ( i = 0; i != pInRow->mBars.Count(); ++i )
- {
- cbBarInfo& bar = *pInRow->mBars[i];
-
- if ( !bar.IsFixed() )
- bar.mLenRatio = double(bar.mBounds.width)/double(totalWidth);
- }
-}
-
-void cbDockPane::RecalcRowLayout( cbRowInfo* pRow )
-{
- cbLayoutRowEvent evt( pRow, this );
-
- mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::ExpandBar( cbBarInfo* pBar )
-{
- mpLayout->GetUpdatesManager().OnStartChanges();
-
- if ( !pBar->mpRow->mpExpandedBar )
- {
- // save ratios only when there arent any bars expanded yet
-
- cbArrayFloat& ratios = pBar->mpRow->mSavedRatios;
-
- ratios.Clear();
- ratios.Alloc( pBar->mpRow->mNotFixedBarsCnt );
-
- cbBarInfo* pCur = pBar->mpRow->mBars[0];
-
- while( pCur )
- {
- if ( !pCur->IsFixed() )
- {
- ratios.Add( 0.0 );
- ratios[ ratios.GetCount() - 1 ] = pCur->mLenRatio;
- }
-
- pCur = pCur->mpNext;
- }
- }
-
- cbBarInfo* pCur = pBar->mpRow->mBars[0];
-
- while( pCur )
- {
- pCur->mLenRatio = 0.0; // minimize the rest
-
- pCur = pCur->mpNext;
- }
-
- pBar->mLenRatio = 1.0; // 100%
- pBar->mBounds.width = 0;
-
- pBar->mpRow->mpExpandedBar = pBar;
-
- mpLayout->RecalcLayout( false );
-
- mpLayout->GetUpdatesManager().OnFinishChanges();
- mpLayout->GetUpdatesManager().UpdateNow();
-}
-
-void cbDockPane::ContractBar( cbBarInfo* pBar )
-{
- mpLayout->GetUpdatesManager().OnStartChanges();
-
- // FIXME: What's the purpose of this???
- // double ratio = 1.0/ double( pBar->mpRow->mNotFixedBarsCnt );
-
- // restore ratios which were present before expansion
-
- cbBarInfo* pCur = pBar->mpRow->mBars[0];
-
- cbArrayFloat& ratios = pBar->mpRow->mSavedRatios;
-
- size_t i = 0;
-
- while( pCur )
- {
- if ( !pCur->IsFixed() )
- {
- pCur->mLenRatio = ratios[i];
- ++i;
- }
-
- pCur = pCur->mpNext;
- }
-
- ratios.Clear();
- ratios.Shrink();
-
- pBar->mpRow->mpExpandedBar = NULL;
-
- mpLayout->RecalcLayout( false );
-
- mpLayout->GetUpdatesManager().OnFinishChanges();
- mpLayout->GetUpdatesManager().UpdateNow();
-}
-
-void cbDockPane::InitLinksForRow( cbRowInfo* pRow )
-{
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- cbBarInfo& bar = *pRow->mBars[i];
-
- if ( i == 0 )
- bar.mpPrev = NULL;
- else
- bar.mpPrev = pRow->mBars[i-1];
-
- if ( i == pRow->mBars.Count() - 1 )
- bar.mpNext = NULL;
- else
- bar.mpNext = pRow->mBars[i+1];
- }
-}
-
-void cbDockPane::InitLinksForRows()
-{
- size_t i;
- for ( i = 0; i != mRows.Count(); ++i )
- {
- cbRowInfo& row = *mRows[i];
-
- if ( i == 0 )
- row.mpPrev = NULL;
- else
- row.mpPrev = mRows[i-1];
-
- if ( i == mRows.Count() - 1 )
- row.mpNext = NULL;
- else
- row.mpNext = mRows[i+1];
- }
-}
-
-void cbDockPane::DoInsertBar( cbBarInfo* pBar, int rowNo )
-{
- cbRowInfo* pRow;
-
- if ( rowNo == -1 || rowNo >= (int)mRows.Count() )
- {
- pRow = new cbRowInfo();
-
- if ( rowNo == -1 && mRows.Count() )
-
- mRows.Insert( pRow, 0 );
- else
- mRows.Add( pRow );
-
- InitLinksForRows();
- }
- else
- {
- pRow = mRows[rowNo];
-
- if ( mProps.mNonDestructFrictionOn == true )
- {
- // store original shape of the row (before the bar is inserted)
-
- mpStoredRow = pRow;
-
- GetRowShapeData( mpStoredRow, &mRowShapeData );
- }
- }
-
- if ( pRow->mBars.Count() )
-
- pRow->mpExpandedBar = NULL;
-
- cbInsertBarEvent insEvt( pBar, pRow, this );
-
- mpLayout->FirePluginEvent( insEvt );
-
- mpLayout->GetUpdatesManager().OnRowWillChange( pRow, this );
-}
-
-void cbDockPane::InsertBar( cbBarInfo* pBarInfo, const wxRect& atRect )
-{
- wxRect rect = atRect;
- FrameToPane( &rect );
-
- pBarInfo->mBounds.x = rect.x;
- pBarInfo->mBounds.width = rect.width;
- pBarInfo->mBounds.height = rect.height;
-
- int row = GetRowAt( rect.y, rect.y + rect.height );
-
- DoInsertBar( pBarInfo, row );
-}
-
-void cbDockPane::InsertBar( cbBarInfo* pBar, cbRowInfo* pIntoRow )
-{
- cbInsertBarEvent insEvt( pBar, pIntoRow, this );
-
- mpLayout->FirePluginEvent( insEvt );
-
- mpLayout->GetUpdatesManager().OnRowWillChange( pIntoRow, this );
-}
-
-void cbDockPane::InsertBar( cbBarInfo* pBarInfo )
-{
- // set transient properties
-
- pBarInfo->mpRow = NULL;
- pBarInfo->mHasLeftHandle = false;
- pBarInfo->mHasRightHandle = false;
- pBarInfo->mLenRatio = 0.0;
-
- // set preferred bar dimensions, according to the state in which
- // the bar is being inserted
-
- pBarInfo->mBounds.width = pBarInfo->mDimInfo.mSizes[ pBarInfo->mState ].x;
- pBarInfo->mBounds.height = pBarInfo->mDimInfo.mSizes[ pBarInfo->mState ].y;
-
- DoInsertBar( pBarInfo, pBarInfo->mRowNo );
-}
-
-void cbDockPane::RemoveRow( cbRowInfo* pRow )
-{
- size_t i;
- // first, hide all bar-windows in the removed row
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( pRow->mBars[i]->mpBarWnd )
- pRow->mBars[i]->mpBarWnd->Show( false );
- }
-
- mRows.Remove( pRow );
-
- pRow->mUMgrData.SetDirty(true);
-}
-
-void cbDockPane::InsertRow( cbRowInfo* pRow, cbRowInfo* pBeforeRow )
-{
- if ( !pBeforeRow )
-
- mRows.Add( pRow );
- else
- mRows.Insert( pRow, mRows.Index( pBeforeRow ) );
-
- InitLinksForRows();
-
- pRow->mUMgrData.SetDirty(true);
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- pRow->mBars[i]->mUMgrData.SetDirty( true );
-
- SyncRowFlags( pRow );
-}
-
-void cbDockPane::SetPaneWidth(int width)
-{
- if ( IsHorizontal() )
- mPaneWidth = width - mLeftMargin - mRightMargin;
- else
- mPaneWidth = width - mTopMargin - mBottomMargin;
-}
-
-
-void cbDockPane::SetBoundsInParent( const wxRect& rect )
-{
- mBoundsInParent = rect;
-
- // set pane dimensions in local coordinates
-
- if ( IsHorizontal() )
- {
- mPaneWidth = mBoundsInParent.width - ( mRightMargin + mLeftMargin );
- mPaneHeight = mBoundsInParent.height - ( mTopMargin + mBottomMargin );
- }
- else
- {
- mPaneWidth = mBoundsInParent.height - ( mTopMargin + mBottomMargin );
- mPaneHeight = mBoundsInParent.width - ( mRightMargin + mLeftMargin );
- }
-
- // convert bounding rectangles of all pane items into parent frame's coordinates
-
- wxBarIterator i( mRows );
-
- wxRect noMarginsRect = mBoundsInParent;
-
- noMarginsRect.x += mLeftMargin;
- noMarginsRect.y += mTopMargin;
- noMarginsRect.width -= ( mLeftMargin + mRightMargin );
- noMarginsRect.height -= ( mTopMargin + mBottomMargin );
-
- // hide the whole pane, if it's bounds became reverted (i.e. pane vanished)
-
- if ( mBoundsInParent.width < 0 ||
- mBoundsInParent.height < 0 )
-
- hide_rect( mBoundsInParent );
-
- if ( noMarginsRect.width < 0 ||
- noMarginsRect.height < 0 )
-
- hide_rect( noMarginsRect );
-
- // calculate mBoundsInParent for each item in the pane
-
- while( i.Next() )
- {
- cbBarInfo& bar = i.BarInfo();
-
- cbRowInfo* pRowInfo = bar.mpRow;
-
- // set up row info, if this is first bar in the row
-
- if ( pRowInfo && bar.mpPrev == NULL )
- {
- pRowInfo->mBoundsInParent.y = pRowInfo->mRowY;
- pRowInfo->mBoundsInParent.x = 0;
- pRowInfo->mBoundsInParent.width = mPaneWidth;
- pRowInfo->mBoundsInParent.height = pRowInfo->mRowHeight;
-
- PaneToFrame( &pRowInfo->mBoundsInParent );
-
- clip_rect_against_rect( pRowInfo->mBoundsInParent, noMarginsRect );
- }
-
- wxRect bounds = bar.mBounds;
-
- // exclude dimensions of handles, when calculating
- // bar's bounds in parent (i.e. "visual bounds")
-
- if ( bar.mHasLeftHandle )
- {
- bounds.x += mProps.mResizeHandleSize;
- bounds.width -= mProps.mResizeHandleSize;
- }
-
- if ( bar.mHasRightHandle )
-
- bounds.width -= mProps.mResizeHandleSize;
-
- PaneToFrame( &bounds );
-
- clip_rect_against_rect( bounds, noMarginsRect );
-
- bar.mBoundsInParent = bounds;
- }
-}
-
-bool cbDockPane::BarPresent( cbBarInfo* pBar )
-{
- wxBarIterator iter( mRows );
-
- while( iter.Next() )
-
- if ( &iter.BarInfo() == pBar ) return true;
-
- return false;
-}
-
-cbRowInfo* cbDockPane::GetRow( int row )
-{
- if ( row >= (int)mRows.Count() ) return NULL;
-
- return mRows[ row ];
-}
-
-int cbDockPane::GetRowIndex( cbRowInfo* pRow )
-{
- size_t i;
- for ( i = 0; i != mRows.Count(); ++i )
- {
- if ( mRows[i] == pRow )
- return i;
- }
-
- wxFAIL_MSG(wxT("Row must be present to call cbDockPane::GetRowIndex()"));
-
- return 0;
-}
-
-int cbDockPane::GetPaneHeight()
-{
- // first, recalculate row heights and the Y-positions
-
- cbLayoutRowsEvent evt( this );
- mpLayout->FirePluginEvent( evt );
-
- int height = 0;
-
- if ( IsHorizontal() )
- height += mTopMargin + mBottomMargin;
- else
- height += mLeftMargin + mRightMargin;
-
- int count = mRows.Count();
-
- if ( count )
- height += mRows[count-1]->mRowY + mRows[count-1]->mRowHeight;
-
- return height;
-}
-
-int cbDockPane::GetAlignment()
-{
- return mAlignment;
-}
-
-bool cbDockPane::MatchesMask( int paneMask )
-{
- int thisMask = 0;
-
- // FIXME:: use array instead of switch()
-
- switch (mAlignment)
- {
- case FL_ALIGN_TOP : thisMask = FL_ALIGN_TOP_PANE; break;
- case FL_ALIGN_BOTTOM : thisMask = FL_ALIGN_BOTTOM_PANE;break;
- case FL_ALIGN_LEFT : thisMask = FL_ALIGN_LEFT_PANE; break;
- case FL_ALIGN_RIGHT : thisMask = FL_ALIGN_RIGHT_PANE; break;
-
- default:
- wxFAIL_MSG(wxT("Bad FL alignment type detected in cbDockPane::MatchesMask()"));
- }
-
- return ( thisMask & paneMask ) != 0;
-}
-
-void cbDockPane::RecalcLayout()
-{
- // first, reposition rows and items vertically
-
- cbLayoutRowsEvent evt( this );
- mpLayout->FirePluginEvent( evt );
-
- // then horizontally in each row
-
- size_t i;
- for ( i = 0; i != mRows.Count(); ++i )
- RecalcRowLayout( mRows[i] );
-}
-
-int cbDockPane::GetDockingState()
-{
- if ( mAlignment == FL_ALIGN_TOP ||
- mAlignment == FL_ALIGN_BOTTOM )
- {
- return wxCBAR_DOCKED_HORIZONTALLY;
- }
- else
- return wxCBAR_DOCKED_VERTICALLY;
-}
-
-inline bool cbDockPane::HasPoint( const wxPoint& pos, int x, int y,
- int width, int height )
-{
- return ( pos.x >= x &&
- pos.y >= y &&
- pos.x < x + width &&
- pos.y < y + height );
-}
-
-int cbDockPane::HitTestPaneItems( const wxPoint& pos,
- cbRowInfo** ppRow,
- cbBarInfo** ppBar
- )
-{
- (*ppRow) = NULL;
- (*ppBar) = NULL;
-
- size_t i;
- for ( i = 0; i != mRows.Count(); ++i )
- {
- cbRowInfo& row = *mRows[i];
-
- *ppRow = &row;
-
- // hit-test handles of the row, if present
-
- if ( row.mHasUpperHandle )
- {
- if ( HasPoint( pos, 0, row.mRowY,
- row.mRowWidth, mProps.mResizeHandleSize ) )
-
- return CB_UPPER_ROW_HANDLE_HITTED;
- }
- else
- if ( row.mHasLowerHandle )
- {
- if ( HasPoint( pos, 0, row.mRowY + row.mRowHeight - mProps.mResizeHandleSize,
- row.mRowWidth, mProps.mResizeHandleSize ) )
-
- return CB_LOWER_ROW_HANDLE_HITTED;
- }
-
- // hit-test bar handles and bar content
-
- size_t k;
- for ( k = 0; k != row.mBars.Count(); ++k )
- {
- cbBarInfo& bar = *row.mBars[k];
- wxRect& bounds = bar.mBounds;
-
- *ppBar = &bar;
-
- if ( bar.mHasLeftHandle )
- {
- if ( HasPoint( pos, bounds.x, bounds.y,
- mProps.mResizeHandleSize, bounds.height ) )
-
- return CB_LEFT_BAR_HANDLE_HITTED;
- }
- else
- if ( bar.mHasRightHandle )
- {
- if ( HasPoint( pos, bounds.x + bounds.width - mProps.mResizeHandleSize, bounds.y,
- mProps.mResizeHandleSize, bounds.height ) )
-
- return CB_RIGHT_BAR_HANDLE_HITTED;
- }
-
- if ( HasPoint( pos, bounds.x, bounds.y, bounds.width, bounds.height ) )
- return CB_BAR_CONTENT_HITTED;
-
- } // hit-test next bar
-
- } // next row
-
- return CB_NO_ITEMS_HITTED;
-}
-
-void cbDockPane::GetBarResizeRange( cbBarInfo* pBar, int* from, int *till,
- bool forLeftHandle )
-{
- cbBarInfo* pGivenBar = pBar;
-
- int notFree = 0;
-
- // calc unavailable space from the left
-
- while( pBar->mpPrev )
- {
- pBar = pBar->mpPrev;
-
- if ( !pBar->IsFixed() ) notFree += mProps.mMinCBarDim.x;
- else notFree += pBar->mBounds.width;
- }
-
- *from = notFree;
-
- pBar = pGivenBar;
-
- notFree = 0;
-
- // calc unavailable space from the right
-
- while( pBar->mpNext )
- {
- pBar = pBar->mpNext;
-
- if ( pBar->mBounds.x >= mPaneWidth ) break;
-
- // treat not-fixed bars as minimized
-
- if ( !pBar->IsFixed() )
- notFree += mProps.mMinCBarDim.x;
- else
- {
- if ( pBar->mBounds.x + pBar->mBounds.width >= mPaneWidth )
- {
- notFree += mPaneWidth - pBar->mBounds.x;
- break;
- }
- else
- notFree += pBar->mBounds.width;
- }
-
- }
-
- *till = mPaneWidth - notFree;
-
- // do not let resizing totally deform the bar itself
-
- if ( forLeftHandle )
- (*till) -= mProps.mMinCBarDim.x;
- else
- (*from) += mProps.mMinCBarDim.x;
-}
-
-int cbDockPane::GetMinimalRowHeight( cbRowInfo* pRow )
-{
- int height = mProps.mMinCBarDim.y;
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( pRow->mBars[i]->IsFixed() )
- height = wxMax( height, pRow->mBars[i]->mBounds.height );
- }
-
- if ( pRow->mHasUpperHandle )
- height += mProps.mResizeHandleSize;
-
- if ( pRow->mHasLowerHandle )
- height += mProps.mResizeHandleSize;
-
- return height;
-}
-
-void cbDockPane::SetRowHeight( cbRowInfo* pRow, int newHeight )
-{
- if ( pRow->mHasUpperHandle )
-
- newHeight -= mProps.mResizeHandleSize;
-
- if ( pRow->mHasLowerHandle )
-
- newHeight -= mProps.mResizeHandleSize;
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( !pRow->mBars[i]->IsFixed() )
- pRow->mBars[i]->mBounds.height = newHeight;
- }
-}
-
-void cbDockPane::GetRowResizeRange( cbRowInfo* pRow, int* from, int* till,
- bool forUpperHandle )
-{
- cbRowInfo* pGivenRow = pRow;
-
- // calc unavailable space from above
-
- int notFree = 0;
-
- while( pRow->mpPrev )
- {
- pRow = pRow->mpPrev;
-
- notFree += GetMinimalRowHeight( pRow );
-
- };
-
- *from = notFree;
-
- // allow accupy the client window space by resizing pane rows
- if ( mAlignment == FL_ALIGN_BOTTOM )
-
- *from -= mpLayout->GetClientHeight();
- else
- if ( mAlignment == FL_ALIGN_RIGHT )
-
- *from -= mpLayout->GetClientWidth();
-
- // calc unavailable space from below
-
- pRow = pGivenRow;
-
- notFree = 0;
-
- while( pRow->mpNext )
- {
- pRow = pRow->mpNext;
-
- notFree += GetMinimalRowHeight( pRow );
-
- }
-
- *till = mPaneHeight - notFree;
-
- // allow adjustinig pane space vs. client window space by resizing pane row heights
-
- if ( mAlignment == FL_ALIGN_TOP )
-
- *till += mpLayout->GetClientHeight();
- else
- if ( mAlignment == FL_ALIGN_LEFT )
-
- *till += mpLayout->GetClientWidth();
-
- // do not let the resizing of the row totally squeeze the row itself
-
- cbRowInfo& row = *pGivenRow;
-
- if ( forUpperHandle )
- {
- *till = row.mRowY + row.mRowHeight - GetMinimalRowHeight( pGivenRow );
-
- if ( row.mHasUpperHandle )
-
- *till -= mProps.mResizeHandleSize;
- }
- else
- {
- *from += GetMinimalRowHeight( pGivenRow );
-
- if ( row.mHasLowerHandle )
-
- *from -= mProps.mResizeHandleSize;
- }
-}
-
-void cbDockPane::ResizeRow( cbRowInfo* pRow, int ofs,
- bool forUpperHandle )
-{
- cbResizeRowEvent evt( pRow, ofs, forUpperHandle, this );
-
- mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::ResizeBar( cbBarInfo* pBar, int ofs,
- bool forLeftHandle )
-{
- pBar->mpRow->mpExpandedBar = NULL;
-
- mpLayout->GetUpdatesManager().OnStartChanges();
-
- wxRect& bounds = pBar->mBounds;
-
- if ( forLeftHandle )
- {
- // do not allow bar width become less then minimal
- if ( bounds.x + ofs > bounds.x + bounds.width - mProps.mMinCBarDim.x )
- {
- bounds.width = mProps.mMinCBarDim.x;
- bounds.x += ofs;
- }
- else
- {
- bounds.x += ofs;
- bounds.width -= ofs;
- }
- }
- else
- {
- // move bar left if necessary
- if ( bounds.width + ofs < mProps.mMinCBarDim.x )
- {
- bounds.x = bounds.x + bounds.width + ofs - mProps.mMinCBarDim.x;
- bounds.width = mProps.mMinCBarDim.x;
- }
- else
- // resize right border only
- bounds.width += ofs;
- }
-
-
- cbRowInfo* pToRow = pBar->mpRow;
-
- this->RemoveBar( pBar );
-
- InsertBar( pBar, pToRow );
-
- mpLayout->RecalcLayout(false);
-
- mpLayout->GetUpdatesManager().OnFinishChanges();
- mpLayout->GetUpdatesManager().UpdateNow();
-}
-
-
-/*** row/bar resizing related methods ***/
-
-void cbDockPane::DrawVertHandle( wxDC& dc, int x, int y, int height )
-{
- int lower = y + height;
-
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawLine( x,y, x, lower );
-
- dc.SetPen( mpLayout->mGrayPen );
- int i;
- for ( i = 0; i != mProps.mResizeHandleSize-1; ++i )
- {
- ++x;
- dc.DrawLine( x,y, x, lower );
- }
-
- dc.SetPen( mpLayout->mDarkPen );
- ++x;
- dc.DrawLine( x,y, x, lower );
-
- dc.SetPen( mpLayout->mBlackPen );
- ++x;
- dc.DrawLine( x,y, x, lower );
-}
-
-void cbDockPane::DrawHorizHandle( wxDC& dc, int x, int y, int width )
-{
- int right = x + width;
-
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawLine( x,y, right, y );
-
- dc.SetPen( mpLayout->mGrayPen );
-
- int i;
- for ( i = 0; i != mProps.mResizeHandleSize-1; ++i )
- {
- ++y;
- dc.DrawLine( x,y, right, y );
- }
-
- ++y;
- dc.SetPen( mpLayout->mDarkPen );
- dc.DrawLine( x,y, right, y );
-
- ++y;
- dc.SetPen( mpLayout->mBlackPen );
- dc.DrawLine( x,y, right, y );
-}
-
-cbBarInfo* cbDockPane::GetBarInfoByWindow( wxWindow* pBarWnd )
-{
- wxBarIterator i( mRows );
-
- while( i.Next() )
-
- if ( i.BarInfo().mpBarWnd == pBarWnd )
-
- return &i.BarInfo();
-
- return NULL;
-}
-
-void cbDockPane::GetRowShapeData( cbRowInfo* pRow, wxList* pLst )
-{
- if(pLst)
- {
- WX_CLEAR_LIST(wxList,*pLst);
- }
-
- pLst->Clear();
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- cbBarInfo& bar = *pRow->mBars[i];
-
- cbBarShapeData* pData = new cbBarShapeData();
-
- pLst->Append( (wxObject*)pData );
-
- pData->mBounds = bar.mBounds;
- pData->mLenRatio = bar.mLenRatio;
- }
-}
-
-void cbDockPane::SetRowShapeData( cbRowInfo* pRow, wxList* pLst )
-{
- if ( pLst->GetFirst() == NULL )
- return;
-
- wxObjectList::compatibility_iterator pData = pLst->GetFirst();
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- wxASSERT( pData ); // DBG::
-
- cbBarInfo& bar = *pRow->mBars[i];;
-
- cbBarShapeData& data = *((cbBarShapeData*)pData->GetData());
-
- bar.mBounds = data.mBounds;
- bar.mLenRatio = data.mLenRatio;
-
- pData = pData->GetNext();
- }
-}
-
-/***** Implementation for class cbUpdatesManagerBase *****/
-
-IMPLEMENT_ABSTRACT_CLASS( cbUpdatesManagerBase, wxObject )
-
-/***** Implementation for class cbPluginBase *****/
-
-IMPLEMENT_ABSTRACT_CLASS( cbPluginBase, wxEvtHandler )
-
-cbPluginBase::~cbPluginBase()
-{
- // nothing
-}
-
-bool cbPluginBase::ProcessEvent(wxEvent& event)
-{
- if ( mPaneMask == wxALL_PANES )
-
- return wxEvtHandler::ProcessEvent( event );
-
- // extract mask info. from received event
-
- cbPluginEvent& evt = *( (cbPluginEvent*)&event );
-
- if ( evt.mpPane == 0 &&
- mPaneMask == wxALL_PANES )
-
- return wxEvtHandler::ProcessEvent( event );
-
- int mask = 0;
-
- switch ( evt.mpPane->mAlignment )
- {
- case FL_ALIGN_TOP : mask = FL_ALIGN_TOP_PANE; break;
- case FL_ALIGN_BOTTOM : mask = FL_ALIGN_BOTTOM_PANE;break;
- case FL_ALIGN_LEFT : mask = FL_ALIGN_LEFT_PANE; break;
- case FL_ALIGN_RIGHT : mask = FL_ALIGN_RIGHT_PANE; break;
- }
-
- // if event's pane maks matches the plugin's mask
-
- if ( mPaneMask & mask )
-
- return wxEvtHandler::ProcessEvent( event );
-
- // otherwise pass to the next handler if present
-
- if ( GetNextHandler() && GetNextHandler()->ProcessEvent( event ) )
-
- return true;
- else
- return false;
-}
diff --git a/contrib/src/fl/dyntbar.cpp b/contrib/src/fl/dyntbar.cpp
deleted file mode 100644
index f0f7d0779f..0000000000
--- a/contrib/src/fl/dyntbar.cpp
+++ /dev/null
@@ -1,614 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: dyntbar.cpp
-// Purpose: wxDynamicToolBar implementation
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: ??/10/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/utils.h" // import wxMin,wxMax macros
-
-#include "wx/fl/dyntbar.h"
-#include "wx/fl/newbmpbtn.h"
-
-IMPLEMENT_DYNAMIC_CLASS( wxDynamicToolBar, wxObject )
-
-BEGIN_EVENT_TABLE( wxDynamicToolBar, wxToolBarBase )
-
- EVT_SIZE ( wxDynamicToolBar::OnSize )
- EVT_PAINT( wxDynamicToolBar::OnPaint )
- //EVT_ERASE_BACKGROUND( wxDynamicToolBar::OnEraseBackground )
-
-END_EVENT_TABLE()
-
-/***** Implementation for class wxToolLayoutItem *****/
-
-IMPLEMENT_DYNAMIC_CLASS(wxToolLayoutItem, wxObject)
-
-
-/***** Implementation for class wxDynToolInfo *****/
-
-IMPLEMENT_DYNAMIC_CLASS(wxDynToolInfo, wxToolLayoutItem)
-
-/***** Implementation for class wxDynamicToolBar *****/
-
-wxDynamicToolBar::wxDynamicToolBar()
- : mpLayoutMan( NULL ),
- mSepartorSize( 8 ),
- mVertGap ( 0 ),
- mHorizGap( 0 )
-{
-}
-
-wxDynamicToolBar::wxDynamicToolBar(wxWindow *parent, const wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- const long style, const int orientation,
- const int RowsOrColumns, const wxString& name )
- : mpLayoutMan( NULL ),
- mSepartorSize( 8 ),
- mVertGap ( 0 ),
- mHorizGap( 0 )
-{
- Create(parent, id, pos, size, style, orientation, RowsOrColumns, name);
-
- SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE) );
-}
-
-bool wxDynamicToolBar::Create(wxWindow *parent, const wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- const long style,
- const int WXUNUSED(orientation), const int WXUNUSED(RowsOrColumns),
- const wxString& name)
-{
- // cut&pasted from wxtbatsmpl.h
-
- if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
- return false;
-
- SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));
-
- return true;
-}
-
-bool wxDynamicToolBar::Realize(void)
-{
- // FOR NOW:: nothing
- return true;
-}
-
-wxDynamicToolBar::~wxDynamicToolBar(void)
-{
- if ( mpLayoutMan )
- delete mpLayoutMan;
-
- size_t i;
- for( i = 0; i != mTools.Count(); ++i )
- {
- delete mTools[i];
- }
-}
-
-void wxDynamicToolBar::AddTool( int toolIndex,
- wxWindow* pToolWindow,
- const wxSize& WXUNUSED(size)
- )
-{
- wxDynToolInfo* pInfo = new wxDynToolInfo();
-
- pInfo->mpToolWnd = pToolWindow;
- pInfo->mIndex = toolIndex;
- pInfo->mIsSeparator = false;
-
- int x,y;
- pToolWindow->GetSize( &x, &y );
- pInfo->mRealSize.x = x;
- pInfo->mRealSize.y = y;
- pInfo->mRect.width = x;
- pInfo->mRect.height = y;
-
- mTools.Add( pInfo );
-}
-
-void wxDynamicToolBar::AddTool( int toolIndex,
- const wxString& imageFileName,
- wxBitmapType imageFileType,
- const wxString& labelText, bool alignTextRight,
- bool isFlat )
-{
- wxNewBitmapButton* pBtn =
-
- new wxNewBitmapButton( imageFileName, imageFileType,
- labelText,
- ( alignTextRight )
- ? NB_ALIGN_TEXT_RIGHT
- : NB_ALIGN_TEXT_BOTTOM,
- isFlat
- );
-
- pBtn->Create( this, toolIndex );
-
- pBtn->Reshape();
-
- AddTool( toolIndex, pBtn );
-}
-void wxDynamicToolBar::AddTool( int toolIndex, wxBitmap labelBmp,
- const wxString& labelText, bool alignTextRight,
- bool isFlat )
-{
- wxNewBitmapButton* pBtn =
-
- new wxNewBitmapButton( labelBmp,
- labelText,
- ( alignTextRight )
- ? NB_ALIGN_TEXT_RIGHT
- : NB_ALIGN_TEXT_BOTTOM,
- isFlat
- );
-
- pBtn->Create( this, toolIndex );
-
- pBtn->Reshape();
-
- AddTool( toolIndex, pBtn );
-}
-
-
-wxToolBarToolBase*
- wxDynamicToolBar::AddTool(const int toolIndex, const wxBitmap& bitmap,
- const wxBitmap& WXUNUSED(pushedBitmap),
- const bool WXUNUSED(toggle), const long WXUNUSED(xPos),
- const long WXUNUSED(yPos), wxObject *WXUNUSED(clientData),
- const wxString& helpString1, const wxString& WXUNUSED(helpString2))
-{
- wxNewBitmapButton* pBmpBtn = new wxNewBitmapButton( bitmap );
-
- pBmpBtn->Create( this, toolIndex );
-
- pBmpBtn->Reshape();
-
-#if wxUSE_TOOLTIPS
- pBmpBtn->SetToolTip( helpString1 );
-#else
- wxUnusedVar( helpString1 );
-#endif // wxUSE_TOOLTIPS
-
- AddTool( toolIndex, pBmpBtn );
-
- return NULL;
-}
-
-
-wxDynToolInfo* wxDynamicToolBar::GetToolInfo( int toolIndex )
-{
- size_t i;
- for( i = 0; i != mTools.Count(); ++i )
- {
- if ( mTools[i]->mIndex == toolIndex )
- return mTools[i];
- }
-
- return NULL;
-}
-
-void wxDynamicToolBar::RemveTool( int toolIndex )
-{
- size_t i;
- for( i = 0; i != mTools.Count(); ++i )
- {
- if ( mTools[i]->mIndex == toolIndex )
- {
- if ( mTools[i]->mpToolWnd )
- {
- mTools[i]->mpToolWnd->Destroy();
- }
- delete mTools[i]; // HVL To be tested!!!
-#if wxCHECK_VERSION(2,3,2)
- mTools.RemoveAt(i);
-#else
- mTools.Remove(i);
-#endif
- Layout();
-
- return;
- }
- }
- // TODO:: if not found, should it be an assertion?
-}
-
-void wxDynamicToolBar::AddSeparator( wxWindow* pSepartorWnd )
-{
- wxDynToolInfo* pInfo = new wxDynToolInfo();
-
- pInfo->mpToolWnd = pSepartorWnd;
- pInfo->mIndex = -1;
- pInfo->mIsSeparator = true;
-
- // Do we draw a separator or is a other object?
- if ( pSepartorWnd )
- {
- // hvl => Is there a way to know if it was already created?
- // hvl => shouldn't the pSepartorWnd be created? (like one should expect?)
- // pSepartorWnd->Create( this, -1 );
-
- int x,y;
- pSepartorWnd->GetSize( &x, &y );
- pInfo->mRealSize.x = x;
- pInfo->mRealSize.y = y;
-
- pInfo->mRect.width = x;
- pInfo->mRect.height = y;
- }
- else
- {
- // Init x and y to the default.
- pInfo->mRealSize.x = 0;
- pInfo->mRealSize.y = 0;
-
- // Init height and width to the normal size of a separator.
- pInfo->mRect.width = mSepartorSize;
- pInfo->mRect.height = mSepartorSize;
- }
-
- mTools.Add( pInfo );
-}
-
-void wxDynamicToolBar::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
-{
- // FOR NOW:: nothing
-}
-
-void wxDynamicToolBar::OnSize( wxSizeEvent& WXUNUSED(event) )
-{
- //SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) );
-
- Layout();
-}
-
-void wxDynamicToolBar::DrawSeparator( wxDynToolInfo& info, wxDC& dc )
-{
- // check the orientation of separator
- if ( info.mRect.width < info.mRect.height )
- {
- int midX = info.mRect.x + info.mRect.width/2 - 1;
-
- dc.SetPen( *wxGREY_PEN );
- dc.DrawLine( midX, info.mRect.y,
- midX, info.mRect.y + info.mRect.height+1 );
-
- dc.SetPen( *wxWHITE_PEN );
- dc.DrawLine( midX+1, info.mRect.y,
- midX+1, info.mRect.y + info.mRect.height+1 );
- }
- else
- {
- int midY = info.mRect.y + info.mRect.height/2 - 1;
-
- dc.SetPen( *wxGREY_PEN );
- dc.DrawLine( info.mRect.x, midY,
- info.mRect.x + info.mRect.width+1, midY );
-
- dc.SetPen( *wxWHITE_PEN );
- dc.DrawLine( info.mRect.x, midY + 1,
- info.mRect.x + info.mRect.width+1, midY + 1 );
- }
-}
-
-void wxDynamicToolBar::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
- // draw separators if any
- wxPaintDC dc(this);
-
- size_t i;
- for( i = 0; i != mTools.Count(); ++i )
- {
- if ( mTools[i]->mIsSeparator )
- {
- // check if separator doesn't have it's own window
- // if so, then draw it using built-in drawing method
- if ( !mTools[i]->mpToolWnd )
- DrawSeparator( *mTools[i], dc );
- }
- }
-}
-
-// FOR NOW:: quick fix
-#include "wx/choice.h"
-
-void wxDynamicToolBar::SizeToolWindows()
-{
- bool bStateCheckDone = false;
- bool bHorzSeparator = false;
- int maxWidth = 0;
- int maxHeight = 0;
-
- size_t i;
- for( i = 0; i != mTools.Count(); ++i )
- {
- wxDynToolInfo& info = *mTools[i];
-
- if ( !info.mIsSeparator )
- {
- // center real rectangle within the rectangle
- // provided by the layout manager
-
- int x = info.mRect.x;
- int y = info.mRect.y + (info.mRect.height - info.mRealSize.y)/2;
-
- // FOR NOW FOR NOW:: quick & dirty fix
- if ( info.mpToolWnd->IsKindOf( CLASSINFO( wxChoice ) ) )
- {
- info.mpToolWnd->SetSize( x, y,
- info.mRealSize.x - 3,
- info.mRealSize.y);
- }
- else
- {
- info.mpToolWnd->SetSize( x, y,
- info.mRealSize.x,
- info.mRealSize.y );
- }
- }
- else
- {
- // We performer this code here, so we only execute it when we have
- // separators and we do it only once (all to do with performance...)
- if (!bStateCheckDone)
- {
- bStateCheckDone = true;
-
- size_t j;
- wxDynToolInfo *pInfo;
- wxDynToolInfo *pPrevInfo = NULL;
- int nVertSeparators = 0;
-
- for( j = 0; j != mTools.Count(); ++j )
- {
- pInfo = mTools[j];
-
- // Count all Vert Separators.
- if ( pInfo->mIsSeparator )
- nVertSeparators++;
-
- // Check if the new row starts with a Separator.
- if ( pPrevInfo && pInfo->mIsSeparator &&
- // pPrevInfo->mRect.x >= pInfo->mRect.x &&
- pPrevInfo->mRect.y < pInfo->mRect.y)
- {
- // If the Separator is shown on the next row and it's
- // the only object on the row it would mean that the
- // Separator should be shown as Horizontal one.
- if (j+1 != mTools.Count())
- {
- if (pInfo->mRect.y < mTools[j+1]->mRect.y)
- nVertSeparators--;
- }
- else
- {
- nVertSeparators--;
- }
- }
-
- pPrevInfo = pInfo;
-
- maxWidth = wxMax(pInfo->mRect.width, maxWidth);
- maxHeight = wxMax(pInfo->mRect.height, maxHeight);
- }
-
- bHorzSeparator = nVertSeparators == 0;
- }
-
- // Check if we should draw Horz or Vert...
- if ( !bHorzSeparator )
- {
- info.mRect.width = mSepartorSize;
- info.mRect.height = maxHeight;
- }
- else
- {
- info.mRect.width = maxWidth;
- info.mRect.height = mSepartorSize;
- }
-
- // Do we need to set a new size to a separator object?
- if ( info.mpToolWnd )
- {
- info.mpToolWnd->SetSize( info.mRect.x,
- info.mRect.y,
- info.mRect.width,
- info.mRect.height);
- }
-
- }
- }
-}
-
-bool wxDynamicToolBar::Layout()
-{
- int x,y;
- GetSize( &x, &y );
- wxSize wndDim(x,y);
- wxSize result;
- size_t i;
- wxDynToolInfo *pInfo;
-
- // Reset the size of separators...
- for( i = 0; i != mTools.Count(); ++i )
- {
- pInfo = mTools[i];
-
- if ( pInfo->mIsSeparator )
- {
- pInfo->mRect.width = mSepartorSize;
- pInfo->mRect.height = mSepartorSize;
- }
- }
-
- // Calc and set the best layout
- GetPreferredDim( wndDim, result );
-
- SizeToolWindows();
- return true;
-}
-
-void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )
-{
- if ( !mpLayoutMan )
- mpLayoutMan = CreateDefaultLayout();
-
- wxLayoutItemArrayT items;
-
- // safe conversion
- size_t i;
- for( i = 0; i != mTools.Count(); ++i )
- items.Add( mTools[i] );
-
- mpLayoutMan->Layout( givenDim, prefDim, items, mVertGap, mHorizGap );
-}
-
-void wxDynamicToolBar::SetLayout( LayoutManagerBase* pLayout )
-{
- if ( mpLayoutMan )
- delete mpLayoutMan;
-
- mpLayoutMan = pLayout;
-
- Layout();
-}
-
-void wxDynamicToolBar::EnableTool(int toolIndex, bool enable )
-{
- wxDynToolInfo* pInfo = GetToolInfo( toolIndex );
-
- if ( !pInfo )
- return;
-
- if ( pInfo->mIsSeparator || !pInfo->mpToolWnd )
- return;
-
- pInfo->mpToolWnd->Enable( enable );
-}
-
-/***** Implementation for class BagLayout *****/
-
-void BagLayout::Layout( const wxSize& parentDim,
- wxSize& resultingDim,
- wxLayoutItemArrayT& items,
- int horizGap,
- int vertGap
- )
-{
- int maxWidth = 0;
- int curY = 0;
- int nRows = 0;
-
- size_t i = 0;
-
- while( i < items.Count() )
- {
- int curX = 0;
- int height = 0;
- // int nItems = 0;
-
- // int firstItem = i;
- int itemsInRow = 0;
-
- if ( nRows > 0 )
- curY += vertGap;
-
- // step #1 - arrange horizontal positions of items in the row
-
- do
- {
- if ( itemsInRow > 0 )
- curX += horizGap;
-
- wxRect& r = items[i]->mRect;
-
- if ( curX + r.width > parentDim.x )
- {
- if ( itemsInRow > 0 )
- break;
- }
- r.x = curX;
- r.y = curY;
-
- curX += r.width;
-
- height = wxMax( height, r.height );
-
- ++itemsInRow;
- ++i;
-
- } while( i < items.Count() );
-
- curY += height;
-
- maxWidth = wxMax( maxWidth, curX );
- }
-
- resultingDim.x = maxWidth;
- resultingDim.y = curY;
-}
-
-//////// stuff from 2.1.15 ///////////
-
-wxToolBarToolBase* wxDynamicToolBar::FindToolForPosition( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) const
-{
- return NULL;
-}
-
-bool wxDynamicToolBar::DoInsertTool( size_t WXUNUSED(pos), wxToolBarToolBase* WXUNUSED(tool) )
-{
- return true;
-}
-
-bool wxDynamicToolBar::DoDeleteTool( size_t WXUNUSED(pos), wxToolBarToolBase* WXUNUSED(tool) )
-{
- return true;
-}
-
-void wxDynamicToolBar::DoEnableTool( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(enable) )
-{
-}
-
-void wxDynamicToolBar::DoToggleTool( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(toggle) )
-{
-}
-
-void wxDynamicToolBar::DoSetToggle( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(toggle) )
-{
-}
-
-wxToolBarToolBase* wxDynamicToolBar::CreateTool( int WXUNUSED(id),
- const wxString& WXUNUSED(label),
- const wxBitmap& WXUNUSED(bmpNormal),
- const wxBitmap& WXUNUSED(bmpDisabled),
- wxItemKind WXUNUSED(kind),
- wxObject *WXUNUSED(clientData),
- const wxString& WXUNUSED(shortHelp),
- const wxString& WXUNUSED(longHelp)
- )
-{
- return NULL;
-}
-
-wxToolBarToolBase* wxDynamicToolBar::CreateTool( wxControl* WXUNUSED(control) )
-{
- return NULL;
-}
-
diff --git a/contrib/src/fl/dyntbarhnd.cpp b/contrib/src/fl/dyntbarhnd.cpp
deleted file mode 100644
index ca0a886278..0000000000
--- a/contrib/src/fl/dyntbarhnd.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: dyntbarhnd.cpp
-// Purpose: cbDynToolBarDimHandler implementation.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 23/01/99
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/dyntbarhnd.h"
-/***** Implementation for class cbDynToolBarDimHandler *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbDynToolBarDimHandler, cbBarDimHandlerBase )
-
-void cbDynToolBarDimHandler::OnChangeBarState(cbBarInfo* WXUNUSED(pBar), int WXUNUSED(newState) )
-{
- // nothing
-}
-
-void cbDynToolBarDimHandler::OnResizeBar( cbBarInfo* pBar,
- const wxSize& given,
- wxSize& preferred )
-{
- wxASSERT( pBar->mpBarWnd ); // DBG:: should be present
-
- wxDynamicToolBar* pTBar = (wxDynamicToolBar*)pBar->mpBarWnd;
-
- pTBar->GetPreferredDim( given, preferred );
-}
-
diff --git a/contrib/src/fl/files.lst b/contrib/src/fl/files.lst
deleted file mode 100644
index 0a653d8b0d..0000000000
--- a/contrib/src/fl/files.lst
+++ /dev/null
@@ -1,19 +0,0 @@
-
-FL_OBJECTS = \
- antiflickpl.$(OBJ_EXT) \
- gcupdatesmgr.$(OBJ_EXT) \
- rowlayoutpl.$(OBJ_EXT) \
- bardragpl.$(OBJ_EXT) \
- dyntbar.$(OBJ_EXT) \
- hintanimpl.$(OBJ_EXT) \
- toolwnd.$(OBJ_EXT) \
- barhintspl.$(OBJ_EXT) \
- dyntbarhnd.$(OBJ_EXT) \
- newbmpbtn.$(OBJ_EXT) \
- updatesmgr.$(OBJ_EXT) \
- cbcustom.$(OBJ_EXT) \
- panedrawpl.$(OBJ_EXT) \
- controlbar.$(OBJ_EXT) \
- garbagec.$(OBJ_EXT) \
- rowdragpl.$(OBJ_EXT)
-
diff --git a/contrib/src/fl/frmview.cpp b/contrib/src/fl/frmview.cpp
deleted file mode 100644
index 56730f2cd3..0000000000
--- a/contrib/src/fl/frmview.cpp
+++ /dev/null
@@ -1,442 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: frmview.cpp
-// Purpose: wxFrameView implementation. NOT USED IN FL.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 02/01/99
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/frmview.h"
-#include "wx/utils.h"
-
-/***** Implementation for class wxFrameView *****/
-
-BEGIN_EVENT_TABLE( wxFrameView, wxEvtHandler )
-
- EVT_IDLE( wxFrameView::OnIdle )
-
-END_EVENT_TABLE()
-
-void wxFrameView::OnIdle( wxIdleEvent& event)
-{
- event.Skip();
-
- if ( mDoToolUpdates )
- {
- // TBD::
- }
-}
-
-/*** public methods ***/
-
-wxFrameView::wxFrameView()
-
- : mpLayout( NULL ),
- mpFrameMgr( NULL )
-{}
-
-wxFrameView::~wxFrameView()
-{
- if ( mpLayout ) delete mpLayout;
-}
-
-wxFrame* wxFrameView::GetParentFrame()
-{
- return mpFrameMgr->GetParentFrame();
-}
-
-wxWindow* wxFrameView::GetClientWindow()
-{
- return mpFrameMgr->GetClientWindow();
-}
-
-void wxFrameView::Activate()
-{
- mpFrameMgr->ActivateView( this );
-}
-
-void wxFrameView::Deactivate()
-{
- mpFrameMgr->DeactivateCurrentView();
-}
-
-void wxFrameView::CreateLayout()
-{
- mpLayout = new wxFrameLayout( GetParentFrame(), mpFrameMgr->GetClientWindow(), false );
-}
-
-wxFrameLayout* wxFrameView::GetLayout()
-{
- return mpLayout;
-}
-
-void wxFrameView::SetToolUpdates( bool doToolUpdates )
-{
- mDoToolUpdates = doToolUpdates;
-}
-
-void wxFrameView::SetLayout( wxFrameLayout* pLayout )
-{
- if ( mpLayout ) delete mpLayout;
-
- mpLayout = pLayout;
-}
-
-wxFrameManager& wxFrameView::GetFrameManager()
-{
- return *mpFrameMgr;
-}
-
-void wxFrameView::RegisterMenu( const wxString& topMenuName )
-{
- mTopMenus.Add( topMenuName );
-}
-
-#if 0
-
-/***** Implementation for class wxFrameViewSerializer *****/
-
-// NOTE:: currently "stipple" property of the brush is not serialized
-
-class wxFrameViewSerializer : public wxEvtHandlerSerializer
-{
- DECLARE_SERIALIZER_CLASS( wxFrameViewSerializer );
-
- static void Serialize( wxObject* pObj, wxObjectStorage& store );
-};
-
-IMPLEMENT_SERIALIZER_CLASS( wxFrameView,
- wxFrameViewSerializer,
- wxFrameViewSerializer::Serialize,
- NO_CLASS_INIT )
-
-void wxFrameViewSerializer::Serialize( wxObject* pObj, wxObjectStorage& store )
-{
- // wxFrameViewSerializer is a kind of wxEvtHandler - peform serialization of
- // the base class first
-
- info.SerializeInherited( pObj, store );
-
- wxFrameView* pView = (wxFrameView*)pObj;
-
- store.XchgObjPtr( (wxObject**) &pView->mpFrameMgr );
- store.XchgObjPtr( (wxObject**) &pView->mpLayout );
- store.XchgBool ( pView->mDoToolUpdates );
-
- // serialize members in derived classes
-
- pView->OnSerialize( store );
-}
-
-#endif
-
-/***** Implementation for class wxFrameManager *****/
-
-void wxFrameManager::DoSerialize( wxObjectStorage& WXUNUSED(store) )
-{
-#if 0
- store.AddInitialRef( mpFrameWnd );
- store.AddInitialRef( this );
- if ( mpClientWnd ) store.AddInitialRef( mpClientWnd );
-
- store.XchgObj( (wxObject*) &mViews );
- store.XchgInt( mActiveViewNo );
-
- store.Finalize(); // finish serialization
-#endif
-}
-
-void wxFrameManager::DestroyViews()
-{
- DeactivateCurrentView();
-
- wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
-
- while ( pNode )
- {
- delete (wxFrameView*)pNode->GetData();
-
- pNode = pNode->GetNext();
- }
-
- if ( mActiveViewNo != -1 && GetParentFrame() )
-
- GetParentFrame()->SetNextHandler( NULL );
-}
-
-int wxFrameManager::GetViewNo( wxFrameView* pView )
-{
- wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
- int n = 0;
-
- while ( pNode )
- {
- if ( (wxFrameView*)pNode->GetData() == pView )
-
- return n;
-
- ++n;
- pNode = pNode->GetNext();
- }
-
- return -1;
-}
-
-void wxFrameManager::EnableMenusForView( wxFrameView* pView, bool enable )
-{
- wxMenuBar* pMenuBar = GetParentFrame()->GetMenuBar();
- int count = pMenuBar->GetMenuCount();
-
- if ( !pMenuBar )
- return;
-
- wxStringList::compatibility_iterator pNode = pView->mTopMenus.GetFirst();
-
- int i;
- while ( pNode )
- {
- for ( i = 0; i != count; ++i )
- {
- if ( pMenuBar->GetMenu(i)->GetTitle() == pNode->GetData() )
- pMenuBar->EnableTop( i, enable );
- }
-
- pNode = pNode->GetNext();
- }
-}
-
-void wxFrameManager::SyncAllMenus()
-{
- wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
- int i = 0;
-
- while ( pNode )
- {
- if ( i != mActiveViewNo )
-
- EnableMenusForView( (wxFrameView*)pNode->GetData(), false );
-
- pNode = pNode->GetNext();
- }
-
- EnableMenusForView( GetView( mActiveViewNo ), true );
-}
-
-/*** public methods ***/
-
-wxFrameManager::wxFrameManager()
-
- : mpFrameWnd( NULL ),
- mActiveViewNo( -1 ),
- mpClientWnd( NULL )
-{
-}
-
-wxFrameManager::~wxFrameManager()
-{
- SaveViewsNow();
- DestroyViews();
-}
-
-void wxFrameManager::Init( wxWindow* pMainFrame, const wxString& settingsFile )
-{
- mSettingsFile = settingsFile;
- mpFrameWnd = pMainFrame;
-
- wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
-
- while ( pNode )
- {
- wxFrameView* pView = (wxFrameView*)pNode->GetData();
-
- pView->OnInit();
- pView->OnInitMenus();
-
- pNode = pNode->GetNext();
- }
-
- if ( !ReloadViews() )
- {
- // if loading of settings file failed (e.g. was not found),
- // do recreation of items in each view
-
- pNode = mViews.GetFirst();
-
- while ( pNode )
- {
- wxFrameView* pView = (wxFrameView*)pNode->GetData();
-
- pView->OnRecreate();
-
- pNode = pNode->GetNext();
- }
- }
-
- if ( mActiveViewNo >= (int)mViews.GetCount() )
- mActiveViewNo = -1;
-
- ActivateView( GetView( ( mActiveViewNo == -1 ) ? 0 : mActiveViewNo ) );
-
- SyncAllMenus();
-}
-
-void wxFrameManager::AddView( wxFrameView* pFrmView )
-{
- mViews.Append( pFrmView );
-
- pFrmView->mpFrameMgr = this; // back ref.
-}
-
-void wxFrameManager::RemoveView( wxFrameView* WXUNUSED(pFrmView) )
-{
- // TBD::
- wxFAIL_MSG( _T("wxFrameManager::RemoveView() has not been implemented yet.") );
-}
-
-int wxFrameManager::GetActiveViewNo()
-{
- return mActiveViewNo;
-}
-
-wxFrameView* wxFrameManager::GetActiveView()
-{
- wxObjectList::compatibility_iterator pNode = mViews.Item( mActiveViewNo );
-
- if ( pNode ) return (wxFrameView*)pNode->GetData();
- else return NULL;
-}
-
-wxObjectList::compatibility_iterator wxFrameManager::GetActiveViewNode()
-{
- return mViews.Item( mActiveViewNo );
-}
-
-wxFrame* wxFrameManager::GetParentFrame()
-{
- return ((wxFrame*)mpFrameWnd);
-}
-
-wxWindow* wxFrameManager::GetParentWindow()
-{
- return mpFrameWnd;
-}
-
-wxFrameView* wxFrameManager::GetView( int viewNo )
-{
- wxObjectList::compatibility_iterator pNode = mViews.Item( viewNo );
-
- if ( pNode ) return (wxFrameView*)pNode->GetData();
- else return NULL;
-}
-
-void wxFrameManager::ActivateView( int viewNo )
-{
- ActivateView( GetView( viewNo ) );
-}
-
-void wxFrameManager::ActivateView( wxFrameView* pFrmView )
-{
- DeactivateCurrentView();
-
- mActiveViewNo = GetViewNo( pFrmView );
-
- if ( pFrmView->mpLayout )
-
- pFrmView->mpLayout->Activate();
-
- // FIXME:: we would have used PushEventHandler(),
- // but wxFrame bypasses attached handlers when
- // handling wxCommand events!
-
- GetParentFrame()->PushEventHandler( pFrmView );
-
- EnableMenusForView( pFrmView, true );
-}
-
-void wxFrameManager::SetClinetWindow( wxWindow* pFrameClient )
-{
- if ( mpClientWnd ) mpClientWnd->Destroy();
-
- mpClientWnd = pFrameClient;
-}
-
-wxWindow* wxFrameManager::GetClientWindow()
-{
- if ( !mpClientWnd )
-
- mpClientWnd = new wxWindow( GetParentFrame(), -1 );
-
- return mpClientWnd;
-}
-
-void wxFrameManager::DeactivateCurrentView()
-{
- if ( mActiveViewNo == -1 )
- return;
-
- wxFrameView* pView = GetActiveView();
-
- // FOR NOW::
- wxASSERT( GetParentFrame()->GetEventHandler() == pView );
-
- GetParentFrame()->PopEventHandler();
-
- if ( pView->mpLayout )
- pView->mpLayout->Deactivate();
-
- EnableMenusForView( pView, false );
-}
-
-void wxFrameManager::SaveViewsNow()
-{
-#if 0
- if ( mSettingsFile == "" ) return;
-
- wxIOStreamWrapper stm;
- stm.CreateForOutput( mSettingsFile );
-
- mStore.SetDataStream( stm );
- DoSerialize( mStore );
-#endif
-}
-
-bool wxFrameManager::ReloadViews()
-{
- return false;
-
- // TBD: ????
-#if 0
- if ( mSettingsFile == "" || !wxFileExists( mSettingsFile ) )
- return false;
-
- DestroyViews();
-
- wxIOStreamWrapper stm;
- stm.CreateForInput( mSettingsFile );
-
- mStore.SetDataStream( stm );
- DoSerialize( mStore );
-
- return true;
-#endif
-}
-
-bool wxFrameManager::ViewsAreLoaded()
-{
- return ( mViews.GetCount() != 0 );
-}
-
diff --git a/contrib/src/fl/garbagec.cpp b/contrib/src/fl/garbagec.cpp
deleted file mode 100644
index e103208ccb..0000000000
--- a/contrib/src/fl/garbagec.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: garbagec.cpp
-// Purpose: Garbage collection algorithm for optimizing refresh.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 18/10/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/garbagec.h"
-
-/***** Implementation for class GarbageCollector *****/
-
-inline static GCItem& node_to_item( wxNode* pNode )
-{
- return *( (GCItem*)(pNode->GetData()) );
-}
-
-GarbageCollector::~GarbageCollector()
-{
- Reset();
-}
-
-/*** GC alg. helpers ***/
-
-void GarbageCollector::DestroyItemList( wxList& lst )
-{
- wxNode* pNode = lst.GetFirst();
-
- while( pNode )
- {
- delete &node_to_item( pNode );
-
- pNode = pNode->GetNext();
- }
-
- lst.Clear();
-}
-
-wxNode* GarbageCollector::FindItemNode( void* pForObj )
-{
- wxNode* pNode = mAllNodes.GetFirst();
-
- while( pNode )
- {
- if ( node_to_item( pNode ).mpObj == pForObj )
-
- return pNode;
-
- pNode = pNode->GetNext();
- }
-
- return NULL;
-}
-
-wxNode* GarbageCollector::FindReferenceFreeItemNode()
-{
- wxNode* pNode = mAllNodes.GetFirst();
-
- while( pNode )
- {
- if ( node_to_item( pNode ).mRefs.GetCount() == 0 )
-
- return pNode;
-
- pNode = pNode->GetNext();
- }
-
- return 0;
-}
-
-void GarbageCollector::RemoveReferencesToNode( wxNode* pItemNode )
-{
- wxNode* pNode = mAllNodes.GetFirst();
-
- while( pNode )
- {
- wxList& refLst = node_to_item( pNode ).mRefs;
- wxNode* pRefNode = refLst.GetFirst();
-
- while( pRefNode )
- {
- if ( pRefNode->GetData() == (wxObject*)pItemNode )
- {
- wxNode* pNext = pRefNode->GetNext();
-
- refLst.DeleteNode( pRefNode );
-
- pRefNode = pNext;
-
- continue;
- }
- else pRefNode = pRefNode->GetNext();
- }
-
- pNode = pNode->GetNext();
- }
-}
-
-void GarbageCollector::ResolveReferences()
-{
- wxNode* pNode = mAllNodes.GetFirst();
-
- while( pNode )
- {
- GCItem& item = node_to_item( pNode );
-
- wxNode* pRefNode = item.mRefs.GetFirst();
-
- while( pRefNode )
- {
- pRefNode->SetData( (wxObject*) FindItemNode( (void*)pRefNode->GetData() ) );
-
- pRefNode = pRefNode->GetNext();
- }
-
- pNode = pNode->GetNext();
- }
-}
-
-void GarbageCollector::AddObject( void* pObj, int WXUNUSED(refCnt) )
-{
- // FOR NOW:: initial ref-count is not used
-
- GCItem* pItem = new GCItem();
-
- pItem->mpObj = pObj;
-
- mAllNodes.Append( (wxObject*) pItem );
-}
-
-void GarbageCollector::AddDependency( void* pObj, void* pDependsOnObj )
-{
- node_to_item( FindItemNode( pObj ) ).mRefs.Append( (wxObject*)pDependsOnObj );
-}
-
-/*** GC alg. implementation ***/
-
-void GarbageCollector::ArrangeCollection()
-{
- ResolveReferences();
-
- do
- {
- // find node, which does not depend on anything
-
- wxNode* pItemNode = FindReferenceFreeItemNode();
-
- if ( pItemNode )
- {
- // append it to the list, where items are contained
- // in the increasing order of dependencies
-
- mRegularLst.Append( pItemNode->GetData() );
-
- mAllNodes.DeleteNode( pItemNode );
-
- // remove references to this current "least-dependent" node
- // from reference lists of all the other nodes
-
- RemoveReferencesToNode( pItemNode );
- }
- else
- {
- // otherwise, what is left - all nodes, which
- // are involved into cycled chains (rings)
-
- wxNode* pNode = mAllNodes.GetFirst();
-
- while( pNode )
- {
- mCycledLst.Append( pNode->GetData() );
-
- pNode = pNode->GetNext();
- }
-
- mAllNodes.Clear();
- break;
- }
-
- // continue search for "least-dependent" nodes
-
- } while(1);
-}
-
-wxList& GarbageCollector::GetRegularObjects()
-{
- return mRegularLst;
-}
-
-wxList& GarbageCollector::GetCycledObjects()
-{
- return mCycledLst;
-}
-
-void GarbageCollector::Reset()
-{
- DestroyItemList( mAllNodes );
- DestroyItemList( mRegularLst );
- DestroyItemList( mCycledLst );
-}
-
diff --git a/contrib/src/fl/gcupdatesmgr.cpp b/contrib/src/fl/gcupdatesmgr.cpp
deleted file mode 100644
index 0ec1bcd358..0000000000
--- a/contrib/src/fl/gcupdatesmgr.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: gcupdatesmgr.cpp
-// Purpose: cbGCUpdatesMgr class, optimizing refresh using GarbageCollector
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 19/10/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/gcupdatesmgr.h"
-
-// helper function
-
-static inline bool rect_hits_rect( const wxRect& r1, const wxRect& r2 )
-{
- if ( ( r2.x >= r1.x && r2.x <= r1.x + r1.width ) ||
- ( r1.x >= r2.x && r1.x <= r2.x + r2.width ) )
-
- if ( ( r2.y >= r1.y && r2.y <= r1.y + r1.height ) ||
- ( r1.y >= r2.y && r1.y <= r2.y + r2.height ) )
-
- return 1;
-
- return 0;
-}
-
-// helper structure
-
-struct cbRectInfo
-{
- cbBarInfo* mpBar;
- cbDockPane* mpPane;
- wxRect* mpCurBounds;
- wxRect* mpPrevBounds;
-};
-
-static inline cbRectInfo& node_to_rect_info( wxNode* pNode )
-{
- return *( (cbRectInfo*) (pNode->GetData()) );
-}
-
-/***** Implementation for class cbSimpleUpdatesMgr *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbGCUpdatesMgr, cbSimpleUpdatesMgr )
-
-cbGCUpdatesMgr::cbGCUpdatesMgr( wxFrameLayout* pPanel )
- : cbSimpleUpdatesMgr( pPanel )
-{}
-
-void cbGCUpdatesMgr::AddItem( wxList& itemList,
- cbBarInfo* pBar,
- cbDockPane* pPane,
- wxRect& curBounds,
- wxRect& prevBounds )
-{
- cbRectInfo* pInfo = new cbRectInfo();
-
- pInfo->mpBar = pBar;
- pInfo->mpPane = pPane;
- pInfo->mpCurBounds = &curBounds;
- pInfo->mpPrevBounds = &prevBounds;
-
- itemList.Append( (wxObject*) pInfo );
-}
-
-void cbGCUpdatesMgr::OnStartChanges()
-{
- // memorize states of ALL items in the layout -
- // this is quite excessive, but OK for the decent
- // implementation of updates manager
-
- mpLayout->GetPrevClientRect() = mpLayout->GetClientRect();
-
- cbDockPane** panes = mpLayout->GetPanesArray();
-
- for( int n = 0; n != MAX_PANES; ++n )
- {
- cbDockPane& pane = *(panes[n]);
-
- // store pane state
- pane.mUMgrData.StoreItemState( pane.mBoundsInParent );
- pane.mUMgrData.SetDirty( false );
-
- cbRowInfo* pRow = pane.GetFirstRow();
-
- while ( pRow )
- {
- cbBarInfo* pBar = pRow->GetFirstBar();
-
- // store row state
- pRow->mUMgrData.StoreItemState( pRow->mBoundsInParent );
- pRow->mUMgrData.SetDirty( false );
-
- while( pBar )
- {
- // store bar state
- pBar->mUMgrData.StoreItemState( pBar->mBoundsInParent );
- pBar->mUMgrData.SetDirty( false );
-
- pBar = pBar->mpNext;
- }
-
- pRow = pRow->mpNext;
- }
- }
-}
-
-void cbGCUpdatesMgr::UpdateNow()
-{
- cbDockPane** panes = mpLayout->GetPanesArray();
-
- wxRect& r1 = mpLayout->GetClientRect();
- wxRect& r2 = mpLayout->GetPrevClientRect();
-
- // detect changes in client window's area
-
- bool clientWindowChanged = ( r1.x != r2.x ||
- r1.y != r2.y ||
- r1.width != r2.width ||
- r1.height != r2.height );
-
- // step #1 - detect changes in each row of each pane,
- // and repaint decorations around changed windows
-
- wxList mBarsToResize;
-
- int n;
- for ( n = 0; n != MAX_PANES; ++n )
- {
- cbDockPane& pane = *(panes[n]);
-
- bool paneChanged = WasChanged( pane.mUMgrData, pane.mBoundsInParent );
-
- if ( paneChanged )
- {
- wxClientDC dc( &mpLayout->GetParentFrame() );
- pane.PaintPaneBackground( dc );
- }
-
- wxRect realBounds;
-
- cbRowInfo* pRow = pane.GetFirstRow();
-
- while ( pRow )
- {
- wxDC* pDc = 0;
-
- cbBarInfo* pBar = pRow->GetFirstBar();
-
- bool rowChanged = false;
-// bool rowBkPainted = false;
-
- // FIXME:: the below should not be fixed
- cbBarInfo* barsToRepaint[128];
- // number of bars, that were changed in the current row
- int nBars = 0;
-
- //wxRect r1 = pRow->mUMgrData.mPrevBounds;
- //wxRect r2 = pRow->mBoundsInParent;
-
- if ( WasChanged( pRow->mUMgrData, pRow->mBoundsInParent ) )
-
- rowChanged = true;
- else
- while( pBar )
- {
- if ( WasChanged( pBar->mUMgrData, pBar->mBoundsInParent ) )
-
- barsToRepaint[nBars++] = pBar;
-
- pBar = pBar->mpNext;
- }
-
- if ( nBars || rowChanged )
- {
- realBounds = pRow->mBoundsInParent;
-
- // include 1-pixel thick shades around the row
- realBounds.x -= 1;
- realBounds.y -= 1;
- realBounds.width += 2;
- realBounds.height += 2;
-
- pDc = pane.StartDrawInArea( realBounds );
- }
-
- if ( rowChanged )
- {
- // postphone the resizement and refreshing the changed
- // bar windows
-
- cbBarInfo* pCurBar = pRow->GetFirstBar();
-
- while ( pCurBar )
- {
- if ( WasChanged( pCurBar->mUMgrData,
- pCurBar->mBoundsInParent ) )
-
- AddItem( mBarsToResize, pCurBar, &pane,
- pCurBar->mBoundsInParent,
- pCurBar->mUMgrData.mPrevBounds );
-
- pCurBar = pCurBar->mpNext;
- }
-
- // draw only their decorations now
-
- pane.PaintRow( pRow, *pDc );
- }
- else
- if ( nBars != 0 )
- {
- for ( int i = 0; i != nBars; ++i )
-
- // postphone the resizement and refreshing the changed
- // bar windows
-
- AddItem( mBarsToResize,
- barsToRepaint[i],
- &pane,
- barsToRepaint[i]->mBoundsInParent,
- barsToRepaint[i]->mUMgrData.mPrevBounds );
-
- // redraw decorations of entire row, regardless of how much
- // of the bars were changed
-
- pane.PaintRow( pRow, *pDc );
- }
-
- if ( pDc )
-
- pane.FinishDrawInArea( realBounds );
-
- pRow = pRow->mpNext;
-
- } // end of while
-
- if ( paneChanged )
- {
- wxClientDC dc( &mpLayout->GetParentFrame() );
- pane.PaintPaneDecorations( dc );
- }
-
- } // end of for
-
- if ( clientWindowChanged && !mpLayout->mClientWndRefreshPending )
- {
- // ptr to client-window object is "marked" as NULL
-
- AddItem( mBarsToResize, NULL, NULL,
- mpLayout->GetClientRect(),
- mpLayout->GetPrevClientRect() );
- }
-
- // step #2 - do ordered refreshing and resizing of bar window objects now
-
- DoRepositionItems( mBarsToResize );
-}
-
-void cbGCUpdatesMgr::DoRepositionItems( wxList& items )
-{
- wxNode* pNode1 = items.GetFirst();
-
- while( pNode1 )
- {
- cbRectInfo& info = node_to_rect_info( pNode1 );
-
- wxNode* pNode2 = items.GetFirst();
-
- // and node itself
-
- mGC.AddObject( &info );
-
- while( pNode2 )
- {
- if ( pNode2 != pNode1 ) // node should not depend on itself
- {
- // Add references to objects on which this object
- // depends. Dependency here indicates intersection of current
- // bounds of this object with the initial bounds of the
- // other object.
-
- cbRectInfo& otherInfo = node_to_rect_info( pNode2 );
-
- if ( rect_hits_rect( *info.mpCurBounds, *otherInfo.mpPrevBounds ) )
-
- // the node depends on node
- mGC.AddDependency( &info, &otherInfo );
- }
-
- pNode2 = pNode2->GetNext();
- }
-
- pNode1 = pNode1->GetNext();
- }
-
- mGC.ArrangeCollection(); // order nodes according "least-dependency" rule,
- // and find out cycled chains
-
- // Regular item nodes need to be resized, but not repainted (since
- // they stand in linear (not cyclic) dependency with other
- // regular nodes).
-
- wxNode* pNode = mGC.GetRegularObjects().GetFirst();
-
- while ( pNode )
- {
- cbRectInfo& info = *((cbRectInfo*)gc_node_to_obj(pNode));
-
- if ( info.mpBar == NULL )
-
- mpLayout->PositionClientWindow();
- else
- info.mpPane->SizeBar( info.mpBar );
-
- pNode = pNode->GetNext();
- }
-
- // cycled item nodes, need to be both resized and repainted
-
- pNode = mGC.GetCycledObjects().GetFirst();
-
- while ( pNode )
- {
- cbRectInfo& info = *((cbRectInfo*)gc_node_to_obj(pNode));
-
- if ( info.mpBar == NULL )
- {
- wxWindow* pClntWnd = mpLayout->GetFrameClient();
-
- mpLayout->PositionClientWindow();
-
- // FIXME FIXME:: excessive!
-
- pClntWnd->Show( false );
- pClntWnd->Show( true );
-
- // OLD STUFF:: mpLayout->PositionClientWindow();
- }
- else
- if ( info.mpBar->mpBarWnd )
- {
- wxWindow* pWnd = info.mpBar->mpBarWnd;
-
- // resize
- info.mpPane->SizeBar( info.mpBar );
-
- // repaint
-
- /* OLD STUFF:: bool isChoice = info.mpBar->IsKindOf( CLASSINFO( wxChoice ) );
-
- //#ifdef __WINDOWS__
- //int result = ::SendMessage( (HWND)pWnd->m_hWnd, WM_NCPAINT, 0, 0 );
- //#endif
- */
-
- // FIXME FIXME:: there's no other way to repaint non-client area of the wxWindow!!
- // so we do *excessive* "hide 'n show"
-
- pWnd->Show(false);
- pWnd->Show(true);
-
- pWnd->Refresh();
- }
-
- pNode = pNode->GetNext();
- }
-
- // release data prepared for GC alg.
-
- pNode = items.GetFirst();
-
- while( pNode )
- {
- cbRectInfo* pInfo = (cbRectInfo*)(pNode->GetData());
-
- delete pInfo;
-
- pNode = pNode->GetNext();
- }
-
- mGC.Reset(); // reinit GC
-
- // FIXME:: this is a dirty-workaround for messy client-area,
- // as a result of docking bar out of floated-container window
-
- if ( mpLayout->mClientWndRefreshPending )
- {
- mpLayout->PositionClientWindow();
- mpLayout->GetFrameClient()->Refresh();
- }
-}
-
diff --git a/contrib/src/fl/hintanimpl.cpp b/contrib/src/fl/hintanimpl.cpp
deleted file mode 100644
index fd49501c18..0000000000
--- a/contrib/src/fl/hintanimpl.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: hintanimpl.cpp
-// Purpose: cbHintAnimationPlugin implementation.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 9/11/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/hintanimpl.h"
-
-#define POS_UNDEFINED -32768
-
-/***** Implementation for class cbHintAnimationPlugin *****/
-
-// FIXME:: some of the below code should be eliminated by
-// reusing parts of cbBarDragPlugin's implementation
-
-IMPLEMENT_DYNAMIC_CLASS( cbHintAnimationPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbHintAnimationPlugin, cbPluginBase )
-
- EVT_PL_DRAW_HINT_RECT( cbHintAnimationPlugin::OnDrawHintRect )
-
-END_EVENT_TABLE()
-
-cbHintAnimationPlugin::cbHintAnimationPlugin(void)
-
- : mpScrDc( NULL ),
- mpAnimTimer( 0 ),
- mAnimStarted( false ),
-
- mMorphDelay ( 5 ),
- mMaxFrames ( 20 ),
- mInClientHintBorder( 4 ),
- mAccelerationOn( true )
-{}
-
-cbHintAnimationPlugin::cbHintAnimationPlugin( wxFrameLayout* pPanel, int paneMask )
-
- : cbPluginBase( pPanel, paneMask ),
- mpScrDc( NULL ),
- mpAnimTimer( 0 ),
- mAnimStarted( false ),
-
- mMorphDelay ( 5 ),
- mMaxFrames ( 20 ),
- mInClientHintBorder( 4 ),
- mAccelerationOn( true )
-{}
-
-cbHintAnimationPlugin::~cbHintAnimationPlugin()
-{
- if ( mpScrDc ) delete mpScrDc;
-}
-
-/*** rect-tracking related methods ***/
-
-void cbHintAnimationPlugin::OnDrawHintRect( cbDrawHintRectEvent& event )
-{
- if ( !mAnimStarted && !mpScrDc )
- {
- StartTracking();
-
- mPrevInClient = event.mIsInClient;
-
- mPrevRect = event.mRect;
-
- mStopPending = false;
- }
-
- if ( !event.mEraseRect )
- {
- // pass on current hint-rect info to the animation "thread", in
- // order to make adjustments to the morph-target on-the-fly
-
- mCurRect.x = event.mRect.x;
- mCurRect.y = event.mRect.y;
- mCurRect.width = event.mRect.width;
- mCurRect.height = event.mRect.height;
- }
-
- // check the amount of change in the shape of hint,
- // and start morph-effect if change is "sufficient"
-
- int change = abs( mCurRect.width - mPrevRect.width ) +
- abs( mCurRect.height - mPrevRect.height );
-
- if ( change > 10 && !event.mLastTime && !event.mEraseRect )
- {
- if ( !mpAnimTimer )
-
- mpAnimTimer = new cbHintAnimTimer();
-
- // init the animation "thread", or reinit if already started
-
- mpAnimTimer->Init( this, mAnimStarted );
-
- mAnimStarted = true;
- }
- else
- if ( !mAnimStarted )
- {
- DoDrawHintRect( event.mRect, event.mIsInClient );
-
- if ( event.mLastTime )
-
- FinishTracking();
-
- mPrevInClient = event.mIsInClient;
- }
- else
- {
- mCurInClient = event.mIsInClient;
-
- if ( event.mLastTime && mpAnimTimer )
- {
- mStopPending = true;
-
- if ( mpAnimTimer->mPrevMorphed.x != POS_UNDEFINED )
-
- // erase previous rect
- DoDrawHintRect( mpAnimTimer->mPrevMorphed, mPrevInClient );
- }
- }
-
- mPrevRect = event.mRect;
-}
-
-#define _IMG_A 0xAA // Note: modified from _A to _IMG_A, _A was already defined (cygwin)
-#define _IMG_B 0x00 // Note: modified from _B to _IMG_A, _B was already defined (cygwin)
-#define _IMG_C 0x55 // Note: modified from _C to _IMG_C, for consistency reasons.
-#define _IMG_D 0x00 // Note: modified from _D to _IMG_D, for consistency reasons.
-
-static const unsigned char _gCheckerImg[16] = { _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D
- };
-
-void cbHintAnimationPlugin::StartTracking()
-{
- mpScrDc = new wxScreenDC;
-
- wxScreenDC::StartDrawingOnTop(&mpLayout->GetParentFrame());
-}
-
-void cbHintAnimationPlugin::DoDrawHintRect( wxRect& rect, bool isInClientRect)
-{
- wxRect scrRect;
-
- RectToScr( rect, scrRect );
-
- int prevLF = mpScrDc->GetLogicalFunction();
-
- mpScrDc->SetLogicalFunction( wxXOR );
-
- if ( isInClientRect )
- {
- // BUG BUG BUG (wx):: somehow stippled brush works only
- // when the bitmap created on stack, not
- // as a member of the class
-
- wxBitmap checker( (const char*)_gCheckerImg, 8,8 );
-
- wxBrush checkerBrush( checker );
-
- mpScrDc->SetPen( mpLayout->mNullPen );
- mpScrDc->SetBrush( checkerBrush );
-
- int half = mInClientHintBorder / 2;
-
- mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y - half,
- scrRect.width + 2*half, mInClientHintBorder );
-
- mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y + scrRect.height - half,
- scrRect.width + 2*half, mInClientHintBorder );
-
- mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y + half - 1,
- mInClientHintBorder, scrRect.height - 2*half + 2);
-
- mpScrDc->DrawRectangle( scrRect.x + scrRect.width - half,
- scrRect.y + half - 1,
- mInClientHintBorder, scrRect.height - 2*half + 2);
-
- mpScrDc->SetBrush( wxNullBrush );
- }
- else
- {
- // otherwise draw 1-pixel thin borders
-
- mpScrDc->SetPen( mpLayout->mBlackPen );
-
- mpScrDc->DrawLine( scrRect.x, scrRect.y,
- scrRect.x + scrRect.width, scrRect.y );
-
- mpScrDc->DrawLine( scrRect.x, scrRect.y + 1,
- scrRect.x, scrRect.y + scrRect.height );
-
- mpScrDc->DrawLine( scrRect.x+1, scrRect.y + scrRect.height,
- scrRect.x + scrRect.width, scrRect.y + scrRect.height );
-
- mpScrDc->DrawLine( scrRect.x + scrRect.width , scrRect.y,
- scrRect.x + scrRect.width, scrRect.y + scrRect.height + 1);
- }
-
- mpScrDc->SetLogicalFunction( prevLF );
-}
-
-void cbHintAnimationPlugin::DrawHintRect ( wxRect& rect, bool isInClientRect)
-{
- DoDrawHintRect( rect, isInClientRect );
-}
-
-void cbHintAnimationPlugin::EraseHintRect( wxRect& rect, bool isInClientRect)
-{
- DoDrawHintRect( rect, isInClientRect );
-}
-
-void cbHintAnimationPlugin::FinishTracking()
-{
- wxScreenDC::EndDrawingOnTop();
-
- delete mpScrDc;
-
- mpScrDc = NULL;
-}
-
-void cbHintAnimationPlugin::RectToScr( wxRect& frameRect, wxRect& scrRect )
-{
- scrRect = frameRect;
-
- int x = frameRect.x, y = frameRect.y;
-
- mpLayout->GetParentFrame().ClientToScreen( &x, &y );
-
- scrRect.x = x;
- scrRect.y = y;
-}
-
-/***** Implementation for class cbHintAnimTimer *****/
-
-cbHintAnimTimer::cbHintAnimTimer(void)
-{
-#ifdef __WINDOWS__
- mLock = 0L;
-#endif
-
- mPrevMorphed.x = POS_UNDEFINED;
-}
-
-void cbHintAnimTimer::MorphPoint( wxPoint& origin, MorphInfoT& info, wxPoint& point )
-{
- // simulate lienar movement (FOR NOW:: without acceleration)
-
- double k;
-
- if ( mpPl->mAccelerationOn )
-
- k = double( mCurIter*mCurIter ) /
- double( (mpPl->mMaxFrames - 1)*(mpPl->mMaxFrames - 1) );
- else
- k = double( mCurIter ) / double( mpPl->mMaxFrames - 1 );
-
- point.x = int ( double ( info.mFrom.x + double (info.mTill.x - info.mFrom.x) * k ) );
-
- point.y = int ( double ( info.mFrom.y + double (info.mTill.y - info.mFrom.y) * k ) );
-
- point.x += origin.x;
- point.y += origin.y;
-}
-
-void cbHintAnimTimer::Notify(void)
-{
- // FIXME:: "clean" implementation should use mutex to sync
- // between GUI and animation threads
-
- if ( mpPl->mStopPending )
- {
- Stop(); // top timer
-
- mpPl->FinishTracking();
-
- mpPl->mStopPending = false;
- mpPl->mpAnimTimer = NULL;
- mpPl->mAnimStarted = false;
-
- mPrevMorphed.x = POS_UNDEFINED;
-
- delete this;
-
- return;
- }
-
- wxPoint origin( mpPl->mCurRect.x, mpPl->mCurRect.y );
-
- wxPoint curUpper, curLower;
-
- MorphPoint( origin, mUpperLeft, curUpper );
- MorphPoint( origin, mLowerRight, curLower );
-
- if ( mPrevMorphed.x != POS_UNDEFINED )
-
- // erase previous rect
- mpPl->DoDrawHintRect( mPrevMorphed, mpPl->mPrevInClient );
-
- wxRect morphed( curUpper.x, curUpper.y,
- curLower.x - curUpper.x,
- curLower.y - curUpper.y );
-
- // draw rect of current iteration
- mpPl->DoDrawHintRect( morphed,
- ( mCurIter != mpPl->mMaxFrames - 1 )
- ? mpPl->mPrevInClient : mpPl->mCurInClient );
-
- mPrevMorphed = morphed;
-
- if ( mCurIter == mpPl->mMaxFrames - 1 )
- {
- Stop(); // top timer
-
- mpPl->FinishTracking();
- mpPl->mpAnimTimer = NULL;
- mpPl->mAnimStarted = false;
-
- mPrevMorphed.x = POS_UNDEFINED;
-
- delete this;
- }
- else
- ++mCurIter;
-}
-
-bool cbHintAnimTimer::Init( cbHintAnimationPlugin* pAnimPl, bool reinit )
-{
-
- mpPl = pAnimPl;
-
- // morph-points are set up relatively to the upper-left corner
- // of the current hint-rectangle
-
- if ( !reinit )
- {
- mUpperLeft.mFrom.x = mpPl->mPrevRect.x - mpPl->mCurRect.x;
- mUpperLeft.mFrom.y = mpPl->mPrevRect.y - mpPl->mCurRect.y;
-
- mLowerRight.mFrom.x = ( mUpperLeft.mFrom.x + mpPl->mPrevRect.width );
- mLowerRight.mFrom.y = ( mUpperLeft.mFrom.y + mpPl->mPrevRect.height );
- }
- else
- {
- wxPoint origin( mpPl->mPrevRect.x, mpPl->mPrevRect.y );
-
- wxPoint curUpper, curLower;
-
- MorphPoint( origin, mUpperLeft, curUpper );
- MorphPoint( origin, mLowerRight, curLower );
-
- mUpperLeft.mFrom.x = curUpper.x - mpPl->mCurRect.x;
- mUpperLeft.mFrom.y = curUpper.y - mpPl->mCurRect.y;
-
- mLowerRight.mFrom.x = ( mUpperLeft.mFrom.x + curLower.x - curUpper.x );
- mLowerRight.mFrom.y = ( mUpperLeft.mFrom.y + curLower.y - curUpper.y );
- }
-
- mUpperLeft.mTill.x = 0;
- mUpperLeft.mTill.y = 0;
-
- mLowerRight.mTill.x = mpPl->mCurRect.width;
- mLowerRight.mTill.y = mpPl->mCurRect.height;
-
- mCurIter = 1;
-
- if ( !reinit )
-
- Start( mpPl->mMorphDelay );
-
- return true;
-}
-
diff --git a/contrib/src/fl/makedocs.vc b/contrib/src/fl/makedocs.vc
deleted file mode 100644
index 40d1733a01..0000000000
--- a/contrib/src/fl/makedocs.vc
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# File: makefile.vc
-WXDIR=$(WXWIN)
-
-NAME=fl
-DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\$(NAME)
-DOCDIR=$(WXDIR)\docs
-THISDIR = $(WXDIR)\contrib\src\$(NAME)
-DOCSOURCES=$(DOCSOURCEDIR)\$(NAME).tex \
- $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\topics.tex
-
-alldocs: mkdirs html htmlhelp htb hlp pdfrtf
-html: touchmanual $(DOCDIR)\html\$(NAME)\$(NAME).htm
-htmlhelp: touchmanual $(DOCDIR)\htmlhelp\$(NAME).chm
-htb: $(DOCDIR)\htb\$(NAME).htb
-hlp: touchmanual $(DOCDIR)\winhelp\$(NAME).hlp
-pdfrtf: $(DOCDIR)\pdf\$(NAME).rtf
-ps: $(DOCDIR)\ps\$(NAME).ps
-
-touchmanual:
- touch $(DOCSOURCEDIR)\$(NAME).tex
-
-$(DOCDIR)\winhelp\$(NAME).hlp: $(DOCSOURCEDIR)\$(NAME).rtf $(DOCSOURCEDIR)\$(NAME).hpj
- cd $(DOCSOURCEDIR)
- -erase $(NAME).ph
- hcw /c /e $(NAME)
- move $(NAME).hlp $(DOCDIR)\winhelp\$(NAME).hlp
- move $(NAME).cnt $(DOCDIR)\winhelp\$(NAME).cnt
- cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).hpj:
- echo [OPTIONS] > $(DOCSOURCEDIR)\$(NAME).hpj
- echo BMROOT=$(WXDIR)\contrib\docs\latex\$(NAME) >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo TITLE=OGL Manual >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo CONTENTS=Contents >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo COMPRESS=HIGH >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [FILES] >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo $(NAME).rtf >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [CONFIG] >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo CreateButton("Up", "&Up", "JumpId(`$(NAME).hlp', `Contents')") >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo BrowseButtons() >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [MAP] >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [BITMAPS] >> $(DOCSOURCEDIR)\$(NAME).hpj
-
-$(DOCSOURCEDIR)\$(NAME).rtf: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCSOURCEDIR)\$(NAME).rtf -twice -winhelp
- cd $(THISDIR)
-
-$(DOCDIR)\pdf\$(NAME).rtf: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -copy *.bmp $(DOCDIR)\pdf
- -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCDIR)\pdf\$(NAME).rtf -twice -rtf
- cd $(THISDIR)
-
-$(DOCDIR)\html\$(NAME)\$(NAME).htm: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -mkdir $(DOCDIR)\html\$(NAME)
- copy *.gif $(DOCDIR)\html\$(NAME)
- -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCDIR)\html\$(NAME)\$(NAME).htm -twice -html
- -erase $(DOCDIR)\html\$(NAME)\*.con
- -erase *.con
- -erase $(DOCDIR)\html\$(NAME)\*.ref
- cd $(THISDIR)
-
-$(DOCDIR)\htmlhelp\$(NAME).chm: $(DOCDIR)\html\$(NAME)\$(NAME).htm $(DOCDIR)\html\$(NAME)\$(NAME).hhp
- cd $(DOCDIR)\html\$(NAME)
- -hhc $(NAME).hhp
- -erase $(DOCDIR)\htmlhelp\$(NAME).chm
- move $(NAME).chm $(DOCDIR)\htmlhelp\$(NAME).chm
- cd $(THISDIR)
-
-# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
-# files, renamed to htb.
-# This can then be used with e.g. helpview.
-# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\$(NAME).htb: $(DOCDIR)\html\$(NAME)\$(NAME).htm
- cd $(DOCDIR)\html\$(NAME)
- -erase $(NAME).zip $(NAME).htb
- zip $(NAME).zip *.htm *.gif *.hhp *.hhc *.hhk
- -mkdir $(DOCDIR)\htb
- -erase $(DOCDIR)\htb\$(NAME).htb
- -erase $(DOCDIR)\htb\$(NAME).htb
- move $(NAME).zip $(DOCDIR)\htb\$(NAME).htb
- cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).dvi: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -latex $(NAME)
- -latex $(NAME)
- -makeindx $(NAME)
- -bibtex $(NAME)
- -latex $(NAME)
- -latex $(NAME)
- cd $(THISDIR)
-
-$(WXDIR)\docs\ps\$(NAME).ps: $(DOCSOURCEDIR)\$(NAME).dvi
- cd $(DOCSOURCEDIR)
- -dvips32 -o $(NAME).ps $(NAME)
- move $(NAME).ps $(WXDIR)\docs\ps\$(NAME).ps
- cd $(THISDIR)
-
diff --git a/contrib/src/fl/newbmpbtn.cpp b/contrib/src/fl/newbmpbtn.cpp
deleted file mode 100644
index eb83eb9c62..0000000000
--- a/contrib/src/fl/newbmpbtn.cpp
+++ /dev/null
@@ -1,851 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: newbmpbtn.cpp
-// Purpose: wxNewBitmapButton enhanced bitmap button class.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: ??/09/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/newbmpbtn.h"
-#include "wx/utils.h" // import wxMin,wxMax macros
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-///////////// button-label rendering helpers //////////////////
-
-static int* create_array( int width, int height, int fill = 0 )
-{
- int* array = new int[width*height];
-
- int len = width*height;
- int i;
- for ( i = 0; i != len; ++i )
- array[i] = fill;
-
- return array;
-}
-
-#define GET_ELEM(array,x,y) (array[width*(y)+(x)])
-
-#define MIN_COLOR_DIFF 10
-
-#define IS_IN_ARRAY(x,y) ( (x) < width && (y) < height && (x) >= 0 && (y) >= 0 )
-
-#define GET_RED(col) col & 0xFF
-#define GET_GREEN(col) (col >> 8) & 0xFF
-#define GET_BLUE(col) (col >> 16) & 0xFF
-
-#define MAKE_INT_COLOR(red,green,blue) ( (red) | \
- ( ( (green) << 8 ) & 0xFF00 ) | \
- ( ( (blue) << 16) & 0xFF0000) \
- )
-
-#define IS_GREATER(col1,col2) ( ( (GET_RED(col1) ) > (GET_RED(col2) ) + MIN_COLOR_DIFF ) && \
- ( (GET_GREEN(col1)) > (GET_GREEN(col2)) + MIN_COLOR_DIFF ) && \
- ( (GET_BLUE(col1) ) > (GET_BLUE(col2) ) + MIN_COLOR_DIFF ) \
- )
-
-#define MASK_BG 0
-#define MASK_DARK 1
-#define MASK_LIGHT 2
-
-// helper function, used internally
-
-static void gray_out_pixmap( int* src, int* dest, int width, int height )
-{
- // assuming the pixels along the edges are of the background color
-
- int x = 0;
- int y = 1;
-
- do
- {
- int cur = GET_ELEM(src,x,y);
-
-
- if ( IS_IN_ARRAY(x-1,y-1) )
- {
- int upperElem = GET_ELEM(src,x-1,y-1);
-
- // if the upper element is lighter than current
- if ( IS_GREATER(upperElem,cur) )
- {
- GET_ELEM(dest,x,y) = MASK_DARK;
- }
- else
- // if the current element is ligher than the upper
- if ( IS_GREATER(cur,upperElem) )
- {
- GET_ELEM(dest,x,y) = MASK_LIGHT;
- }
- else
- {
- if ( GET_ELEM(dest,x-1,y-1) == MASK_LIGHT )
-
- GET_ELEM(dest,x,y) = MASK_BG;
-
- if ( GET_ELEM(dest,x-1,y-1 ) == MASK_DARK )
-
- GET_ELEM(dest,x,y) = MASK_DARK;
- else
- GET_ELEM(dest,x,y) = MASK_BG;
- }
- }
-
- // go zig-zag
-
- if ( IS_IN_ARRAY(x+1,y-1) )
- {
- ++x;
- --y;
- }
- else
- {
- while ( IS_IN_ARRAY(x-1,y+1) )
- {
- --x;
- ++y;
- }
-
- if ( IS_IN_ARRAY(x,y+1) )
- {
- ++y;
- continue;
- }
- else
- {
- if ( IS_IN_ARRAY(x+1,y) )
- {
- ++x;
- continue;
- }
- else break;
- }
- }
-
- } while (1);
-}
-
-// algorithm for making the image look "grayed" (e.g. disabled button)
-// NOTE:: used GetPixel(), which is Windows-Only!
-
-void gray_out_image_on_dc( wxDC& dc, int width, int height )
-{
- // assuming the pixels along the edges are of the background color
- wxColour bgCol;
- dc.GetPixel( 0, 0, &bgCol );
-
- wxPen darkPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW),1, wxSOLID );
- wxPen lightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT),1, wxSOLID );
- wxPen bgPen ( bgCol, 1, wxSOLID );
-
- int* src = create_array( width, height, MASK_BG );
- int* dest = create_array( width, height, MASK_BG );
-
- int x, y;
- for ( y = 0; y != height; ++y )
- {
- for ( x = 0; x != width; ++x )
- {
- wxColour col;
- dc.GetPixel( x,y, &col );
-
- GET_ELEM(src,x,y) = MAKE_INT_COLOR( col.Red(), col.Green(), col.Blue() );
- }
- }
- gray_out_pixmap( src, dest, width, height );
-
- for ( y = 0; y != height; ++y )
- {
- for ( x = 0; x != width; ++x )
- {
- int mask = GET_ELEM(dest,x,y);
-
- switch (mask)
- {
- case MASK_BG : { dc.SetPen( bgPen );
- dc.DrawPoint( x,y ); break;
- }
- case MASK_DARK : { dc.SetPen( darkPen );
- dc.DrawPoint( x,y ); break;
- }
- case MASK_LIGHT : { dc.SetPen( lightPen );
- dc.DrawPoint( x,y ); break;
- }
- default : break;
- }
- }
- }
- delete [] src;
- delete [] dest;
-}
-
-///////////////////////////////
-
-/***** Implementation for class wxNewBitmapButton *****/
-
-IMPLEMENT_DYNAMIC_CLASS(wxNewBitmapButton, wxPanel)
-
-BEGIN_EVENT_TABLE( wxNewBitmapButton, wxPanel )
-
- EVT_LEFT_DOWN ( wxNewBitmapButton::OnLButtonDown )
- EVT_LEFT_UP ( wxNewBitmapButton::OnLButtonUp )
-// EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDClick )
- EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDown )
- EVT_ENTER_WINDOW( wxNewBitmapButton::OnMouseEnter )
- EVT_LEAVE_WINDOW( wxNewBitmapButton::OnMouseLeave )
-
- EVT_SIZE ( wxNewBitmapButton::OnSize )
- EVT_PAINT( wxNewBitmapButton::OnPaint )
-
- //EVT_KILL_FOCUS( wxNewBitmapButton::OnKillFocus )
-
- EVT_ERASE_BACKGROUND( wxNewBitmapButton::OnEraseBackground )
-
- EVT_IDLE(wxNewBitmapButton::OnIdle)
-
-END_EVENT_TABLE()
-
-wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap,
- const wxString& labelText,
- int alignText,
- bool isFlat,
- int firedEventType,
- int marginX,
- int marginY,
- int textToLabelGap,
- bool isSticky)
- : mTextToLabelGap ( textToLabelGap ),
- mMarginX( marginX ),
- mMarginY( marginY ),
- mTextAlignment( alignText ),
- mIsSticky( isSticky ),
- mIsFlat( isFlat ),
- mLabelText( labelText ),
- mImageFileType( wxBITMAP_TYPE_INVALID ),
- mDepressedBmp( labelBitmap ),
-
- mpDepressedImg( NULL ),
- mpPressedImg ( NULL ),
- mpDisabledImg ( NULL ),
- mpFocusedImg ( NULL ),
-
-
- mDragStarted ( false ),
- mIsPressed ( false ),
- mIsInFocus ( false ),
- mIsToggled ( false ),
- mHasFocusedBmp( false ),
- mFiredEventType( firedEventType ),
-
- mBlackPen( wxColour( 0, 0, 0), 1, wxSOLID ),
- mDarkPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID ),
- mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
- mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ),
-
- mIsCreated( false ),
- mSizeIsSet( false )
-
-{
-}
-
-wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName,
- const wxBitmapType bitmapFileType,
- const wxString& labelText,
- int alignText,
- bool isFlat,
- int WXUNUSED(firedEventType),
- int WXUNUSED(marginX),
- int WXUNUSED(marginY),
- int WXUNUSED(textToLabelGap),
- bool WXUNUSED(isSticky))
-
- : mTextToLabelGap ( 2 ),
- mMarginX( 2 ),
- mMarginY( 2 ),
- mTextAlignment( alignText ),
- mIsSticky( false ),
- mIsFlat( isFlat ),
- mLabelText( labelText ),
- mImageFileName( bitmapFileName ),
- mImageFileType( bitmapFileType ),
-
- mpDepressedImg( NULL ),
- mpPressedImg ( NULL ),
- mpDisabledImg ( NULL ),
- mpFocusedImg ( NULL ),
-
- mDragStarted ( false ),
- mIsPressed ( false ),
- mIsInFocus ( false ),
- mIsToggled ( false ),
- mHasFocusedBmp( false ),
- mFiredEventType( wxEVT_COMMAND_MENU_SELECTED ),
-
- mBlackPen( wxColour( 0, 0, 0), 1, wxSOLID ),
- mDarkPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID ),
- mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
- mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ),
-
- mIsCreated( false ),
- mSizeIsSet( false )
-
-{
-}
-
-wxNewBitmapButton::~wxNewBitmapButton(void)
-{
- DestroyLabels();
-}
-
-void wxNewBitmapButton::DrawShade( int outerLevel,
- wxDC& dc,
- wxPen& upperLeftSidePen,
- wxPen& lowerRightSidePen )
-{
- wxBitmap* pBmp = GetStateLabel();
- int x = mMarginX - (outerLevel + 2);
- int y = mMarginY - (outerLevel + 2);
- int height = pBmp->GetHeight() + (outerLevel + 2)*2 - 1;
- int width = pBmp->GetWidth() + (outerLevel + 2)*2 - 1;
- dc.SetPen( upperLeftSidePen );
- dc.DrawLine( x,y, x + width, y );
- dc.DrawLine( x,y, x, y + height );
- dc.DrawLine( x,y+1, x + width , y +1 ); // top
- dc.DrawLine( x+1,y, x+1, y + height ); // left
-
- dc.SetPen( lowerRightSidePen );
- dc.DrawLine( x + width, y, x + width, y + height + 1 );
- dc.DrawLine( x, y + height, x + width, y + height );
- dc.DrawLine( x + width-1, y+1, x + width-1, y + height +1 ); // right
- dc.DrawLine( x +1, y + height-1, x + width, y + height-1 ); // bottom
-}
-
-void wxNewBitmapButton::DestroyLabels()
-{
- if ( mpDepressedImg ) delete mpDepressedImg;
- if ( mpPressedImg ) delete mpPressedImg;
- if ( mpDisabledImg ) delete mpDisabledImg;
- if ( mpFocusedImg ) delete mpFocusedImg;
-
- mpDepressedImg = NULL;
- mpPressedImg = NULL;
- mpDisabledImg = NULL;
- mpFocusedImg = NULL;
-}
-
-wxBitmap* wxNewBitmapButton::GetStateLabel()
-{
- if ( IsEnabled() )
- {
- if ( mIsPressed )
- {
- return mpPressedImg;
- }
- else
- {
- if ( mIsInFocus )
- {
- if ( mHasFocusedBmp )
-
- return mpFocusedImg;
- else
- return mpDepressedImg;
- }
- else
- return mpDepressedImg;
- }
- }
- else
- return mpDisabledImg;
-}
-
-#ifndef __WXMSW__
-
-static const unsigned char _gDisableImage[] = { 0x55,0xAA,0x55,0xAA,
- 0x55,0xAA,0x55,0xAA,
- 0x55,0xAA,0x55,0xAA,
- 0x55,0xAA,0x55,0xAA
- };
-
-#endif
-
-void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
- bool isEnabled, bool isPressed )
-{
- if ( destBmp != 0 ) return;
-
- // render labels on-demand
-
- wxMemoryDC srcDc;
- srcDc.SelectObject( *srcBmp );
-
- bool hasText = ( mTextAlignment != NB_NO_TEXT ) &&
- ( mLabelText.length() != 0 );
-
- bool hasImage = (mTextAlignment != NB_NO_IMAGE);
-
- wxSize destDim;
- wxPoint txtPos;
- wxPoint imgPos;
-
- if ( hasText )
- {
- long txtWidth, txtHeight;
-
- srcDc.SetFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) );
- srcDc.GetTextExtent( mLabelText, &txtWidth, &txtHeight );
-
- if ( mTextAlignment == NB_ALIGN_TEXT_RIGHT )
- {
- destDim.x = srcBmp->GetWidth() + 2*mTextToLabelGap + txtWidth;
-
- destDim.y =
- wxMax( srcBmp->GetHeight(), txtHeight );
-
- txtPos.x = srcBmp->GetWidth() + mTextToLabelGap;
- txtPos.y = (destDim.y - txtHeight)/2;
- imgPos.x = 0;
- imgPos.y = (destDim.y - srcBmp->GetHeight())/2;
- }
- else
- if ( mTextAlignment == NB_ALIGN_TEXT_BOTTOM )
- {
- destDim.x =
- wxMax( srcBmp->GetWidth(), txtWidth );
-
- destDim.y = srcBmp->GetHeight() + mTextToLabelGap + txtHeight;
-
- txtPos.x = (destDim.x - txtWidth)/2;
- txtPos.y = srcBmp->GetHeight() + mTextToLabelGap;
- imgPos.x = (destDim.x - srcBmp->GetWidth())/2;
- imgPos.y = 0;
- }
- else
- {
- wxFAIL_MSG(wxT("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()"));
- }
- }
- else
- {
- imgPos.x = 0;
- imgPos.y = 0;
- destDim.x = srcBmp->GetWidth();
- destDim.y = srcBmp->GetHeight();
- }
-
- destBmp = new wxBitmap( int(destDim.x), int(destDim.y) );
-
- wxMemoryDC destDc;
- destDc.SelectObject( *destBmp );
-
- wxBrush grayBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE), wxSOLID );
-
- destDc.SetBrush( grayBrush );
- destDc.SetPen( *wxTRANSPARENT_PEN );
- destDc.DrawRectangle( 0,0, destDim.x+1, destDim.y+1 );
-
- if ( isPressed )
- {
- ++imgPos.x; ++imgPos.y;
- ++txtPos.x; ++txtPos.y;
- }
-
- if ( hasImage )
- {
-
- destDc.Blit( imgPos.x, imgPos.y,
- srcBmp->GetWidth(),
- srcBmp->GetHeight(),
- &srcDc, 0,0, wxCOPY,true );
- }
-
- if ( hasText )
- {
- wxWindow* pTopWnd = this;
-
- do
- {
- wxWindow* pParent = pTopWnd->GetParent();
-
- if ( pParent == 0 )
- break;
-
- pTopWnd = pParent;
- } while (1);
-
- destDc.SetFont( wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT) );
-
- if ( isEnabled )
- {
- destDc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT) );
- }
- else
- {
- destDc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) );
- }
- destDc.SetTextBackground( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE) );
-
- destDc.DrawText( mLabelText, txtPos.x, txtPos.y );
- }
-
- if ( !isEnabled ){
-
-#ifdef __WXMSW__ // This is currently MSW specific
- gray_out_image_on_dc( destDc, destDim.x, destDim.y );
-#else
- wxBitmap bmp( (const char*)_gDisableImage,8,8);
- wxBrush checkerBrush(bmp);
- checkerBrush.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
- destDc.SetBrush( checkerBrush );
- destDc.DrawRectangle( imgPos.x, imgPos.y, srcBmp->GetWidth()+1, srcBmp->GetHeight()+1);
-#endif
- }
- // adjust button size to fit the new dimensions of the label
- if ( !mSizeIsSet && 0 )
- {
- mSizeIsSet = true;
- SetSize( wxDefaultCoord, wxDefaultCoord,
- destBmp->GetWidth() + mMarginX*2,
- destBmp->GetHeight() + mMarginY*2, 0
- );
- }
- destDc.SelectObject( wxNullBitmap );
-
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
- // Map to system colours
- (void) wxToolBar::MapBitmap(destBmp->GetHBITMAP(), destBmp->GetWidth(), destBmp->GetHeight());
-#endif
-}
-
-void wxNewBitmapButton::RenderAllLabelImages()
-{
- if ( !mIsCreated )
- return;
- RenderLabelImage( mpDisabledImg, &mDepressedBmp, false );
- RenderLabelImage( mpPressedImg, &mDepressedBmp, true, true );
- RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false );
- if ( mHasFocusedBmp )
- {
- RenderLabelImage( mpFocusedImg, &mFocusedBmp, true, false );
- }
-}
-
-
-void wxNewBitmapButton::RenderLabelImages()
-{
- if ( !mIsCreated )
- return;
-
- if ( !IsEnabled() )
- {
- RenderLabelImage( mpDisabledImg, &mDepressedBmp, false );
- }
- else
-
- if ( mIsPressed )
-
- RenderLabelImage( mpPressedImg, &mDepressedBmp, true, true );
- else
- {
- if ( mIsInFocus )
- {
- if ( mHasFocusedBmp )
- RenderLabelImage( mpFocusedImg, &mFocusedBmp, true, false );
- else
- RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false );
- }
- else
- RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false );
- }
-}
-
-bool wxNewBitmapButton::Toggle(bool enable)
-{
- if ( mIsToggled == enable )
- {
- return false;
- }
-
- mIsToggled = enable;
- Refresh();
-
- return true;
-}
-
-bool wxNewBitmapButton::Enable(bool enable)
-{
- if ( enable != m_isEnabled )
- {
- if ( mIsInFocus )
- {
- mIsInFocus = false;
- }
-
- if ( mIsPressed )
- {
- mIsPressed = false;
- }
-
- Refresh();
- }
-
- return wxPanel::Enable( enable );
-}
-
-void wxNewBitmapButton::DrawDecorations( wxDC& dc )
-{
- if ( mIsFlat )
- {
- DrawShade( 1, dc, mGrayPen, mGrayPen );
- if ( mIsToggled )
- {
- DrawShade( 0, dc, mDarkPen, mLightPen );
- }
- else if ( mIsInFocus )
- {
- if ( mIsPressed )
- DrawShade( 0, dc, mDarkPen, mLightPen );
- else
- DrawShade( 0, dc, mLightPen, mDarkPen );
- }
- else
- DrawShade( 0, dc, mGrayPen, mGrayPen );
- }
- else
- {
- if ( mIsPressed || mIsToggled )
- {
- DrawShade( 0, dc, mDarkPen, mGrayPen );
- DrawShade( 1, dc, mBlackPen, mLightPen );
- }
- else
- {
- DrawShade( 0, dc, mGrayPen, mDarkPen );
- DrawShade( 1, dc, mLightPen, mBlackPen );
- }
- }
-}
-
-void wxNewBitmapButton::SetLabel(const wxBitmap& labelBitmap,
- const wxString& labelText )
-{
- DestroyLabels();
-
- mLabelText = labelText;
- mDepressedBmp = labelBitmap;
-
- //RenderLabelImages();
- RenderAllLabelImages();
-}
-
-void wxNewBitmapButton::SetAlignments( int alignText,
- int marginX,
- int marginY,
- int textToLabelGap)
-{
- DestroyLabels();
-
- mMarginX = marginX;
- mMarginY = marginY;
- mTextAlignment = alignText;
- mTextToLabelGap = textToLabelGap;
-
- //RenderLabelImages();
- RenderAllLabelImages();
-}
-
-// event handlers
-
-void wxNewBitmapButton::OnLButtonDown( wxMouseEvent& WXUNUSED(event) )
-{
- mDragStarted = true;
- mIsPressed = true;
- Refresh();
-}
-
-void wxNewBitmapButton::OnLButtonUp( wxMouseEvent& event )
-{
- if ( !mDragStarted )
- return;
-
- mDragStarted = false;
- mIsPressed = false;
- Refresh();
-
- if ( IsInWindow( event.m_x, event.m_y ) )
- {
- // fire event, if mouse was released
- // within the bounds of button
- wxCommandEvent cmd( mFiredEventType, GetId() );
- GetParent()->ProcessEvent( cmd );
- }
-}
-
-bool wxNewBitmapButton::IsInWindow( int x, int y )
-{
- int width, height;
- GetSize( &width, &height );
-
- return ( x >= 0 && y >= 0 &&
- x < width &&
- y < height );
-}
-
-void wxNewBitmapButton::OnMouseEnter( wxMouseEvent& WXUNUSED(event) )
-{
- bool prevIsInFocus = mIsInFocus;
-
- if ( !mIsInFocus )
- {
- mIsInFocus = true;
- }
- if ( prevIsInFocus != mIsInFocus )
- {
- Refresh();
- }
-}
-
-void wxNewBitmapButton::OnMouseLeave( wxMouseEvent& WXUNUSED(event) )
-{
- bool prevIsInFocus = mIsInFocus;
- bool prevIsPressed = mIsPressed;
- if ( mIsInFocus )
- {
- mIsInFocus = false;
- mIsPressed = false;
- }
- if ( prevIsInFocus != mIsInFocus || prevIsPressed != mIsPressed )
- {
- Refresh();
- }
-}
-
-void wxNewBitmapButton::OnSize( wxSizeEvent& WXUNUSED(event) )
-{
- //Reshape();
-}
-
-void wxNewBitmapButton::Reshape( )
-{
- bool wasCreated = mIsCreated;
- mIsCreated = true;
-
- if ( !wasCreated )
- {
- // in the case of loading button from stream, check if we
- // have non-empty image-file name, load if possible
-
- if (!mImageFileName.empty())
- {
- mDepressedBmp.LoadFile( mImageFileName, mImageFileType );
-
- //wxMessageBox("Image Loaded!!!");
- }
-
- //RenderLabelImages();
- RenderAllLabelImages();
-
- wxBitmap* pCurImg = GetStateLabel();
-
- int w = pCurImg->GetWidth(),
- h = pCurImg->GetHeight();
-
- SetSize( 0,0, w + mMarginX*2, h + mMarginY*2 , 0 );
- }
-}
-
-void wxNewBitmapButton::DrawLabel( wxDC& dc )
-{
- wxBitmap* pCurBmp = GetStateLabel();
-
- if ( pCurBmp == NULL )
- {
- wxSizeEvent evt;
- OnSize( evt ); // fake it up!
-
- //RenderLabelImages();
- pCurBmp = GetStateLabel();
- }
-
- wxMemoryDC mdc;
- mdc.SelectObject( *pCurBmp );
-
- dc.Blit( mMarginX, mMarginY,
- pCurBmp->GetWidth(),
- pCurBmp->GetHeight(),
- &mdc, 0,0, wxCOPY
- );
-
- mdc.SelectObject( wxNullBitmap );
-}
-
-void wxNewBitmapButton::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
- wxPaintDC dc(this);
-
- // first, make sure images for current state are prepared
- //RenderLabelImages();
-
- DrawLabel( dc );
-
- DrawDecorations( dc );
-}
-
-void wxNewBitmapButton::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
-{
- // do nothing
-}
-
-void wxNewBitmapButton::OnKillFocus( wxFocusEvent& WXUNUSED(event) )
-{
- // useless
-
- wxMessageBox(wxT("kill-focus for button!"));
-}
-
-// ----------------------------------------------------------------------------
-// UI updates
-// ----------------------------------------------------------------------------
-
-void wxNewBitmapButton::OnIdle(wxIdleEvent& event)
-{
- DoButtonUpdate();
-
- event.Skip();
-}
-
-// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
-void wxNewBitmapButton::DoButtonUpdate()
-{
- wxUpdateUIEvent event(GetId());
- event.SetEventObject(this);
-
- if ( GetParent()->ProcessEvent(event) )
- {
- if ( event.GetSetEnabled() )
- {
- bool enabled = event.GetEnabled();
- if ( enabled != IsEnabled() )
- Enable( enabled );
- }
- if ( event.GetSetChecked() )
- Toggle( event.GetChecked() );
- }
-}
diff --git a/contrib/src/fl/panedrawpl.cpp b/contrib/src/fl/panedrawpl.cpp
deleted file mode 100644
index cb292b7285..0000000000
--- a/contrib/src/fl/panedrawpl.cpp
+++ /dev/null
@@ -1,1284 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: panedrawpl.cpp
-// Purpose: cbPaneDrawPlugin implementation.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 06/09/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include
-#include
-
-#include "wx/utils.h" // import wxMin,wxMax macros
-
-#include "wx/fl/panedrawpl.h"
-
-// bitmap bits used by bar-resizing brush
-
-#define _IMG_A 0xAA // Note: modified from _A to _IMG_A, _A was already defined (cygwin)
-#define _IMG_B 0x00 // Note: modified from _B to _IMG_A, _B was already defined (cygwin)
-#define _IMG_C 0x55 // Note: modified from _C to _IMG_C, for consistency reasons.
-#define _IMG_D 0x00 // Note: modified from _D to _IMG_D, for consistency reasons.
-
-static const unsigned char _gCheckerImg[16] = { _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D
- };
-
-// FIXME:: The below code somehow doesn't work - cursors remain unchanged
-// Used: controlbar.cpp(1268): set_cursor_bits( _gHorizCursorImg, bits, 32, 16 );
-// Used: controlbar.cpp(1272): set_cursor_bits( _gVertCursorImg, bits, 32, 16 );
-/*
-static void set_cursor_bits( const char** img, char* bits, int width, int height )
-{
- for( int i = 0; i != (width*height)/8; ++i )
- bits[i] = 0;
-
- for( int y = 0; y != height; ++y )
- {
- const char* row = img[0];
-
- for( int x = 0; x != width; ++x )
- {
- int bitNo = y*width + x;
-
- char value = ( row[x] != '.' ) ? 1 : 0;
-
- bits[ bitNo / sizeof(char) ] |=
- ( ( bitNo %sizeof(char) ) << value );
- }
-
- ++img;
- }
-}
-*/
-
-/***** Implementation for class cbPaneDrawPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbPaneDrawPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbPaneDrawPlugin, cbPluginBase )
-
- EVT_PL_LEFT_DOWN ( cbPaneDrawPlugin::OnLButtonDown )
- EVT_PL_LEFT_UP ( cbPaneDrawPlugin::OnLButtonUp )
-// EVT_PL_LEFT_DCLICK ( cbPaneDrawPlugin::OnLDblClick )
- EVT_PL_RIGHT_UP ( cbPaneDrawPlugin::OnRButtonUp )
- EVT_PL_MOTION ( cbPaneDrawPlugin::OnMouseMove )
-
-
- EVT_PL_DRAW_PANE_BKGROUND ( cbPaneDrawPlugin::OnDrawPaneBackground )
- EVT_PL_DRAW_PANE_DECOR ( cbPaneDrawPlugin::OnDrawPaneDecorations )
-
- EVT_PL_DRAW_ROW_DECOR ( cbPaneDrawPlugin::OnDrawRowDecorations )
- EVT_PL_DRAW_ROW_HANDLES ( cbPaneDrawPlugin::OnDrawRowHandles )
- EVT_PL_DRAW_ROW_BKGROUND ( cbPaneDrawPlugin::OnDrawRowBackground )
-
- EVT_PL_SIZE_BAR_WND ( cbPaneDrawPlugin::OnSizeBarWindow )
- EVT_PL_DRAW_BAR_DECOR ( cbPaneDrawPlugin::OnDrawBarDecorations )
- EVT_PL_DRAW_BAR_HANDLES ( cbPaneDrawPlugin::OnDrawBarHandles )
-
- EVT_PL_START_DRAW_IN_AREA ( cbPaneDrawPlugin::OnStartDrawInArea )
- EVT_PL_FINISH_DRAW_IN_AREA ( cbPaneDrawPlugin::OnFinishDrawInArea )
-
-END_EVENT_TABLE()
-
-cbPaneDrawPlugin::cbPaneDrawPlugin(void)
-
- : mResizeStarted ( false ),
-
- mResizeCursorOn ( false ),
- mpDraggedBar ( NULL ),
- mpResizedRow ( NULL ),
-
- mRowHandleHitted ( false ),
- mIsUpperHandle ( false ),
- mBarHandleHitted ( false ),
- mIsLeftHandle ( false ),
- mBarContentHitted ( false ),
-
- mpClntDc ( NULL ),
- mpPane ( NULL )
-{}
-
-cbPaneDrawPlugin::cbPaneDrawPlugin( wxFrameLayout* pPanel, int paneMask )
-
- : cbPluginBase( pPanel, paneMask ),
-
- // bar-row resizing state varaibles
-
- mResizeStarted ( false ),
-
- mResizeCursorOn ( false ),
- mpDraggedBar ( NULL ),
- mpResizedRow ( NULL ),
-
- mRowHandleHitted ( false ),
- mIsUpperHandle ( false ),
- mBarHandleHitted ( false ),
- mIsLeftHandle ( false ),
- mBarContentHitted ( false ),
-
- mpClntDc ( NULL ),
- mpPane ( NULL )
-{}
-
-cbPaneDrawPlugin::~cbPaneDrawPlugin()
-{
- // DBG::
- wxASSERT( mpClntDc == NULL );
-}
-
-void cbPaneDrawPlugin::DrawDraggedHandle( const wxPoint& pos, cbDockPane& pane )
-{
- wxScreenDC dc;
- int ofsX = 0;
- int ofsY = 0;
-
- wxPoint fpos = pos;
- pane.PaneToFrame( &fpos.x, &fpos.y );
-
- // short-cut
- int resizeHndSize = pane.mProps.mResizeHandleSize;
-
- // "Required for X to specify that
- // that we wish to draw on top of all windows
- // - and we optimise by specifying the area
- // for creating the overlap window." --J.S.
-
- wxScreenDC::StartDrawingOnTop(&mpLayout->GetParentFrame());
-
- mpLayout->GetParentFrame().ClientToScreen( &ofsX, &ofsY );
-
- int prevLF = dc.GetLogicalFunction();
-
- // BUG BUG BUG (wx):: somehow stippled brush works only
- // when the bitmap created on stack, not
- // as a member of the class
-
- wxBitmap checker( (const char*)_gCheckerImg, 8,8 );
-
- wxBrush checkerBrush( checker );
-
- dc.SetPen( mpLayout->mNullPen );
- dc.SetBrush( checkerBrush );
- dc.SetLogicalFunction( wxXOR );
-
- if ( mHandleIsVertical )
- {
- int delta = pos.x - mDragOrigin.x;
-
- if ( !pane.IsHorizontal() )
-
- delta = pos.y - mDragOrigin.y;
-
- int realHndOfs;
- realHndOfs = pane.mBoundsInParent.x + pane.mLeftMargin + mHandleOfs;
-
- int newX = realHndOfs + delta;
-
- if ( newX + resizeHndSize > mHandleDragArea.x + mHandleDragArea.width )
-
- newX = mHandleDragArea.x + mHandleDragArea.width - 1;
-
- if ( newX < mHandleDragArea.x )
-
- newX = mHandleDragArea.x;
-
- mDraggedDelta = newX - realHndOfs;
-
- dc.DrawRectangle( newX + ofsX, mHandleDragArea.y + ofsY,
- resizeHndSize + 1,
- mHandleDragArea.height+1 );
- }
- else
- {
- // otherwise, draw horizontal handle
-
- int delta = pos.y - mDragOrigin.y;
-
- if ( !pane.IsHorizontal() )
-
- delta = pos.x - mDragOrigin.x;
-
- int realHndOfs;
- realHndOfs = pane.mBoundsInParent.y + pane.mTopMargin + mHandleOfs;
-
- int newY = realHndOfs + delta;
-
- if ( newY + resizeHndSize > mHandleDragArea.y + mHandleDragArea.height )
-
- newY = mHandleDragArea.y + mHandleDragArea.height - 1;
-
- if ( newY < mHandleDragArea.y )
-
- newY = mHandleDragArea.y;
-
- mDraggedDelta = newY - realHndOfs;
-
- dc.DrawRectangle( mHandleDragArea.x + ofsX, newY + ofsY,
- mHandleDragArea.width + 1,
- resizeHndSize + 1 );
- }
-
- dc.SetLogicalFunction( prevLF );
-
- // "End drawing on top (frees the window used for drawing
- // over the screen)" --J.S.
- wxScreenDC::EndDrawingOnTop();
-}
-
-void cbPaneDrawPlugin::OnMouseMove( cbMotionEvent& event )
-{
- if ( !mResizeStarted )
- {
- // if nothing is started, do hit-tests
-
- bool prevWasRowHandle = mRowHandleHitted;
-
- mBarContentHitted = false;
- mBarHandleHitted = false;
- mRowHandleHitted = false;
-
- int testResult =
- event.mpPane->HitTestPaneItems( event.mPos, // in pane's coordiantes
- &mpResizedRow,
- &mpDraggedBar );
-
- if ( testResult != CB_NO_ITEMS_HITTED )
- {
- if ( testResult == CB_BAR_CONTENT_HITTED )
- {
- // restore cursor, if non of the handles were hit
- if ( mResizeCursorOn )
- {
- // remove resizing hints
-
- mpLayout->ReleaseEventsFromPane( event.mpPane );
- mpLayout->ReleaseEventsFromPlugin( this );
-
- mResizeCursorOn = false;
-
- mBarContentHitted = true;
-
- // In Windows, at least, the frame needs to have a null cursor
- // else child windows (such as text windows) inherit the cursor
-#if 1
- mpLayout->GetParentFrame().SetCursor( wxNullCursor );
-#else
- mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
-#endif
- }
-
- // TBD:: fire something like "mouse-over-bar" event
-
- event.Skip(); // pass event to the next handler in the chain
- return;
- }
-
- wxCursor* pCurs;
-
- if ( testResult == CB_UPPER_ROW_HANDLE_HITTED ||
- testResult == CB_LOWER_ROW_HANDLE_HITTED)
- {
- if ( event.mpPane->IsHorizontal() )
-
- pCurs = mpLayout->mpVertCursor;
- else
- pCurs = mpLayout->mpHorizCursor;
-
- mRowHandleHitted = true;
- mIsUpperHandle = ( testResult == CB_UPPER_ROW_HANDLE_HITTED );
- }
- else
- {
- // otherwise, if inter-bar handle was hitted
-
- if ( event.mpPane->IsHorizontal() )
-
- pCurs = mpLayout->mpHorizCursor;
- else
- pCurs = mpLayout->mpVertCursor;
-
- mBarHandleHitted = true;
- mIsLeftHandle = ( testResult == CB_LEFT_BAR_HANDLE_HITTED );
- }
-
- // avoid setting the same cursor twice
-
- if ( !mResizeCursorOn || prevWasRowHandle != mRowHandleHitted )
- {
- mpLayout->GetParentFrame().SetCursor( *pCurs );
-
- if ( !mResizeCursorOn )
- {
- // caputre if not captured yet
- mpLayout->CaptureEventsForPane( event.mpPane );
- mpLayout->CaptureEventsForPlugin( this );
- }
- }
-
- mResizeCursorOn = true;
-
- // handled is being dragged now, thus event is "eaten" by this plugin
-
- return;
-
- } // end of if (HitTestBarHandles())
-
- // restore cursor, if non of the handles were hit
- if ( mResizeCursorOn )
- {
- mpLayout->ReleaseEventsFromPane( event.mpPane );
- mpLayout->ReleaseEventsFromPlugin( this );
-
- // In Windows, at least, the frame needs to have a null cursor
- // else child windows (such as text windows) inherit the cursor
-#if 1
- mpLayout->GetParentFrame().SetCursor( wxNullCursor );
-#else
- mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
-#endif
-
- mResizeCursorOn = false;
- }
-
- event.Skip(); // pass event to the next plugin
- }
-
- // othewise series of actions, if something has already started
-
- else
- if ( mResizeStarted )
- {
- // apply xor-mask twice
- DrawDraggedHandle( mPrevPos, *event.mpPane );
-
- // draw handle in the new position
- DrawDraggedHandle( event.mPos, *event.mpPane );
- mPrevPos = event.mPos;
-
- // handled is dragged, thus event is "eaten" by this plugin
- }
- else
- event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnLDblClick( cbLeftDClickEvent& event )
-{
- if ( !mResizeCursorOn )
- {
- cbBarInfo* pBarToFloat;
-
- if ( event.mpPane->HitTestPaneItems( event.mPos, // in pane's coordiantes
- &mpResizedRow,
- &pBarToFloat ) == CB_BAR_CONTENT_HITTED
- )
- {
- return;
- }
-
- event.Skip();
- }
-}
-
-void cbPaneDrawPlugin::OnLButtonDown( cbLeftDownEvent& event )
-{
- wxASSERT( !mResizeStarted );
-
- if ( mResizeCursorOn )
- {
- mResizeStarted = true;
- mDragOrigin = event.mPos;
-
- // setup constraints for the dragging handle
-
- int from, till;
- mHandleOfs = 0;
- mHandleIsVertical = false;
-
- if ( mRowHandleHitted )
-
- event.mpPane->GetRowResizeRange( mpResizedRow, &from, &till, mIsUpperHandle );
- else
- // otherwise if bar handle was hitted
- event.mpPane->GetBarResizeRange( mpDraggedBar, &from, &till, mIsLeftHandle );
-
- if ( mRowHandleHitted )
- {
- mHandleIsVertical = ( event.mpPane->IsHorizontal() ) ? false : true;
-
- mHandleDragArea.x = 0;
- mHandleDragArea.width = event.mpPane->mPaneWidth;
-
- mHandleDragArea.y = from;
- mHandleDragArea.height = till - from;
-
- if ( mIsUpperHandle )
-
- mHandleOfs = mpResizedRow->mRowY;
- else
- mHandleOfs = mpResizedRow->mRowY +
- mpResizedRow->mRowHeight -
- event.mpPane->mProps.mResizeHandleSize;
- }
- else
- {
- // otehrwise if bar handle dragged
-
-// cbRowInfo& rowInfo = *mpDraggedBar->mpRow;
- wxRect& bounds = mpDraggedBar->mBounds;
-
- mHandleIsVertical = ( event.mpPane->IsHorizontal() ) ? true : false;
-
- mHandleDragArea.x = from;
- mHandleDragArea.width = till - from;
-
-
- mHandleDragArea.y = bounds.y;
- mHandleDragArea.height = bounds.height;
-
- // left-side-handle mBounds
- if ( mIsLeftHandle )
-
- mHandleOfs = bounds.x;
- else
- mHandleOfs = bounds.x +
- bounds.width - event.mpPane->mProps.mResizeHandleSize;
-
- }
-
- event.mpPane->PaneToFrame( &mHandleDragArea );
- DrawDraggedHandle(mDragOrigin, *event.mpPane);
-
- mPrevPos = mDragOrigin;
-
- return;
- // handled is dragged, thus event is "eaten" by this plugin
- }
- else
- {
- cbBarInfo* pDraggedBar;
-
- if ( event.mpPane->HitTestPaneItems( event.mPos, // in pane's coordiantes
- &mpResizedRow,
- &pDraggedBar ) == CB_BAR_CONTENT_HITTED
- )
- {
- int x = event.mPos.x,
- y = event.mPos.y;
-
- event.mpPane->PaneToFrame( &x, &y );
-
- cbStartBarDraggingEvent dragEvt( pDraggedBar, wxPoint(x,y), event.mpPane );
-
- mpLayout->FirePluginEvent( dragEvt );
-
- return; // event is "eaten" by this plugin
- }
- }
-
- event.Skip(); // pass event to the next plugin in the chain
-}
-
-void cbPaneDrawPlugin::OnLButtonUp( cbLeftUpEvent& event )
-{
- if ( mResizeStarted )
- {
- DrawDraggedHandle( event.mPos, *event.mpPane );
-
- mResizeStarted = false;
- mResizeCursorOn = false;
-
- mpLayout->ReleaseEventsFromPane( event.mpPane );
- mpLayout->ReleaseEventsFromPlugin( this );
-
- // In Windows, at least, the frame needs to have a null cursor
- // else child windows (such as text windows) inherit the cursor
-#if 1
- mpLayout->GetParentFrame().SetCursor( wxNullCursor );
-#else
- mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
-#endif
-
- if ( mRowHandleHitted )
- {
- event.mpPane->ResizeRow( mpResizedRow,
- mDraggedDelta,
- mIsUpperHandle );
- }
- else
- {
- event.mpPane->ResizeBar( mpDraggedBar,
- mDraggedDelta,
- mIsLeftHandle );
- }
-
- mpDraggedBar = NULL;
- mpResizedRow = NULL;
-
- // handled dragging action was finished by this mouse-up,
- // thus event is "eaten" by this plugin
-
- return;
- }
-
- event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnRButtonUp( cbRightUpEvent& event )
-{
- wxPoint fpos = event.mPos;
- event.mpPane->PaneToFrame( &fpos.x, &fpos.y );
-
- cbBarInfo* pDraggedBar;
-
- // user clicks inside the bar contnet, fire bar-customization event
-
- if ( event.mpPane->HitTestPaneItems( event.mPos, // in pane's coordiantes
- &mpResizedRow,
- &pDraggedBar ) == CB_BAR_CONTENT_HITTED
- )
- {
- cbCustomizeBarEvent cbEvt( pDraggedBar, fpos, event.mpPane );
-
- mpLayout->FirePluginEvent( cbEvt );
-
- return; // event is "eaten" by this plugin
- }
-
- // otherwise fire whole-layout customization event
-
- cbCustomizeLayoutEvent csEvt( fpos );
-
- mpLayout->FirePluginEvent( csEvt );
-
- // event is "eaten" by this plugin
-}
-
-void cbPaneDrawPlugin::OnSizeBarWindow( cbSizeBarWndEvent& event )
-{
- cbBarInfo& bar = *event.mpBar;
- mpPane = event.mpPane;
-
- // it's possible that a bar does not have it's own window!
- if ( !bar.mpBarWnd ) return;
-
- wxRect& bounds = event.mBoundsInParent;
-
- // check visibility
- if ( bounds.height != 0 )
- {
- // size smaller than bounds, to leave space for shade lines
-
- // FIXME:: +/- 1s
-
- int nNewHeight = bounds.height - 2 - bar.mDimInfo.mVertGap *2;
- if(nNewHeight < 0)
- nNewHeight = 0;
-
- bar.mpBarWnd->wxWindow::SetSize( bounds.x + 1 + bar.mDimInfo.mHorizGap,
- bounds.y + 1 + bar.mDimInfo.mVertGap,
- bounds.width - 2 - bar.mDimInfo.mHorizGap*2,
- nNewHeight,
- 0
- );
-
- if ( !bar.mpBarWnd->IsShown() )
-
- bar.mpBarWnd->Show( true );
- }
- else
- // hide bar if not visible
- bar.mpBarWnd->Show( false );
-
- event.Skip(); // pass event to the next plugin in the chain
-}
-
-void cbPaneDrawPlugin::OnDrawRowDecorations( cbDrawRowDecorEvent& event )
-{
- DrawPaneShadeForRow( event.mpRow, *event.mpDc );
-
- event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::DrawUpperRowHandle( cbRowInfo* pRow, wxDC& dc )
-{
- wxRect& bounds = pRow->mBoundsInParent;
-
- if ( mpPane->IsHorizontal() )
- {
- if ( pRow->mHasUpperHandle )
-
- mpPane->DrawHorizHandle( dc, bounds.x,
- bounds.y-1,
- pRow->mRowWidth );
- }
- else
- {
- if ( pRow->mHasUpperHandle )
-
- mpPane->DrawVertHandle( dc, bounds.x-1,
- bounds.y, pRow->mRowWidth );
- }
-}
-
-void cbPaneDrawPlugin::DrawLowerRowHandle( cbRowInfo* pRow, wxDC& dc )
-{
- wxRect& bounds = pRow->mBoundsInParent;
-
- // check if iter-row handles present
-
- if ( mpPane->IsHorizontal() )
- {
- if ( pRow->mHasLowerHandle )
-
- mpPane->DrawHorizHandle( dc, bounds.x, bounds.y + bounds.height - mpPane->mProps.mResizeHandleSize - 1,
- pRow->mRowWidth );
- }
- else
- {
- if ( pRow->mHasLowerHandle )
-
- mpPane->DrawVertHandle( dc, bounds.x + bounds.width - mpPane->mProps.mResizeHandleSize - 1,
- bounds.y, pRow->mRowWidth );
- }
-}
-
-void cbPaneDrawPlugin::OnDrawRowHandles( cbDrawRowHandlesEvent& event )
-{
- // short-cuts
- cbRowInfo* pRow = event.mpRow;
- wxDC& dc = *event.mpDc;
- mpPane = event.mpPane;
-
- // draw handles of surrounding rows first
-
- if ( pRow->mpPrev && pRow->mpPrev->mHasLowerHandle )
-
- DrawLowerRowHandle( pRow->mpPrev, dc );
-
- if ( pRow->mpNext && pRow->mpNext->mHasUpperHandle )
-
- DrawUpperRowHandle( pRow->mpNext, dc );
-
- // draw handles of the given row
-
- if ( pRow->mHasUpperHandle )
-
- DrawUpperRowHandle( pRow, dc );
-
- if ( pRow->mHasLowerHandle )
-
- DrawLowerRowHandle( pRow, dc );
-
- event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnDrawPaneBackground ( cbDrawPaneBkGroundEvent& event )
-{
- wxDC& dc = *event.mpDc;
- mpPane = event.mpPane;
-
- // FOR NOW:: hard-coded
- wxBrush bkBrush( mpLayout->mBorderPen.GetColour(), wxSOLID );
-
- dc.SetBrush( bkBrush );
- dc.SetPen( mpLayout->mNullPen );
-
- wxRect& bounds = mpPane->mBoundsInParent;
-
- if ( mpPane->mTopMargin >= 1 )
-
- dc.DrawRectangle( bounds.x, bounds.y,
- bounds.width+1,
- mpPane->mTopMargin + 1);
-
-
- if ( mpPane->mBottomMargin >= 1 )
-
- dc.DrawRectangle( bounds.x,
- bounds.y + bounds.height - mpPane->mBottomMargin,
- bounds.width + 1,
- mpPane->mBottomMargin + 1);
-
-
- if ( mpPane->mLeftMargin >= 1 )
-
- dc.DrawRectangle( bounds.x,
- bounds.y + mpPane->mTopMargin - 1,
- mpPane->mLeftMargin + 1,
- bounds.height - mpPane->mTopMargin - mpPane->mBottomMargin + 2);
-
-
- if ( mpPane->mRightMargin >= 1 )
-
- dc.DrawRectangle( bounds.x + bounds.width - mpPane->mRightMargin,
- bounds.y + mpPane->mTopMargin - 1,
- mpPane->mRightMargin + 1,
- bounds.height - mpPane->mTopMargin - mpPane->mBottomMargin + 2);
-
- event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnDrawRowBackground ( cbDrawRowBkGroundEvent& event )
-{
- // short-cuts
- cbRowInfo* pRow = event.mpRow;
- wxDC& dc = *event.mpDc;
- mpPane = event.mpPane;
-
- // get ready
- wxRect rowBounds = pRow->mBoundsInParent;
- bool isHorizontal = event.mpPane->IsHorizontal();
-
-// int prevPos;
-
- if ( isHorizontal )
- {
-// prevPos = rowBounds.x;
- // include one line above and below the row
- --rowBounds.y;
- rowBounds.height += 2;
-
- --rowBounds.x;
- rowBounds.width += 2;
- }
- else
- {
-// prevPos = rowBounds.y;
- // include one line above and below the row
- --rowBounds.x;
- rowBounds.width += 2;
-
- --rowBounds.y;
- rowBounds.height += 2;
- }
-
-//#define TEST_BK_ERASING
-
-#ifdef TEST_BK_ERASING
-
- // DBG::
- wxBrush br0( wxColour(0,160,160), wxSOLID );
- dc.SetBrush(br0);
- dc.SetPen ( mpLayout->mNullPen );
- dc.DrawRectangle( rowBounds.x, rowBounds.y,
- rowBounds.width + 1,
- rowBounds.height + 1 );
-#endif
-
- wxBrush bkBrush( mpLayout->mGrayPen.GetColour(), wxSOLID );
-
- dc.SetPen ( mpLayout->mNullPen );
- dc.SetBrush( bkBrush );
-
- // fill background-recatangle of entire row area
- dc.DrawRectangle( rowBounds.x, rowBounds.y,
- rowBounds.width + 1,
- rowBounds.height + 1 );
-
- dc.SetBrush( wxNullBrush );
-
- // draw "shaded-side-bars" for each bar
- for( size_t i = 0; i != pRow->mBars.Count(); ++i )
- {
- wxRect& bounds = pRow->mBars[i]->mBoundsInParent;
-
- if ( isHorizontal )
- {
- DrawShade( 1, bounds, FL_ALIGN_LEFT, dc );
- DrawShade( 1, bounds, FL_ALIGN_RIGHT, dc );
- }
- else
- {
- DrawShade( 1, bounds, FL_ALIGN_TOP, dc );
- DrawShade( 1, bounds, FL_ALIGN_BOTTOM, dc );
- }
- }
-
- // draw extra shades to simulate "glued-bricks" effect
-
- // TBD:: reduce exessive drawing of shades, when the
- // row handle is present, and shades will be overr-drawn anyway
-
- DrawUpperRowShades( pRow, dc, 1 ); // outer shade
-
- if ( pRow->mpPrev )
- {
- DrawLowerRowShades( pRow->mpPrev, dc, 1 ); // outter shade
- DrawLowerRowShades( pRow->mpPrev, dc, 0 ); // inner shade
- }
-
- DrawLowerRowShades( pRow, dc, 1 );
-
- if ( pRow->mpNext )
- {
- DrawUpperRowShades( pRow->mpNext, dc, 1 );
- DrawUpperRowShades( pRow->mpNext, dc, 0 );
- }
-
- event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::DrawUpperRowShades( cbRowInfo* pRow, wxDC& dc, int level )
-{
- for( size_t i = 0; i != pRow->mBars.Count(); ++i )
- {
- wxRect& bounds = pRow->mBars[i]->mBoundsInParent;
-
- if ( mpPane->IsHorizontal() )
- {
- DrawShade( level, bounds, FL_ALIGN_TOP, dc );
- if ( level == 1 )
- {
- dc.SetPen( mpLayout->mDarkPen );
- dc.DrawPoint( bounds.x - 1, bounds.y );
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawPoint( bounds.x + bounds.width , bounds.y );
- }
- }
- else
- {
- DrawShade( level, bounds, FL_ALIGN_LEFT, dc );
- if ( level == 1 )
- {
- dc.SetPen( mpLayout->mDarkPen );
- dc.DrawPoint( bounds.x, bounds.y -1 );
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawPoint( bounds.x, bounds.y + bounds.height );
- }
- }
- }
-}
-
-void cbPaneDrawPlugin::DrawLowerRowShades( cbRowInfo* pRow, wxDC& dc, int level )
-{
- for( size_t i = 0; i != pRow->mBars.Count(); ++i )
- {
- wxRect& bounds = pRow->mBars[i]->mBoundsInParent;
-
- if ( mpPane->IsHorizontal() )
- {
- DrawShade( level, bounds, FL_ALIGN_BOTTOM, dc );
- if ( level == 1 )
- {
- dc.SetPen( mpLayout->mDarkPen );
- dc.DrawPoint( bounds.x - 1, bounds.y + bounds.height -1 );
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawPoint( bounds.x + bounds.width , bounds.y + bounds.height -1 );
- }
- }
- else
- {
- DrawShade( level, bounds, FL_ALIGN_RIGHT, dc );
- if ( level == 1 )
- {
- dc.SetPen( mpLayout->mDarkPen );
- dc.DrawPoint( bounds.x + bounds.width - 1, bounds.y -1 );
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawPoint( bounds.x + bounds.width - 1, bounds.y + bounds.height );
- }
- }
- }
-}
-
-void cbPaneDrawPlugin::DrawBarInnerShadeRect( cbBarInfo* pBar, wxDC& dc )
-{
- wxRect& bounds = pBar->mBoundsInParent;
-
- dc.SetPen( mpLayout->mDarkPen );
-
- dc.DrawLine( bounds.x + bounds.width - 1,
- bounds.y,
- bounds.x + bounds.width - 1,
- bounds.y + bounds.height );
-
- dc.DrawLine( bounds.x,
- bounds.y + bounds.height - 1,
- bounds.x + bounds.width,
- bounds.y + bounds.height -1 );
-
- dc.SetPen( mpLayout->mLightPen );
-
- dc.DrawLine( bounds.x,
- bounds.y,
- bounds.x + bounds.width - 1,
- bounds.y );
-
- dc.DrawLine( bounds.x,
- bounds.y,
- bounds.x,
- bounds.y + bounds.height - 1 );
-}
-
-void cbPaneDrawPlugin::DrawShade( int level, wxRect& rect, int alignment, wxDC& dc )
-{
- // simulates "guled-bricks" appearence of control bars
-
- if ( ( alignment == FL_ALIGN_TOP && level == 1 ) ||
- ( alignment == FL_ALIGN_BOTTOM && level == 0 ) ||
- ( alignment == FL_ALIGN_LEFT && level == 1 ) ||
- ( alignment == FL_ALIGN_RIGHT && level == 0 )
- )
-
- dc.SetPen( mpLayout->mDarkPen );
- else
- dc.SetPen( mpLayout->mLightPen );
-
- if ( alignment == FL_ALIGN_TOP )
- {
- if ( level == 0 )
-
- dc.DrawLine( rect.x,
- rect.y,
- rect.x + rect.width - 1,
- rect.y );
- else
- dc.DrawLine( rect.x - 1,
- rect.y - 1,
- rect.x + rect.width + 0,
- rect.y - 1 );
- }
- else
- if ( alignment == FL_ALIGN_BOTTOM )
- {
- if ( level == 0 )
-
- dc.DrawLine( rect.x,
- rect.y + rect.height - 1,
- rect.x + rect.width,
- rect.y + rect.height - 1 );
- else
- dc.DrawLine( rect.x - 1,
- rect.y + rect.height,
- rect.x + rect.width + 1,
- rect.y + rect.height );
- }
- else
- if ( alignment == FL_ALIGN_LEFT )
- {
- if ( level == 0 )
-
- dc.DrawLine( rect.x,
- rect.y,
- rect.x,
- rect.y + rect.height - 1 );
- else
- dc.DrawLine( rect.x - 1,
- rect.y - 1,
- rect.x - 1,
- rect.y + rect.height );
- }
- else
- if ( alignment == FL_ALIGN_RIGHT )
- {
- if ( level == 0 )
-
- dc.DrawLine( rect.x + rect.width - 1,
- rect.y,
- rect.x + rect.width - 1,
- rect.y + rect.height );
- else
- {
- dc.DrawLine( rect.x + rect.width,
- rect.y - 1,
- rect.x + rect.width,
- rect.y + rect.height + 1 );
- }
- }
-}
-
-void cbPaneDrawPlugin::DrawShade1( int level, wxRect& rect, int alignment, wxDC& dc )
-{
- // simulates "guled-bricks" appearence of control bars
-
- if ( ( alignment == FL_ALIGN_TOP && level == 1 ) ||
- ( alignment == FL_ALIGN_BOTTOM && level == 0 ) ||
- ( alignment == FL_ALIGN_LEFT && level == 1 ) ||
- ( alignment == FL_ALIGN_RIGHT && level == 0 )
- )
-
- dc.SetPen( mpLayout->mDarkPen );
- else
- dc.SetPen( mpLayout->mLightPen );
-
- if ( alignment == FL_ALIGN_TOP )
- {
- if ( level == 0 )
-
- dc.DrawLine( rect.x,
- rect.y,
- rect.x + rect.width,
- rect.y );
- else
- dc.DrawLine( rect.x,
- rect.y - 1,
- rect.x + rect.width,
- rect.y - 1 );
- }
- else
- if ( alignment == FL_ALIGN_BOTTOM )
- {
- if ( level == 0 )
-
- dc.DrawLine( rect.x,
- rect.y + rect.height - 1,
- rect.x + rect.width,
- rect.y + rect.height - 1 );
- else
- dc.DrawLine( rect.x,
- rect.y + rect.height,
- rect.x + rect.width,
- rect.y + rect.height );
- }
- else
- if ( alignment == FL_ALIGN_LEFT )
- {
- if ( level == 0 )
-
- dc.DrawLine( rect.x,
- rect.y,
- rect.x,
- rect.y + rect.height );
- else
- dc.DrawLine( rect.x - 1,
- rect.y,
- rect.x - 1,
- rect.y + rect.height );
- }
- else
- if ( alignment == FL_ALIGN_RIGHT )
- {
- if ( level == 0 )
-
- dc.DrawLine( rect.x + rect.width - 1,
- rect.y,
- rect.x + rect.width - 1,
- rect.y + rect.height );
- else
- {
- dc.DrawLine( rect.x + rect.width,
- rect.y ,
- rect.x + rect.width,
- rect.y + rect.height );
- }
- }
-}
-
-void cbPaneDrawPlugin::DrawPaneShade( wxDC& dc, int alignment )
-{
- if ( !mpPane->mProps.mShow3DPaneBorderOn ) return;
-
- wxRect bounds = mpPane->mBoundsInParent;
-
- bounds.x += mpPane->mLeftMargin;
- bounds.y += mpPane->mTopMargin;
- bounds.width -= ( mpPane->mLeftMargin + mpPane->mRightMargin );
- bounds.height -= ( mpPane->mTopMargin + mpPane->mBottomMargin );
-
- DrawShade( 0, bounds, alignment, dc );
- DrawShade( 1, bounds, alignment, dc );
-}
-
-void cbPaneDrawPlugin::DrawPaneShadeForRow( cbRowInfo* pRow, wxDC& dc )
-{
- if ( !mpPane->mProps.mShow3DPaneBorderOn ) return;
-
- // do not draw decoration, if pane has "vainished"
- if ( mpPane->mPaneWidth < 0 ||
- mpPane->mPaneHeight < 0 )
-
- return;
-
- wxRect bounds = pRow->mBoundsInParent;
-
- if ( mpPane->mAlignment == FL_ALIGN_TOP ||
- mpPane->mAlignment == FL_ALIGN_BOTTOM )
- {
- --bounds.y;
- bounds.height += 2;
-
- DrawShade1( 0, bounds, FL_ALIGN_LEFT, dc );
- DrawShade1( 1, bounds, FL_ALIGN_LEFT, dc );
- DrawShade1( 0, bounds, FL_ALIGN_RIGHT, dc );
- DrawShade1( 1, bounds, FL_ALIGN_RIGHT, dc );
-
- if ( !pRow->mpNext )
- DrawPaneShade( dc, FL_ALIGN_BOTTOM );
-
- if ( !pRow->mpPrev )
- DrawPaneShade( dc, FL_ALIGN_TOP );
- }
- else
- {
- --bounds.x;
- bounds.width += 2;
-
- DrawShade1( 0, bounds, FL_ALIGN_TOP, dc );
- DrawShade1( 1, bounds, FL_ALIGN_TOP, dc );
- DrawShade1( 0, bounds, FL_ALIGN_BOTTOM, dc );
- DrawShade1( 1, bounds, FL_ALIGN_BOTTOM, dc );
-
- if ( !pRow->mpNext )
- DrawPaneShade( dc, FL_ALIGN_RIGHT );
-
- if ( !pRow->mpPrev )
- DrawPaneShade( dc, FL_ALIGN_LEFT );
- }
-}
-
-void cbPaneDrawPlugin::OnDrawPaneDecorations( cbDrawPaneDecorEvent& event )
-{
- wxDC& dc = *event.mpDc;
-
- cbDockPane* pPane = event.mpPane;
-
- RowArrayT& lst = pPane->GetRowList();
-
- // FIXME:: this is a workaround for some glitches
-
- if ( lst.Count() )
- {
- cbRowInfo* pLastRow = lst[ lst.Count() - 1 ];
-
- pPane->PaintRowBackground( pLastRow, dc );
- pPane->PaintRowDecorations( pLastRow, dc );
- pPane->PaintRowHandles( pLastRow, dc );
- }
-
- if ( !pPane->mProps.mShow3DPaneBorderOn ) return;
-
- // do not draw decoration, if pane is completely hidden
- if ( event.mpPane->mPaneWidth < 0 ||
- event.mpPane->mPaneHeight < 0 )
-
- return;
-
- DrawPaneShade( dc, FL_ALIGN_TOP );
- DrawPaneShade( dc, FL_ALIGN_BOTTOM );
- DrawPaneShade( dc, FL_ALIGN_LEFT );
- DrawPaneShade( dc, FL_ALIGN_RIGHT );
-
- event.Skip(); // pass event to the next plugin
-}
-
-// bar decoration/sizing handlers
-
-void cbPaneDrawPlugin::OnDrawBarDecorations( cbDrawBarDecorEvent& event )
-{
-// cbBarInfo* pBar = event.mpBar;
- wxDC& dc = *event.mpDc;
-
- // draw brick borders
-
- wxRect& rect = event.mBoundsInParent;
-
- dc.SetPen( mpLayout->mLightPen );
-
- // horiz
- dc.DrawLine( rect.x, rect.y,
- rect.x + rect.width-1, rect.y );
-
- // vert
- dc.DrawLine( rect.x, rect.y,
- rect.x, rect.y + rect.height-1 );
-
-
- dc.SetPen( mpLayout->mDarkPen );
-
- // vert
- dc.DrawLine( rect.x + rect.width-1, rect.y,
- rect.x + rect.width-1, rect.y + rect.height-1 );
-
- // horiz
- dc.DrawLine( rect.x, rect.y + rect.height-1,
- rect.x + rect.width, rect.y + rect.height-1 );
-
- event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnDrawBarHandles( cbDrawBarHandlesEvent& event )
-{
- // short-cuts
- cbBarInfo* pBar = event.mpBar;
- wxDC& dc = *event.mpDc;
- mpPane = event.mpPane;
-
- // draw handles around the bar if present
-
- if ( pBar->mHasLeftHandle ||
- pBar->mHasRightHandle )
- {
- wxRect& bounds = pBar->mBoundsInParent;
-
- if ( mpPane->IsHorizontal() )
- {
- if ( pBar->mHasLeftHandle )
-
- mpPane->DrawVertHandle( dc, bounds.x - mpPane->mProps.mResizeHandleSize -1,
- bounds.y, bounds.height );
-
- if ( pBar->mHasRightHandle )
-
- mpPane->DrawVertHandle( dc,
- bounds.x + bounds.width -1,
- bounds.y, bounds.height );
- }
- else
- {
- if ( pBar->mHasLeftHandle )
-
- mpPane->DrawHorizHandle( dc, bounds.x,
- bounds.y - mpPane->mProps.mResizeHandleSize - 1,
- bounds.width );
-
- if ( pBar->mHasRightHandle )
-
- mpPane->DrawHorizHandle( dc, bounds.x,
- bounds.y + bounds.height - 1,
- bounds.width );
- }
- }
-
- event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnStartDrawInArea( cbStartDrawInAreaEvent& event )
-{
- // DBG::
- wxASSERT( mpClntDc == NULL );
-
- // FOR NOW:: create/destroy client-dc upon each drawing
- mpClntDc = new wxClientDC( &mpLayout->GetParentFrame() );
-
- (*event.mppDc) = mpClntDc;
-
- mpClntDc->SetClippingRegion( event.mArea.x, event.mArea.y,
- event.mArea.width, event.mArea.height );
-}
-
-void cbPaneDrawPlugin::OnFinishDrawInArea( cbFinishDrawInAreaEvent& WXUNUSED(event) )
-{
- // DBG::
- wxASSERT( mpClntDc );
-
- delete mpClntDc;
-
- mpClntDc = NULL;
-}
-
diff --git a/contrib/src/fl/rowdragpl.cpp b/contrib/src/fl/rowdragpl.cpp
deleted file mode 100644
index e2f4d478c1..0000000000
--- a/contrib/src/fl/rowdragpl.cpp
+++ /dev/null
@@ -1,1451 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: rowdragpl.cpp
-// Purpose: cbRowDragPlugin implementation.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 06/10/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/rowdragpl.h"
-
-#define MINIMAL_ROW_DRAG_OFS 5
-
-// parameters for row-hints of NC-look
-
-#define TRIANGLE_OFFSET 2
-#define TRIANGLE_TO_PAT_GAP 2
-#define PAT_OFFSET 2
-#define COLLAPSED_ICON_WIDTH 45
-#define COLLAPSED_ICON_HEIGHT 9
-#define ROW_DRAG_HINT_WIDTH 10
-#define ICON_TRIAN_WIDTH 6
-#define ICON_TRIAN_HEIGHT 3
-
-/***** Implementation for class cbHiddenBarInfo *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbHiddenBarInfo, wxObject )
-
-/***** Implementation for class cbRowDragPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbRowDragPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbRowDragPlugin, cbPluginBase )
-
- EVT_PL_LEFT_DOWN ( cbRowDragPlugin::OnLButtonDown )
- EVT_PL_LEFT_UP ( cbRowDragPlugin::OnLButtonUp )
- EVT_PL_MOTION ( cbRowDragPlugin::OnMouseMove )
-
- EVT_PL_DRAW_PANE_DECOR ( cbRowDragPlugin::OnDrawPaneBackground )
-
-END_EVENT_TABLE()
-
-// FIXME:: how to eliminated these cut and pasted constructors?
-
-cbRowDragPlugin::cbRowDragPlugin(void)
-
- : mHightColor ( 192, 192, 255 ),
- mLowColor ( 192, 192, 192 ),
- mTrianInnerColor ( 0,0,255 ),
- mTrianInnerPen ( mTrianInnerColor, 1, wxSOLID ),
-
- mDragStarted ( false ),
- mDecisionMode ( false ),
- mCurDragOfs ( 0 ),
- mCaptureIsOn ( false ),
- mSvTopMargin ( -1 ),
- mSvBottomMargin ( -1 ),
- mSvLeftMargin ( -1 ),
- mSvRightMargin ( -1 ),
-
- mpPaneImage ( NULL ),
- mpRowImage ( NULL ),
- mpCombinedImage ( NULL ),
-
- mpRowInFocus ( NULL ),
- mCollapsedIconInFocus( -1 ),
-
- mpPane ( NULL )
-{
-}
-
-cbRowDragPlugin::cbRowDragPlugin( wxFrameLayout* pLayout, int paneMask )
-
- : cbPluginBase( pLayout, paneMask ),
-
- mHightColor ( 192, 192, 255 ),
- mLowColor ( 192, 192, 192 ),
- mTrianInnerColor ( 0,0,255 ),
- mTrianInnerPen ( mTrianInnerColor, 1, wxSOLID ),
-
- mDragStarted ( false ),
- mDecisionMode ( false ),
- mCurDragOfs ( 0 ),
- mCaptureIsOn ( false ),
- mSvTopMargin ( -1 ),
- mSvBottomMargin ( -1 ),
- mSvLeftMargin ( -1 ),
- mSvRightMargin ( -1 ),
-
- mpPaneImage ( NULL ),
- mpRowImage ( NULL ),
- mpCombinedImage ( NULL ),
-
- mpRowInFocus ( NULL ),
- mCollapsedIconInFocus( -1 ),
-
- mpPane ( NULL )
-{
-}
-
-cbRowDragPlugin::~cbRowDragPlugin()
-{
-}
-
-// handlers for plugin events
-void cbRowDragPlugin::OnMouseMove( cbMotionEvent& event )
-{
- // short-cuts
- wxPoint pos = event.mPos;
- mpPane = event.mpPane;
-
- mpPane->PaneToFrame( &pos.x, &pos.y );
-
- if ( !mDragStarted )
- {
- if ( mDecisionMode && mpRowInFocus )
- {
- int ofs;
-
- if ( mpPane->IsHorizontal() )
-
- ofs = pos.y - mDragOrigin.y;
- else
- ofs = pos.x - mDragOrigin.x;
-
- // check if the item was dragged sufficeintly
- // far, enough to consider that user really intends
- // to drag it
-
- if ( ofs >= MINIMAL_ROW_DRAG_OFS ||
- ofs <= -MINIMAL_ROW_DRAG_OFS )
- {
- // DBG::
- //.wxPoint pos = event.mPos;
- //wxPoint drg = mDragOrigin;
- //int dif = event.mPos.x - mDragOrigin.x;
-
- mDragStarted = true;
- mDecisionMode = false;
- mDragOrigin = pos;
-
- PrepareForRowDrag();
- return;
- }
-
- // this plugin "eats" all mouse input while item is dragged,
- return;
- }
-
- cbRowInfo* pRow = GetFirstRow();
-
- bool focusFound = false;
-
- while( pRow )
- {
- if ( HitTestRowDragHint( pRow, pos ) )
- {
- CheckPrevItemInFocus( pRow, -1 );
- SetMouseCapture( true );
-
- focusFound = true;
-
- mpRowInFocus = pRow;
- mCollapsedIconInFocus = -1;
- break;
- }
-
- pRow = pRow->mpNext;
- }
-
- if ( !focusFound )
- {
- int hrCnt = GetHRowsCountForPane( event.mpPane );
-
- for( int i = 0; i != hrCnt; ++i )
- {
- if ( HitTestCollapsedRowIcon( i, pos ) )
- {
- CheckPrevItemInFocus( NULL, i );
- SetMouseCapture( true );
-
- focusFound = true;
-
- mCollapsedIconInFocus = i;
- mpRowInFocus = NULL;
- break;
- }
- }
- }
-
- if ( !focusFound && ItemIsInFocus() )
- {
- // kill focus from item previously been in focus
- UnhighlightItemInFocus();
-
- mpRowInFocus = NULL;
- mCollapsedIconInFocus = -1;
- SetMouseCapture( false );
- }
-
- if ( !ItemIsInFocus() )
-
- // delegate it to other plugins
- event.Skip();
- }
- else
- {
- // otherwise mouse pointer moves, when dragging is started
-
- if ( mpPane->IsHorizontal() )
- {
- // row is dragged up or down;
- ShowDraggedRow( pos.y - mDragOrigin.y );
- }
- else
- {
- // row is dragged left or right
- ShowDraggedRow( pos.x - mDragOrigin.x );
- }
-
- // this plugin "eats" all mouse input while item is dragged,
- }
-}
-
-void cbRowDragPlugin::OnLButtonDown( cbLeftDownEvent& event )
-{
- mpPane = event.mpPane;
-
- // DBG::
- wxASSERT( !mDragStarted && !mDecisionMode );
-
- if ( ItemIsInFocus() )
- {
- mDecisionMode = true;
-
- wxPoint pos = event.mPos;
- mpPane->PaneToFrame( &pos.x, &pos.y );
-
- mDragOrigin = pos;
-
- SetMouseCapture( true );
- }
- else
- // propagate event to other plugins
- event.Skip();
-}
-
-void cbRowDragPlugin::OnLButtonUp ( cbLeftUpEvent& event )
-{
- if ( !mDragStarted && !mDecisionMode )
- {
- event.Skip();
- return;
- }
-
- mpPane = event.mpPane;
-
- if ( mDecisionMode )
- {
- cbDockPane* pPane = mpPane;
-
- SetMouseCapture( false );
-
- mDecisionMode = false;
- mDragStarted = false;
-
- wxPoint frmPos = event.mPos;
- pPane->PaneToFrame( &frmPos.x, &frmPos.y );
-
- if ( mpRowInFocus )
- {
- CollapseRow( mpRowInFocus );
- mpRowInFocus = 0;
- }
- else
- {
- ExpandRow( mCollapsedIconInFocus );
- mCollapsedIconInFocus = -1;
- }
-
- mpRowInFocus = NULL;
- mpPane = pPane;
-
- pPane->FrameToPane( &frmPos.x, &frmPos.y );
-
- // give it another try after relayouting bars
-
- cbMotionEvent moveEvt( frmPos, pPane );
- this->OnMouseMove( moveEvt );
-
- // this plugin has "eaten" the mouse-up event
-
- return;
- }
- else
- {
- // otherwise, the dragged row was dropped, determine
- // where to insert it
-
- // restore initial pane appearence
- ShowPaneImage();
- FinishOnScreenDraw();
-
- cbRowInfo* pRow = GetFirstRow();
-
- mpLayout->GetUpdatesManager().OnStartChanges();
-
- pRow->mUMgrData.SetDirty(true);
-
- cbBarInfo* pBar = mpRowInFocus->mBars[0];
-
- while ( pBar )
- {
- pBar->mUMgrData.SetDirty(true);
-
- if ( pBar->mpBarWnd )
- {
- // do complete refresh
- pBar->mpBarWnd->Show(false);
- pBar->mpBarWnd->Show(true);
- }
-
- pBar = pBar->mpNext;
- }
-
- while( pRow )
- {
- if ( mCurDragOfs < pRow->mRowY )
- {
- InsertDraggedRowBefore( pRow );
- break;
- }
-
- pRow = pRow->mpNext;
- }
-
- if ( pRow == NULL ) InsertDraggedRowBefore( NULL );
-
- mpRowInFocus = NULL;
-
- mpLayout->RecalcLayout(false);
-
- // finish change "transaction"
- mpLayout->GetUpdatesManager().OnFinishChanges();
- mpLayout->GetUpdatesManager().UpdateNow();
-
- // finish drag action
- SetMouseCapture( false );
- mDragStarted = false;
- }
-}
-
-void cbRowDragPlugin::OnDrawPaneBackground ( cbDrawPaneDecorEvent& event )
-{
- mpPane = event.mpPane;
-
- // FIXME:: this may harm operation of other plugins
-
- if ( GetNextHandler() && mpPane->GetRowList().GetCount() )
- {
- // first, let other plugins add their decorations now
-
- GetNextHandler()->ProcessEvent( event );
- event.Skip(false);
- }
-
- wxClientDC dc( &mpLayout->GetParentFrame() );
-
- dc.SetClippingRegion( mpPane->mBoundsInParent.x,
- mpPane->mBoundsInParent.y,
- mpPane->mBoundsInParent.width,
- mpPane->mBoundsInParent.height );
-
- int cnt = GetHRowsCountForPane( event.mpPane );
-
- if ( cnt > 0 )
-
- DrawCollapsedRowsBorder( dc );
-
- if ( mpPane->GetRowList().GetCount() )
-
- DrawRowsDragHintsBorder( dc );
-
- cbRowInfo* pRow = GetFirstRow();
-
- while( pRow )
- {
- DrawRowDragHint( pRow, dc, false );
- pRow = pRow->mpNext;
- }
-
- for( int i = 0; i != cnt; ++i )
-
- DrawCollapsedRowIcon(i, dc, false );
-}
-
-int cbRowDragPlugin::GetHRowsCountForPane( cbDockPane* pPane )
-{
- wxNode* pNode = mHiddenBars.GetFirst();
-
- int maxIconNo = -1;
-
- while( pNode )
- {
- cbHiddenBarInfo* pHBInfo = (cbHiddenBarInfo*)pNode->GetData();
-
- if ( pHBInfo->mAlignment == pPane->mAlignment )
-
- maxIconNo = wxMax( maxIconNo, pHBInfo->mIconNo );
-
- pNode = pNode->GetNext();
- }
-
- return ( maxIconNo + 1 );
-}
-
-int cbRowDragPlugin::GetCollapsedRowIconHeight()
-{
- return COLLAPSED_ICON_HEIGHT;
-}
-
-int cbRowDragPlugin::GetRowDragHintWidth()
-{
- return ROW_DRAG_HINT_WIDTH;
-}
-
-void cbRowDragPlugin::SetPaneMargins()
-{
- int hiddenRowsCnt = GetHRowsCountForPane( mpPane );
-
- if ( mSvTopMargin == -1 )
- {
- mSvTopMargin = mpPane->mTopMargin;
- mSvBottomMargin = mpPane->mBottomMargin;
- mSvLeftMargin = mpPane->mLeftMargin;
- mSvRightMargin = mpPane->mRightMargin;
- }
-
- if ( mpPane->IsHorizontal() )
- {
- mpPane->mTopMargin = mSvTopMargin;
- mpPane->mBottomMargin = ( hiddenRowsCnt == 0 )
- ? mSvBottomMargin
- : mSvBottomMargin + GetCollapsedRowIconHeight();
-
- mpPane->mLeftMargin = mSvLeftMargin + GetRowDragHintWidth();
- mpPane->mRightMargin = mSvRightMargin;
- }
- else
- {
- mpPane->mTopMargin = mSvTopMargin;
- mpPane->mBottomMargin = mSvBottomMargin + GetRowDragHintWidth();
-
- mpPane->mLeftMargin = mSvLeftMargin;
- mpPane->mRightMargin = ( hiddenRowsCnt == 0 ) ?
- mSvRightMargin : mSvRightMargin + GetCollapsedRowIconHeight();
- }
-}
-
-void cbRowDragPlugin::OnInitPlugin()
-{
- cbDockPane** panes = mpLayout->GetPanesArray();
-
- for( int i = 0; i != MAX_PANES; ++i )
-
- if ( panes[i]->MatchesMask( mPaneMask ) )
- {
- mpPane = panes[i];
-
- SetPaneMargins();
- }
-}
-
-/*** helpers for drag&drop ***/
-
-void cbRowDragPlugin::SetMouseCapture( bool captureOn )
-{
- if ( mCaptureIsOn == captureOn ) return;
-
- if ( captureOn )
- {
- mpLayout->CaptureEventsForPane( mpPane );
- mpLayout->CaptureEventsForPlugin( this );
- }
- else
- {
- mpLayout->ReleaseEventsFromPane( mpPane );
- mpLayout->ReleaseEventsFromPlugin( this );
- }
-
- mCaptureIsOn = captureOn;
-}
-
-void cbRowDragPlugin::UnhighlightItemInFocus()
-{
- wxClientDC dc( &mpLayout->GetParentFrame() );
-
- if ( mpRowInFocus )
-
- DrawRowDragHint( mpRowInFocus, dc, false );
- else
- if ( mCollapsedIconInFocus != - 1 )
-
- DrawCollapsedRowIcon( mCollapsedIconInFocus, dc, false );
-}
-
-void cbRowDragPlugin::ShowDraggedRow( int offset )
-{
- // create combined image of pane and dragged
- // row on it, in the mpCombinedImage bitmap
-
- if ( mpPane->IsHorizontal() )
- {
- if ( mInitialRowOfs + offset + mRowImgDim.y > mCombRect.y + mCombRect.height )
-
- offset = mCombRect.y + mCombRect.height - mRowImgDim.y - mInitialRowOfs;
-
- if ( mInitialRowOfs + offset < mCombRect.y )
-
- offset = mCombRect.y - mInitialRowOfs;
-
- int x, y = mInitialRowOfs + offset;
- mpPane->FrameToPane( &x, &y );
- mCurDragOfs = y;
- }
- else
- {
- if ( mInitialRowOfs + offset + mRowImgDim.x > mCombRect.x + mCombRect.width )
-
- offset = mCombRect.x + mCombRect.width - mRowImgDim.x - mInitialRowOfs;
-
- if ( mInitialRowOfs + offset < mCombRect.x )
-
- offset = mCombRect.x - mInitialRowOfs;
-
- int x = mInitialRowOfs + offset, y;
- mpPane->FrameToPane( &x, &y );
- mCurDragOfs = x;
- }
-
- wxMemoryDC rowImgDc;
- rowImgDc.SelectObject ( *mpRowImage );
-
- wxMemoryDC paneImgDc;
- paneImgDc.SelectObject( *mpPaneImage );
-
- wxMemoryDC combImgDc;
- combImgDc.SelectObject( *mpCombinedImage );
-
- combImgDc.Blit( 0,0, mCombRect.width, mCombRect.height,
- &paneImgDc, 0,0, wxCOPY );
-
- if ( mpPane->IsHorizontal() )
- {
- combImgDc.Blit( 0, mInitialRowOfs + offset - mCombRect.y,
- mCombRect.width, mRowImgDim.y,
- &rowImgDc, 0,0, wxCOPY );
- }
- else
- {
- combImgDc.Blit( mInitialRowOfs + offset - mCombRect.x,
- 0,
- mRowImgDim.x, mCombRect.height,
- &rowImgDc, 0,0, wxCOPY );
- }
-
- int scrX = mCombRect.x,
- scrY = mCombRect.y;
-
- mpLayout->GetParentFrame().ClientToScreen( &scrX, &scrY );
-
- mpScrDc->Blit( scrX, scrY, mCombRect.width, mCombRect.height,
- &combImgDc, 0,0, wxCOPY );
-
- rowImgDc .SelectObject( wxNullBitmap );
- paneImgDc.SelectObject( wxNullBitmap );
- combImgDc.SelectObject( wxNullBitmap );
-}
-
-wxBitmap* cbRowDragPlugin::CaptureDCArea( wxDC& dc, wxRect& area )
-{
- wxBitmap* pBmp = new wxBitmap( int(area.width), int(area.height) );
-
- wxMemoryDC mdc;
- mdc.SelectObject( *pBmp );
-
- mdc.Blit( 0,0, area.width, area.height, &dc, area.x, area.y, wxCOPY );
- mdc.SelectObject( wxNullBitmap );
-
- return pBmp;
-}
-
-void cbRowDragPlugin::PrepareForRowDrag()
-{
- wxRect rowBounds = mpRowInFocus->mBoundsInParent;
-
- if ( mpPane->IsHorizontal() )
- {
- mCombRect = mpPane->mBoundsInParent;
-
- mCombRect.x += mpPane->mLeftMargin - ROW_DRAG_HINT_WIDTH - 1;
- mCombRect.y += mpPane->mTopMargin;
-
- mCombRect.width -= mpPane->mLeftMargin + mpPane->mRightMargin - ROW_DRAG_HINT_WIDTH - 1 - 1;
- mCombRect.height -= mpPane->mTopMargin + mpPane->mBottomMargin;
-
- mCombRect.height += 2*rowBounds.height;
- mCombRect.y -= rowBounds.height;
- mInitialRowOfs = rowBounds.y;
-
- rowBounds.y -= 1;
- rowBounds.height += 2;
- rowBounds.x = mCombRect.x;
- rowBounds.width = mCombRect.width;
-
- mRowImgDim.y = rowBounds.height;
- }
- else
- {
- mCombRect = mpPane->mBoundsInParent;
-
- mCombRect.y += mpPane->mTopMargin - 1;
- mCombRect.x += mpPane->mLeftMargin - 1;
- ;
- mCombRect.height -= mpPane->mTopMargin + mpPane->mBottomMargin - ROW_DRAG_HINT_WIDTH - 1 - 1;
- mCombRect.width -= mpPane->mLeftMargin + mpPane->mRightMargin;
-
- mCombRect.width += 2*rowBounds.width;
- mCombRect.x -= rowBounds.width;
- mInitialRowOfs = rowBounds.x;
-
- rowBounds.x -= 1;
- rowBounds.width += 2;
- rowBounds.y = mCombRect.y;
- rowBounds.height = mCombRect.height;
-
- mRowImgDim.x = rowBounds.width;
- }
- // output cobination results onto frame's client area
- wxScreenDC::StartDrawingOnTop(&mpLayout->GetParentFrame());
- mpScrDc = new wxScreenDC();
-
- int x = mCombRect.x, y = mCombRect.y;
- mpLayout->GetParentFrame().ClientToScreen( &x, &y );
-
- wxRect scrRect = mCombRect;
- scrRect.x = x;
- scrRect.y = y;
-
- mpPaneImage = CaptureDCArea( *mpScrDc, scrRect );
-
- wxMemoryDC mdc;
- mdc.SelectObject( *mpPaneImage );
- mdc.SetDeviceOrigin( -mCombRect.x, -mCombRect.y );
-
- DrawRectShade( rowBounds, mdc, -1, mpLayout->mGrayPen, mpLayout->mDarkPen );
- DrawRectShade( rowBounds, mdc, 0, mpLayout->mLightPen, mpLayout->mBlackPen );
-
- mpRowImage = CaptureDCArea( mdc, rowBounds );
-
- // draw dark empty-row placeholder
- DrawEmptyRow( mdc, rowBounds );
-
- //DrawRectShade( rowBounds, mdc, 0, mpLayout->mGrayPen, mpLayout->mDarkPen );
- DrawRectShade( rowBounds, mdc, -1, mpLayout->mGrayPen, mpLayout->mGrayPen );
-
- mdc.SelectObject( wxNullBitmap );
-
- mpCombinedImage = new wxBitmap( int(mCombRect.width), int(mCombRect.height) );
-
- // show it for the first time
- ShowDraggedRow( 0 );
-}
-
-void cbRowDragPlugin::DrawEmptyRow( wxDC& dc, wxRect& rowBounds )
-{
- wxBrush bkBrush( mpLayout->mDarkPen.GetColour(), wxSOLID );
-
- // paint the "dark" empty-row placeholder
-
- dc.SetBrush( bkBrush );
- dc.SetPen ( mpLayout->mNullPen );
-
- dc.DrawRectangle( rowBounds.x, rowBounds.y,
- rowBounds.width+1, rowBounds.height+1 );
-
- dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::ShowPaneImage()
-{
- int scrX = 0, scrY = 0;
-
- mpLayout->GetParentFrame().ClientToScreen( &scrX, &scrY );
-
- wxMemoryDC mdc;
- mdc.SelectObject( *mpPaneImage );
-
- mpScrDc->Blit( mCombRect.x + scrX, mCombRect.y + scrY,
- mCombRect.width, mCombRect.height,
- &mdc, 0,0, wxCOPY );
-
- mdc.SelectObject( wxNullBitmap );
-}
-
-void cbRowDragPlugin::FinishOnScreenDraw()
-{
- wxScreenDC::EndDrawingOnTop();
-
- delete mpScrDc;
- delete mpCombinedImage;
- delete mpPaneImage;
- delete mpRowImage;
-
- mpScrDc = NULL;
-
- mpCombinedImage = mpPaneImage = mpRowImage = NULL;
-}
-
-void cbRowDragPlugin::CollapseRow( cbRowInfo* pRow )
-{
- int iconCnt = GetHRowsCountForPane( mpPane );
-
- mpLayout->GetUpdatesManager().OnStartChanges();
-
- cbBarInfo* pBar = pRow->mBars[0];
-
- int rowNo = 0;
-
- cbRowInfo* pCur = pRow;
- while( pCur->mpPrev ) { ++rowNo; pCur = pCur->mpPrev; }
-
- while( pBar )
- {
- cbHiddenBarInfo* pHBInfo = new cbHiddenBarInfo();
-
- pHBInfo->mpBar = pBar;
- pHBInfo->mRowNo = rowNo;
- pHBInfo->mIconNo = iconCnt;
- pHBInfo->mAlignment = mpPane->mAlignment;
-
- mHiddenBars.Append( (wxObject*) pHBInfo );
-
- // hide it
- if ( pBar->mpBarWnd )
-
- pBar->mpBarWnd->Show( false );
-
- pBar->mState = wxCBAR_HIDDEN;
-
- cbBarInfo* pNext = pBar->mpNext;
-
- pBar->mpRow = NULL;
- pBar->mpNext = NULL;
- pBar->mpPrev = NULL;
-
- pBar = pNext;
- }
-
- mpPane->GetRowList().Remove( pRow );
- mpPane->InitLinksForRows();
-
- delete pRow;
-
- SetPaneMargins();
-
- mpLayout->RecalcLayout(false);
-
- mpRowInFocus = NULL;
-
- mpLayout->GetUpdatesManager().OnFinishChanges();
- mpLayout->GetUpdatesManager().UpdateNow();
-}
-
-void cbRowDragPlugin::ExpandRow( int collapsedIconIdx )
-{
- mpLayout->GetUpdatesManager().OnStartChanges();
-
- cbRowInfo* pNewRow = new cbRowInfo();
-
- wxNode* pNode = mHiddenBars.GetFirst();
-
- int rowNo = 0;
-
- // move bars from internal list to the newly expanded row
-
- while( pNode )
- {
- cbHiddenBarInfo* pHBInfo = (cbHiddenBarInfo*)pNode->GetData();
-
- if ( pHBInfo->mAlignment == mpPane->mAlignment &&
- pHBInfo->mIconNo == collapsedIconIdx )
- {
- rowNo = pHBInfo->mRowNo;
-
- if ( pHBInfo->mpBar->mState == wxCBAR_HIDDEN )
- {
- pNewRow->mBars.Add( pHBInfo->mpBar );
-
- pHBInfo->mpBar->mState = ( mpPane->IsHorizontal() )
- ? wxCBAR_DOCKED_HORIZONTALLY
- : wxCBAR_DOCKED_VERTICALLY;
- }
-
- // remove bar info from internal list
-
- wxNode* pNext = pNode->GetNext();
-
- delete pHBInfo;
- mHiddenBars.DeleteNode( pNode );
-
- pNode = pNext;
- }
- else
- {
- // decrease incon numbers with higher indicies, since this
- // row is now removed from the hidden-rows list
-
- if ( pHBInfo->mIconNo > collapsedIconIdx &&
- pHBInfo->mAlignment == mpPane->mAlignment )
-
- --pHBInfo->mIconNo;
-
- pNode = pNode->GetNext();
- }
- }
-
- mpPane->InitLinksForRow( pNewRow );
-
- // insert row into pane at it's original position
-
- if ( pNewRow->mBars.GetCount() )
- {
- cbRowInfo* beforeRowNode = mpPane->GetRow( rowNo );
-
- mpPane->InsertRow( pNewRow, beforeRowNode );
- }
- else
- delete pNewRow;
-
- SetPaneMargins();
-
- mpLayout->RecalcLayout(false);
-
- mCollapsedIconInFocus = -1;
-
- mpLayout->GetUpdatesManager().OnFinishChanges();
- mpLayout->GetUpdatesManager().UpdateNow();
-
-
- /*
- wxNode* pRowNode = mHiddenRows.Nth( collapsedIconIdx );
-
- mpLayout->GetUpdatesManager().OnStartChanges();
-
- // insert at the end of rows list
- mpPane->InsertRow( pRowNode, NULL );
-
- int success = mHiddenRows.DeleteNode( pRowNode );
- // DBG::
- wxASSERT( success );
-
- SetPaneMargins();
-
- mpLayout->RecalcLayout(false);
-
- mCollapsedIconInFocus = -1;
-
- mpLayout->GetUpdatesManager().OnFinishChanges();
- mpLayout->GetUpdatesManager().UpdateNow();
- */
-}
-
-void cbRowDragPlugin::InsertDraggedRowBefore( cbRowInfo* pBeforeRow )
-{
- if ( mpRowInFocus != pBeforeRow &&
- mpRowInFocus->mpNext != pBeforeRow
- )
- {
- mpPane->GetRowList().Remove( mpRowInFocus );
-
- mpPane->InsertRow( mpRowInFocus, pBeforeRow );
- }
- else
- {
- // otherwise, nothing has happned (row positions do not change)
-
- //wxClientDC dc( &mpLayout->GetParentFrame() );
-
- //mpPane->PaintRow( mpRowInFocus, dc );
- //DrawRowDragHint( mpRowInFocus, dc, false );
- }
-}
-
-bool cbRowDragPlugin::ItemIsInFocus()
-{
- return ( mpRowInFocus || mCollapsedIconInFocus != - 1 );
-}
-
-void cbRowDragPlugin::CheckPrevItemInFocus( cbRowInfo* pRow, int iconIdx )
-{
- wxClientDC dc( &mpLayout->GetParentFrame() );
-
- if ( pRow != NULL && mpRowInFocus == pRow ) return;
- if ( iconIdx != -1 && mCollapsedIconInFocus == iconIdx ) return;
-
- UnhighlightItemInFocus();
-
- if ( iconIdx != - 1 )
-
- DrawCollapsedRowIcon( iconIdx, dc, true );
-
- else
- if ( pRow != NULL )
-
- DrawRowDragHint( pRow, dc, true );
-}
-
-cbRowInfo* cbRowDragPlugin::GetFirstRow()
-{
- return ( mpPane->GetRowList().GetCount() )
- ? mpPane->GetRowList()[0]
- : NULL;
-}
-
-/*** "hard-coded" metafile for NN-look ***/
-
-void cbRowDragPlugin::DrawTrianUp( wxRect& inRect, wxDC& dc )
-{
- int xOfs = (inRect.width - ICON_TRIAN_WIDTH)/2;
-
- wxBrush br( mTrianInnerColor, wxSOLID );
-
- dc.SetBrush( br );
- dc.SetPen( mpLayout->mBlackPen );
-
- wxPoint points[3];
- points[0].x = inRect.x + xOfs;
- points[0].y = inRect.y + inRect.height - 1;
- points[1].x = inRect.x + xOfs + ICON_TRIAN_WIDTH/2 + 1;
- points[1].y = inRect.y + inRect.height - 2 - ICON_TRIAN_HEIGHT;
- points[2].x = inRect.x + xOfs + ICON_TRIAN_WIDTH+1;
- points[2].y = inRect.y + inRect.height - 1;
-
- dc.DrawPolygon( 3, points );
-
- // higlight upper-right edge of triangle
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawLine( points[2].x, points[2].y,
- points[0].x, points[0].y );
-
- dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::DrawTrianDown( wxRect& inRect, wxDC& dc )
-{
- int xOfs = (inRect.width - ICON_TRIAN_WIDTH)/2;
-
- wxBrush br( mTrianInnerColor, wxSOLID );
-
- dc.SetBrush( br );
- dc.SetPen( mpLayout->mBlackPen );
-
- wxPoint points[3];
- points[0].x = inRect.x + xOfs;
- points[0].y = inRect.y;
- points[1].x = inRect.x + xOfs + ICON_TRIAN_WIDTH;
- points[1].y = inRect.y;
- points[2].x = inRect.x + xOfs + ICON_TRIAN_WIDTH/2;
- points[2].y = inRect.y + ICON_TRIAN_HEIGHT;
-
- dc.DrawPolygon( 3, points );
-
- // higlight upper-right edge of triangle
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawLine( points[2].x, points[2].y,
- points[1].x, points[1].y );
-
- dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::DrawTrianRight( wxRect& inRect, wxDC& dc )
-{
- int yOfs = (inRect.height - ICON_TRIAN_WIDTH)/2;
-
- wxBrush br( mTrianInnerColor, wxSOLID );
-
- dc.SetBrush( br );
- dc.SetPen( mpLayout->mBlackPen );
-
- wxPoint points[3];
- points[0].x = inRect.x;
- points[0].y = inRect.y + yOfs + ICON_TRIAN_WIDTH;
- points[1].x = inRect.x;
- points[1].y = inRect.y + yOfs;
- points[2].x = inRect.x + ICON_TRIAN_HEIGHT;
- points[2].y = inRect.y + yOfs + ICON_TRIAN_WIDTH/2;
-
- dc.DrawPolygon( 3, points );
-
- // higlight upper-right edge of triangle
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawLine( points[0].x, points[0].y,
- points[2].x, points[2].y );
-
- dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::Draw3DPattern( wxRect& inRect, wxDC& dc )
-{
- for( int y = inRect.y; y < inRect.y + inRect.height; y+=3 )
-
- for( int x = inRect.x; x < inRect.x + inRect.width; x+=3 )
- {
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawPoint( x,y );
- dc.SetPen( mpLayout->mBlackPen );
- dc.DrawPoint( x+1, y+1 );
- }
-}
-
-void cbRowDragPlugin::DrawRombShades( wxPoint& p1, wxPoint& p2,
- wxPoint& p3, wxPoint& p4,
- wxDC& dc )
-{
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawLine( p1.x, p1.y, p2.x, p2.y );
- dc.DrawLine( p2.x, p2.y, p3.x, p3.y );
- dc.SetPen( mpLayout->mDarkPen );
- dc.DrawLine( p3.x, p3.y, p4.x, p4.y );
- dc.DrawLine( p4.x, p4.y, p1.x, p1.y );
-}
-
-void cbRowDragPlugin::DrawOrtoRomb( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush )
-{
- dc.SetBrush( bkBrush );
- dc.SetPen( mpLayout->mBlackPen );
-
- wxPoint points[4];
-
- if ( inRect.width > inRect.height )
- {
- // horizontal orienation
- points[0].x = inRect.x;
- points[0].y = inRect.y + inRect.height;
- points[1].x = inRect.x;
- points[1].y = inRect.y;
- points[2].x = inRect.x + inRect.width;
- points[2].y = inRect.y;
- points[3].x = inRect.x + inRect.width - COLLAPSED_ICON_HEIGHT;
- points[3].y = inRect.y + inRect.height;
-
- dc.DrawPolygon( 4, points );
-
- // squeeze romb's bounds to create an inner-shade shape
- ++points[0].x;
- --points[0].y;
- ++points[1].x;
- ++points[1].y;
- --points[2].x; --points[2].x;
- ++points[2].y;
- --points[3].y;
-
- DrawRombShades( points[0], points[1], points[2], points[3], dc );
- }
- else
- {
- // vertical orientation
- points[0].x = inRect.x + inRect.width;
- points[0].y = inRect.y + inRect.height;
- points[1].x = inRect.x;
- points[1].y = inRect.y + inRect.height;
- points[2].x = inRect.x;
- points[2].y = inRect.y;
- points[3].x = inRect.x + inRect.width;
- points[3].y = inRect.y + COLLAPSED_ICON_HEIGHT;
-
- dc.DrawPolygon( 4, points );
-
- // squeeze romb's bounds to create an inner-shade shape
- --points[0].y ;
- --points[0].x;
- ++points[1].x;
- --points[1].y;
- ++points[2].y; ++points[2].y;
- ++points[2].x;
- --points[3].x;
-
- DrawRombShades( points[1], points[2], points[3], points[0], dc );
- }
-
- dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::DrawRomb( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush )
-{
- wxPoint points[4];
-
- dc.SetBrush( bkBrush );
- dc.SetPen( mpLayout->mBlackPen );
-
- if ( inRect.width > inRect.height )
- {
- // horizontal orientation
- points[0].x = inRect.x;
- points[0].y = inRect.y + inRect.height;
- points[1].x = inRect.x + COLLAPSED_ICON_HEIGHT;
- points[1].y = inRect.y;
- points[2].x = inRect.x + inRect.width;
- points[2].y = inRect.y;
- points[3].x = inRect.x + inRect.width - COLLAPSED_ICON_HEIGHT;
- points[3].y = inRect.y + inRect.height;
-
- dc.DrawPolygon( 4, points );
-
- // squeeze romb's bounds to create an inner-shade shape
- ++points[0].x ;++points[0].x ;
- --points[0].y;
- ++points[1].y;
- --points[2].x; --points[2].x;
- ++points[2].y;
- //--points[3].x ;
- --points[3].y;
-
- DrawRombShades( points[0], points[1], points[2], points[3], dc );
-
- }
- else
- {
- // vertical orientation
- points[0].x = inRect.x + inRect.width;
- points[0].y = inRect.y + inRect.height;
- points[1].x = inRect.x;
- points[1].y = inRect.y + inRect.height - COLLAPSED_ICON_HEIGHT;
- points[2].x = inRect.x;
- points[2].y = inRect.y;
- points[3].x = inRect.x + inRect.width;
- points[3].y = inRect.y + COLLAPSED_ICON_HEIGHT;
-
- dc.DrawPolygon( 4, points );
-
- // squeeze romb's bounds to create an inner-shade shape
- --points[0].y ;--points[0].y ;
- --points[0].x;
- ++points[1].x;
- ++points[2].y; ++points[2].y;
- ++points[2].x;
- --points[3].x;
-
- DrawRombShades( points[1], points[2], points[3], points[0], dc );
- }
-
- dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::DrawRectShade( wxRect& inRect, wxDC& dc,
- int level, const wxPen& upperPen, const wxPen& lowerPen )
-{
- // upper shade
- dc.SetPen( upperPen );
- dc.DrawLine( inRect.x - level,
- inRect.y - level,
- inRect.x + inRect.width - 1 + level,
- inRect.y - level);
- dc.DrawLine( inRect.x - level, inRect.y - level,
- inRect.x - level, inRect.y + inRect.height - 1 + level );
-
- // lower shade
- dc.SetPen( lowerPen );
- dc.DrawLine( inRect.x - level,
- inRect.y + inRect.height - 1 + level,
- inRect.x + inRect.width + level,
- inRect.y + inRect.height - 1 + level);
- dc.DrawLine( inRect.x + inRect.width - 1 + level,
- inRect.y - level,
- inRect.x + inRect.width - 1 + level,
- inRect.y + inRect.height + level);
-
- dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::Draw3DRect( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush )
-{
- dc.SetPen( mpLayout->mNullPen );
- dc.SetBrush( bkBrush );
-
- dc.DrawRectangle( inRect.x, inRect.y,
- inRect.width, inRect.height );
-
- DrawRectShade( inRect, dc, 0, mpLayout->mLightPen, mpLayout->mDarkPen );
-}
-
-int cbRowDragPlugin::GetCollapsedIconsPos()
-{
- RowArrayT& rows = mpPane->GetRowList();
-
- if ( rows.GetCount() == 0 )
- {
- if ( mpPane->IsHorizontal() )
-
- return mpPane->mBoundsInParent.y + mpPane->mTopMargin;
- else
- return mpPane->mBoundsInParent.x + mpPane->mLeftMargin;
- }
-
- wxRect& bounds = rows[ rows.GetCount() - 1 ]->mBoundsInParent;
-
- if ( mpPane->IsHorizontal() )
-
- return bounds.y + bounds.height + 1;
- else
- return bounds.x + bounds.width + 1;
-
-}
-
-void cbRowDragPlugin::GetRowHintRect( cbRowInfo* pRow, wxRect& rect )
-{
- wxRect& bounds = pRow->mBoundsInParent;
-
- if ( mpPane->IsHorizontal() )
- {
- rect.x = bounds.x - ROW_DRAG_HINT_WIDTH - 1;
- rect.y = bounds.y;
- rect.width = ROW_DRAG_HINT_WIDTH;
- rect.height = bounds.height;
- }
- else
- {
- rect.x = bounds.x;
- rect.y = bounds.y + bounds.height + 1;
- rect.width = bounds.width;
- rect.height = ROW_DRAG_HINT_WIDTH;
- }
-}
-
-void cbRowDragPlugin::GetCollapsedInconRect( int iconIdx, wxRect& rect )
-{
- int upper = GetCollapsedIconsPos();
-
- int right = (iconIdx == 0 )
- ? 0 : iconIdx * (COLLAPSED_ICON_WIDTH - COLLAPSED_ICON_HEIGHT);
-
- if ( mpPane->IsHorizontal() )
- {
- rect.x = mpPane->mBoundsInParent.x + mpPane->mLeftMargin - ROW_DRAG_HINT_WIDTH - 1
- + right;
-
- rect.y = upper;
- rect.width = COLLAPSED_ICON_WIDTH;
- rect.height = COLLAPSED_ICON_HEIGHT;
- }
- else
- {
- rect.x = upper;
- rect.y = mpPane->mBoundsInParent.y + mpPane->mBoundsInParent.height
- - mpPane->mBottomMargin + ROW_DRAG_HINT_WIDTH + 1
- - right - COLLAPSED_ICON_WIDTH;
-
- rect.height = COLLAPSED_ICON_WIDTH;
- rect.width = COLLAPSED_ICON_HEIGHT;
- }
-}
-
-/*** overridables ***/
-
-void cbRowDragPlugin::DrawCollapsedRowIcon( int index, wxDC& dc, bool isHighlighted )
-{
- wxRect rect;
- GetCollapsedInconRect( index, rect );
-
- wxBrush hiBrush ( mHightColor, wxSOLID );
- wxBrush lowBrush( mLowColor, wxSOLID );
- wxBrush& curBrush = ( isHighlighted ) ? hiBrush : lowBrush;
-
- if ( mpPane->IsHorizontal() )
- {
- if ( index == 0 )
-
- DrawOrtoRomb( rect, dc, curBrush );
- else
- DrawRomb( rect, dc, curBrush );
-
- int triOfs = (index == 0) ? TRIANGLE_OFFSET : TRIANGLE_OFFSET + COLLAPSED_ICON_HEIGHT;
-
- wxRect triRect;
- triRect.x = triOfs + rect.x;
-
- triRect.width = ICON_TRIAN_HEIGHT;
- triRect.y = rect.y;
- triRect.height = rect.height;
-
- DrawTrianRight( triRect, dc );
-
- wxRect patRect;
- patRect.x = triOfs + ICON_TRIAN_HEIGHT + TRIANGLE_TO_PAT_GAP + rect.x;
- patRect.y = rect.y + PAT_OFFSET;
- patRect.width = rect.width - (patRect.x - rect.x) - COLLAPSED_ICON_HEIGHT - PAT_OFFSET;
- patRect.height = rect.height - PAT_OFFSET*2;
-
- Draw3DPattern( patRect, dc );
- }
- else
- {
- if ( index == 0 )
-
- DrawOrtoRomb( rect, dc, curBrush );
- else
- DrawRomb( rect, dc, curBrush );
-
- int triOfs = (index == 0)
- ? TRIANGLE_OFFSET + ICON_TRIAN_HEIGHT
- : TRIANGLE_OFFSET + COLLAPSED_ICON_HEIGHT + ICON_TRIAN_HEIGHT;
-
- wxRect triRect;
- triRect.y = rect.y + rect.height - triOfs;
- triRect.x = rect.x;
- triRect.width = rect.width;
- triRect.height = ICON_TRIAN_HEIGHT;
-
- DrawTrianUp( triRect, dc );
-
- wxRect patRect;
- patRect.y = rect.y + COLLAPSED_ICON_HEIGHT + PAT_OFFSET;
- patRect.x = rect.x + PAT_OFFSET;
- patRect.width = rect.width - 2*PAT_OFFSET ;
- patRect.height = rect.height - triOfs - 2*PAT_OFFSET - COLLAPSED_ICON_HEIGHT;
-
- Draw3DPattern( patRect, dc );
- }
-}
-
-void cbRowDragPlugin::DrawRowDragHint( cbRowInfo* pRow , wxDC& dc, bool isHighlighted )
-{
- wxRect rect;
- GetRowHintRect( pRow, rect );
-
- wxBrush hiBrush ( mHightColor, wxSOLID );
- wxBrush lowBrush( mLowColor, wxSOLID );
- wxBrush& curBrush = ( isHighlighted ) ? hiBrush : lowBrush;
-
- Draw3DRect( rect, dc, curBrush );
-
- if ( mpPane->IsHorizontal() )
- {
- wxRect triRect;
- triRect.y = rect.y + TRIANGLE_OFFSET;
- triRect.x = rect.x;
- triRect.width = rect.width;
- triRect.height = ICON_TRIAN_HEIGHT;
-
- DrawTrianDown( triRect, dc );
-
- wxRect patRect;
- patRect.x = rect.x + PAT_OFFSET;
- patRect.y = rect.y + TRIANGLE_OFFSET + ICON_TRIAN_HEIGHT + TRIANGLE_TO_PAT_GAP;
- patRect.width = rect.width - 2*PAT_OFFSET;
- patRect.height = rect.height - ( patRect.y - rect.y ) - PAT_OFFSET;
- Draw3DPattern( patRect, dc );
-
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawLine( rect.x, rect.y + rect.height, rect.x + rect.width, rect.y + rect.height );
- }
- else
- {
- wxRect triRect;
- triRect.x = rect.x + TRIANGLE_OFFSET;
- triRect.y = rect.y;
- triRect.height = rect.height;
- triRect.width = ICON_TRIAN_HEIGHT;
-
- DrawTrianRight( triRect, dc );
-
- wxRect patRect;
- patRect.y = rect.y + PAT_OFFSET;
- patRect.x = rect.x + TRIANGLE_OFFSET + ICON_TRIAN_HEIGHT + TRIANGLE_TO_PAT_GAP;
- patRect.height = rect.height - 2*PAT_OFFSET;
- patRect.width = rect.width - ( patRect.x - rect.x ) - PAT_OFFSET;
- Draw3DPattern( patRect, dc );
-
- dc.SetPen( mpLayout->mLightPen );
- dc.DrawLine( rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height );
- }
-}
-
-void cbRowDragPlugin::DrawRowsDragHintsBorder( wxDC& WXUNUSED(dc) )
-{
- // FIXME:: what was that?
-}
-
-void cbRowDragPlugin::DrawCollapsedRowsBorder( wxDC& dc )
-{
- int colRowOfs = GetCollapsedIconsPos();
- wxRect& bounds = mpPane->mBoundsInParent;
-
- wxBrush bkBrush( mpLayout->mGrayPen.GetColour(), wxSOLID );
- dc.SetBrush( bkBrush );
- dc.SetPen( mpLayout->mDarkPen );
-
- if ( mpPane->IsHorizontal() )
-
- dc.DrawRectangle( bounds.x + mpPane->mLeftMargin - ROW_DRAG_HINT_WIDTH - 1,
- colRowOfs,
- bounds.width - mpPane->mLeftMargin - mpPane->mRightMargin + 2 + ROW_DRAG_HINT_WIDTH,
- COLLAPSED_ICON_HEIGHT + 1);
- else
- dc.DrawRectangle( colRowOfs,
- bounds.y + mpPane->mTopMargin - 1,
- COLLAPSED_ICON_HEIGHT + 1,
- bounds.height - mpPane->mTopMargin - mpPane->mBottomMargin
- - ROW_DRAG_HINT_WIDTH - 2 );
-
- dc.SetBrush( wxNullBrush );
-}
-
-static inline bool rect_contains_point( const wxRect& rect, int x, int y )
-{
- return ( x >= rect.x &&
- y >= rect.y &&
- x < rect.x + rect.width &&
- y < rect.y + rect.height );
-}
-
-bool cbRowDragPlugin::HitTestCollapsedRowIcon( int iconIdx, const wxPoint& pos )
-{
- wxRect bounds;
- GetCollapsedInconRect( iconIdx, bounds );
-
- return rect_contains_point( bounds, pos.x, pos.y );
-}
-
-bool cbRowDragPlugin::HitTestRowDragHint( cbRowInfo* pRow, const wxPoint& pos )
-{
- wxRect bounds;
- GetRowHintRect( pRow, bounds );
-
- return rect_contains_point( bounds, pos.x, pos.y );
-}
-
diff --git a/contrib/src/fl/rowlayoutpl.cpp b/contrib/src/fl/rowlayoutpl.cpp
deleted file mode 100644
index 1c78f4b5a2..0000000000
--- a/contrib/src/fl/rowlayoutpl.cpp
+++ /dev/null
@@ -1,1220 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: rowlayoutpl.cpp
-// Purpose: cbRowLayoutPlugin implementation.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 09/09/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/rowlayoutpl.h"
-
-// exerimental "features" are still buggy
-#undef __EXPERIMENTAL
-
-/***** Implementation for class cbRowLayoutPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbRowLayoutPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbRowLayoutPlugin, cbPluginBase )
-
- EVT_PL_LAYOUT_ROW ( cbRowLayoutPlugin::OnLayoutRow )
- EVT_PL_LAYOUT_ROWS( cbRowLayoutPlugin::OnLayoutRows )
- EVT_PL_RESIZE_ROW ( cbRowLayoutPlugin::OnResizeRow )
-
- EVT_PL_INSERT_BAR ( cbRowLayoutPlugin::OnInsertBar )
- EVT_PL_REMOVE_BAR ( cbRowLayoutPlugin::OnRemoveBar )
-
-END_EVENT_TABLE()
-
-cbRowLayoutPlugin::cbRowLayoutPlugin(void)
- : mpPane( 0 )
-{}
-
-cbRowLayoutPlugin::cbRowLayoutPlugin( wxFrameLayout* pPanel, int paneMask )
-
- : cbPluginBase( pPanel, paneMask ),
- mpPane( 0 )
-{}
-
-void cbRowLayoutPlugin::CheckIfAtTheBoundary( cbBarInfo* pTheBar, cbRowInfo& rowInfo )
-{
- // this method handles situation, when fixed bar is inserted
- // into the row, where among fixed bars not-fixed ones are present.
- // In this case we need to check if the pBarNode appears to be inserted
- // chain of fixed-bars on the very right or left side of the row,
- // then all the white-space, such chain should be eliminated,
- // and the resulting chain justified to the right or the left
- // side of the row
-
- if ( !pTheBar->IsFixed() || rowInfo.mHasOnlyFixedBars )
-
- return;
-
- cbBarInfo* pBar = rowInfo.mBars[ rowInfo.mBars.Count() - 1 ];
-
- // slide fixed bars to the right on the right side relative to the pBarNode
-
- int prevX = mpPane->mPaneWidth;
-
- do
- {
- if ( !pBar->IsFixed() )
- break;
-
- wxRect& bounds = pBar->mBounds;
-
- bounds.x = prevX - bounds.width;
-
- prevX = bounds.x;
-
- if ( pBar == pTheBar ) break;
-
- pBar = pBar->mpPrev;
- }
- while( 1 );
-
- // slide fixed bars to the left on the left side relative to the pBarNode
-
- pBar = rowInfo.mBars[0];
-
- prevX = 0;
-
- do
- {
- if ( pBar->IsFixed() )
-
- break;
-
- wxRect& bounds = pBar->mBounds;
-
- bounds.x = prevX;
-
- prevX = bounds.x + bounds.width;
-
- if ( pBar == pTheBar ) break;
-
- pBar = pBar->mpNext;
- }
- while( 1 );
-}
-
-void cbRowLayoutPlugin::ExpandNotFixedBars( cbRowInfo* pRow )
-{
- ApplyLengthRatios( pRow );
-
- #if 1
-
- // FIXME:: something's wrong?
- return;
-
- #else
-
- double freeSpc = (double)GetRowFreeSpace( pRow );
-
- // calculate sum of precents
-
- double pcntSum = 0.0;
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( !pRow->mBars[i]->IsFixed() )
- pcntSum += pRow->mBars[i]->mLenRatio;
- }
-
- // setup bar lengths
-
- int curX = 0;
-
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- cbBarInfo& bar = *pRow->mBars[i];
-
- if ( !bar.IsFixed() )
- {
- bar.mLenRatio = bar.mLenRatio/(pcntSum);
-
- bar.mBounds.width =
-
- wxMax( mpPane->mProps.mMinCBarDim.x, int( freeSpc*bar.mLenRatio ) );
- }
-
- bar.mBounds.x = curX;
- curX = bar.mBounds.x + bar.mBounds.width;
- }
- #endif
-}
-
-void cbRowLayoutPlugin::AdjustLengthOfInserted( cbRowInfo* WXUNUSED(pRow), cbBarInfo* WXUNUSED(pTheBar) )
-{
- return;
-
-#if 0
-
- // TBD: Makes following code unreachable
-
- // pTheBar is not-fixed
-
- // FIXME:: what is this for??
-
-#if 1
-
- int totalLen = 0;
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( !pRow->mBars[i]->IsFixed() )
- totalLen += pRow->mBars[i]->mBounds.width;
- }
-
- double curWidth = pTheBar->mBounds.width;
-
- if ( pRow->mBars.Count() )
-
- pTheBar->mBounds.width = int( mpPane->mPaneWidth * (curWidth / double(totalLen)) );
-#else
-
- double freeSpc = (double)GetRowFreeSpace( pRow );
-
- double pcntSum = 0.0;
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( !pRow->mBars[i]->IsFixed() )
- pcntSum += pRow->mBars[i]->mLenRatio;
- }
-
- // if no longer "balanced", assume that `pTheBar' was previously
- // removed from this row (kind of AI...)
-
- if ( pcntSum < 0.98 )
-
- pTheBar->mBounds.width = freeSpc * (1.0 - pcntSum);
-#endif
-
-#endif
-
-}
-
-void cbRowLayoutPlugin::FitBarsToRange( int from, int till,
- cbBarInfo* pTheBar, cbRowInfo* pRow )
-{
- cbBarInfo* pFromBar;
- cbBarInfo* pTillBar;
-
- if ( pTheBar->mBounds.x > from )
- {
- // it's range from the left
- pFromBar = pRow->mBars[0];
- pTillBar = pTheBar;
- }
- else
- {
- pFromBar = pTheBar->mpNext;
- pTillBar = NULL;
- }
-
- // calc free space in the range
-
- cbBarInfo* pBar = pFromBar;
- int freeSpc = till-from;
- double pcntSum = 0;
-
- while( pBar != pTillBar )
- {
- if ( pBar->IsFixed() )
- freeSpc -= pBar->mBounds.width;
- else
- pcntSum += pBar->mLenRatio;
-
- pBar = pBar->mpNext;
- }
-
- // adjust not-fixed bar sizes in the range
-
- pBar = pFromBar;
-
- while ( pBar != pTillBar )
- {
- if ( !pBar->IsFixed() )
- {
- pBar->mBounds.width =
- wxMax( mpPane->mProps.mMinCBarDim.x,
- (int)( ((double)freeSpc) * (pBar->mLenRatio/pcntSum) )
- );
- }
- pBar = pBar->mpNext;
- }
-
- // layout range, starting from the left-most bar
-
- pBar = pFromBar;
- int prevX = from;
- bool hasNotFixedBars = false;
-
- while ( pBar != pTillBar )
- {
- wxRect& bounds = pBar->mBounds;
-
- if ( !pBar->IsFixed() )
- {
- hasNotFixedBars = true;
-
- freeSpc -= bounds.width;
- }
-
- bounds.x = prevX;
-
- prevX = bounds.x + bounds.width;
-
- pBar = pBar->mpNext;
- }
-
- // make width adjustment for the right-most bar in the range, due to
- // lost precision when seting widths using f.p. length-ratios
-
- if ( hasNotFixedBars )
- {
- if ( pTheBar->mBounds.x > from )
- {
- if ( pTillBar->mpPrev )
- {
- wxRect& tillBar = pTillBar->mpPrev->mBounds;
-
- //tillBar.width = bar.mBounds.x - tillBar.x;
- tillBar.width += freeSpc;
- }
- }
- else
- {
- cbBarInfo* pLast = pRow->mBars[ pRow->mBars.Count() - 1 ];
-
- if ( pLast != pTheBar )
- {
- pTheBar->mBounds.width += freeSpc;
-
- SlideRightSideBars( pTheBar );
- }
- }
- }
-}
-
-void cbRowLayoutPlugin::MinimzeNotFixedBars( cbRowInfo* pRow, cbBarInfo* pBarToPreserve )
-{
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( !pRow->mBars[i]->IsFixed() && pRow->mBars[i] != pBarToPreserve )
- pRow->mBars[i]->mBounds.width = mpPane->mProps.mMinCBarDim.x;
- }
-}
-
-int cbRowLayoutPlugin::GetRowFreeSpace( cbRowInfo* pRow )
-{
- int freeSpc = mpPane->mPaneWidth;
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- // not-fixed bars variable length, thus their
- // dimensions are ignored
- if ( pRow->mBars[i]->IsFixed() )
- freeSpc -= pRow->mBars[i]->mBounds.width;
- }
-
- return freeSpc;
-}
-
-void cbRowLayoutPlugin::RecalcLengthRatios( cbRowInfo* pRow )
-{
- double freeSpc = double( GetRowFreeSpace( pRow ) );
-
- cbBarInfo* pBar = pRow->mBars[0];
- cbBarInfo* pLastNotFixed = NULL;
-
- double pcntLeft = 1.0; // (100%)
-
-#ifdef __EXPERIMENTAL
-
- int totalLen = 0;
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( !pRow->mBars[i]->IsFixed() )
- totalLen += pRow->mBars[i]->mBounds.width;
- }
-#endif
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- cbBarInfo& bar = *pRow->mBars[i];
-
- if ( !bar.IsFixed() )
- {
-
-#ifdef __EXPERIMENTAL
-
- bar.mLenRatio = double(bar.mBounds.width)/double(totalLen);
-#else
- bar.mLenRatio = double(bar.mBounds.width)/freeSpc;
-#endif
-
- pcntLeft -= bar.mLenRatio;
- pLastNotFixed = pBar;
- }
- }
-
- // attach remainder (the result of lost precision) to the
- // last not-fixed bar
-
-#if !defined(__EXPERIMENTAL)
-
- if ( pLastNotFixed )
-
- pLastNotFixed->mLenRatio += pcntLeft;
-#endif
-
-}
-
-void cbRowLayoutPlugin::ApplyLengthRatios( cbRowInfo* pRow )
-{
- size_t i;
- double pcntSum = 0;
-
- // FOR NOW:: all-in-one
-
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( !pRow->mBars[i]->IsFixed() )
- pcntSum += pRow->mBars[i]->mLenRatio;
- }
-
- /*
- pBar = node_to_first_bar_node( pRow );
-
- while( pBar )
- {
- cbBarInfo& bar = node_to_bar( pBar );
-
- if ( !bar.IsFixed() )
-
- bar.mLenRatio = pcntSum / bar.mLenRatio;
-
- pBar = pBar->Next();
- }
- */
-
- int prevX = 0;
- double freeSpc = GetRowFreeSpace( pRow );
-
- // tricky stuff (improtant!):
- // when not-fixed bar is removed from the row and there are
- // still some other not-fixed ones left in that row, then
- // the sum of mLenRatio's is no longer 1.0 - this is left
- // intintionally to handle the case when the removed bar
- // is returned right back to the row - so that it would retain
- // it's original dimensions in this row (this is kind of AI...)
- //
- // The problem is - when it's remvoed, the sum of
- // mLenRatio's is not in "balance", i.e. is < 1.0,
- // it's possible to restore balance, but instead of that
- // we artifically ajdust freeSpc value in a way that it would
- // look like total of mLetRatio's is 1.0, thus original
- // len. ratios are _preserved_:
-
- if (pcntSum == 0.0)
- pcntSum = 1.0;
-
- double unit = freeSpc / pcntSum;
-
- bool haveSquished = false;
-
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- if ( !pRow->mBars[i]->IsFixed() )
- {
- cbBarInfo& bar = *pRow->mBars[i];
-
- if ( int( unit * bar.mLenRatio ) < mpPane->mProps.mMinCBarDim.x )
- {
- haveSquished = true;
-
- bar.mBounds.width = -1; // mark as "squished"
-
- pcntSum -= bar.mLenRatio;
-
- freeSpc -= mpPane->mProps.mMinCBarDim.x;
- }
- }
- } // for
-
- if ( haveSquished )
- unit = freeSpc / pcntSum;
-
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- cbBarInfo& bar = *pRow->mBars[i];
-
- bar.mBounds.x = prevX;
-
- if ( !bar.IsFixed() )
- {
- if ( bar.mBounds.width == -1 )
-
- bar.mBounds.width = mpPane->mProps.mMinCBarDim.x;
- else
- bar.mBounds.width = int( unit * bar.mLenRatio );
-
- // a little bit of AI:
- // memorize bar's height and width, when docked in
- // the current orientation - by making the current
- // dimensions to be "preffered" ones for this docking state
-
- if ( !bar.IsFixed() )
- {
- bar.mDimInfo.mSizes[ bar.mState ].x = bar.mBounds.width;
- bar.mDimInfo.mSizes[ bar.mState ].y = bar.mBounds.height;
- }
- }
-
- prevX = bar.mBounds.x + bar.mBounds.width;
- }
-}
-
-void cbRowLayoutPlugin::DetectBarHandles( cbRowInfo* pRow )
-{
- // first pass from left to right (detect left-side handles)
-
- bool foundNotFixed = false;
-
- size_t i;
- for ( i = 0; i != pRow->mBars.Count(); ++i )
- {
- cbBarInfo& bar = *pRow->mBars[i];
-
- bar.mHasLeftHandle = false;
-
- if ( !bar.IsFixed() )
- {
- if ( foundNotFixed )
-
- if ( bar.mpPrev &&
- bar.mpPrev->IsFixed() )
-
- bar.mHasLeftHandle = true;
-
- foundNotFixed = true;
- }
- }
-
- // pass from right to left (detect right-side handles)
-
- foundNotFixed = false;
-
- cbBarInfo* pBar = pRow->mBars[ pRow->mBars.Count() - 1 ];
-
- while( pBar )
- {
- pBar->mHasRightHandle = false;
-
- if ( !pBar->IsFixed() )
- {
- if ( foundNotFixed )
-
- if ( pBar->mpNext )
-
- pBar->mHasRightHandle = true;
-
- foundNotFixed = true;
- }
-
- pBar = pBar->mpPrev;
- }
-}
-
-void cbRowLayoutPlugin::RelayoutNotFixedBarsAround( cbBarInfo* pTheBar, cbRowInfo* pRow )
-{
- if ( !pTheBar->mpPrev )
- {
- if ( !pTheBar->IsFixed() )
- {
- // this bar the first in the row, move it's
- // left edge to the very left
- pTheBar->mBounds.width += pTheBar->mBounds.x;
- pTheBar->mBounds.x = 0;
- }
- }
- else
- FitBarsToRange( 0, pTheBar->mBounds.x, pTheBar, pRow );
-
- if ( !pTheBar->mpNext )
- {
- if ( !pTheBar->IsFixed() )
- {
- // this bar is the last one, move it's
- // right edge to the very right
-
- pTheBar->mBounds.width = mpPane->mPaneWidth - pTheBar->mBounds.x;
- }
- }
- else
- FitBarsToRange( pTheBar->mBounds.x + pTheBar->mBounds.width, mpPane->mPaneWidth,
- pTheBar, pRow
- );
-}
-
-void cbRowLayoutPlugin::LayoutItemsVertically( cbRowInfo& row )
-{
- size_t i;
- for ( i = 0; i != row.mBars.Count(); ++i )
- {
- cbBarInfo& bar = *row.mBars[i];
-
- bar.mBounds.y = row.mRowY;
-
- if ( !bar.IsFixed() )
-
- // make all not-fixed bars of equal height
- bar.mBounds.height = row.mRowHeight;
-
- if ( row.mHasUpperHandle )
-
- bar.mBounds.y += mpPane->mProps.mResizeHandleSize;
- }
-}
-
-int cbRowLayoutPlugin::CalcRowHeight( cbRowInfo& row )
-{
- int maxHeight = 0;
-
- size_t i;
- for ( i = 0; i != row.mBars.Count(); ++i )
-
- maxHeight = wxMax( maxHeight, row.mBars[i]->mBounds.height );
-
- return maxHeight;
-}
-
-void cbRowLayoutPlugin::StickRightSideBars( cbBarInfo* pToBar )
-{
- cbBarInfo* pBar = pToBar->mpNext;
- cbBarInfo* pPrev = pToBar;
-
- while( pBar )
- {
- wxRect& cur = pBar->mBounds;
- wxRect& prev = pPrev->mBounds;
-
- cur.x = prev.x + prev.width;
-
- pPrev = pBar;
- pBar = pBar->mpNext;
- }
-}
-
-void cbRowLayoutPlugin::SlideLeftSideBars( cbBarInfo* pTheBar )
-{
- // shift left-side-bars to the left (with respect to "theBar"),
- // so that they would not obscured by each other
-
- cbBarInfo* pBar = pTheBar->mpPrev;
- cbBarInfo* pPrev = pTheBar;
-
- while( pBar )
- {
- wxRect& cur = pBar->mBounds;
- wxRect& prev = pPrev->mBounds;
-
- if ( cur.x + cur.width > prev.x )
-
- cur.x = prev.x - cur.width;
-
- pPrev = pBar;
- pBar = pBar->mpPrev;
- }
-}
-
-void cbRowLayoutPlugin::SlideRightSideBars( cbBarInfo* pTheBar )
-{
- // shift right-side-bars to the right (with respect to "theBar"),
- // so that they would not be obscured by each other
-
- cbBarInfo* pBar = pTheBar->mpNext;
- cbBarInfo* pPrev = pTheBar;
-
- while( pBar )
- {
- wxRect& cur = pBar->mBounds;
- wxRect& prev = pPrev->mBounds;
-
- if ( cur.x < prev.x + prev.width )
-
- cur.x = prev.x + prev.width;
-
- pPrev = pBar;
- pBar = pBar->mpNext;
- }
-}
-
-void cbRowLayoutPlugin::ShiftLeftTrashold( cbBarInfo* WXUNUSED(pTheBar), cbRowInfo& row )
-{
- wxRect& first = row.mBars[0]->mBounds;
-
- if ( first.x < 0 )
- {
- row.mBars[0]->mBounds.x = 0;
-
- SlideRightSideBars( row.mBars[0] );
- }
-}
-
-void cbRowLayoutPlugin::ShiftRightTrashold( cbBarInfo* pTheBar, cbRowInfo& row )
-{
- wxRect& theBar = pTheBar->mBounds;
-
- do
- {
- cbBarInfo* pBar = pTheBar;
-
- // calculate free spece on the left side
-
- int leftFreeSpc = 0;
-
- while( pBar )
- {
- wxRect& cur = pBar->mBounds;
-
- if ( pBar->mpPrev )
- {
- wxRect& prev = pBar->mpPrev->mBounds;
-
- leftFreeSpc += cur.x - prev.x - prev.width;
- }
- else
- leftFreeSpc += cur.x;
-
- if ( cur.x < 0 )
- {
- leftFreeSpc = 0;
- break;
- }
-
- pBar = pBar->mpPrev;
- }
-
- pBar = pTheBar;
-
- int rightOverflow = 0;
-
- if ( pTheBar->IsFixed() )
-
- while( pBar )
- {
- if ( !pBar->mpNext )
- {
- wxRect& cur = pBar->mBounds;
-
- if ( cur.x + cur.width > mpPane->mPaneWidth )
-
- rightOverflow = cur.x + cur.width - mpPane->mPaneWidth;
- }
-
- pBar = pBar->mpNext;
- }
-
- if ( rightOverflow > 0 )
- {
- if ( leftFreeSpc <= 0 ) return;
-
- if ( pTheBar->mpNext )
- {
- wxRect& next = pTheBar->mpNext->mBounds;
-
- // if there's enough space on the left, move over one half-obscured
- // bar from the right to the left side with respect to "theBar"
-
- if ( next.width < leftFreeSpc )
- {
- cbBarInfo* pNext = pTheBar->mpNext;
-
- row.mBars.Remove( pNext );
-
- row.mBars.Insert( pNext, row.mBars.Index( pTheBar ) );
-
- next.x = theBar.x - next.width;
-
- // re-setup mpPrev/mpNext references after insertion
-
- mpPane->InitLinksForRow( &row );
-
- // tighten things
-
- StickRightSideBars( pTheBar );
- SlideLeftSideBars ( pTheBar );
-
- continue;
- }
- }
-
- int leftShift = ( rightOverflow > leftFreeSpc )
- ? leftFreeSpc
- : rightOverflow;
-
- theBar.x -= leftShift;
-
- StickRightSideBars( pTheBar );
- SlideLeftSideBars ( pTheBar );
-
- break;
-
- } // end of if ( rightOverflow )
- else
- break;
-
- } while(1);
-}
-
-void cbRowLayoutPlugin::InsertBefore( cbBarInfo* pBeforeBar,
- cbBarInfo* pTheBar,
- cbRowInfo& row )
-{
- if ( pBeforeBar )
-
- row.mBars.Insert( pTheBar, row.mBars.Index( pBeforeBar ) );
- else
- row.mBars.Add( pTheBar );
-
- pTheBar->mpRow = &row;
-}
-
-void cbRowLayoutPlugin::DoInsertBar( cbBarInfo* pTheBar, cbRowInfo& row )
-{
- wxRect& theBar = pTheBar->mBounds;
-
- /* OLD STUFF::
- if ( theBar.x < 0 && !node_to_bar( pTheBar ).IsFixed() )
- {
- // AI::
- theBar.width += theBar.x;
- theBar.x = 0;
- } */
-
- size_t i;
- for ( i = 0; i != row.mBars.Count(); ++i )
- {
- cbBarInfo& bar = *row.mBars[i];
-
- wxRect& cur = bar.mBounds;
-
- // if bar hits the left edge
- if ( theBar.x <= cur.x )
- {
- InsertBefore( &bar, pTheBar, row );
- return;
- }
-
- else
- // if bar hits the right edge
- if ( theBar.x <= cur.x + cur.width )
- {
- if ( theBar.x + theBar.width > cur.x + cur.width )
- {
- InsertBefore( bar.mpNext, pTheBar, row );
- return;
- }
-
- // otherwise the bar lies within the bounds of current bar
-
- int leftDist = theBar.x - cur.x;
- int rightDist = cur.x + cur.width - (theBar.x + theBar.width);
-
- if ( leftDist < rightDist )
-
- InsertBefore( &bar, pTheBar, row );
- else
- InsertBefore( bar.mpNext, pTheBar, row );
-
- return;
- }
- }
-
- InsertBefore( NULL, pTheBar, row ); // insert at the end
-}
-
-// evnet handlers
-
-void cbRowLayoutPlugin::OnInsertBar( cbInsertBarEvent& event )
-{
- cbBarInfo* pBarToInsert = event.mpBar;
- cbRowInfo* pIntoRow = event.mpRow;
- mpPane = event.mpPane;
-
- if ( !pBarToInsert->IsFixed() )
-
- AdjustLengthOfInserted( pIntoRow, pBarToInsert );
-
- DoInsertBar( pBarToInsert, *pIntoRow );
-
- mpPane->InitLinksForRow( pIntoRow ); // relink "mpNext/mpPrev"s
-
- // perform relayouting of the bars after insertion
-
- // init bar location info
- pBarToInsert->mAlignment = event.mpPane->mAlignment;
- pBarToInsert->mRowNo = event.mpPane->GetRowIndex( pIntoRow );
-
-#ifdef __EXPERIMENTAL
-
- if ( !pIntoRow->mHasOnlyFixedBars || !pBarToInsert->IsFixed() )
-
- RecalcLengthRatios( pIntoRow );
-
-#endif
-
- MinimzeNotFixedBars( pIntoRow, pBarToInsert );
-
- SlideLeftSideBars ( pBarToInsert );
- SlideRightSideBars( pBarToInsert );
-
- ShiftLeftTrashold ( pBarToInsert, *pIntoRow );
- ShiftRightTrashold( pBarToInsert, *pIntoRow );
-
- mpPane->SyncRowFlags( pIntoRow );
-
- CheckIfAtTheBoundary( pBarToInsert, *pIntoRow );
-
- if ( event.mpPane->IsHorizontal() )
-
- pBarToInsert->mState = wxCBAR_DOCKED_HORIZONTALLY;
- else
- pBarToInsert->mState = wxCBAR_DOCKED_VERTICALLY;
-
- if ( !pIntoRow->mHasOnlyFixedBars )
- {
-
-#ifdef __EXPERIMENTAL
-
- ExpandNotFixedBars( pIntoRow );
-#else
-
- RelayoutNotFixedBarsAround( pBarToInsert, pIntoRow );
- RecalcLengthRatios( pIntoRow );
-
-#endif
-
- DetectBarHandles( pIntoRow );
-
- // do proportional resizing of not-fixed bars
- ApplyLengthRatios( pIntoRow );
- }
-
- // adjust the bar's docking state
-
- // a little bit of AI:
- // memorize bar's height and width, when docked in
- // the current orientation - by making the current
- // dimensions to be "preferred" ones for this docking state
-
- if ( !pBarToInsert->IsFixed() )
- {
- cbBarInfo& bar = *pBarToInsert;
-
- bar.mDimInfo.mSizes[ bar.mState ].x = bar.mBounds.width;
- bar.mDimInfo.mSizes[ bar.mState ].y = bar.mBounds.height;
- }
-}
-
-void cbRowLayoutPlugin::OnRemoveBar ( cbRemoveBarEvent& event )
-{
- cbBarInfo* pBar = event.mpBar;
- mpPane = event.mpPane;
-
- cbRowInfo* pRow = pBar->mpRow;
-
- mpLayout->GetUpdatesManager().OnBarWillChange( pBar, pRow, event.mpPane );
-
- // invalidate the whole row
- //pFirst->mpRowInfo->mMgrData.mPrevBounds.x = -1;
-
- pRow->mBars.Remove( pBar );
-
- // rest bar information after removing it from the row
- pBar->mpRow = NULL;
- pBar->mHasLeftHandle = false;
- pBar->mHasRightHandle = false;
-
- mpPane->InitLinksForRow( pRow ); // relink "mpNext/mpPrev"s
-
- if ( pRow->mBars.Count() == 0 )
- {
- // empty rows should not exist
-
- event.mpPane->GetRowList().Remove( pRow );
-
- delete pRow;
-
- mpPane->InitLinksForRows();
- }
- else
- {
- // force repainting of bars, in the row, from which the bar was removed
-
- // FIXME:: really needed?
- pRow->mBars[0]->mUMgrData.SetDirty(true);
-
- // re-setup mHasOnlyFixedBars flag for the row information
- event.mpPane->SyncRowFlags( pRow );
-
- DetectBarHandles( pRow );
-
- if ( !pRow->mHasOnlyFixedBars )
-
- ExpandNotFixedBars( pRow );
- }
-}
-
-void cbRowLayoutPlugin::OnLayoutRow( cbLayoutRowEvent& event )
-{
- cbRowInfo* pRow = event.mpRow;
- mpPane = event.mpPane;
-
- MinimzeNotFixedBars( pRow, NULL );
-
- if ( !pRow->mHasOnlyFixedBars )
- {
- // do proportional resizing of not-fixed bars
- ApplyLengthRatios( pRow );
- }
-
- cbBarInfo& lastBar = *pRow->mBars[ pRow->mBars.Count() - 1 ];
- cbBarInfo& firstBar = *pRow->mBars[ 0 ];
-
- // FIXME:: Next line not used
- // wxRect& bounds = lastBar.mBounds;
-
- if ( lastBar.mBounds.x + lastBar.mBounds.width > mpPane->mPaneWidth )
- {
- lastBar.mBounds.x = mpPane->mPaneWidth - lastBar.mBounds.width;
-
- // first simulate left-row-edge friction
-
- SlideLeftSideBars( &lastBar );
-
- if ( firstBar.mBounds.x < 0 )
- firstBar.mBounds.x = 0;
-
- // then left-row-edge function, though this
- // may cause some of the right-side bars going
- // out of row bounds, but left-side always
- // has the highest "priority"
-
- SlideRightSideBars( &firstBar );
- }
-
- event.Skip(); // pass event to the next handler
-}
-
-void cbRowLayoutPlugin::OnLayoutRows( cbLayoutRowsEvent& event )
-{
- mpPane = event.mpPane;
-
- int curY = 0;
-
- // FIXME:: Next line not used.
- // RowArrayT& arr = mpPane->GetRowList();
-
- size_t i;
- for ( i = 0; i != mpPane->GetRowList().Count(); ++i )
- {
- cbRowInfo& row = *mpPane->GetRowList()[ i ];
- //mpPane->CalcLengthRatios(& row);
-
- // setup "has-handle" flags for rows, which depend on the existence
- // of not-fixed bars in the row
-
- if ( !row.mHasOnlyFixedBars )
- {
- if ( mpPane->mAlignment == FL_ALIGN_TOP ||
- mpPane->mAlignment == FL_ALIGN_LEFT )
- {
- row.mHasLowerHandle = true;
-
- row.mHasUpperHandle = false;
- }
- else
- {
- row.mHasUpperHandle = true;
-
- row.mHasLowerHandle = false;
- }
- }
- else
- {
- // otherwise, rows with fixed-bars only, have no height-resizing handles
- row.mHasUpperHandle = false;
- row.mHasLowerHandle = false;
- }
-
- // setup vertical positions for items in the row
-
- row.mRowY = curY;
-
- row.mRowWidth = mpPane->mPaneWidth;
- row.mRowHeight = CalcRowHeight( row );
-
- LayoutItemsVertically( row );
-
- if ( row.mHasUpperHandle )
- row.mRowHeight += mpPane->mProps.mResizeHandleSize;
- if ( row.mHasLowerHandle )
- row.mRowHeight += mpPane->mProps.mResizeHandleSize;
-
- curY += row.mRowHeight;
- }
-
- event.Skip(); // pass event to the next handler - other hookeds plugin
- // may also add some "refinements" to the layout now
-}
-
-void cbRowLayoutPlugin::OnResizeRow( cbResizeRowEvent& event )
-{
- // extract resize-event info
- int ofs = event.mHandleOfs;
- bool forUpperHandle = event.mForUpperHandle;
- cbRowInfo* pTheRow = event.mpRow;
- mpPane = event.mpPane;
-
- // FIXME:: Next line not used.
- //int newHeight = pTheRow->mRowHeight;
-
- if ( forUpperHandle )
- {
- // calculate available free space from above,
- // which can be obtained by squeezing not-fixed height rows
-
- cbRowInfo* pRow = pTheRow->mpPrev;
-
- while( pRow )
- {
- pRow = pRow->mpPrev;
- }
- }
- else
- {
- // calculate available free space from below,
- // which can be obtained by squeezing not-fixed height rows
-
- cbRowInfo* pRow = pTheRow->mpNext;
-
- while( pRow )
- {
- pRow = pRow->mpNext;
- }
- }
-
- mpLayout->GetUpdatesManager().OnStartChanges();
-
- int clientSize;
-
- // allow user adjusting pane vs. client-area space, for upper-handle
-
- if ( mpPane->IsHorizontal() )
-
- clientSize = mpLayout->GetClientHeight();
- else
- clientSize = mpLayout->GetClientWidth();
-
- if ( forUpperHandle && ofs < -clientSize )
- {
- int needed = -(ofs + clientSize);
-
- cbRowInfo* pRow = mpPane->GetRowList()[ 0 ];
-
- // start squeezing rows from the top row towards bottom
-
- while( pRow != pTheRow && needed )
- {
- // only not-fixed rows can be squeezed
-
- if ( !pRow->mHasOnlyFixedBars )
- {
- int prevHeight = pRow->mRowHeight;
-
- int newHeight = wxMax( event.mpPane->GetMinimalRowHeight( pRow ),
- prevHeight - needed );
-
- if ( newHeight != prevHeight )
- {
- event.mpPane->SetRowHeight( pRow, newHeight );
-
- needed -= prevHeight - pRow->mRowHeight;
- }
- }
-
- pRow = pRow->mpNext;
- }
- }
-
- // allow user adjusting pane vs. client-area space, for lower-handle
-
- if ( !forUpperHandle && ofs > clientSize )
- {
- int needed = ofs - clientSize;
-
- cbRowInfo* pRow = mpPane->GetRowList()[ mpPane->GetRowList().Count() - 1 ];
-
- // start squeezing rows from the bottom towards the top row
-
- while( pRow && needed )
- {
- // only not-fixed rows can be squeezed
-
- if ( !pRow->mHasOnlyFixedBars )
- {
- int prevHeight = pRow->mRowHeight;
-
- int newHeight = wxMax( event.mpPane->GetMinimalRowHeight( pRow ),
- prevHeight - needed );
-
- if ( newHeight != prevHeight )
- {
- event.mpPane->SetRowHeight( pRow, newHeight );
-
- needed -= prevHeight - pRow->mRowHeight;
- }
- }
-
- pRow = pRow->mpPrev;
- }
- }
-
- if ( forUpperHandle )
-
- event.mpPane->SetRowHeight( pTheRow, pTheRow->mRowHeight + (-ofs) );
- else
- event.mpPane->SetRowHeight( pTheRow, pTheRow->mRowHeight + ofs );
-
- mpLayout->RecalcLayout(false);
-
- mpLayout->GetUpdatesManager().OnFinishChanges();
- mpLayout->GetUpdatesManager().UpdateNow();
-}
-
diff --git a/contrib/src/fl/toolwnd.cpp b/contrib/src/fl/toolwnd.cpp
deleted file mode 100644
index bca90066b7..0000000000
--- a/contrib/src/fl/toolwnd.cpp
+++ /dev/null
@@ -1,1108 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: toolwnd.cpp
-// Purpose: wxToolWindow implementation.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 06/09/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/toolwnd.h"
-
-#define _IMG_A 0xAA // Note: modified from _A to _IMG_A, _A was already defined (cygwin)
-#define _IMG_B 0x00 // Note: modified from _B to _IMG_A, _B was already defined (cygwin)
-#define _IMG_C 0x55 // Note: modified from _C to _IMG_C, for consistency reasons.
-#define _IMG_D 0x00 // Note: modified from _D to _IMG_D, for consistency reasons.
-
-// FOR NOW:: static
-
-static const unsigned char _gCheckerImg[16] = { _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D,
- _IMG_A,_IMG_B,_IMG_C,_IMG_D
- };
-
-/***** Implementation for class wxToolWindow *****/
-
-IMPLEMENT_DYNAMIC_CLASS( wxToolWindow, wxFrame)
-
-BEGIN_EVENT_TABLE( wxToolWindow, wxFrame )
-
- EVT_PAINT ( wxToolWindow::OnPaint )
- EVT_MOTION ( wxToolWindow::OnMotion )
- EVT_LEFT_DOWN( wxToolWindow::OnLeftDown )
- EVT_LEFT_UP ( wxToolWindow::OnLeftUp )
- EVT_SIZE ( wxToolWindow::OnSize )
-
-
- EVT_ERASE_BACKGROUND( wxToolWindow::OnEraseBackground )
-
-END_EVENT_TABLE()
-
-enum INTERNAL_HIT_CODES
-{
- HITS_WND_NOTHING,
- HITS_WND_CLIENT,
- HITS_WND_TITLE,
-
- HITS_WND_LEFT_EDGE,
- HITS_WND_RIGHT_EDGE,
- HITS_WND_TOP_EDGE,
- HITS_WND_BOTTOM_EDGE,
-
- HITS_WND_TOP_LEFT_CORNER,
- HITS_WND_BOTTOM_RIGHT_CORNER,
- HITS_WND_TOP_RIGHT_CORNER,
- HITS_WND_BOTTOM_LEFT_CORNER
-};
-
-wxToolWindow::wxToolWindow()
-
- : mpClientWnd ( NULL ),
-
-#ifndef __WXMSW__
- mTitleFont( 8, wxSWISS, wxNORMAL, wxNORMAL ),
-#else
- // just to simulate MS-Dev style
- mTitleFont( 8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif") ),
-#endif
-
- mTitleHeight ( 16 ),
- mClntHorizGap ( 2 ),
- mClntVertGap ( 2 ),
- mWndVertGap ( 4 ),
- mWndHorizGap ( 4 ),
-
- mButtonGap ( 2 ),
- mInTitleMargin( 4 ),
- mHintBorder ( 4 ),
-
- mResizeStarted( false ),
- mRealTimeUpdatesOn( true ),
-
- mMTolerance ( 5 ), // mouse-resizing tollerance
-
- mCursorType( HITS_WND_NOTHING ),
- mMouseCaptured( false ),
-
- mpScrDc( NULL )
-
-{
-}
-
-wxToolWindow::~wxToolWindow()
-{
- if ( mpScrDc ) delete mpScrDc;
-
- for( size_t i = 0; i != mButtons.Count(); ++i )
- delete mButtons[i];
-}
-
-void wxToolWindow::LayoutMiniButtons()
-{
- int w,h;
-
- GetSize( &w, &h );
-
- int x = w - mWndHorizGap - mInTitleMargin - BTN_BOX_WIDTH;
- int y = mWndVertGap + 2;
-
- for( size_t i = 0; i != mButtons.Count(); ++i )
- {
- mButtons[i]->SetPos( wxPoint( x,y ) );
- x-= BTN_BOX_WIDTH + mButtonGap;
- }
-}
-
-void wxToolWindow::SetClient( wxWindow* pWnd )
-{
- mpClientWnd = pWnd;
-}
-
-wxWindow* wxToolWindow::GetClient()
-{
- return mpClientWnd;
-}
-
-void wxToolWindow::SetTitleFont( wxFont& font )
-{
- mTitleFont = font;
-}
-
-void wxToolWindow::AddMiniButton( cbMiniButton* pBtn )
-{
- pBtn->mpWnd = this;
-
- mButtons.Add( pBtn );
-
- // not necesserely now..
- //LayoutMiniButtons();
-}
-
-void wxToolWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
- wxPaintDC pdc( this );
- wxWindowDC dc( this );
-
- int w,h;
- GetSize( &w, &h );
-
- wxBrush backGround( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID );
- //dc.SetBrush( *wxLIGHT_GREY_BRUSH );
- dc.SetBrush( backGround );
- dc.SetPen( *wxTRANSPARENT_PEN );
-
- int y = mWndVertGap + mTitleHeight + mClntVertGap;
-
- dc.DrawRectangle( 0,0, w, y ); // Top grey part.
- dc.DrawRectangle( 0,y-1, mWndHorizGap + mClntHorizGap, h - y ); // Left grey part.
- dc.DrawRectangle( w - ( mWndHorizGap + mClntHorizGap ), y-1,
- mWndHorizGap + mClntHorizGap, h - y ); // Right grey part.
- dc.DrawRectangle( 0, h - mWndVertGap - mClntVertGap, w, mWndVertGap + mClntVertGap ); // Bottom grey part.
-
- // draw shades
- dc.SetPen( *wxLIGHT_GREY_PEN );
-
- dc.DrawLine( 0,0, w, 0 );
- dc.DrawLine( 0,0, 0, h );
-
- dc.SetPen( *wxWHITE_PEN );
-
- dc.DrawLine( 1,1, w, 1 );
- dc.DrawLine( 1,2, 1, h );
-
- dc.SetPen( *wxGREY_PEN );
-
- dc.DrawLine( w - 2, 1, w - 2, h - 1 );
- dc.DrawLine( 1, h - 2, w - 2, h - 2 );
-
- dc.SetPen( *wxBLACK_PEN );
-
- dc.DrawLine( 0, h - 1, w, h - 1 );
- dc.DrawLine( w-1, 0, w-1, h );
-
- // fill inner area
-
- dc.SetBrush( *wxTheBrushList->FindOrCreateBrush( wxColour( 0,0,128 ), wxSOLID ) );
-
- dc.DrawRectangle( mWndHorizGap, mWndVertGap, w - mWndHorizGap*2, mTitleHeight );
-
- dc.SetFont( mTitleFont );
-
- for( size_t i = 0; i != mButtons.Count(); ++i )
- mButtons[i]->Draw( dc );
-
- int x1 = mWndHorizGap + mClntHorizGap;
- int x2 = mButtons[ mButtons.GetCount() - 1 ]->mPos.x - mClntHorizGap*2;
-
- dc.SetClippingRegion( x1, mWndVertGap + mClntVertGap, x2 - x1, mTitleHeight );
-
- dc.SetTextForeground( *wxWHITE );
- dc.SetBackgroundMode( wxTRANSPARENT );
- dc.DrawText( GetTitle(), mWndHorizGap + 2, mWndVertGap + 1 );
-}
-
-void wxToolWindow::GetScrWindowRect( wxRect& r )
-{
- int x,y;
- GetPosition(&x,&y);
- int w,h;
- GetSize( &w, &h );
-
- r.x = x; r.y = y;
- r.width = w; r.height = h;
-}
-
-void wxToolWindow::GetScrMousePos( wxMouseEvent& event, wxPoint& pos )
-{
- int x = event.m_x, y = event.m_y;
-
- ClientToScreen( &x, &y );
-
- pos.x = x; pos.y = y;
-}
-
-int wxToolWindow::HitTestWindow( wxMouseEvent& event )
-{
- wxPoint pos;
- wxRect r;
-
- GetScrMousePos( event, pos );
- GetScrWindowRect( r );
-
- int k = mMTolerance;
-
- if ( !( pos.x >= r.x && pos.y >= r.y &&
- pos.x < r.x + r.width &&
- pos.y < r.y + r.height )
- )
- return HITS_WND_NOTHING;
-
- if ( pos.y <= r.y + k )
- {
- if ( pos.x < r.x + k*2 )
- return HITS_WND_TOP_LEFT_CORNER;
- else
- {
- if ( pos.x >= r.x + r.width - k*2 )
- return HITS_WND_TOP_RIGHT_CORNER;
- else
- return HITS_WND_TOP_EDGE;
- }
- }
- else
- {
- if ( pos.y >= r.y + r.height - k )
- {
- if ( pos.x < r.x + k*2 )
- return HITS_WND_BOTTOM_LEFT_CORNER;
- else
- {
- if ( pos.x > r.x + r.width - k*2 )
- return HITS_WND_BOTTOM_RIGHT_CORNER;
- else
- return HITS_WND_BOTTOM_EDGE;
- }
- }
- else
- {
- if ( pos.x <= r.x + k )
- return HITS_WND_LEFT_EDGE;
- else
- {
- if ( pos.x >= r.x + r.width - k )
- return HITS_WND_RIGHT_EDGE;
- else
- {
- if ( pos.y <= r.y + mWndVertGap + mTitleHeight + mClntVertGap )
- return HITS_WND_TITLE;
- else
- return HITS_WND_CLIENT;
- }
- }
- }
- }
-}
-
-void wxToolWindow::DrawHintRect( const wxRect& r )
-{
- // BUG BUG BUG (wx):: somehow stippled brush works only
- // when the bitmap created on stack, not
- // as a member of the class
-
- int prevLF = mpScrDc->GetLogicalFunction();
-
- mpScrDc->SetLogicalFunction( wxXOR );
-
- wxBitmap checker( (const char*)_gCheckerImg, 8,8 );
-
- wxBrush checkerBrush( checker );
-
- mpScrDc->SetPen( *wxTRANSPARENT_PEN );
- mpScrDc->SetBrush( checkerBrush );
-
- int half = mHintBorder / 2;
-
- mpScrDc->DrawRectangle( r.x - half, r.y - half,
- r.width + 2*half, mHintBorder );
-
- mpScrDc->DrawRectangle( r.x - half, r.y + r.height - half,
- r.width + 2*half, mHintBorder );
-
- mpScrDc->DrawRectangle( r.x - half, r.y + half - 1,
- mHintBorder, r.height - 2*half + 2);
-
- mpScrDc->DrawRectangle( r.x + r.width - half,
- r.y + half - 1,
- mHintBorder, r.height - 2*half + 2);
-
- mpScrDc->SetBrush( wxNullBrush );
-
- mpScrDc->SetLogicalFunction( prevLF );
-}
-
-void wxToolWindow::SetHintCursor( int type )
-{
- if ( mResizeStarted )
- return;
-
- if ( type == HITS_WND_NOTHING || type == HITS_WND_CLIENT )
- {
- // the cursor is out of window - reset to arrow
-
- if ( mMouseCaptured )
- {
- ReleaseMouse();
- mMouseCaptured = false;
- }
-
- SetCursor( wxCURSOR_ARROW );
-
- mCursorType = type;
-
- return;
- }
-
- // did the cursor actually changed?
-
- if ( type != mCursorType )
- {
- mCursorType = type;
-
- switch ( type )
- {
- case HITS_WND_LEFT_EDGE : SetCursor( wxCURSOR_SIZEWE ); break;
- case HITS_WND_RIGHT_EDGE : SetCursor( wxCURSOR_SIZEWE ); break;
- case HITS_WND_TOP_EDGE : SetCursor( wxCURSOR_SIZENS ); break;
- case HITS_WND_BOTTOM_EDGE : SetCursor( wxCURSOR_SIZENS ); break;
-
- case HITS_WND_TOP_LEFT_CORNER : SetCursor( wxCURSOR_SIZENWSE ); break;
- case HITS_WND_BOTTOM_RIGHT_CORNER : SetCursor( wxCURSOR_SIZENWSE ); break;
- case HITS_WND_TOP_RIGHT_CORNER : SetCursor( wxCURSOR_SIZENESW ); break;
- case HITS_WND_BOTTOM_LEFT_CORNER : SetCursor( wxCURSOR_SIZENESW ); break;
-
- case HITS_WND_TITLE : SetCursor( wxCURSOR_ARROW ); break;
- case HITS_WND_CLIENT : SetCursor( wxCURSOR_ARROW ); break;
-
- default: break;
- }
-
- if (mMouseCaptured)
- {
- mMouseCaptured = false;
- ReleaseMouse();
- }
- }
-
- if ( !mMouseCaptured )
- {
- mMouseCaptured = true;
- CaptureMouse();
- }
-}
-
-#define FL_INFINITY 32768
-
-static inline void clip_to( int& value, long from, long till )
-{
- if ( value < from )
- value = from;
-
- if ( value > till )
- value = till;
-}
-
-void wxToolWindow::AdjustRectPos( const wxRect& original, const wxSize& newDim, wxRect& newRect )
-{
- if ( mCursorType == HITS_WND_TOP_EDGE ||
- mCursorType == HITS_WND_TOP_LEFT_CORNER )
- {
- newRect.x = original.x + original.width - newDim.x;
- newRect.y = original.y + original.height - newDim.y;
- }
- else
- if ( mCursorType == HITS_WND_LEFT_EDGE ||
- mCursorType == HITS_WND_BOTTOM_LEFT_CORNER )
- {
- newRect.x = original.x + original.width - newDim.x;
- newRect.y = original.y;
- }
- else
- if ( mCursorType == HITS_WND_RIGHT_EDGE ||
- mCursorType == HITS_WND_TOP_RIGHT_CORNER )
- {
- newRect.x = original.x;
- newRect.y = original.y + original.height - newDim.y;
- }
- else
- if ( mCursorType == HITS_WND_BOTTOM_EDGE ||
- mCursorType == HITS_WND_BOTTOM_RIGHT_CORNER )
- {
- newRect.x = original.x;
- newRect.y = original.y;
- }
-
- newRect.width = newDim.x;
- newRect.height = newDim.y;
-}
-
-void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize& minDim )
-{
- // Microsoft's rect-coordinates are best suited
- // for the case of corner-clipping
-
- int left = mInitialRect.x;
- int top = mInitialRect.y;
- int right = mInitialRect.x + mInitialRect.width;
- int bottom = mInitialRect.y + mInitialRect.height;
-
- // constraint delta edge is dragged
-
- switch ( mCursorType )
- {
- case HITS_WND_LEFT_EDGE : delta.y = 0; break;
- case HITS_WND_RIGHT_EDGE : delta.y = 0; break;
- case HITS_WND_TOP_EDGE : delta.x = 0; break;
- case HITS_WND_BOTTOM_EDGE : delta.x = 0; break;
- default: break;
- }
-
- if ( mCursorType == HITS_WND_TOP_EDGE ||
- mCursorType == HITS_WND_TOP_LEFT_CORNER )
- {
- left += delta.x;
- top += delta.y;
-
- clip_to( left, -FL_INFINITY, mInitialRect.x + mInitialRect.width - minDim.x );
- clip_to( top, -FL_INFINITY, mInitialRect.y + mInitialRect.height - minDim.y );
- }
- else
- if ( mCursorType == HITS_WND_LEFT_EDGE ||
- mCursorType == HITS_WND_BOTTOM_LEFT_CORNER )
- {
- left += delta.x;
- bottom += delta.y;
-
- clip_to( left, -FL_INFINITY, mInitialRect.x + mInitialRect.width - minDim.x );
- clip_to( bottom, mInitialRect.y + minDim.y, FL_INFINITY );
- }
- else
- if ( mCursorType == HITS_WND_RIGHT_EDGE ||
- mCursorType == HITS_WND_TOP_RIGHT_CORNER )
- {
- right += delta.x;
- top += delta.y;
-
- clip_to( right, mInitialRect.x + minDim.x, FL_INFINITY );
- clip_to( top, -FL_INFINITY, mInitialRect.y + mInitialRect.height - minDim.y );
- }
- else
- if ( mCursorType == HITS_WND_BOTTOM_EDGE ||
- mCursorType == HITS_WND_BOTTOM_RIGHT_CORNER )
- {
- right += delta.x;
- bottom += delta.y;
-
- clip_to( right, mInitialRect.x + minDim.x, FL_INFINITY );
- clip_to( bottom, mInitialRect.y + minDim.y, FL_INFINITY );
- }
- else
- {
- wxFAIL_MSG( _T("what did the cursor hit?") );
- }
-
- rect.x = left;
- rect.y = top;
- rect.width = right - left;
- rect.height = bottom - top;
-}
-
-wxSize wxToolWindow::GetMinimalWndDim()
-{
- return wxSize( (mWndHorizGap + mClntHorizGap)*2 + BTN_BOX_WIDTH*4,
- (mWndVertGap + mClntVertGap )*2 + mTitleHeight );
-}
-
-void wxToolWindow::OnMotion( wxMouseEvent& event )
-{
- if ( !mResizeStarted )
- {
- for( size_t i = 0; i != mButtons.Count(); ++i )
- mButtons[i]->OnMotion( wxPoint( event.m_x, event.m_y ) );
-
- SetHintCursor( HitTestWindow( event ) );
- return;
- }
-
- wxPoint pos;
- GetScrMousePos( event, pos );
-
- if ( mCursorType == HITS_WND_TITLE )
- {
- int w,h;
- GetSize( &w, &h );
-
- SetSize( mInitialRect.x + pos.x - mDragOrigin.x,
- mInitialRect.y + pos.y - mDragOrigin.y,
- w,h, 0 );
- }
-
- else
- {
- wxPoint delta( pos.x - mDragOrigin.x, pos.y - mDragOrigin.y );
-
- wxRect newRect;
-
- wxSize minDim = GetMinimalWndDim();
-
- CalcResizedRect( newRect, delta, minDim );
-
- wxSize borderDim( ( mWndHorizGap + mClntHorizGap )*2,
- ( mWndVertGap + mClntVertGap )*2 + mTitleHeight );
-
- wxSize preferred = GetPreferredSize( wxSize( newRect.width - borderDim.x,
- newRect.height - borderDim.y ) );
-
- preferred.x += borderDim.x;
- preferred.y += borderDim.y;
-
- //CalcResizedRect( newRect, delta, preferred );
-
- wxRect finalRect = newRect;
-
- AdjustRectPos( newRect, preferred, finalRect );
-
- if ( mRealTimeUpdatesOn )
- {
- SetSize( finalRect.x, finalRect.y,
- finalRect.width, finalRect.height, 0 );
- }
- else
- {
- DrawHintRect( mPrevHintRect );
- DrawHintRect( finalRect );
-
- ::wxLogTrace(wxT("wxToolWindow"),wxT("%d,%d / %d,%d\n"), finalRect.x, finalRect.y, finalRect.width, finalRect.height);
- }
-
- mPrevHintRect = finalRect;
- }
-}
-
-void wxToolWindow::OnLeftDown( wxMouseEvent& event )
-{
- int result = HitTestWindow( event );
-
- for( size_t i = 0; i != mButtons.Count(); ++i )
- {
- mButtons[i]->OnLeftDown( wxPoint( event.m_x, event.m_y ) );
-
- if ( mButtons[i]->IsPressed() )
- return; // button hitted,
- }
-
- if ( result >= HITS_WND_LEFT_EDGE || result == HITS_WND_TITLE )
- {
- GetScrMousePos( event, mDragOrigin );
-
- /*
- if ( mMouseCaptured `)
- {
- ReleaseMouse();
- mMouseCaptured = false;
- }*/
-
- if ( result == HITS_WND_TITLE &&
- HandleTitleClick( event ) )
- return;
-
- mResizeStarted = true;
-
- int x,y;
- GetPosition( &x, &y );
-
- mInitialRect.x = x;
- mInitialRect.y = y;
-
- GetSize( &x, &y );
- mInitialRect.width = x;
- mInitialRect.height = y;
-
- mPrevHintRect = mInitialRect;
-
- if ( mCursorType != HITS_WND_TITLE && !mRealTimeUpdatesOn )
- {
- mpScrDc = new wxScreenDC();
-
- wxScreenDC::StartDrawingOnTop( (wxRect*)NULL );
-
- DrawHintRect( mInitialRect );
- }
- }
-}
-
-void wxToolWindow::OnLeftUp( wxMouseEvent& event )
-{
- for( size_t i = 0; i != mButtons.Count(); ++i )
- {
- mButtons[i]->OnLeftUp( wxPoint( event.m_x, event.m_y ) );
-
- if ( mButtons[i]->WasClicked() )
- {
- OnMiniButtonClicked( i ); // notify derived classes
- mButtons[i]->Reset();
- }
- }
-
- if ( mResizeStarted )
- {
- mResizeStarted = false;
-
- if ( mCursorType != HITS_WND_TITLE )
- {
- if ( !mRealTimeUpdatesOn )
- {
- DrawHintRect( mPrevHintRect );
-
- wxScreenDC::EndDrawingOnTop();
-
- delete mpScrDc;
-
- mpScrDc = NULL;
-
- SetSize( mPrevHintRect.x, mPrevHintRect.y,
- mPrevHintRect.width, mPrevHintRect.height, 0 );
- }
- }
- }
-}
-
-void wxToolWindow::OnSize( wxSizeEvent& WXUNUSED(event) )
-{
- if ( mpClientWnd )
- {
- int w,h;
- GetSize( &w, &h );
-
- int x = mWndHorizGap + mClntHorizGap;
- int y = mWndVertGap + mTitleHeight + mClntVertGap;
-
- mpClientWnd->SetSize( x-1, y-1,
- w - 2*(mWndHorizGap + mClntHorizGap),
- h - y - mClntVertGap - mWndVertGap,
- 0
- );
- }
-
- LayoutMiniButtons();
-}
-
-wxSize wxToolWindow::GetPreferredSize( const wxSize& given )
-{
- return given;
-}
-
-void wxToolWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
-{
- // nothing
-}
-
-/***** Implementation for class cbMiniButton *****/
-
-cbMiniButton::cbMiniButton()
-
- : mVisible( true ),
- mEnabled( true ),
-
- mpLayout( NULL ),
- mpPane ( NULL ),
- mpPlugin( NULL ),
- mpWnd ( NULL ),
-
- mWasClicked( false ),
- mDragStarted( false ),
- mPressed( false )
-{}
-
-void cbMiniButton::SetPos( const wxPoint& pos )
-{
- mPos = pos;
-}
-
-bool cbMiniButton::HitTest( const wxPoint& pos )
-{
- if ( !mVisible ) return false;
-
- return ( pos.x >= mPos.x && pos.y >= mPos.y &&
- pos.x < mPos.x + BTN_BOX_WIDTH &&
- pos.y < mPos.y + BTN_BOX_HEIGHT );
-}
-
-void cbMiniButton::OnLeftDown( const wxPoint& pos )
-{
- if ( !mVisible || mDragStarted ) return;
-
- if ( HitTest( pos ) && mEnabled )
- {
- if ( mpPlugin )
- {
- mpLayout->CaptureEventsForPane( mpPane );
- mpLayout->CaptureEventsForPlugin( mpPlugin );
- }
- else
- mpWnd->CaptureMouse();
-
- mDragStarted = true;
- mPressed = true;
- mWasClicked = false;
-
- Refresh();
- }
-}
-
-void cbMiniButton::OnLeftUp( const wxPoint& WXUNUSED(pos) )
-{
- if ( !mVisible || !mDragStarted ) return;
-
- if ( mpPlugin )
- {
- mpLayout->ReleaseEventsFromPane( mpPane );
- mpLayout->ReleaseEventsFromPlugin( mpPlugin );
- }
- else
- mpWnd->ReleaseMouse();
-
- mWasClicked = mPressed;
- mDragStarted = false;
-
- mPressed = false;
- Refresh();
-}
-
-void cbMiniButton::OnMotion( const wxPoint& pos )
-{
- if ( !mVisible ) return;
-
- if ( mDragStarted )
- {
- mPressed = HitTest( pos );
-
- Refresh();
- }
-}
-
-void cbMiniButton::Refresh()
-{
- if ( mpLayout )
- {
- wxClientDC dc( &mpLayout->GetParentFrame() );
-
- Draw( dc );
- }
- else
- {
- wxWindowDC dc( mpWnd );
-
- Draw( dc );
- }
-}
-
-void cbMiniButton::Draw( wxDC& dc )
-{
- if ( !mVisible ) return;
-
- dc.SetPen( *wxTRANSPARENT_PEN );
-
- dc.SetBrush( *wxLIGHT_GREY_BRUSH );
-
- dc.DrawRectangle( mPos.x + 1, mPos.y + 1, BTN_BOX_WIDTH - 2, BTN_BOX_HEIGHT - 2 );
-
- // "hard-code" metafile
-
- if ( !mPressed )
- dc.SetPen( *wxWHITE_PEN );
- else
- dc.SetPen( *wxBLACK_PEN );
-
- dc.DrawLine( mPos.x, mPos.y, mPos.x + BTN_BOX_WIDTH, mPos.y );
- dc.DrawLine( mPos.x, mPos.y, mPos.x, mPos.y + BTN_BOX_HEIGHT );
-
- dc.SetPen( *wxGREY_PEN );
-
- if ( !mPressed )
- {
- dc.DrawLine( mPos.x + 1, mPos.y + BTN_BOX_HEIGHT - 2,
- mPos.x + BTN_BOX_WIDTH - 1, mPos.y + BTN_BOX_HEIGHT - 2 );
-
- dc.DrawLine( mPos.x + BTN_BOX_WIDTH - 2, mPos.y + 1,
- mPos.x + BTN_BOX_WIDTH - 2, mPos.y + BTN_BOX_HEIGHT - 1 );
- }
- else
- {
- dc.DrawLine( mPos.x + 1, mPos.y + 1,
- mPos.x + BTN_BOX_WIDTH - 2, mPos.y + 1 );
-
- dc.DrawLine( mPos.x + 1, mPos.y + 1,
- mPos.x + 1, mPos.y + BTN_BOX_HEIGHT - 2 );
- }
-
- if ( !mPressed )
- dc.SetPen( *wxBLACK_PEN );
- else
- dc.SetPen( *wxWHITE_PEN );
-
- dc.DrawLine( mPos.x, mPos.y + BTN_BOX_HEIGHT - 1,
- mPos.x + BTN_BOX_WIDTH, mPos.y + BTN_BOX_HEIGHT - 1 );
-
- dc.DrawLine( mPos.x + BTN_BOX_WIDTH - 1, mPos.y ,
- mPos.x + BTN_BOX_WIDTH - 1, mPos.y + BTN_BOX_HEIGHT );
-}
-
-bool cbMiniButton::WasClicked()
-{
- return mWasClicked;
-}
-
-void cbMiniButton::Reset()
-{
- mWasClicked = false;
-}
-
-/***** Implementation fro class cbCloseBox *****/
-
-void cbCloseBox::Draw( wxDC& dc )
-{
- cbMiniButton::Draw( dc );
-
- dc.SetPen( *wxBLACK_PEN );
-
- int width = BTN_BOX_WIDTH - 7;
-
- int xOfs = (mPressed) ? 4 : 3;
- int yOfs = (mPressed) ? 4 : 3;
-
- for( int i = 0; i != BTN_X_WEIGHT; ++i )
- {
- dc.DrawLine( mPos.x + xOfs + i,
- mPos.y + yOfs,
- mPos.x + xOfs + i + width,
- mPos.y + yOfs + width );
-
- dc.DrawLine( mPos.x + xOfs + i + width - 1,
- mPos.y + yOfs,
- mPos.x + xOfs + i - 1,
- mPos.y + yOfs + width );
- }
-}
-
-/***** Implementation fro class cbCollapseBox *****/
-
-inline static void my_swap( int& a, int& b )
-{
- long tmp = a;
- a = b;
- b = tmp;
-}
-
-void cbCollapseBox::Draw( wxDC& dc )
-{
- cbMiniButton::Draw( dc );
-
- dc.SetPen( *wxTRANSPARENT_PEN );
-
- wxPoint arr[3];
-
- int yOfs = (mPressed) ? 3 : 2;
- int xOfs = (mPressed) ? 5 : 4;
- int width = BTN_BOX_WIDTH - 8;
-
- // rotating/shifting triangle inside collapse box
-
- arr[0].x = xOfs;
- arr[0].y = yOfs-1;
- arr[2].x = xOfs;
- arr[2].y = BTN_BOX_HEIGHT - yOfs - 1;
- arr[1].x = xOfs + width;
- arr[1].y = (arr[2].y + arr[0].y)/2;
-
- if ( !mIsAtLeft )
- {
- arr[0].x = BTN_BOX_WIDTH - arr[0].x;
- arr[1].x = BTN_BOX_WIDTH - arr[1].x;
- arr[2].x = BTN_BOX_WIDTH - arr[2].x;
- }
-
- if ( !mpPane->IsHorizontal() )
- {
- my_swap( arr[0].y, arr[0].x );
- my_swap( arr[1].y, arr[1].x );
- my_swap( arr[2].y, arr[2].x );
-
- arr[0].x += 1;
- arr[1].x += 1;
- arr[2].x += 1;
-
- //arr[1].y -= 1;
- }
-
- arr[0].x += mPos.x;
- arr[0].y += mPos.y;
- arr[1].x += mPos.x;
- arr[1].y += mPos.y;
- arr[2].x += mPos.x;
- arr[2].y += mPos.y;
-
- if ( !mEnabled ) dc.SetBrush( *wxGREY_BRUSH );
- else dc.SetBrush( *wxBLACK_BRUSH );
-
- dc.DrawPolygon( 3, arr );
- dc.SetBrush( wxNullBrush );
-}
-
-/***** Implementation for class cbDockBoxBox *****/
-
-void cbDockBox::Draw( wxDC& dc )
-{
- cbMiniButton::Draw( dc );
-
- int width = BTN_BOX_WIDTH - 7;
-
- int xOfs = (mPressed) ? 4 : 3;
- int yOfs = (mPressed) ? 4 : 3;
-
- dc.SetPen( *wxBLACK_PEN );
- dc.SetBrush( *wxBLACK_BRUSH );
-
- dc.DrawRectangle( mPos.x + xOfs, mPos.y + yOfs, width, width );
-
- xOfs += 1;
- yOfs += 1;
-
- dc.SetBrush( *wxWHITE_BRUSH );
-
- dc.DrawRectangle( mPos.x + xOfs, mPos.y + yOfs, width-2, width-2 );
-}
-
-/***** Implementation for class wxToolWindow *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbFloatedBarWindow, wxToolWindow )
-
-BEGIN_EVENT_TABLE( cbFloatedBarWindow, wxToolWindow )
-
- EVT_LEFT_DCLICK( cbFloatedBarWindow::OnDblClick )
-
-END_EVENT_TABLE()
-
-cbFloatedBarWindow::cbFloatedBarWindow()
-
- : mpBar( NULL )
-{
- AddMiniButton( new cbCloseBox() );
- AddMiniButton( new cbDockBox() );
-}
-
-void cbFloatedBarWindow::SetBar( cbBarInfo* pBar )
-{
- mpBar = pBar;
-}
-
-cbBarInfo* cbFloatedBarWindow::GetBar()
-{
- return mpBar;
-}
-
-void cbFloatedBarWindow::SetLayout( wxFrameLayout* pLayout )
-{
- mpLayout = pLayout;
-}
-
-void cbFloatedBarWindow::PositionFloatedWnd( int scrX, int scrY,
- int width, int height )
-{
- wxSize minDim = GetMinimalWndDim();
-
- SetSize( scrX - mWndHorizGap - mClntHorizGap,
- scrY - mClntVertGap - mTitleHeight - mWndVertGap,
- width + minDim.x, height + minDim.y, 0 );
-}
-
-wxSize cbFloatedBarWindow::GetPreferredSize( const wxSize& given )
-{
- if ( mpBar->mDimInfo.GetDimHandler() )
- {
- cbBarDimHandlerBase* pHandler = mpBar->mDimInfo.GetDimHandler();
-
- wxSize prefDim;
-
- // int vtad = *((int*)pHandler);
-
- pHandler->OnResizeBar( mpBar, given, prefDim );
-
- return prefDim;
- }
- else
- {
- if ( mpBar->IsFixed() )
- return mpBar->mDimInfo.mSizes[ wxCBAR_FLOATING ];
- else
- return given; // not-fixed bars are resized exactly the way user wants
- }
-}
-
-void cbFloatedBarWindow::OnMiniButtonClicked( int btnIdx )
-{
- // #1 - close mini-button
- // #0 - dock mini-button
-
- if ( btnIdx == 0 )
- {
- mpBar->mAlignment = -1; // sepcial "marking" for hidden bars out of floated state
- mpLayout->SetBarState( mpBar, wxCBAR_HIDDEN, true );
- }
- else
- mpLayout->SetBarState( mpBar, wxCBAR_DOCKED_HORIZONTALLY, true );
-}
-
-bool cbFloatedBarWindow::HandleTitleClick( wxMouseEvent& event )
-{
- ReleaseMouse();
- mMouseCaptured = false;
-
- wxPoint scrPos;
- GetScrMousePos( event, scrPos );
-
- int msX = scrPos.x,
- msY = scrPos.y;
-
- mpLayout->GetParentFrame().ScreenToClient( &msX, &msY );
-
- int x,y;
- GetPosition(&x,&y);
- int w,h;
- GetSize( &w, &h );
-
- wxSize minDim = GetMinimalWndDim();
-
- w -= minDim.x;
- h -= minDim.y;
-
- x += mWndHorizGap + mClntHorizGap;
- y += mWndVertGap + mTitleHeight + mClntVertGap;
-
- mpLayout->GetParentFrame().ScreenToClient( &x, &y );
-
- wxRect& bounds = mpBar->mDimInfo.mBounds[ wxCBAR_FLOATING ];
-
- bounds.x = x;
- bounds.y = y;
- bounds.width = w;
- bounds.height = h;
-
- cbStartBarDraggingEvent dragEvt( mpBar, wxPoint(msX,msY),
- mpLayout->GetPanesArray()[FL_ALIGN_TOP] );
-
- mpLayout->FirePluginEvent( dragEvt );
-
- return true;
-}
-
-void cbFloatedBarWindow::OnDblClick( wxMouseEvent& WXUNUSED(event) )
-{
- mpLayout->SetBarState( mpBar, wxCBAR_DOCKED_HORIZONTALLY, true );
-
- //wxMessageBox("toolWnd - dblClick!");
-}
-
diff --git a/contrib/src/fl/updatesmgr.cpp b/contrib/src/fl/updatesmgr.cpp
deleted file mode 100644
index 58e9244d26..0000000000
--- a/contrib/src/fl/updatesmgr.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: updatesmgr.cpp
-// Purpose: cbSimpleUpdatesMgr implementation.
-// Author: Aleksandras Gluchovas
-// Modified by:
-// Created: 19/10/98
-// RCS-ID: $Id$
-// Copyright: (c) Aleksandras Gluchovas
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/updatesmgr.h"
-
-// helper function
-
-static inline bool rect_hits_rect( const wxRect& r1, const wxRect& r2 )
-{
- if ( ( r2.x >= r1.x && r2.x <= r1.x + r1.width ) ||
- ( r1.x >= r2.x && r1.x <= r2.x + r2.width ) )
-
- if ( ( r2.y >= r1.y && r2.y <= r1.y + r1.height ) ||
- ( r1.y >= r2.y && r1.y <= r2.y + r2.height ) )
-
- return 1;
-
- return 0;
-}
-
-/***** Implementation for class cbSimpleUpdatesMgr *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbSimpleUpdatesMgr, cbUpdatesManagerBase )
-
-cbSimpleUpdatesMgr::cbSimpleUpdatesMgr( wxFrameLayout* pPanel )
- : cbUpdatesManagerBase( pPanel )
-{}
-
-bool cbSimpleUpdatesMgr::WasChanged( cbUpdateMgrData& data, wxRect& currentBounds )
-{
- return ( data.IsDirty() ||
-
- ( data.mPrevBounds.x != currentBounds.x ||
- data.mPrevBounds.y != currentBounds.y ||
- data.mPrevBounds.width != currentBounds.width ||
- data.mPrevBounds.height != currentBounds.height )
- );
-}
-
-void cbSimpleUpdatesMgr::OnStartChanges()
-{
- // memorize states of ALL items in the layout -
- // this is quite excessive, but OK for the simple
- // implementation of updates manager
-
- mpLayout->GetPrevClientRect() = mpLayout->GetClientRect();
-
- cbDockPane** panes = mpLayout->GetPanesArray();
-
- for( int n = 0; n != MAX_PANES; ++n )
- {
- cbDockPane& pane = *panes[n];
- // store pane state
- pane.mUMgrData.StoreItemState( pane.mBoundsInParent );
- pane.mUMgrData.SetDirty( false );
-
- for( size_t i = 0; i != pane.GetRowList().Count(); ++i )
- {
- cbRowInfo& row = *pane.GetRowList()[ i ];
-
- // store row state
- row.mUMgrData.StoreItemState( row.mBoundsInParent );
- row.mUMgrData.SetDirty( false );
-
- for( size_t k = 0; k != row.mBars.Count(); ++k )
- {
- cbBarInfo& bar = *row.mBars[ k ];
-
- // store bar state
- bar.mUMgrData.StoreItemState( bar.mBoundsInParent );
- bar.mUMgrData.SetDirty( false );
- }
- }
- }
-}
-
-void cbSimpleUpdatesMgr::OnFinishChanges()
-{
- // nothing here, could be overriden by more sophisticated updates-managers
-}
-
-void cbSimpleUpdatesMgr::OnRowWillChange( cbRowInfo* WXUNUSED(pRow), cbDockPane* WXUNUSED(pInPane) )
-{
- // -/-
-}
-
-void cbSimpleUpdatesMgr::OnBarWillChange( cbBarInfo* WXUNUSED(pBar),
- cbRowInfo* WXUNUSED(pInRow), cbDockPane* WXUNUSED(pInPane) )
-{
- // -/-
-}
-
-void cbSimpleUpdatesMgr::OnPaneMarginsWillChange( cbDockPane* WXUNUSED(pPane) )
-{
- // -/-
-}
-
-void cbSimpleUpdatesMgr::OnPaneWillChange( cbDockPane* WXUNUSED(pPane) )
-{
- // -/-
-}
-
-void cbSimpleUpdatesMgr::UpdateNow()
-{
- cbDockPane** panes = mpLayout->GetPanesArray();
-
- wxRect& r1 = mpLayout->GetClientRect();
- wxRect& r2 = mpLayout->GetPrevClientRect();
-
- // detect changes in client window's area
-
- bool clientWindowChanged = ( r1.x != r2.x ||
- r1.y != r2.y ||
- r1.width != r2.width ||
- r1.height != r2.height );
-
- // step #1 - detect changes in each row of each pane,
- // and repaint decorations around changed windows
-
- wxList mBarsToRefresh;
- wxList mPanesList;
-
- for( int n = 0; n != MAX_PANES; ++n )
- {
- cbDockPane& pane = *(panes[n]);
-
- bool paneChanged = WasChanged( pane.mUMgrData, pane.mBoundsInParent );
-
- if ( paneChanged )
- {
- wxClientDC dc( &mpLayout->GetParentFrame() );
- pane.PaintPaneBackground( dc );
- }
-
- wxRect realBounds;
-
- for( size_t i = 0; i != pane.GetRowList().Count(); ++i )
- {
- cbRowInfo& row = *pane.GetRowList()[ i ];
-
- wxDC* pDc = NULL;
-
- bool rowChanged = false;
-
- // FIXME:: the below should not be fixed
- cbBarInfo* barsToRepaint[256];
-
- // number of bars, that were changed in the current row
- int nBars = 0;
-
- if ( WasChanged( row.mUMgrData, row.mBoundsInParent ) )
-
- rowChanged = true;
- else
- for( size_t k = 0; k != row.mBars.Count(); ++k )
-
- if ( WasChanged( row.mBars[k]->mUMgrData,
- row.mBars[k]->mBoundsInParent )
- )
-
- barsToRepaint[nBars++] = row.mBars[k];
-
- if ( nBars || rowChanged )
- {
- realBounds = row.mBoundsInParent;
-
- // include 1-pixel thick shades around the row
- realBounds.x -= 1;
- realBounds.y -= 1;
- realBounds.width += 2;
- realBounds.height += 2;
-
- pDc = pane.StartDrawInArea( realBounds );
- }
-
- if ( rowChanged )
- {
- // postphone the resizing and refreshing the changed
- // bar windows
-
- for( size_t k = 0; k != row.mBars.Count(); ++k )
- {
- mBarsToRefresh.Append( (wxObject*)row.mBars[k] );
- mPanesList.Append( &pane );
- }
-
- // draw only their decorations now
-
- pane.PaintRow( &row, *pDc );
- }
- else
- if ( nBars != 0 )
- {
- for( int i = 0; i != nBars; ++i )
- {
- // postphone the resizement and refreshing the changed
- // bar windows
-
- mBarsToRefresh.Append( (wxObject*)barsToRepaint[i] );
- mPanesList.Append( &pane );
- }
-
- // redraw decorations of entire row, regardless of how much
- // of the bars were changed
- pane.PaintRow( &row, *pDc );
- }
-
- if ( pDc )
-
- pane.FinishDrawInArea( realBounds );
- } // end of while
-
- if ( paneChanged )
- {
- wxClientDC dc( &mpLayout->GetParentFrame() );
- pane.PaintPaneDecorations( dc );
- }
-
- } // end of for
-
- if ( clientWindowChanged )
- {
- mpLayout->PositionClientWindow();
- // ptr to client-window object is "marked" as 0
- }
-
- // step #2 - do ordered refreshing and resizing of bar window objects now
-
- wxNode* pNode = mBarsToRefresh.GetFirst();
- wxNode* pPaneNode = mPanesList.GetFirst();
-
- while( pNode )
- {
- cbBarInfo* pBar = (cbBarInfo*) pNode->GetData();
- cbDockPane* pPane = (cbDockPane*)pPaneNode->GetData();
-
- pPane->SizeBar( pBar );
-
- pNode = pNode->GetNext();
- pPaneNode = pPaneNode->GetNext();
- }
-
- pNode = mBarsToRefresh.GetFirst();
-
- while( pNode )
- {
- cbBarInfo* pBar = (cbBarInfo*)pNode->GetData();
-
- if ( pBar->mpBarWnd )
- {
- pBar->mpBarWnd->Refresh();
-
- // FIXME::
- //info.mpBarWnd->Show(false);
- //info.mpBarWnd->Show(true);
- }
-
- pNode = pNode->GetNext();
- }
-
- if ( clientWindowChanged )
- {
- // FIXME:: excessive?
-
- mpLayout->GetFrameClient()->Refresh();
- }
-}
-
-
diff --git a/contrib/src/foldbar/Makefile.in b/contrib/src/foldbar/Makefile.in
deleted file mode 100644
index 40581ad27f..0000000000
--- a/contrib/src/foldbar/Makefile.in
+++ /dev/null
@@ -1,307 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-LIBEXT = @LIBEXT@
-LIBPREFIX = @LIBPREFIX@
-SO_SUFFIX = @SO_SUFFIX@
-DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
-LN_S = @LN_S@
-WINDRES = @WINDRES@
-PIC_FLAG = @PIC_FLAG@
-SONAME_FLAG = @SONAME_FLAG@
-STRIP = @STRIP@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = @INSTALL_DIR@
-BK_DEPS = @BK_DEPS@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-libdir = @libdir@
-includedir = @includedir@
-DLLPREFIX = @DLLPREFIX@
-LIBS = @LIBS@
-AR = @AR@
-AROPTIONS = @AROPTIONS@
-RANLIB = @RANLIB@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-VENDOR = @VENDOR@
-WX_FLAVOUR = @WX_FLAVOUR@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-FOLDBARDLL_CXXFLAGS = $(__foldbardll_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
- -DWXMAKINGDLL_FOLDBAR $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARDLL_OBJECTS = \
- $(__foldbardll___win32rc) \
- foldbardll_captionbar.o \
- foldbardll_foldpanelbar.o \
- foldbardll_foldpanelitem.o
-FOLDBARDLL_ODEP = $(___pch_wxprec_foldbardll_wx_wxprec_h_gch___depname)
-FOLDBARLIB_CXXFLAGS = $(__foldbarlib_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS = \
- foldbarlib_captionbar.o \
- foldbarlib_foldpanelbar.o \
- foldbarlib_foldpanelitem.o
-FOLDBARLIB_ODEP = $(___pch_wxprec_foldbarlib_wx_wxprec_h_gch___depname)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
-@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-COND_SHARED_1___foldbardll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-@COND_SHARED_1@__foldbardll___depname = $(COND_SHARED_1___foldbardll___depname)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-@COND_SHARED_1@__install_foldbardll___depname = install_foldbardll
-@COND_SHARED_1@__uninstall_foldbardll___depname = uninstall_foldbardll
-COND_PLATFORM_MACOSX_1___foldbardll___macinstnamecmd = -install_name \
- $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__foldbardll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___foldbardll___macinstnamecmd)
-COND_PLATFORM_OS2_1___foldbardll___importlib = -import \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__foldbardll___importlib = $(COND_PLATFORM_OS2_1___foldbardll___importlib)
-COND_WINDOWS_IMPLIB_1___foldbardll___importlib = \
- -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__foldbardll___importlib = $(COND_WINDOWS_IMPLIB_1___foldbardll___importlib)
-@COND_GCC_PCH_1@__foldbardll_PCH_INC = -I.pch/wxprec_foldbardll
-@COND_ICC_PCH_1@__foldbardll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_foldbardll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_foldbardll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_foldbardll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__foldbardll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__foldbardll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__foldbardll___targetsuf2 = .$(SO_SUFFIX)
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__foldbardll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__foldbardll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__foldbardll___targetsuf3 \
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__foldbardll___targetsuf3 = .$(SO_SUFFIX)
-COND_USE_SOVERLINUX_1___foldbardll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__foldbardll___soname_flags = $(COND_USE_SOVERLINUX_1___foldbardll___soname_flags)
-COND_USE_SOVERSOLARIS_1___foldbardll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__foldbardll___soname_flags = $(COND_USE_SOVERSOLARIS_1___foldbardll___soname_flags)
-COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
- -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_inst_cmd = rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_uninst_cmd = rm -f \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__foldbardll___win32rc = foldbardll_version_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_SHARED_0___foldbarlib___depname = \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__foldbarlib___depname = $(COND_SHARED_0___foldbarlib___depname)
-@COND_SHARED_0@__install_foldbarlib___depname = install_foldbarlib
-@COND_SHARED_0@__uninstall_foldbarlib___depname = uninstall_foldbarlib
-@COND_GCC_PCH_1@__foldbarlib_PCH_INC = -I.pch/wxprec_foldbarlib
-@COND_ICC_PCH_1@__foldbarlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_foldbarlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_foldbarlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_foldbarlib/wx/wxprec.h.gch
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-
-### Targets: ###
-
-all: $(__foldbardll___depname) $(__foldbarlib___depname)
-
-install: all $(__install_foldbardll___depname) $(__install_foldbarlib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/foldbar/captionbar.h wx/foldbar/foldpanelbar.h wx/foldbar/foldpanelitem.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
- fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-uninstall: $(__uninstall_foldbardll___depname) $(__uninstall_foldbarlib___depname)
- for f in wx/foldbar/captionbar.h wx/foldbar/foldpanelbar.h wx/foldbar/foldpanelitem.h; do \
- rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-install-strip: install
- $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3): $(FOLDBARDLL_OBJECTS) $(__foldbardll___win32rc)
-@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__foldbardll___macinstnamecmd) $(__foldbardll___importlib) $(__foldbardll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
-@COND_SHARED_1@
-@COND_SHARED_1@ $(__foldbardll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_foldbardll:
-@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__foldbardll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_foldbardll:
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__foldbardll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_foldbardll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_foldbardll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(FOLDBARLIB_OBJECTS)
-@COND_SHARED_0@ rm -f $@
-@COND_SHARED_0@ $(AR) $(AROPTIONS) $@ $(FOLDBARLIB_OBJECTS)
-@COND_SHARED_0@ $(RANLIB) $@
-
-@COND_SHARED_0@install_foldbarlib:
-@COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_foldbarlib:
-@COND_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_foldbarlib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_foldbarlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARLIB_CXXFLAGS)
-
-foldbardll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FOLDBARDLL_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-foldbardll_captionbar.o: $(srcdir)/captionbar.cpp $(FOLDBARDLL_ODEP)
- $(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(srcdir)/captionbar.cpp
-
-foldbardll_foldpanelbar.o: $(srcdir)/foldpanelbar.cpp $(FOLDBARDLL_ODEP)
- $(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(srcdir)/foldpanelbar.cpp
-
-foldbardll_foldpanelitem.o: $(srcdir)/foldpanelitem.cpp $(FOLDBARDLL_ODEP)
- $(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(srcdir)/foldpanelitem.cpp
-
-foldbarlib_captionbar.o: $(srcdir)/captionbar.cpp $(FOLDBARLIB_ODEP)
- $(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(srcdir)/captionbar.cpp
-
-foldbarlib_foldpanelbar.o: $(srcdir)/foldpanelbar.cpp $(FOLDBARLIB_ODEP)
- $(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(srcdir)/foldpanelbar.cpp
-
-foldbarlib_foldpanelitem.o: $(srcdir)/foldpanelitem.cpp $(FOLDBARLIB_ODEP)
- $(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(srcdir)/foldpanelitem.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_foldbardll uninstall_foldbardll install_foldbarlib uninstall_foldbarlib
diff --git a/contrib/src/foldbar/captionbar.cpp b/contrib/src/foldbar/captionbar.cpp
deleted file mode 100644
index bc1a6eb8e1..0000000000
--- a/contrib/src/foldbar/captionbar.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: captionbar.cpp
-// Purpose: wxCaptionBar class belonging to the wxFoldPanel (but can be used independent)
-// Author: Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-// : wxWidgets coding standards
-// Created: 18/06/2004
-// RCS-ID: $Id$
-// Copyright: (c) Jorgen Bodde
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/foldbar/foldpanelbar.h"
-
-/*
- * wxCaptionBar
- */
-
-BEGIN_EVENT_TABLE(wxCaptionBar, wxWindow)
- EVT_PAINT(wxCaptionBar::OnPaint)
- EVT_CHAR(wxCaptionBar::OnChar)
- EVT_MOUSE_EVENTS(wxCaptionBar::OnMouseEvent)
- EVT_SIZE(wxCaptionBar::OnSize)
-END_EVENT_TABLE()
-
-wxCaptionBar::wxCaptionBar(wxWindow* parent, const wxString &caption, wxImageList *images, wxWindowID id,
- const wxCaptionBarStyle &cbstyle, const wxPoint& pos, const wxSize& size, long style)
- : wxWindow(parent, id, pos, size, style)
- , m_caption(caption)
- , m_foldIcons(images)
- , m_rightIndent(wxFPB_BMP_RIGHTSPACE)
- , m_iconWidth(16)
- , m_iconHeight(16)
- , m_collapsed(false)
-{
- // do initialisy thingy stuff
-
- ApplyCaptionStyle(cbstyle, true);
-
- // set initial size
- if(m_foldIcons)
- {
- wxASSERT(m_foldIcons->GetImageCount() > 1);
- m_foldIcons->GetSize(0, m_iconWidth, m_iconHeight);
- }
-}
-
-wxCaptionBar::~wxCaptionBar()
-{
-
-}
-
-void wxCaptionBar::ApplyCaptionStyle(const wxCaptionBarStyle &cbstyle, bool applyDefault)
-{
- wxASSERT(GetParent());
-
- wxCaptionBarStyle newstyle = cbstyle;
-
- // set defaults in newly created style copy if needed
- if(applyDefault)
- {
- // get first colour from style or make it default
- if(!newstyle.FirstColourUsed())
- newstyle.SetFirstColour(*wxWHITE);
-
- // get second colour from style or make it default
- if(!newstyle.SecondColourUsed())
- {
- // make the second colour slightly darker then the background
- wxColour col = GetParent()->GetBackgroundColour();
- col.Set((unsigned char)((col.Red() >> 1) + 20),
- (unsigned char)((col.Green() >> 1) + 20),
- (unsigned char)((col.Blue() >> 1) + 20));
- newstyle.SetSecondColour(col);
- }
-
- // get text colour
- if(!newstyle.CaptionColourUsed())
- newstyle.SetCaptionColour(*wxBLACK);
-
- // get font colour
- if(!newstyle.CaptionFontUsed())
- newstyle.SetCaptionFont(GetParent()->GetFont());
-
- // apply caption style
- if(!newstyle.CaptionStyleUsed())
- newstyle.SetCaptionStyle(wxCAPTIONBAR_GRADIENT_V);
- }
-
- // apply the style
- m_captionStyle = newstyle;
-}
-
-void wxCaptionBar::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
- wxPaintDC dc(this);
- wxRect wndRect = GetRect();
- bool vertical = IsVertical();
-
- // TODO: Maybe first a memory DC should draw all, and then paint it on the
- // caption. This way a flickering arrow during resize is not visible
-
- // draw basics
-
- FillCaptionBackground(dc);
-
- dc.SetFont(m_captionStyle.GetCaptionFont());
- if(vertical)
- dc.DrawText(m_caption, 4, (wxFPB_EXTRA_Y / 2));
- else
- dc.DrawRotatedText(m_caption, (wxFPB_EXTRA_Y / 2) , wndRect.GetBottom() - 4 , 90 );
-
- // draw small icon, either collapsed or expanded
- // based on the state of the bar. If we have
- // any bmp's
-
- if(m_foldIcons)
- {
- wxCHECK2(m_foldIcons->GetImageCount() > 1, return);
-
- int index = 0;
- if(m_collapsed)
- index = 1;
-
- if(vertical)
- m_foldIcons->Draw(index,
- dc,
- wndRect.GetRight() - m_iconWidth - m_rightIndent,
- (wndRect.GetHeight() - m_iconHeight) / 2,
- wxIMAGELIST_DRAW_TRANSPARENT);
- else
- m_foldIcons->Draw(index,
- dc,
- (wndRect.GetWidth() - m_iconWidth) / 2,
- m_rightIndent,
- wxIMAGELIST_DRAW_TRANSPARENT);
- }
-}
-
-void wxCaptionBar::FillCaptionBackground(wxPaintDC &dc)
-{
- // dispatch right style for caption drawing
-
- switch(m_captionStyle.GetCaptionStyle())
- {
- case wxCAPTIONBAR_GRADIENT_V:
- if (IsVertical())
- DrawVerticalGradient(dc, GetRect());
- else
- DrawHorizontalGradient(dc, GetRect());
- break;
- case wxCAPTIONBAR_GRADIENT_H:
- if (IsVertical())
- DrawHorizontalGradient(dc, GetRect());
- else
- DrawVerticalGradient(dc, GetRect());
- break;
- case wxCAPTIONBAR_SINGLE:
- DrawSingleColour(dc, GetRect());
- break;
- case wxCAPTIONBAR_RECTANGLE:
- case wxCAPTIONBAR_FILLED_RECTANGLE:
- DrawSingleRectangle(dc, GetRect());
- break;
- default:
- break;
- }
-}
-
-void wxCaptionBar::OnMouseEvent(wxMouseEvent& event)
-{
- // if clicked on the arrow (single) or double on the caption
- // we change state and an event must be fired to let this
- // panel collapse or expand
-
- bool send_event = false;
-
- if (event.LeftDown() && m_foldIcons)
- {
- wxPoint pt(event.GetPosition());
- wxRect rect = GetRect();
- bool vertical = IsVertical();
-
- if((vertical && pt.x > (rect.GetWidth() - m_iconWidth - m_rightIndent))||
- (!vertical && pt.y < m_iconHeight + m_rightIndent))
- send_event = true;
- }
- else if(event.LeftDClick())
- send_event = true;
-
- // send the collapse, expand event to the parent
-
- if(send_event)
- {
- wxCaptionBarEvent event(wxEVT_CAPTIONBAR);
- event.SetCaptionBar(this);
-
- ::wxPostEvent(this, event);
-
- }
-}
-
-void wxCaptionBar::OnChar(wxKeyEvent &event)
-{
- // TODO: Anything here?
-
- event.Skip();
-}
-
-wxSize wxCaptionBar::DoGetBestSize() const
-{
- int x,y;
-
- if(IsVertical())
- GetTextExtent(m_caption, &x, &y);
- else
- GetTextExtent(m_caption, &y, &x);
-
- if(x < m_iconWidth)
- x = m_iconWidth;
-
- if(y < m_iconHeight)
- y = m_iconHeight;
-
- // TODO: The extra wxFPB_EXTRA_X constants should be adjustable as well
-
- return wxSize(x + wxFPB_EXTRA_X, y + wxFPB_EXTRA_Y);
-}
-
-
-void wxCaptionBar::DrawVerticalGradient(wxDC &dc, const wxRect &rect )
-{
- // gradient fill from colour 1 to colour 2 with top to bottom
-
- if(rect.height < 1 || rect.width < 1)
- return;
-
- int size = rect.height;
-
- dc.SetPen(*wxTRANSPARENT_PEN);
-
-
- // calculate gradient coefficients
- wxColour col2 = m_captionStyle.GetSecondColour(),
- col1 = m_captionStyle.GetFirstColour();
-
- double rstep = double((col2.Red() - col1.Red())) / double(size), rf = 0,
- gstep = double((col2.Green() - col1.Green())) / double(size), gf = 0,
- bstep = double((col2.Blue() - col1.Blue())) / double(size), bf = 0;
-
- wxColour currCol;
- for(int y = rect.y; y < rect.y + size; y++)
- {
- currCol.Set(
- (unsigned char)(col1.Red() + rf),
- (unsigned char)(col1.Green() + gf),
- (unsigned char)(col1.Blue() + bf)
- );
- dc.SetBrush( wxBrush( currCol, wxSOLID ) );
- dc.DrawRectangle( rect.x, rect.y + (y - rect.y), rect.width, size );
- //currCol.Set(currCol.Red() + rstep, currCol.Green() + gstep, currCol.Blue() + bstep);
- rf += rstep; gf += gstep; bf += bstep;
- }
-}
-
-void wxCaptionBar::DrawHorizontalGradient(wxDC &dc, const wxRect &rect )
-{
- // gradient fill from colour 1 to colour 2 with left to right
-
- if(rect.height < 1 || rect.width < 1)
- return;
-
- int size = rect.width;
-
- dc.SetPen(*wxTRANSPARENT_PEN);
-
- // calculate gradient coefficients
- wxColour col2 = m_captionStyle.GetSecondColour(),
- col1 = m_captionStyle.GetFirstColour();
-
- double rstep = double((col2.Red() - col1.Red())) / double(size), rf = 0,
- gstep = double((col2.Green() - col1.Green())) / double(size), gf = 0,
- bstep = double((col2.Blue() - col1.Blue())) / double(size), bf = 0;
-
- wxColour currCol;
- for(int x = rect.x; x < rect.x + size; x++)
- {
- currCol.Set(
- (unsigned char)(col1.Red() + rf),
- (unsigned char)(col1.Green() + gf),
- (unsigned char)(col1.Blue() + bf)
- );
- dc.SetBrush( wxBrush( currCol, wxSOLID ) );
- dc.DrawRectangle( rect.x + (x - rect.x), rect.y, 1, rect.height );
- rf += rstep; gf += gstep; bf += bstep;
- }
-}
-
-void wxCaptionBar::DrawSingleColour(wxDC &dc, const wxRect &rect )
-{
- // single colour fill. This is the most easy one to find
-
- if(rect.height < 1 || rect.width < 1)
- return;
-
- dc.SetPen(*wxTRANSPARENT_PEN);
-
- // draw simple rectangle
- dc.SetBrush( wxBrush( m_captionStyle.GetFirstColour(), wxSOLID ) );
- dc.DrawRectangle( rect.x, rect.y, rect.width, rect.height );
-}
-
-void wxCaptionBar::DrawSingleRectangle(wxDC &dc, const wxRect &rect )
-{
- wxASSERT(GetParent());
-
- // single colour fill. This is the most easy one to find
-
- if(rect.height < 2 || rect.width < 1)
- return;
-
- // single frame, set up internal fill colour
-
- wxBrush br;
- br.SetStyle(wxSOLID);
-
- if(m_captionStyle.GetCaptionStyle() == wxCAPTIONBAR_RECTANGLE)
- br.SetColour(GetParent()->GetBackgroundColour());
- else
- br.SetColour(m_captionStyle.GetFirstColour());
-
- // setup the pen frame
-
- wxPen pen(m_captionStyle.GetSecondColour());
- dc.SetPen(pen);
-
- dc.SetBrush( br );
- dc.DrawRectangle( rect.x, rect.y, rect.width, rect.height - 1);
-
- wxPen bgpen(GetParent()->GetBackgroundColour());
- dc.SetPen(bgpen);
- dc.DrawLine(rect.x, rect.y + rect.height - 1, rect.x + rect.width, rect.y + rect.height - 1);
-}
-
-
-void wxCaptionBar::OnSize(wxSizeEvent &event)
-{
- wxSize size = event.GetSize();
-
- if(m_foldIcons)
- {
- // What I am doing here is simply invalidating the part of the window exposed. So when I
- // make a rect with as width the newly exposed part, and the x,y of the old window size origin,
- // I don't need a bitmap calulation in it, or do I ? The bitmap needs redrawing anyway. Leave it
- // like this until I figured it out
-
- // set rect to redraw as old bitmap area which is entitled to redraw
-
- wxRect rect(size.GetWidth() - m_iconWidth - m_rightIndent, 0, m_iconWidth + m_rightIndent,
- m_iconWidth + m_rightIndent);
-
- // adjust rectangle when more is slided so we need to redraw all
- // the old stuff but not all (ugly flickering)
-
- int diffX = size.GetWidth() - m_oldSize.GetWidth();
- if(diffX > 1)
- {
- // adjust the rect with all the crap to redraw
-
- rect.SetWidth(rect.GetWidth() + diffX + 10);
- rect.SetX(rect.GetX() - diffX - 10);
- }
-
- RefreshRect(rect);
- }
- else
- {
- wxRect rect = GetRect();
- RefreshRect(rect);
- }
-
- m_oldSize = size;
-}
-
-void wxCaptionBar::RedrawIconBitmap()
-{
- if(m_foldIcons)
- {
- // invalidate the bitmap area and force a redraw
-
- wxRect rect = GetRect();
-
- rect.SetX(rect.GetWidth() - m_iconWidth - m_rightIndent);
- rect.SetWidth(m_iconWidth + m_rightIndent);
- RefreshRect(rect);
- }
-}
-
-bool wxCaptionBar::IsVertical() const
-{
- // parent of wxCaptionBar is wxFoldPanelItem
- // default is vertical
- wxFoldPanelItem *bar = wxDynamicCast(GetParent(), wxFoldPanelItem);
- wxCHECK_MSG( bar, true, _T("wrong parent") );
- return bar->IsVertical();
-}
-
-/*
- * wxCaptionBarEvent
- */
-
-DEFINE_EVENT_TYPE(wxEVT_CAPTIONBAR)
-
-wxCaptionBarEvent::wxCaptionBarEvent(const wxCaptionBarEvent &event)
- : wxCommandEvent(event)
-{
- m_captionBar = event.m_captionBar;
-}
-
-//DEFINE_EVENT_TYPE(wxEVT_CAPTIONBAR)
-//IMPLEMENT_DYNAMIC_CLASS(wxCaptionBarEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxCaptionBarEvent, wxCommandEvent)
diff --git a/contrib/src/foldbar/foldpanelbar.cpp b/contrib/src/foldbar/foldpanelbar.cpp
deleted file mode 100644
index 17ce202366..0000000000
--- a/contrib/src/foldbar/foldpanelbar.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: foldpanelbar.cpp
-// Purpose:
-// Author: Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-// : wxWidgets coding standards
-// Created: 22/06/2004
-// RCS-ID: $Id$
-// Copyright: (c) Jorgen Bodde
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/foldbar/foldpanelbar.h"
-#include "icon_collapsed.xpm"
-#include "icon_expanded.xpm"
-#include "icon_theresmore.xpm"
-
-//----------------------------------------------------------------------------
-// wxFoldPanelBar
-//----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS( wxFoldPanelBar, wxPanel )
-
-BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel)
- EVT_SIZE(wxFoldPanelBar::OnSizePanel)
- //EVT_PAINT(wxFoldPanelBar::OnPaint)
- EVT_CAPTIONBAR(wxID_ANY, wxFoldPanelBar::OnPressCaption)
-END_EVENT_TABLE()
-
-wxFoldPanelBar::wxFoldPanelBar()
- : wxPanel()
- , m_foldPanel(NULL)
- , m_bottomPanel(NULL)
- , m_controlCreated(false)
-{
-
-}
-
-wxFoldPanelBar::wxFoldPanelBar( wxWindow *parent, wxWindowID id, const wxPoint &position,
- const wxSize& size, long style, long extraStyle)
- : wxPanel()
- , m_foldPanel(NULL)
- , m_bottomPanel(NULL)
- , m_controlCreated(false)
-{
- Create( parent, id, position, size, style, extraStyle);
-}
-
-void wxFoldPanelBar::Create( wxWindow *parent, wxWindowID id, const wxPoint &position,
- const wxSize& size, long style, long extraStyle )
-{
-
- m_extraStyle = extraStyle;
-
- // make sure there is any orientation
- if ( ( style & wxFPB_HORIZONTAL ) != wxFPB_HORIZONTAL )
- style |= wxFPB_VERTICAL;
-
- // create the panel (duh!). This causes a size event, which we are going
- // to skip when we are not initialised
-
- wxPanel::Create(parent, id, position, size, style);
-
- // the fold panel area
-
- m_foldPanel = new wxPanel(this, wxID_ANY, position, size, wxNO_BORDER|wxTAB_TRAVERSAL);
-
- // the extra area for some icons / context menu etc
-
-#if 0
- m_bottomPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,22), wxNO_BORDER|wxTAB_TRAVERSAL);
- m_bottomPanel->SetBackgroundColour(*wxWHITE);
-#endif
-
- // create the fold icons to be used in the captions
-
- m_images = new wxImageList(16, 16);
-
- wxBitmap *bmp = new wxBitmap(icon_expanded);
- m_images->Add(*bmp);
- delete bmp;
-
- bmp = new wxBitmap(icon_collapsed);
- m_images->Add(*bmp);
- delete bmp;
-
- m_moreBmp = new wxBitmap(icon_theresmore);
-
- // do this as last, to check if create is already called
-
- m_controlCreated = true;
-}
-
-wxFoldPanelBar::~wxFoldPanelBar()
-{
- delete m_images;
- delete m_moreBmp;
-}
-
-wxFoldPanel wxFoldPanelBar::AddFoldPanel(const wxString &caption, bool collapsedInitially, const wxCaptionBarStyle &style)
-{
- wxASSERT(m_controlCreated);
-
- // create a fold panel item, which is first only the caption.
- // the user can now add a panel area which will be folded in
- // when pressed.
-
- wxFoldPanelItem *item = new wxFoldPanelItem(m_foldPanel, caption, m_images, collapsedInitially, style);
-
- // look at the last added one and reposition this one
- int pos = 0;
- if(m_panels.GetCount() > 0)
- pos = m_panels.Last()->GetItemPos() + m_panels.Last()->GetPanelLength();
-
- item->Reposition(pos);
- m_panels.Add(item);
-
- //return wxFoldPanel(item);
- return wxFoldPanel(item);
-}
-
-int wxFoldPanelBar::AddFoldPanelWindow(const wxFoldPanel &panel, wxWindow *window, int flags, int ySpacing, int leftSpacing,
- int rightSpacing)
-{
- wxCHECK(panel.IsOk(), -1);
- panel.GetItem()->AddWindow(window, flags, ySpacing, leftSpacing, rightSpacing);
-
- // TODO: Take old and new height, and if difference, reposition all the lower panels
- // this is because the user can add new wxWindow controls somewhere in between
- // when other panels are already present.
-
- return 0;
-}
-
-int wxFoldPanelBar::AddFoldPanelSeperator(const wxFoldPanel &panel, const wxColour &color, int ySpacing, int leftSpacing,
- int rightSpacing)
-{
- wxCHECK(panel.IsOk(), -1);
- panel.GetItem()->AddSeparator(color, ySpacing, leftSpacing, rightSpacing);
-
- return 0;
-}
-
-void wxFoldPanelBar::OnSizePanel(wxSizeEvent &event)
-{
- // skip all stuff when we are not initialised yet
-
- if(!m_controlCreated)
- {
- event.Skip();
- return;
- }
-
- // now size the fold panel area and the
- // lower bar in such a way that the bar is always
- // visible
-
- wxRect foldrect = GetRect();
-
- // fold panel itself. If too little space,
- // don't show it
-
-#if 0
- if(foldrect.GetHeight() < 23)
- foldrect.SetHeight(0);
- else
- foldrect.SetHeight(foldrect.GetHeight() - 22);
-#endif
-
- foldrect.SetX(0);
- foldrect.SetY(0);
- m_foldPanel->SetSize(foldrect);
-
- if(m_extraStyle & wxFPB_COLLAPSE_TO_BOTTOM)
- {
- wxRect rect = RepositionCollapsedToBottom();
- bool vertical = IsVertical();
- if((vertical && rect.GetHeight() > 0) || (!vertical && rect.GetWidth() > 0))
- RefreshRect(rect);
- }
-
- // TODO: A smart way to check wether the old - new width of the
- // panel changed, if so no need to resize the fold panel items
-
- RedisplayFoldPanelItems();
-
- // tool panel for icons and other stuff
-
-#if 0
- wxRect bottomrect = GetRect();
- if(bottomrect.GetHeight() < 22)
- bottomrect.SetY(0);
- else
- bottomrect.SetY(bottomrect.GetHeight() - 22);
-
- bottomrect.SetHeight(22);
- bottomrect.SetX(0);
- m_bottomPanel->SetSize(bottomrect);
-
- // TODO: redraw the bitmap properly
- // use the captionbar algorithm for that
-
- m_bottomPanel->Refresh();
-#endif
-}
-
-void wxFoldPanelBar::OnPaint(wxPaintEvent &event)
-{
- if(!m_controlCreated)
- return;
-#if 0
- // paint the bottom panel only, where the
- // arrow is shown when there is more to show the user
- // just as informative icon
-
- wxPaintDC dc(m_bottomPanel);
-
- wxSize size = m_bottomPanel->GetSize();
- int offset = (size.GetHeight() - m_moreBmp->GetHeight()) / 2;
-
- dc.DrawBitmap(*m_moreBmp, size.GetWidth() - m_moreBmp->GetWidth() - 2, offset, true);
-#endif
-
- event.Skip();
-}
-
-void wxFoldPanelBar::OnPressCaption(wxCaptionBarEvent &event)
-{
- // act upon the folding or expanding status of the bar
- // to expand or collapse the panel(s)
-
- if(event.GetFoldStatus())
- Collapse(wxFoldPanel((wxFoldPanelItem *)event.GetTag()));
- else
- Expand(wxFoldPanel((wxFoldPanelItem *)event.GetTag()));
-}
-
-void wxFoldPanelBar::RefreshPanelsFrom(wxFoldPanelItem *item)
-{
- wxASSERT(item);
-
- int i = m_panels.Index(item);
- if(i != wxNOT_FOUND)
- RefreshPanelsFrom(i);
-}
-
-void wxFoldPanelBar::RefreshPanelsFrom(size_t i)
-{
- Freeze();
-
- // if collapse to bottom is on, the panels that are not expanded
- // should be drawn at the bottom. All panels that are expanded
- // are drawn on top. The last expanded panel gets all the extra space
-
- if(m_extraStyle & wxFPB_COLLAPSE_TO_BOTTOM)
- {
- int offset = 0;
-
- for(size_t j = 0; j < m_panels.GetCount(); j++)
- {
- if(m_panels.Item(j)->IsExpanded())
- offset += m_panels.Item(j)->Reposition(offset);
- }
-
- // put all non collapsed panels at the bottom where there is space, else
- // put them right behind the expanded ones
-
- RepositionCollapsedToBottom();
- }
- else
- {
- int pos = m_panels.Item(i)->GetItemPos() + m_panels.Item(i)->GetPanelLength();
- for(i++; i < m_panels.GetCount(); i++)
- pos += m_panels.Item(i)->Reposition(pos);
- }
- Thaw();
-}
-
-void wxFoldPanelBar::RedisplayFoldPanelItems()
-{
- // resize them all. No need to reposition
-
- wxFoldPanelItem *item;
- for(size_t i = 0; i < m_panels.GetCount(); i++)
- {
- item = m_panels.Item(i);
- wxASSERT(item);
-
- item->ResizePanel();
- }
-}
-
-wxRect wxFoldPanelBar::RepositionCollapsedToBottom()
-{
- wxRect value(0,0,0,0);
- bool vertical = IsVertical();
-
- // determine wether the number of panels left
- // times the size of their captions is enough
- // to be placed in the left over space
-
- int expanded = 0, collapsed = 0, offset;
- GetPanelsLength(collapsed, expanded);
-
- // if no room stick them behind the normal ones, else
- // at the bottom
-
- if(((vertical ? GetSize().GetHeight() : GetSize().GetWidth()) - expanded - collapsed) < 0)
- offset = expanded;
- else
- {
- // value is the region which is left unpainted
- // I will send it back as 'slack' so it does not need to
- // be recalulated.
-
- value.SetHeight(GetSize().GetHeight());
- value.SetWidth(GetSize().GetWidth());
-
- if(vertical)
- {
- value.SetY(expanded);
- value.SetHeight(value.GetHeight() - expanded);
- }
- else
- {
- value.SetX(expanded);
- value.SetWidth(value.GetWidth() - expanded);
- }
-
- offset = (vertical ? GetSize().GetHeight() : GetSize().GetWidth()) - collapsed;
- }
-
- // go reposition
-
- for(size_t i = 0; i < m_panels.GetCount(); i++)
- {
- if(!m_panels.Item(i)->IsExpanded())
- offset += m_panels.Item(i)->Reposition(offset);
- }
-
- return value;
-}
-
-int wxFoldPanelBar::GetPanelsLength(int &collapsed, int &expanded)
-{
- int value = 0;
-
- // assumed here that all the panels that are expanded
- // are positioned after each other from 0,0 to end.
-
- for(size_t j = 0; j < m_panels.GetCount(); j++)
- {
- int offset = m_panels.Item(j)->GetPanelLength();
- value += offset;
- if(m_panels.Item(j)->IsExpanded())
- expanded += offset;
- else
- collapsed += offset;
- }
-
- return value;
-}
diff --git a/contrib/src/foldbar/foldpanelitem.cpp b/contrib/src/foldbar/foldpanelitem.cpp
deleted file mode 100644
index 48997c1372..0000000000
--- a/contrib/src/foldbar/foldpanelitem.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: foldpanelitem.cpp
-// Purpose:
-// Author: Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-// : wxWidgets coding standards
-// Created: 22/06/2004
-// RCS-ID: $Id$
-// Copyright: (c) Jorgen Bodde
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/foldbar/foldpanelbar.h"
-
-#include
-WX_DEFINE_OBJARRAY(wxFoldWindowItemArray);
-
-//----------------------------------------------------------------------------
-// wxFoldPanelItem
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS( wxFoldPanelItem, wxPanel )
-
-BEGIN_EVENT_TABLE(wxFoldPanelItem,wxPanel)
- EVT_CAPTIONBAR(wxID_ANY, wxFoldPanelItem::OnPressCaption)
- EVT_PAINT(wxFoldPanelItem::OnPaint)
- //EVT_SIZE(wxFoldPanelItem::OnSize)
-END_EVENT_TABLE()
-
-wxFoldPanelItem::wxFoldPanelItem( wxWindow *parent, const wxString &caption, wxImageList *icons, bool collapsedInitially,
- const wxCaptionBarStyle &style )
- : m_controlCreated(false)
- , m_userSize(0)
- , m_panelSize(0)
- , m_lastInsertPos(0)
- , m_itemPos(0)
- , m_userSized(false)
-{
- wxCHECK2(parent, return);
-
- wxPanel::Create(parent, wxID_ANY);
-
- // create the caption bar, in collapsed or expanded state
-
- m_captionBar = new wxCaptionBar(this, caption, icons, wxID_ANY, style, wxPoint(0,0));
- //m_captionBar->SetBoldFont();
-
- if(collapsedInitially)
- m_captionBar->Collapse();
-
- m_controlCreated = true;
-
- // make initial size for component, if collapsed, the
- // size is determined on the panel height and won't change
-
- wxSize size = m_captionBar->GetSize();
- m_panelSize = IsVertical()?size.GetHeight():size.GetWidth();
- m_lastInsertPos = m_panelSize;
-}
-
-void wxFoldPanelItem::AddWindow(wxWindow *window, int flags, int ySpacing, int leftSpacing, int rightSpacing)
-{
- wxASSERT(window);
-
- wxFoldWindowItem *wi = new wxFoldWindowItem(window, flags, ySpacing, leftSpacing, rightSpacing);
- m_items.Add(wi);
-
- bool vertical = this->IsVertical();
-
- window->SetSize( vertical ? leftSpacing : m_lastInsertPos + ySpacing,
- vertical ? m_lastInsertPos + ySpacing : leftSpacing,
- wxDefaultCoord,
- wxDefaultCoord,
- wxSIZE_USE_EXISTING);
-
- m_lastInsertPos += wi->GetWindowLength( vertical );
-
- ResizePanel();
-}
-
-void wxFoldPanelItem::AddSeparator(const wxColour &color, int ySpacing, int leftSpacing, int rightSpacing)
-{
- wxFoldWindowItem *wi = new wxFoldWindowItem(m_lastInsertPos, color, ySpacing, leftSpacing, rightSpacing);
- m_items.Add(wi);
-
- m_lastInsertPos += wi->GetWindowLength( this->IsVertical() );
-
- ResizePanel();
-}
-
-
-wxFoldPanelItem::~wxFoldPanelItem()
-{
- m_items.Clear();
-}
-
-void wxFoldPanelItem::OnPressCaption(wxCaptionBarEvent &event)
-{
- // tell the upper container we are responsible
- // for this event, so it can fold the panel item
- // and do a refresh
-
- event.SetTag((void *)this);
- event.Skip();
-}
-
-/* Inactive */
-void wxFoldPanelItem::OnSize(wxSizeEvent &event)
-{
- // deny access to pointers (yet)
-
- if(!m_controlCreated)
- {
- event.Skip();
- return;
- }
-
- // calculate the size needed for this window, so
- // we get the parent size, and determine the size for the caption and the panel
-
- //wxRect rect = GetRect();
-
- //wxSize size(0,wxDefaultCoord);
- //size.SetWidth(rect.GetWidth());
- //m_captionBar->SetSize(size);
-
-}
-
-int wxFoldPanelItem::Reposition(int pos)
-{
- // NOTE: Call Resize before Reposition when an item is added, because the new
- // size needed will be calculated by Resize. Ofcourse the relative position
- // of the controls have to be correct in respect to the caption bar
-
- Freeze();
-
- bool vertical = this->IsVertical();
-
- SetSize( vertical ? wxDefaultCoord : pos,
- vertical ? pos : wxDefaultCoord,
- wxDefaultCoord,
- wxDefaultCoord,
- wxSIZE_USE_EXISTING);
-
- m_itemPos = pos;
-
- Thaw();
-
- return GetPanelLength();
-}
-
-void wxFoldPanelItem::ResizePanel()
-{
- bool vertical = IsVertical();
-
- // prevent unnecessary updates by blocking repaints for a sec
-
- Freeze();
-
- // force this panel to take the width of the parent panel and the y of the
- // user or calulated width (which will be recalculated by the contents here
-
- wxSize size;
- if(m_captionBar->IsCollapsed())
- {
- size = m_captionBar->GetSize();
- m_panelSize = vertical ? size.GetHeight() : size.GetWidth();
- }
- else
- {
- size = GetBestSize();
- m_panelSize = vertical ? size.GetHeight() : size.GetWidth();
-
- if(m_userSized)
- {
- if ( vertical )
- size.SetHeight(m_userSize);
- else
- size.SetWidth(m_userSize);
- }
- }
-
- wxSize pnlsize = GetParent()->GetSize();
- if ( vertical )
- size.SetWidth(pnlsize.GetWidth());
- else
- size.SetHeight(pnlsize.GetHeight());
-
- // resize caption bar
- m_captionBar->SetSize( vertical ? size.GetWidth() : wxDefaultCoord,
- vertical ? wxDefaultCoord : size.GetHeight());
-
- // resize the panel
- SetSize(size);
-
- // go by all the controls and call Layout
-
- for(size_t i = 0; i < m_items.GetCount(); i++)
- m_items.Item(i).ResizeItem( vertical ? size.GetWidth() : size.GetHeight() , vertical );
-
- // and draw all
-
- Thaw();
-}
-
-void wxFoldPanelItem::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
- // draw all the items that are lines
- wxPaintDC dc(this);
- bool vertical = IsVertical();
-
- for(size_t i = 0; i < m_items.GetCount(); i++)
- {
- wxFoldWindowItem &item = m_items.Item(i);
- wxPen pen(item.GetLineColour(), 1, wxSOLID);
- if(item.GetType() == wxFoldWindowItem::SEPARATOR)
- {
- dc.SetPen(pen);
- int a = item.GetLeftSpacing();
- int b = item.GetLineY() + item.GetSpacing();
- int c = item.GetLineLength();
- int d = a + c;
- if (vertical)
- dc.DrawLine(a, b, d, b);
- else
- dc.DrawLine(b, a, b, d);
- }
- }
-}
-
-bool wxFoldPanelItem::IsVertical() const
-{
- // grandparent of wxFoldPanelItem is wxFoldPanelBar
- // default is vertical
- wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
- wxCHECK_MSG( panel, true, _T("wrong parent") );
- wxFoldPanelBar *bar = wxDynamicCast(panel->GetParent(), wxFoldPanelBar);
- wxCHECK_MSG( bar, true, _T("wrong parent") );
- return bar->IsVertical();
-}
diff --git a/contrib/src/foldbar/icon_collapsed.old.xpm b/contrib/src/foldbar/icon_collapsed.old.xpm
deleted file mode 100644
index 583b47da9b..0000000000
--- a/contrib/src/foldbar/icon_collapsed.old.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * icon_collapsed[] = {
-"16 16 3 1",
-" c #00FFFF",
-". c None",
-"+ c #000000",
-"................",
-"................",
-".......+........",
-".......+........",
-"......+++.......",
-"......+++.......",
-".....+++++......",
-".....+++++......",
-"....+++++++.....",
-"....+++++++.....",
-"...+++++++++....",
-"...+++++++++....",
-"..+++++++++++...",
-"..+++++++++++...",
-"................",
-"................"};
diff --git a/contrib/src/foldbar/icon_collapsed.xpm b/contrib/src/foldbar/icon_collapsed.xpm
deleted file mode 100644
index ad999be33d..0000000000
--- a/contrib/src/foldbar/icon_collapsed.xpm
+++ /dev/null
@@ -1,36 +0,0 @@
-/* XPM */
-static char *icon_collapsed[] = {
-"16 16 16 2",
-"00 c black",
-"01 c #800000",
-"02 c #008000",
-"03 c #808000",
-"04 c #000080",
-"05 c #800080",
-"06 c #008080",
-"07 c #C0C0C0",
-"08 c #808080",
-"09 c red",
-"10 c green",
-"11 c yellow",
-"12 c blue",
-"13 c none",
-"14 c cyan",
-"15 c gray100",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313001313131313131313",
-"13131313131313001313131313131313",
-"13131313131300000013131313131313",
-"13131313131300000013131313131313",
-"13131313130000000000131313131313",
-"13131313130000000000131313131313",
-"13131313000000000000001313131313",
-"13131313000000000000001313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313"
-};
diff --git a/contrib/src/foldbar/icon_expanded.old.xpm b/contrib/src/foldbar/icon_expanded.old.xpm
deleted file mode 100644
index 2d6b0130a4..0000000000
--- a/contrib/src/foldbar/icon_expanded.old.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * icon_expanded[] = {
-"16 16 3 1",
-" c #00FFFF",
-". c None",
-"+ c #000000",
-"................",
-"................",
-"..+++++++++++...",
-"..+++++++++++...",
-"...+++++++++....",
-"...+++++++++....",
-"....+++++++.....",
-"....+++++++.....",
-".....+++++......",
-".....+++++......",
-"......+++.......",
-"......+++.......",
-".......+........",
-".......+........",
-"................",
-"................"};
diff --git a/contrib/src/foldbar/icon_expanded.xpm b/contrib/src/foldbar/icon_expanded.xpm
deleted file mode 100644
index 33d67d2319..0000000000
--- a/contrib/src/foldbar/icon_expanded.xpm
+++ /dev/null
@@ -1,36 +0,0 @@
-/* XPM */
-static char *icon_expanded[] = {
-"16 16 16 2",
-"00 c black",
-"01 c #800000",
-"02 c #008000",
-"03 c #808000",
-"04 c #000080",
-"05 c #800080",
-"06 c #008080",
-"07 c #C0C0C0",
-"08 c #808080",
-"09 c red",
-"10 c green",
-"11 c yellow",
-"12 c blue",
-"13 c none",
-"14 c cyan",
-"15 c gray100",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313000000000000001313131313",
-"13131313000000000000001313131313",
-"13131313130000000000131313131313",
-"13131313130000000000131313131313",
-"13131313131300000013131313131313",
-"13131313131300000013131313131313",
-"13131313131313001313131313131313",
-"13131313131313001313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313"
-};
diff --git a/contrib/src/foldbar/icon_theresmore.xpm b/contrib/src/foldbar/icon_theresmore.xpm
deleted file mode 100644
index b7cfeebd46..0000000000
--- a/contrib/src/foldbar/icon_theresmore.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char *icon_theresmore[] = {
-"7 10 16 2",
-"00 c black",
-"01 c none",
-"02 c gray100",
-"03 c gray100",
-"04 c gray100",
-"05 c gray100",
-"06 c gray100",
-"07 c gray100",
-"08 c gray100",
-"09 c gray100",
-"10 c gray100",
-"11 c gray100",
-"12 c gray100",
-"13 c gray100",
-"14 c gray100",
-"15 c gray100",
-"01010101010101",
-"01010100010101",
-"01010000000101",
-"01000001000001",
-"00000101010000",
-"00010100010100",
-"01010000000101",
-"01000001000001",
-"00000101010000",
-"00010101010100"
-};
diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in
deleted file mode 100644
index 4ce41afff1..0000000000
--- a/contrib/src/gizmos/Makefile.in
+++ /dev/null
@@ -1,463 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-LIBEXT = @LIBEXT@
-LIBPREFIX = @LIBPREFIX@
-SO_SUFFIX = @SO_SUFFIX@
-DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
-LN_S = @LN_S@
-WINDRES = @WINDRES@
-PIC_FLAG = @PIC_FLAG@
-SONAME_FLAG = @SONAME_FLAG@
-STRIP = @STRIP@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = @INSTALL_DIR@
-BK_DEPS = @BK_DEPS@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-libdir = @libdir@
-includedir = @includedir@
-DLLPREFIX = @DLLPREFIX@
-LIBS = @LIBS@
-AR = @AR@
-AROPTIONS = @AROPTIONS@
-RANLIB = @RANLIB@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-VENDOR = @VENDOR@
-WX_FLAVOUR = @WX_FLAVOUR@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_XML = @EXTRALIBS_XML@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-GIZMOSDLL_CXXFLAGS = $(__gizmosdll_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
- -DWXMAKINGDLL_GIZMOS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-GIZMOSDLL_OBJECTS = \
- $(__gizmosdll___win32rc) \
- gizmosdll_dynamicsash.o \
- gizmosdll_editlbox.o \
- gizmosdll_ledctrl.o \
- gizmosdll_multicell.o \
- gizmosdll_splittree.o \
- gizmosdll_statpict.o
-GIZMOSDLL_ODEP = $(___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname)
-GIZMOS_XRCDLL_CXXFLAGS = $(__gizmos_xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
- -DWXMAKINGDLL_GIZMOS_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCDLL_OBJECTS = \
- $(__gizmos_xrcdll___win32rc) \
- gizmos_xrcdll_xh_statpict.o
-GIZMOS_XRCDLL_ODEP = \
- $(___pch_wxprec_gizmos_xrcdll_wx_wxprec_h_gch___depname)
-GIZMOSLIB_CXXFLAGS = $(__gizmoslib_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-GIZMOSLIB_OBJECTS = \
- gizmoslib_dynamicsash.o \
- gizmoslib_editlbox.o \
- gizmoslib_ledctrl.o \
- gizmoslib_multicell.o \
- gizmoslib_splittree.o \
- gizmoslib_statpict.o
-GIZMOSLIB_ODEP = $(___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname)
-GIZMOS_XRCLIB_CXXFLAGS = $(__gizmos_xrclib_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCLIB_OBJECTS = \
- gizmos_xrclib_xh_statpict.o
-GIZMOS_XRCLIB_ODEP = \
- $(___pch_wxprec_gizmos_xrclib_wx_wxprec_h_gch___depname)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
-@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-COND_SHARED_1___gizmosdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname)
-@COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll
-@COND_SHARED_1@__uninstall_gizmosdll___depname = uninstall_gizmosdll
-COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd = -install_name \
- $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
-@COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___gizmosdll___importlib = -import \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__gizmosdll___importlib = $(COND_PLATFORM_OS2_1___gizmosdll___importlib)
-COND_WINDOWS_IMPLIB_1___gizmosdll___importlib = \
- -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__gizmosdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmosdll___importlib)
-@COND_GCC_PCH_1@__gizmosdll_PCH_INC = -I.pch/wxprec_gizmosdll
-@COND_ICC_PCH_1@__gizmosdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_gizmosdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_gizmosdll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___gizmosdll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
-@COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = $(COND_USE_SOVERLINUX_1___gizmosdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___gizmosdll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_USE_SOVERSOLARIS_1@__gizmosdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gizmosdll___soname_flags)
-COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd = rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst_cmd = rm -f \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst_cmd)
-@COND_PLATFORM_WIN32_1@__gizmosdll___win32rc = gizmosdll_version_rc.o
-COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_SHARED_1_USE_XRC_1@__gizmos_xrcdll___depname = $(COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname)
-@COND_SHARED_1_USE_XRC_1@__install_gizmos_xrcdll___depname \
-@COND_SHARED_1_USE_XRC_1@ = install_gizmos_xrcdll
-@COND_SHARED_1_USE_XRC_1@__uninstall_gizmos_xrcdll___depname \
-@COND_SHARED_1_USE_XRC_1@ = uninstall_gizmos_xrcdll
-COND_PLATFORM_MACOSX_1___gizmos_xrcdll___macinstnamecmd = -install_name \
- $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
-@COND_PLATFORM_MACOSX_1@__gizmos_xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gizmos_xrcdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___gizmos_xrcdll___importlib = -import \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__gizmos_xrcdll___importlib = $(COND_PLATFORM_OS2_1___gizmos_xrcdll___importlib)
-COND_WINDOWS_IMPLIB_1___gizmos_xrcdll___importlib = \
- -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__gizmos_xrcdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmos_xrcdll___importlib)
-@COND_GCC_PCH_1@__gizmos_xrcdll_PCH_INC = -I.pch/wxprec_gizmos_xrcdll
-@COND_ICC_PCH_1@__gizmos_xrcdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gizmos_xrcdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___gizmos_xrcdll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
-@COND_USE_SOVERLINUX_1@__gizmos_xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___gizmos_xrcdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___gizmos_xrcdll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_USE_SOVERSOLARIS_1@__gizmos_xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gizmos_xrcdll___soname_flags)
-COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \
- rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__gizmos_xrcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_inst_cmd = rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gizmos_xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_uninst_cmd = rm -f \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gizmos_xrcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_uninst_cmd)
-@COND_PLATFORM_WIN32_1@__gizmos_xrcdll___win32rc = \
-@COND_PLATFORM_WIN32_1@ gizmos_xrcdll_version_rc.o
-COND_MONOLITHIC_0___WXLIB_XRC_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XRC_p = $(COND_MONOLITHIC_0___WXLIB_XRC_p)
-COND_MONOLITHIC_0___WXLIB_XML_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
-COND_SHARED_0___gizmoslib___depname = \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__gizmoslib___depname = $(COND_SHARED_0___gizmoslib___depname)
-@COND_SHARED_0@__install_gizmoslib___depname = install_gizmoslib
-@COND_SHARED_0@__uninstall_gizmoslib___depname = uninstall_gizmoslib
-@COND_GCC_PCH_1@__gizmoslib_PCH_INC = -I.pch/wxprec_gizmoslib
-@COND_ICC_PCH_1@__gizmoslib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_gizmoslib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_gizmoslib/wx/wxprec.h.gch
-COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname = \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0_USE_XRC_1@__gizmos_xrclib___depname = $(COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname)
-@COND_SHARED_0_USE_XRC_1@__install_gizmos_xrclib___depname \
-@COND_SHARED_0_USE_XRC_1@ = install_gizmos_xrclib
-@COND_SHARED_0_USE_XRC_1@__uninstall_gizmos_xrclib___depname \
-@COND_SHARED_0_USE_XRC_1@ = uninstall_gizmos_xrclib
-@COND_GCC_PCH_1@__gizmos_xrclib_PCH_INC = -I.pch/wxprec_gizmos_xrclib
-@COND_ICC_PCH_1@__gizmos_xrclib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gizmos_xrclib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = --define wxNO_THREADS
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmos = .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos = .0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__gizmos = .$(SO_SUFFIX)
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__gizmos_0 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__gizmos_0 = -0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__gizmos_0 = .$(SO_SUFFIX)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-
-### Targets: ###
-
-all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
-
-install: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
- fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-uninstall: $(__uninstall_gizmosdll___depname) $(__uninstall_gizmos_xrcdll___depname) $(__uninstall_gizmoslib___depname) $(__uninstall_gizmos_xrclib___depname)
- for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.h; do \
- rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-install-strip: install
- $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
- $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
- rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOSDLL_OBJECTS) $(__gizmosdll___win32rc)
-@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
-@COND_SHARED_1@
-@COND_SHARED_1@ $(__gizmosdll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_gizmosdll:
-@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_gizmosdll:
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
-
-@COND_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOS_XRCDLL_OBJECTS) $(__gizmos_xrcdll___win32rc) $(__gizmosdll___depname)
-@COND_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(GIZMOS_XRCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmos_xrcdll___macinstnamecmd) $(__gizmos_xrcdll___importlib) $(__gizmos_xrcdll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
-@COND_SHARED_1_USE_XRC_1@
-@COND_SHARED_1_USE_XRC_1@ $(__gizmos_xrcdll___so_symlinks_cmd)
-
-@COND_SHARED_1_USE_XRC_1@install_gizmos_xrcdll:
-@COND_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
-@COND_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmos_xrcdll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1_USE_XRC_1@uninstall_gizmos_xrcdll:
-@COND_SHARED_1_USE_XRC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1_USE_XRC_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmos_xrcdll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GIZMOSLIB_OBJECTS)
-@COND_SHARED_0@ rm -f $@
-@COND_SHARED_0@ $(AR) $(AROPTIONS) $@ $(GIZMOSLIB_OBJECTS)
-@COND_SHARED_0@ $(RANLIB) $@
-
-@COND_SHARED_0@install_gizmoslib:
-@COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_gizmoslib:
-@COND_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS)
-
-@COND_SHARED_0_USE_XRC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GIZMOS_XRCLIB_OBJECTS)
-@COND_SHARED_0_USE_XRC_1@ rm -f $@
-@COND_SHARED_0_USE_XRC_1@ $(AR) $(AROPTIONS) $@ $(GIZMOS_XRCLIB_OBJECTS)
-@COND_SHARED_0_USE_XRC_1@ $(RANLIB) $@
-
-@COND_SHARED_0_USE_XRC_1@install_gizmos_xrclib:
-@COND_SHARED_0_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0_USE_XRC_1@uninstall_gizmos_xrclib:
-@COND_SHARED_0_USE_XRC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCLIB_CXXFLAGS)
-
-gizmosdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(GIZMOSDLL_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp $(GIZMOSDLL_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/dynamicsash.cpp
-
-gizmosdll_editlbox.o: $(srcdir)/editlbox.cpp $(GIZMOSDLL_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/editlbox.cpp
-
-gizmosdll_ledctrl.o: $(srcdir)/ledctrl.cpp $(GIZMOSDLL_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/ledctrl.cpp
-
-gizmosdll_multicell.o: $(srcdir)/multicell.cpp $(GIZMOSDLL_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/multicell.cpp
-
-gizmosdll_splittree.o: $(srcdir)/splittree.cpp $(GIZMOSDLL_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/splittree.cpp
-
-gizmosdll_statpict.o: $(srcdir)/statpict.cpp $(GIZMOSDLL_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/statpict.cpp
-
-gizmos_xrcdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(GIZMOS_XRCDLL_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-gizmos_xrcdll_xh_statpict.o: $(srcdir)/xh_statpict.cpp $(GIZMOS_XRCDLL_ODEP)
- $(CXXC) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(srcdir)/xh_statpict.cpp
-
-gizmoslib_dynamicsash.o: $(srcdir)/dynamicsash.cpp $(GIZMOSLIB_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/dynamicsash.cpp
-
-gizmoslib_editlbox.o: $(srcdir)/editlbox.cpp $(GIZMOSLIB_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/editlbox.cpp
-
-gizmoslib_ledctrl.o: $(srcdir)/ledctrl.cpp $(GIZMOSLIB_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/ledctrl.cpp
-
-gizmoslib_multicell.o: $(srcdir)/multicell.cpp $(GIZMOSLIB_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/multicell.cpp
-
-gizmoslib_splittree.o: $(srcdir)/splittree.cpp $(GIZMOSLIB_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/splittree.cpp
-
-gizmoslib_statpict.o: $(srcdir)/statpict.cpp $(GIZMOSLIB_ODEP)
- $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/statpict.cpp
-
-gizmos_xrclib_xh_statpict.o: $(srcdir)/xh_statpict.cpp $(GIZMOS_XRCLIB_ODEP)
- $(CXXC) -c -o $@ $(GIZMOS_XRCLIB_CXXFLAGS) $(srcdir)/xh_statpict.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_gizmosdll uninstall_gizmosdll install_gizmos_xrcdll uninstall_gizmos_xrcdll install_gizmoslib uninstall_gizmoslib install_gizmos_xrclib uninstall_gizmos_xrclib
diff --git a/contrib/src/gizmos/dynamicsash.cpp b/contrib/src/gizmos/dynamicsash.cpp
deleted file mode 100644
index ed9548212f..0000000000
--- a/contrib/src/gizmos/dynamicsash.cpp
+++ /dev/null
@@ -1,1471 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: dynamicsash.cpp
-// Purpose: A window which can be dynamically split to an arbitrary depth
-// and later reunified through the user interface
-// Author: Matt Kimball
-// Modified by:
-// Created: 7/15/2001
-// RCS-ID: $Id$
-// Copyright: (c) 2001 Matt Kimball
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers)
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#ifdef __WXMSW__
-#include "wx/mdi.h"
-#endif
-
-#include "wx/gizmos/dynamicsash.h"
-
-
-const wxChar* wxDynamicSashWindowNameStr = wxT("dynamicSashWindow");
-
-
-/*
- wxDynamicSashWindow works by internally storing a tree of Implementation
- objects (wxDynamicSsahWindowImpl) and Leaf objects
- (wxDynamicSashWindowLeaf). The wxDynamicSashWindow has a pointer to one
- implementation, and each implementation either has a pointer to a one
- leaf (m_leaf) or a pointer to two children implementation objects
- (m_child). The leaves each are responsible for drawing the frame and
- decorations around one user-provided views and for responding to mouse
- and scrollbar events.
-
- A resulting tree might look something like this:
-
- wxDynamicSashWindow
- |
- +- wxDynamicSashWindowImpl
- |
- +- wxDynamicSashWindowLeaf
- | |
- | +- user view window
- |
- +- wxDynamicSashWindowImpl
- |
- +- wxDynamicSashWindowLeaf
- | |
- | +- user view window
- |
- +- wxDynamicSashWindowLeaf
- |
- +- user view window
-
- Each time a split occurs, one of the implementation objects removes its
- leaf, generates two new implementation object children, each with a new
- leaf, and reparents the user view which was connected to its old leaf
- to be one of the new leaf's user view, and sends a Split event to the
- user view in the hopes that it will generate a new user view for the
- other new leaf.
-
- When a unification ocurrs, an implementation object is replaced by one
- of its children, and the tree of its other child is pruned.
-
- One quirk is that the top-level implementation object (m_top) always
- keeps a pointer to the implementation object where a new child is needed.
- (m_add_child_target). This is so that when a new uesr view is added
- to the hierarchy, AddChild() is able to reparent the new user view to
- the correct implementation object's leaf.
-
-*/
-
-#include "wx/dcmemory.h"
-#include "wx/dcscreen.h"
-#include "wx/layout.h"
-#include "wx/scrolbar.h"
-#include "wx/settings.h"
-
-
-const wxEventType wxEVT_DYNAMIC_SASH_SPLIT = wxNewEventType();
-const wxEventType wxEVT_DYNAMIC_SASH_UNIFY = wxNewEventType();
-const wxEventType wxEVT_DYNAMIC_SASH_REPARENT = wxNewEventType();
-
-enum DynamicSashRegion
-{
- DSR_NONE,
- DSR_VERTICAL_TAB,
- DSR_HORIZONTAL_TAB,
- DSR_CORNER,
- DSR_LEFT_EDGE,
- DSR_TOP_EDGE,
- DSR_RIGHT_EDGE,
- DSR_BOTTOM_EDGE
-};
-
-
-/*
- wxDynamicSashReparentEvent is generated by the AddChild() method of
- wxDynamicSashWindow when it wants a Leaf to reparent a user view window
- to its viewport at some time in the future. We can't reparent the window
- immediately, because switching parents in AddChild() confuses the wxWindow
- class. Instead, we queue up this event, and the window is actually
- reparented the next time we process events in the idle loop.
-*/
-class wxDynamicSashReparentEvent : public wxEvent
-{
-public:
- wxDynamicSashReparentEvent();
- wxDynamicSashReparentEvent(wxObject *object);
- wxDynamicSashReparentEvent(const wxDynamicSashReparentEvent& evt);
-
- virtual wxEvent* Clone() const { return new wxDynamicSashReparentEvent(*this); }
-
- DECLARE_DYNAMIC_CLASS(wxDynamicSashReparentEvent)
-};
-
-
-class wxDynamicSashWindowImpl : public wxEvtHandler
-{
-public:
- wxDynamicSashWindowImpl(wxDynamicSashWindow *window);
- ~wxDynamicSashWindowImpl();
-
- bool Create();
- void AddChild(wxWindow *window);
- void DrawSash(int x, int y) const;
- void ConstrainChildren(int px, int py);
- void Split(int x, int y);
- void Unify(int panel);
- void Resize(int x, int y);
- wxDynamicSashWindowImpl *FindParent(DynamicSashRegion side) const;
- wxDynamicSashWindowImpl *FindUpperParent(wxDynamicSashWindowImpl *sash_a,
- wxDynamicSashWindowImpl *sash_b) const;
- wxWindow *FindFrame() const;
- wxScrollBar *FindScrollBar(const wxWindow *child, int vert) const;
-
- void OnSize(wxSizeEvent &event);
- void OnPaint(wxPaintEvent &event);
- void OnMouseMove(wxMouseEvent &event);
- void OnLeave(wxMouseEvent &event);
- void OnPress(wxMouseEvent &event);
- void OnRelease(wxMouseEvent &event);
-
- wxDynamicSashWindow *m_window;
- wxDynamicSashWindowImpl *m_add_child_target;
-
- /* This is the window we are responsible for managing. Either of
- leaf or our children are in this window. For the top level
- implementation object, this is the same as m_window.
- Otherwise it is a window we've created an will destroy when we
- are deleted. */
- wxWindow *m_container;
-
- wxDynamicSashWindowImpl *m_parent;
- wxDynamicSashWindowImpl *m_top;
- wxDynamicSashWindowImpl *m_child[2];
-
- class wxDynamicSashWindowLeaf *m_leaf;
-
- /* If the implementation is split horizontally or vertically, m_split
- is set to DSR_HORIZONTAL_TAB or DSR_VERTICAL_TAB, respectively.
- Otherwise it is set to DSR_NONE. */
- DynamicSashRegion m_split;
-
- /* These are used to keep track of a sash as it is being dragged, for
- drawing the user interface correctly. */
- DynamicSashRegion m_dragging;
- int m_drag_x, m_drag_y;
-};
-
-class wxDynamicSashWindowLeaf : public wxEvtHandler
-{
-public:
- wxDynamicSashWindowLeaf(wxDynamicSashWindowImpl *impl);
- ~wxDynamicSashWindowLeaf();
-
- bool Create();
- void AddChild(wxWindow *window);
- DynamicSashRegion GetRegion(int x, int y);
- void ResizeChild(const wxSize& size);
- wxScrollBar *FindScrollBar(const wxWindow *child, int vert) const;
-
- void OnSize(wxSizeEvent &event);
- void OnViewSize(wxSizeEvent &event);
- void OnPaint(wxPaintEvent &event);
- void OnScroll(wxScrollEvent &event);
- void OnFocus(wxFocusEvent &event);
- void OnMouseMove(wxMouseEvent &event);
- void OnLeave(wxMouseEvent &event);
- void OnPress(wxMouseEvent &event);
- void OnRelease(wxMouseEvent &event);
- void OnReparent(wxEvent &event);
-
- wxDynamicSashWindowImpl *m_impl;
-
- wxScrollBar *m_vscroll,
- *m_hscroll;
-
- /* m_child is the window provided to us by the application developer.
- m_viewport is a window we've created, and it is the immediately
- parent of m_child. We scroll m_child by moving it around within
- m_viewport. */
- wxWindow *m_viewport,
- *m_child;
-};
-
-
-// ============================================================================
-// wxDynamicSashWindow
-// ============================================================================
-
-wxDynamicSashWindow::wxDynamicSashWindow()
-{
- m_impl = NULL;
-}
-
-wxDynamicSashWindow::wxDynamicSashWindow(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- m_impl = NULL;
- Create(parent, id, pos, size, style, name);
-}
-
-wxDynamicSashWindow::~wxDynamicSashWindow()
-{
- SetEventHandler(this);
- delete m_impl;
-}
-
-bool wxDynamicSashWindow::Create(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- if (m_impl)
- return false;
-
- if (!wxWindow::Create(parent, id, pos, size, style, name))
- return false;
-
- m_impl = new wxDynamicSashWindowImpl(this);
- if (!m_impl)
- return false;
-
- if (!m_impl->Create())
- {
- delete m_impl;
- m_impl = NULL;
- return false;
- }
-
- return true;
-}
-
-void wxDynamicSashWindow::AddChild(wxWindowBase *child)
-{
- wxWindow::AddChild(child);
-
- m_impl->AddChild(wxDynamicCast(child, wxWindow));
-}
-
-wxScrollBar *wxDynamicSashWindow::GetHScrollBar(const wxWindow *child) const
-{
- return m_impl->FindScrollBar(child, 0);
-}
-
-wxScrollBar *wxDynamicSashWindow::GetVScrollBar(const wxWindow *child) const
-{
- return m_impl->FindScrollBar(child, 1);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashWindow, wxWindow)
-
-
-// ============================================================================
-// wxDynamicSashWindowImpl
-// ============================================================================
-
-wxDynamicSashWindowImpl::wxDynamicSashWindowImpl(wxDynamicSashWindow *window)
-{
- m_window = window;
- m_add_child_target = this;
-
- m_container = NULL;
- m_parent = NULL;
- m_top = this;
- m_child[0] =
- m_child[1] = NULL;
- m_leaf = NULL;
- m_dragging = DSR_NONE;
- m_split = DSR_NONE;
-}
-
-wxDynamicSashWindowImpl::~wxDynamicSashWindowImpl()
-{
- delete m_leaf;
- delete m_child[0];
- m_child[0] = NULL;
- delete m_child[1];
- m_child[1] = NULL;
- m_leaf = NULL;
-
- if (m_container != m_window && m_container)
- {
- m_container->SetEventHandler(m_container);
- m_container->Destroy();
- }
-}
-
-bool wxDynamicSashWindowImpl::Create()
-{
- if (!m_container)
- m_container = m_window;
-
- wxCursor cursor(wxCURSOR_ARROW);
- m_container->SetCursor(cursor);
-
- m_leaf = new wxDynamicSashWindowLeaf(this);
- if (!m_leaf)
- return false;
-
- if (!m_leaf->Create())
- {
- delete m_leaf;
- m_leaf = NULL;
- return false;
- }
-
- m_container->SetEventHandler(this);
-
- Connect(wxEVT_SIZE, wxSizeEventHandler(wxDynamicSashWindowImpl::OnSize));
- Connect(wxEVT_PAINT, wxPaintEventHandler(wxDynamicSashWindowImpl::OnPaint));
- Connect(wxEVT_MOTION,
- wxMouseEventHandler(wxDynamicSashWindowImpl::OnMouseMove));
- Connect(wxEVT_ENTER_WINDOW,
- wxMouseEventHandler(wxDynamicSashWindowImpl::OnMouseMove));
- Connect(wxEVT_LEAVE_WINDOW,
- wxMouseEventHandler(wxDynamicSashWindowImpl::OnLeave));
- Connect(wxEVT_LEFT_DOWN,
- wxMouseEventHandler(wxDynamicSashWindowImpl::OnPress));
- Connect(wxEVT_LEFT_UP,
- wxMouseEventHandler(wxDynamicSashWindowImpl::OnRelease));
-
- return true;
-}
-
-void wxDynamicSashWindowImpl::AddChild(wxWindow *window)
-{
- if (m_add_child_target && m_add_child_target->m_leaf)
- m_add_child_target->m_leaf->AddChild(window);
-}
-
-void wxDynamicSashWindowImpl::DrawSash(int x, int y) const
-{
- int i, j;
-
- wxScreenDC dc;
- dc.StartDrawingOnTop(m_container);
-
- wxBitmap bmp(8, 8);
- wxMemoryDC bdc;
- bdc.SelectObject(bmp);
- bdc.DrawRectangle(-1, -1, 10, 10);
- for (i = 0; i < 8; i++)
- {
- for (j = 0; j < 8; j++)
- {
- if ((i + j) & 1)
- bdc.DrawPoint(i, j);
- }
- }
-
- wxBrush brush(bmp);
- dc.SetBrush(brush);
- dc.SetLogicalFunction(wxXOR);
-
- if ((m_dragging == DSR_CORNER) &&
- (m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0)
- {
- int cx = 0;
- int cy = 0;
-
- m_container->ClientToScreen(&cx, &cy);
- m_container->ClientToScreen(&x, &y);
-
- if (cx < x && cy < y)
- {
- dc.DrawRectangle(cx - 2, cy - 2, x - cx + 4, 4);
- dc.DrawRectangle(x - 2, cy + 2, 4, y - cy);
- dc.DrawRectangle(cx - 2, cy + 2, 4, y - cy);
- dc.DrawRectangle(cx + 2, y - 2, x - cx - 4, 4);
- }
- }
- else
- {
- int body_w, body_h;
- m_container->GetClientSize(&body_w, &body_h);
-
- if (y < 0)
- y = 0;
- if (y > body_h)
- y = body_h;
- if (x < 0)
- x = 0;
- if (x > body_w)
- x = body_w;
-
- if (m_dragging == DSR_HORIZONTAL_TAB)
- x = 0;
- else
- y = 0;
-
- m_container->ClientToScreen(&x, &y);
-
- int w, h;
- w = body_w; h = body_h;
-
- if (m_dragging == DSR_HORIZONTAL_TAB)
- dc.DrawRectangle(x, y - 2, w, 4);
- else
- dc.DrawRectangle(x - 2, y, 4, h);
- }
-
- dc.EndDrawingOnTop();
-}
-
-wxDynamicSashWindowImpl *
-wxDynamicSashWindowImpl::FindParent(DynamicSashRegion side) const
-{
- if (m_parent == NULL)
- return NULL;
-
- if (m_parent->m_split == DSR_HORIZONTAL_TAB)
- {
- if (side == DSR_TOP_EDGE && m_parent->m_child[1] == this)
- return m_parent;
- if (side == DSR_BOTTOM_EDGE && m_parent->m_child[0] == this)
- return m_parent;
- }
- else if (m_parent->m_split == DSR_VERTICAL_TAB)
- {
- if (side == DSR_LEFT_EDGE && m_parent->m_child[1] == this)
- return m_parent;
- if (side == DSR_RIGHT_EDGE && m_parent->m_child[0] == this)
- return m_parent;
- }
-
- return m_parent->FindParent(side);
-}
-
-wxDynamicSashWindowImpl *
-wxDynamicSashWindowImpl::FindUpperParent(wxDynamicSashWindowImpl *sash_a,
- wxDynamicSashWindowImpl *sash_b) const
-{
- wxWindow *win;
- win = sash_a->m_container->GetParent();
- while (win && !win->IsTopLevel())
- {
- if (win == sash_b->m_container)
- return sash_b;
-
- win = win->GetParent();
- }
-
- return sash_a;
-}
-
-
-wxWindow *wxDynamicSashWindowImpl::FindFrame() const
-{
- wxWindow *win;
-
- win = m_window->GetParent();
- while (win && !win->IsTopLevel()
-#if defined(__WXMSW__) && wxUSE_MDI
- && ! wxIsKindOf(win, wxMDIChildFrame) // not top-level but still a frame
-#endif
- )
- {
- win = win->GetParent();
- }
-
- return win;
-}
-
-wxScrollBar *
-wxDynamicSashWindowImpl::FindScrollBar(const wxWindow *child, int vert) const
-{
- if (m_child[0] == NULL && m_leaf == NULL)
- return NULL;
-
- if (!m_child[0])
- {
- return m_leaf->FindScrollBar(child, vert);
- }
-
- wxScrollBar *ret = m_child[0]->FindScrollBar(child, vert);
- if (!ret)
- ret = m_child[1]->FindScrollBar(child, vert);
-
- return ret;
-}
-
-void wxDynamicSashWindowImpl::ConstrainChildren(int px, int py)
-{
- wxLayoutConstraints *layout = new wxLayoutConstraints();
- layout->left.SameAs(m_container, wxLeft);
- layout->top.SameAs(m_container, wxTop);
- if (m_split == DSR_HORIZONTAL_TAB)
- {
- layout->right.SameAs(m_container, wxRight);
- layout->height.PercentOf(m_container, wxHeight, py);
- }
- else
- {
- layout->bottom.SameAs(m_container, wxBottom);
- layout->width.PercentOf(m_container, wxWidth, px);
- }
- m_child[0]->m_container->SetConstraints(layout);
-
- layout = new wxLayoutConstraints();
- layout->right.SameAs(m_container, wxRight);
- layout->bottom.SameAs(m_container, wxBottom);
- if (m_split == DSR_HORIZONTAL_TAB)
- {
- layout->top.Below(m_child[0]->m_container, 1);
- layout->left.SameAs(m_container, wxLeft);
- }
- else
- {
- layout->left.RightOf(m_child[0]->m_container, 1);
- layout->top.SameAs(m_container, wxTop);
- }
- m_child[1]->m_container->SetConstraints(layout);
-}
-
-void wxDynamicSashWindowImpl::Unify(int panel)
-{
- int other = panel == 0 ? 1 : 0;
-
- if (m_child[panel]->m_leaf)
- {
- wxDynamicSashWindowImpl *child[2];
-
- child[0] = m_child[0];
- child[1] = m_child[1];
-
- m_child[0] = m_child[1] = NULL;
-
- m_leaf = new wxDynamicSashWindowLeaf(this);
- m_leaf->Create();
- m_leaf->m_child = child[panel]->m_leaf->m_child;
-
- m_leaf->m_vscroll->SetScrollbar(child[panel]->m_leaf->m_vscroll->GetThumbPosition(),
- child[panel]->m_leaf->m_vscroll->GetThumbSize(),
- child[panel]->m_leaf->m_vscroll->GetRange(),
- child[panel]->m_leaf->m_vscroll->GetPageSize());
- m_leaf->m_hscroll->SetScrollbar(child[panel]->m_leaf->m_hscroll->GetThumbPosition(),
- child[panel]->m_leaf->m_hscroll->GetThumbSize(),
- child[panel]->m_leaf->m_hscroll->GetRange(),
- child[panel]->m_leaf->m_hscroll->GetPageSize());
- m_add_child_target = NULL;
- wxDynamicSashReparentEvent event(m_leaf);
- m_leaf->ProcessEvent(event);
-
- delete child[0];
- delete child[1];
-
- m_split = DSR_NONE;
-
- wxDynamicSashUnifyEvent unify(m_leaf->m_child);
- m_leaf->m_child->ProcessEvent(unify);
- }
- else
- {
- m_split = m_child[panel]->m_split;
-
- delete m_child[other];
-
- wxDynamicSashWindowImpl *child_panel = m_child[panel];
- m_child[0] = child_panel->m_child[0];
- m_child[1] = child_panel->m_child[1];
-
- m_child[0]->m_parent = this;
- m_child[1]->m_parent = this;
-
- m_add_child_target = NULL;
- m_child[0]->m_container->Reparent(m_container);
- m_child[1]->m_container->Reparent(m_container);
-
- child_panel->m_child[0] = child_panel->m_child[1] = NULL;
- delete child_panel;
-
- wxSize size = m_container->GetSize();
- wxSize child_size = m_child[0]->m_container->GetSize();
-
- ConstrainChildren(child_size.GetWidth() * 100 / size.GetWidth(),
- child_size.GetHeight() * 100 / size.GetHeight());
-
- m_container->Layout();
- }
-}
-
-void wxDynamicSashWindowImpl::Split(int px, int py)
-{
-
- m_add_child_target = NULL;
-
- m_child[0] = new wxDynamicSashWindowImpl(m_window);
- m_child[0]->m_container = new wxWindow(m_container, wxID_ANY);
- m_child[0]->m_parent = this;
- m_child[0]->m_top = m_top;
- m_child[0]->Create();
- if (m_leaf->m_child)
- {
- m_leaf->m_child->Reparent(m_container);
- m_child[0]->AddChild(m_leaf->m_child);
- }
-
- m_child[1] = new wxDynamicSashWindowImpl(m_window);
- m_child[1]->m_container = new wxWindow(m_container, wxID_ANY);
- m_child[1]->m_parent = this;
- m_child[1]->m_top = m_top;
- m_child[1]->Create();
-
- m_split = m_dragging;
- ConstrainChildren(px, py);
-
- m_top->m_add_child_target = m_child[1];
- wxDynamicSashSplitEvent split(m_child[0]->m_leaf->m_child);
- m_child[0]->m_leaf->m_child->ProcessEvent(split);
-
- m_child[0]->m_leaf->m_vscroll->SetScrollbar(m_leaf->m_vscroll->GetThumbPosition(),
- m_leaf->m_vscroll->GetThumbSize(),
- m_leaf->m_vscroll->GetRange(),
- m_leaf->m_vscroll->GetPageSize());
- m_child[0]->m_leaf->m_hscroll->SetScrollbar(m_leaf->m_hscroll->GetThumbPosition(),
- m_leaf->m_hscroll->GetThumbSize(),
- m_leaf->m_hscroll->GetRange(),
- m_leaf->m_hscroll->GetPageSize());
- m_child[1]->m_leaf->m_vscroll->SetScrollbar(m_leaf->m_vscroll->GetThumbPosition(),
- m_leaf->m_vscroll->GetThumbSize(),
- m_leaf->m_vscroll->GetRange(),
- m_leaf->m_vscroll->GetPageSize());
- m_child[1]->m_leaf->m_hscroll->SetScrollbar(m_leaf->m_hscroll->GetThumbPosition(),
- m_leaf->m_hscroll->GetThumbSize(),
- m_leaf->m_hscroll->GetRange(),
- m_leaf->m_hscroll->GetPageSize());
- delete m_leaf;
- m_leaf = NULL;
-
- m_container->Layout();
-}
-
-
-/* This code is called when you finish resizing a view by dragging the
- corner tab, but I think this implementation is lousy and will surprise
- the user more often than it will do what they are trying to do. What
- I really need to be doing here is do a rewrite such that *no* sashes
- move except the ones immediately to the bottom and right of this window,
- and handle the case where you resize a window larger than it's neighbors
- by destroying the neighbors.
-
- But this will do for now. */
-void wxDynamicSashWindowImpl::Resize(int x, int y)
-{
- wxDynamicSashWindowImpl *h_parent = FindParent(DSR_BOTTOM_EDGE);
- wxDynamicSashWindowImpl *v_parent = FindParent(DSR_RIGHT_EDGE);
- int h_unify = -1;
- int v_unify = -1;
- wxWindow *frame = FindFrame();
-
- if (x < 0)
- x = 0;
- if (y < 0)
- y = 0;
-
- if (h_parent)
- {
- m_container->ClientToScreen(NULL, &y);
- h_parent->m_container->ScreenToClient(NULL, &y);
-
- int py = (int)((y * 100) / h_parent->m_container->GetSize().GetHeight() + 0.5);
-
- if (py < 10)
- {
- wxDynamicSashWindowImpl *ho_parent = FindParent(DSR_TOP_EDGE);
-
- if (ho_parent)
- {
- if (FindUpperParent(h_parent, ho_parent) == ho_parent)
- {
- h_unify = 1;
- }
- else
- {
- py = (int)((ho_parent->m_child[0]->m_container->GetSize().GetHeight() * 100)
- / h_parent->m_container->GetSize().GetHeight() + 0.5);
- h_parent->m_child[0]->m_container->GetConstraints()->height.PercentOf(
- h_parent->m_container, wxHeight, py);
-
- h_parent = ho_parent;
- h_unify = 0;
- }
- }
- else
- {
- h_unify = 1;
- }
- }
- else if (py > 90)
- {
- h_unify = 0;
- }
- else
- {
- h_parent->m_child[0]->m_container->GetConstraints()->height.PercentOf(
- h_parent->m_container, wxHeight, py);
- h_parent->m_container->Layout();
- }
- }
- else
- {
- int do_resize = 1;
- h_parent = FindParent(DSR_TOP_EDGE);
-
- if (h_parent)
- {
- int py = (int)((y * 100) /
- (h_parent->m_container->GetSize().GetHeight() +
- y - m_container->GetSize().GetHeight()) + 0.5);
-
- if (py < 10)
- h_unify = 0;
- }
- else if (y < 64)
- {
- do_resize = 0;
- }
-
- if (do_resize)
- {
- wxSize size = frame->GetSize();
- frame->SetSize(size.GetWidth(), size.GetHeight() + y - m_container->GetSize().GetHeight());
- }
- }
-
- if (v_parent)
- {
- m_container->ClientToScreen(&x, NULL);
- v_parent->m_container->ScreenToClient(&x, NULL);
-
- int px = (int)((x * 100) / v_parent->m_container->GetSize().GetWidth() + 0.5);
-
- if (px < 10)
- {
- wxDynamicSashWindowImpl *vo_parent = FindParent(DSR_LEFT_EDGE);
-
- if (vo_parent)
- {
- if (FindUpperParent(v_parent, vo_parent) == vo_parent)
- {
- v_unify = 1;
- }
- else
- {
- px = (int)((vo_parent->m_child[0]->m_container->GetSize().GetWidth() * 100)
- / v_parent->m_container->GetSize().GetWidth() + 0.5);
- v_parent->m_child[0]->m_container->GetConstraints()->width.PercentOf(
- v_parent->m_container, wxWidth, px);
-
- v_parent = vo_parent;
- v_unify = 0;
- }
- }
- else
- {
- v_unify = 1;
- }
- }
- else if (px > 90)
- {
- v_unify = 0;
- }
- else
- {
- v_parent->m_child[0]->m_container->GetConstraints()->width.PercentOf(
- v_parent->m_container, wxWidth, px);
- v_parent->m_container->Layout();
- }
- }
- else
- {
- int do_resize = 1;
- v_parent = FindParent(DSR_LEFT_EDGE);
-
- if (v_parent)
- {
- int px = (int)((x * 100) /
- (v_parent->m_container->GetSize().GetWidth() +
- x - m_container->GetSize().GetWidth()) + 0.5);
-
- if (px < 10)
- v_unify = 0;
- }
- else if (x < 64)
- {
- do_resize = 0;
- }
-
- if (do_resize)
- {
- wxSize size = frame->GetSize();
- frame->SetSize(size.GetWidth() + x - m_container->GetSize().GetWidth(), size.GetHeight());
- }
- }
-
- if (h_unify != -1 && v_unify != -1)
- {
- wxDynamicSashWindowImpl *parent = FindUpperParent(h_parent, v_parent);
-
- if (parent == h_parent)
- {
- h_parent->Unify(h_unify);
- }
- else
- {
- v_parent->Unify(v_unify);
- }
- }
- else if (h_unify != -1)
- {
- h_parent->Unify(h_unify);
- }
- else if (v_unify != -1)
- {
- v_parent->Unify(v_unify);
- }
-}
-
-
-void wxDynamicSashWindowImpl::OnSize(wxSizeEvent &event)
-{
- m_container->Layout();
-
- if (m_leaf)
- m_leaf->OnSize(event);
-}
-
-void wxDynamicSashWindowImpl::OnPaint(wxPaintEvent &event)
-{
- if (m_leaf)
- m_leaf->OnPaint(event);
- else
- {
- wxPaintDC dc(m_container);
- dc.SetBackground(wxBrush(m_container->GetBackgroundColour(), wxSOLID));
- dc.Clear();
- }
-}
-
-void wxDynamicSashWindowImpl::OnMouseMove(wxMouseEvent &event)
-{
- if (m_dragging)
- {
- DrawSash(m_drag_x, m_drag_y);
- m_drag_x = event.m_x; m_drag_y = event.m_y;
- DrawSash(m_drag_x, m_drag_y);
- }
- else if (m_leaf)
- {
- m_leaf->OnMouseMove(event);
- }
-}
-
-void wxDynamicSashWindowImpl::OnLeave(wxMouseEvent &event)
-{
- if (m_leaf)
- m_leaf->OnLeave(event);
-}
-
-void wxDynamicSashWindowImpl::OnPress(wxMouseEvent &event)
-{
- if (m_leaf)
- {
- m_leaf->OnPress(event);
- }
- else
- {
- m_dragging = m_split;
- m_drag_x = event.m_x;
- m_drag_y = event.m_y;
- DrawSash(m_drag_x, m_drag_y);
- m_container->CaptureMouse();
- }
-}
-
-void wxDynamicSashWindowImpl::OnRelease(wxMouseEvent &event)
-{
- if ((m_dragging == DSR_CORNER) &&
- (m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0)
- {
- DrawSash(m_drag_x, m_drag_y);
- m_container->ReleaseMouse();
-
- Resize(event.m_x, event.m_y);
-
- m_dragging = DSR_NONE;
- }
- else if (m_dragging)
- {
- DrawSash(m_drag_x, m_drag_y);
- m_container->ReleaseMouse();
-
- wxSize size = m_container->GetSize();
- int px = (int)((event.m_x * 100) / size.GetWidth() + 0.5);
- int py = (int)((event.m_y * 100) / size.GetHeight() + 0.5);
-
- if ((m_dragging == DSR_HORIZONTAL_TAB && py >= 10 && py <= 90)
- || (m_dragging == DSR_VERTICAL_TAB && px >= 10 && px <= 90))
- {
- if (m_child[0] == NULL)
- {
- Split(px, py);
- }
- else
- {
- /* It would be nice if moving *this* sash didn't implicitly move
- the sashes of our children (if any). But this will do. */
- wxLayoutConstraints *layout = m_child[0]->m_container->GetConstraints();
- if (m_split == DSR_HORIZONTAL_TAB)
- {
- layout->height.PercentOf(m_container, wxHeight, py);
- }
- else
- {
- layout->width.PercentOf(m_container, wxWidth, px);
- }
- m_container->Layout();
- }
- }
- else
- {
- if (m_child[0] != NULL)
- {
- if ((m_dragging == DSR_HORIZONTAL_TAB && py <= 10)
- || (m_dragging == DSR_VERTICAL_TAB && px <= 10))
- {
- Unify(1);
- }
- else
- {
- Unify(0);
- }
- }
- }
-
- wxCursor cursor;
- if (m_split == DSR_HORIZONTAL_TAB)
- cursor = wxCursor(wxCURSOR_SIZENS);
- else if (m_split == DSR_VERTICAL_TAB)
- cursor = wxCursor(wxCURSOR_SIZEWE);
- else
- cursor = wxCursor(wxCURSOR_ARROW);
-
- m_container->SetCursor(cursor);
-
- m_dragging = DSR_NONE;
- }
- else if (m_leaf)
- {
- m_leaf->OnRelease(event);
- }
-}
-
-// ============================================================================
-// wxDynamicSashWindowLeaf
-// ============================================================================
-
-wxDynamicSashWindowLeaf::wxDynamicSashWindowLeaf(wxDynamicSashWindowImpl *impl)
-{
- m_impl = impl;
-
- m_hscroll =
- m_vscroll = NULL;
-
- m_child = NULL;
-}
-
-wxDynamicSashWindowLeaf::~wxDynamicSashWindowLeaf()
-{
- m_hscroll->SetEventHandler(m_hscroll);
- m_vscroll->SetEventHandler(m_vscroll);
-
- m_hscroll->Destroy();
- m_vscroll->Destroy();
- m_viewport->Destroy();
-}
-
-bool wxDynamicSashWindowLeaf::Create()
-{
- m_hscroll = new wxScrollBar();
- m_vscroll = new wxScrollBar();
- m_viewport = new wxWindow();
-
- wxDynamicSashWindowImpl *add_child_target = m_impl->m_add_child_target;
- m_impl->m_add_child_target = NULL;
-
- bool success = m_hscroll->Create(m_impl->m_container, wxID_ANY,
- wxDefaultPosition, wxDefaultSize,
- wxSB_HORIZONTAL);
- if ( success )
- success = m_vscroll->Create(m_impl->m_container, wxID_ANY,
- wxDefaultPosition, wxDefaultSize,
- wxSB_VERTICAL);
- if ( success )
- success = m_viewport->Create(m_impl->m_container, wxID_ANY);
- if ( !success )
- return false;
-
- m_impl->m_add_child_target = add_child_target;
-
- wxCursor cursor(wxCURSOR_ARROW);
- m_hscroll->SetCursor(cursor);
- m_vscroll->SetCursor(cursor);
- m_viewport->SetCursor(cursor);
-
- // the viewport must resize its child when it is itself resized, but it's
- // more convenient to do it in our own method instead of deriving a new
- // class just for this: this is why we pass this as last Connect() argument
- m_viewport->Connect(wxEVT_SIZE,
- wxSizeEventHandler(wxDynamicSashWindowLeaf::OnViewSize),
- NULL, this);
-
- Connect(wxEVT_DYNAMIC_SASH_REPARENT,
- wxEventHandler(wxDynamicSashWindowLeaf::OnReparent));
-
- if (m_impl->m_window->GetWindowStyle() & wxDS_MANAGE_SCROLLBARS)
- {
- m_hscroll->SetEventHandler(this);
- m_vscroll->SetEventHandler(this);
-
- Connect(wxEVT_SET_FOCUS,
- wxFocusEventHandler(wxDynamicSashWindowLeaf::OnFocus));
- Connect(wxEVT_SCROLL_TOP,
- wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
- Connect(wxEVT_SCROLL_BOTTOM,
- wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
- Connect(wxEVT_SCROLL_LINEUP,
- wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
- Connect(wxEVT_SCROLL_LINEDOWN,
- wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
- Connect(wxEVT_SCROLL_PAGEUP,
- wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
- Connect(wxEVT_SCROLL_PAGEDOWN,
- wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
- Connect(wxEVT_SCROLL_THUMBTRACK,
- wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
- Connect(wxEVT_SCROLL_THUMBRELEASE,
- wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
- }
-
- wxLayoutConstraints *layout = new wxLayoutConstraints();
- if (!layout)
- return false;
-
- wxSize size = m_hscroll->GetBestSize();
-
- layout->left.SameAs(m_impl->m_container, wxLeft, 10);
- layout->right.LeftOf(m_vscroll);
- layout->bottom.SameAs(m_impl->m_container, wxBottom, 3);
- layout->height.Absolute(size.GetHeight());
- m_hscroll->SetConstraints(layout);
-
- layout = new wxLayoutConstraints();
- if (!layout)
- return false;
-
- size = m_vscroll->GetBestSize();
-
- layout->top.SameAs(m_impl->m_container, wxTop, 10);
- layout->bottom.Above(m_hscroll);
- layout->right.SameAs(m_impl->m_container, wxRight, 3);
- layout->width.Absolute(size.GetWidth());
- m_vscroll->SetConstraints(layout);
-
- layout = new wxLayoutConstraints();
- if (!layout)
- return false;
- layout->left.SameAs(m_impl->m_container, wxLeft, 3);
- layout->right.LeftOf(m_vscroll);
- layout->top.SameAs(m_impl->m_container, wxTop, 3);
- layout->bottom.Above(m_hscroll);
- m_viewport->SetConstraints(layout);
-
- m_impl->m_container->Layout();
-
- return true;
-}
-
-void wxDynamicSashWindowLeaf::AddChild(wxWindow *window)
-{
- if (m_child)
- m_child->Destroy();
-
- m_child = window;
-
- wxDynamicSashReparentEvent event(this);
- AddPendingEvent(event);
-}
-
-DynamicSashRegion wxDynamicSashWindowLeaf::GetRegion(int x, int y)
-{
- wxSize size = m_impl->m_container->GetSize();
- int w = size.GetWidth();
- int h = size.GetHeight();
- size = m_hscroll->GetSize();
- int sh = size.GetHeight();
- size = m_vscroll->GetSize();
- int sw = size.GetWidth();
-
- if (x >= w - sw - 3 && x < w && y >= h - sh - 3 && y < h)
- return DSR_CORNER;
- if (x >= 3 && x < 10 && y >= h - sh - 3 && y < h - 2)
- return DSR_VERTICAL_TAB;
- if (x >= w - sw - 3 && x < w - 2 && y >= 3 && y < 10)
- return DSR_HORIZONTAL_TAB;
- if (x < 3)
- return DSR_LEFT_EDGE;
- if (y < 3)
- return DSR_TOP_EDGE;
- if (x >= w - 2)
- return DSR_RIGHT_EDGE;
- if (y >= h - 2)
- return DSR_BOTTOM_EDGE;
-
- return DSR_NONE;
-}
-
-void wxDynamicSashWindowLeaf::ResizeChild(const wxSize& size)
-{
- if (m_child)
- {
- if (m_impl->m_window->HasFlag(wxDS_MANAGE_SCROLLBARS))
- {
- wxSize best_size = m_child->GetBestSize();
- if (best_size.GetWidth() < size.GetWidth())
- best_size.SetWidth(size.GetWidth());
- if (best_size.GetHeight() < size.GetHeight())
- best_size.SetHeight(size.GetHeight());
- m_child->SetSize(best_size);
-
- int hpos = m_hscroll->GetThumbPosition();
- int vpos = m_vscroll->GetThumbPosition();
-
- if (hpos < 0)
- hpos = 0;
- if (vpos < 0)
- vpos = 0;
- if (hpos > best_size.GetWidth() - size.GetWidth())
- hpos = best_size.GetWidth() - size.GetWidth();
- if (vpos > best_size.GetHeight() - size.GetHeight())
- vpos = best_size.GetHeight() - size.GetHeight();
-
- m_hscroll->SetScrollbar(hpos, size.GetWidth(),
- best_size.GetWidth(), size.GetWidth());
- m_vscroll->SetScrollbar(vpos, size.GetHeight(),
- best_size.GetHeight(), size.GetHeight());
-
- // Umm, the scrollbars are doing something insane under GTK+ and subtracting
- // one from the position I pass in. This works around that.
- m_hscroll->SetThumbPosition(hpos + hpos - m_hscroll->GetThumbPosition());
- m_vscroll->SetThumbPosition(vpos + vpos - m_vscroll->GetThumbPosition());
-
- wxPoint pos = m_child->GetPosition();
- m_viewport->ScrollWindow(-hpos - pos.x, -vpos - pos.y);
- }
- else // !wxDS_MANAGE_SCROLLBARS
- {
- m_child->SetSize(size);
- }
- }
-}
-
-wxScrollBar *
-wxDynamicSashWindowLeaf::FindScrollBar(const wxWindow *child, int vert) const
-{
- if (m_child == child)
- {
- return vert ? m_vscroll : m_hscroll;
- }
-
- return NULL;
-}
-
-void wxDynamicSashWindowLeaf::OnSize(wxSizeEvent &WXUNUSED(event))
-{
- m_impl->m_container->Refresh();
-}
-
-void wxDynamicSashWindowLeaf::OnViewSize(wxSizeEvent &WXUNUSED(event))
-{
- if ( m_viewport )
- ResizeChild(m_viewport->GetSize());
-}
-
-void wxDynamicSashWindowLeaf::OnPaint(wxPaintEvent &WXUNUSED(event))
-{
- wxPaintDC dc(m_impl->m_container);
- dc.SetBackground(wxBrush(m_impl->m_container->GetBackgroundColour(), wxSOLID));
- dc.Clear();
-
- wxPen highlight(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT), 1, wxSOLID);
- wxPen shadow(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW), 1, wxSOLID);
- wxPen black(*wxBLACK, 1, wxSOLID);
-
- wxSize size = m_impl->m_container->GetSize();
- int w = size.GetWidth();
- int h = size.GetHeight();
- size = m_hscroll->GetSize();
- int sh = size.GetHeight();
- size = m_vscroll->GetSize();
- int sw = size.GetWidth();
-
- dc.SetPen(shadow);
- dc.DrawLine(1, 1, 1, h - 2);
- dc.DrawLine(1, 1, w - 2, 1);
- dc.SetPen(black);
- dc.DrawLine(2, 2, 2, h - 3);
- dc.DrawLine(2, 2, w - 3, 2);
- dc.SetPen(highlight);
- dc.DrawLine(w - 2, 2, w - 2, h - sh - 2);
- dc.DrawLine(w - 2, h - sh - 2, w - sw - 2, h - sh - 2);
- dc.DrawLine(w - sw - 2, h - sh - 2, w - sw - 2, h - 2);
- dc.DrawLine(w - sw - 2, h - 2, 2, h - 2);
-
- dc.SetPen(highlight);
- dc.DrawLine(w - sw - 2, 8, w - sw - 2, 4);
- dc.DrawLine(w - sw - 2, 4, w - 5, 4);
- dc.SetPen(shadow);
- dc.DrawLine(w - 5, 4, w - 5, 8);
- dc.DrawLine(w - 5, 8, w - sw - 2, 8);
- dc.SetPen(black);
- dc.DrawLine(w - 4, 3, w - 4, 9);
- dc.DrawLine(w - 4, 9, w - sw - 3, 9);
-
- dc.SetPen(highlight);
- dc.DrawLine(4, h - 5, 4, h - sh - 2);
- dc.DrawLine(4, h - sh - 2, 8, h - sh - 2);
- dc.SetPen(shadow);
- dc.DrawLine(8, h - sh - 2, 8, h - 5);
- dc.DrawLine(8, h - 5, 4, h - 5);
- dc.SetPen(black);
- dc.DrawLine(9, h - sh - 3, 9, h - 4);
- dc.DrawLine(9, h - 4, 3, h - 4);
-
- int cy = (h - sh + h - 6) / 2 + 1;
- int cx = (w - sw + w - 6) / 2 + 1;
- int sy = cy;
- while (sy > h - sh)
- sy -= 4;
- int sx = cx;
- while (sx > w - sw)
- sx -= 4;
-
- int x, y;
- for (y = sy; y < h - 2; y += 4)
- {
- for (x = sx; x < w - 2; x += 4)
- {
- if (x - cx >= -(y - cy))
- {
- dc.SetPen(highlight);
- dc.DrawPoint(x, y);
- dc.SetPen(shadow);
- dc.DrawPoint(x + 1, y + 1);
- }
- }
- }
-}
-
-void wxDynamicSashWindowLeaf::OnScroll(wxScrollEvent &WXUNUSED(event))
-{
- int nx = -m_hscroll->GetThumbPosition();
- int ny = -m_vscroll->GetThumbPosition();
-
- if (m_child)
- {
- wxPoint pos = m_child->GetPosition();
-
- m_viewport->ScrollWindow(nx - pos.x, ny - pos.y);
- }
-}
-
-void wxDynamicSashWindowLeaf::OnFocus(wxFocusEvent &event)
-{
- if ( event.GetEventObject() == m_hscroll ||
- event.GetEventObject() == m_vscroll )
- {
- m_child->SetFocus();
- }
-}
-
-
-void wxDynamicSashWindowLeaf::OnMouseMove(wxMouseEvent &event)
-{
- if (m_impl->m_dragging)
- return;
-
- DynamicSashRegion region = GetRegion(event.m_x, event.m_y);
-
- wxCursor cursor(wxCURSOR_ARROW);
- if (region == DSR_HORIZONTAL_TAB)
- {
- cursor = wxCursor(wxCURSOR_SIZENS);
- }
- else if (region == DSR_VERTICAL_TAB)
- {
- cursor = wxCursor(wxCURSOR_SIZEWE);
- }
- else if ((region == DSR_CORNER) &&
- (m_impl->m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0)
- {
- cursor = wxCursor(wxCURSOR_SIZENWSE);
- }
- else if (region == DSR_LEFT_EDGE || region == DSR_TOP_EDGE
- || region == DSR_RIGHT_EDGE || region == DSR_BOTTOM_EDGE)
- {
- if (m_impl->FindParent(region))
- {
- if (region == DSR_LEFT_EDGE || region == DSR_RIGHT_EDGE)
- {
- cursor = wxCursor(wxCURSOR_SIZEWE);
- }
- else
- {
- cursor = wxCursor(wxCURSOR_SIZENS);
- }
- }
- }
-
- m_impl->m_container->SetCursor(cursor);
-}
-
-void wxDynamicSashWindowLeaf::OnLeave(wxMouseEvent &WXUNUSED(event))
-{
- wxCursor cursor(wxCURSOR_ARROW);
- m_impl->m_container->SetCursor(cursor);
-}
-
-
-void wxDynamicSashWindowLeaf::OnPress(wxMouseEvent &event)
-{
- DynamicSashRegion region = GetRegion(event.m_x, event.m_y);
-
- if ((region == DSR_CORNER) && (m_impl->m_window->GetWindowStyle() & wxDS_DRAG_CORNER) == 0)
- return;
-
- if (region == DSR_HORIZONTAL_TAB || region == DSR_VERTICAL_TAB || region == DSR_CORNER)
- {
- m_impl->m_dragging = region;
- m_impl->m_drag_x = event.m_x;
- m_impl->m_drag_y = event.m_y;
- m_impl->DrawSash(event.m_x, event.m_y);
- m_impl->m_container->CaptureMouse();
- }
- else if (region == DSR_LEFT_EDGE || region == DSR_TOP_EDGE
- || region == DSR_RIGHT_EDGE || region == DSR_BOTTOM_EDGE)
- {
- wxDynamicSashWindowImpl *parent = m_impl->FindParent(region);
-
- if (parent)
- {
- int x = event.m_x;
- int y = event.m_y;
-
- m_impl->m_container->ClientToScreen(&x, &y);
- parent->m_container->ScreenToClient(&x, &y);
-
- parent->m_dragging = parent->m_split;
- parent->m_drag_x = x;
- parent->m_drag_y = y;
- parent->DrawSash(x, y);
- parent->m_container->CaptureMouse();
- }
- }
-}
-
-void wxDynamicSashWindowLeaf::OnRelease(wxMouseEvent &WXUNUSED(event))
-{
-}
-
-void wxDynamicSashWindowLeaf::OnReparent(wxEvent &WXUNUSED(event))
-{
- if (m_child)
- {
- m_child->Reparent(m_viewport);
- }
-
- ResizeChild(m_viewport->GetSize());
-}
-
-// ============================================================================
-// events
-// ============================================================================
-
-wxDynamicSashSplitEvent::wxDynamicSashSplitEvent()
-{
- m_eventObject = NULL;
- m_eventType = wxEVT_DYNAMIC_SASH_SPLIT;
-}
-
-wxDynamicSashSplitEvent::wxDynamicSashSplitEvent(wxObject *object)
-{
- m_eventObject = object;
- m_eventType = wxEVT_DYNAMIC_SASH_SPLIT;
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashSplitEvent, wxCommandEvent)
-
-wxDynamicSashUnifyEvent::wxDynamicSashUnifyEvent()
-{
- m_eventObject = NULL;
- m_eventType = wxEVT_DYNAMIC_SASH_UNIFY;
-}
-
-wxDynamicSashUnifyEvent::wxDynamicSashUnifyEvent(wxObject *object)
-{
- m_eventObject = object;
- m_eventType = wxEVT_DYNAMIC_SASH_UNIFY;
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashUnifyEvent, wxCommandEvent)
-
-
-wxDynamicSashReparentEvent::wxDynamicSashReparentEvent()
-{
- m_eventObject = NULL;
- m_eventType = wxEVT_DYNAMIC_SASH_REPARENT;
-}
-
-wxDynamicSashReparentEvent::wxDynamicSashReparentEvent(wxObject *object)
-{
- m_eventObject = object;
- m_eventType = wxEVT_DYNAMIC_SASH_REPARENT;
-}
-
-wxDynamicSashReparentEvent::wxDynamicSashReparentEvent(const wxDynamicSashReparentEvent& evt)
- : wxEvent(evt)
-{
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashReparentEvent, wxEvent)
-
diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp
deleted file mode 100644
index 38fd1429e2..0000000000
--- a/contrib/src/gizmos/editlbox.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: editlbox.cpp
-// Purpose: ListBox with editable items
-// Author: Vaclav Slavik
-// RCS-ID: $Id$
-// Copyright: (c) Vaclav Slavik
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers)
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/gizmos/editlbox.h"
-#include "wx/sizer.h"
-#include "wx/listctrl.h"
-
-
-
-
-// list control with auto-resizable column:
-class CleverListCtrl : public wxListCtrl
-{
-public:
- CleverListCtrl(wxWindow *parent,
- wxWindowID id = wxID_ANY,
- const wxPoint &pos = wxDefaultPosition,
- const wxSize &size = wxDefaultSize,
- long style = wxLC_ICON,
- const wxValidator& validator = wxDefaultValidator,
- const wxString &name = wxListCtrlNameStr)
- : wxListCtrl(parent, id, pos, size, style, validator, name)
- {
- CreateColumns();
- }
-
- void CreateColumns()
- {
- InsertColumn(0, _T("item"));
- SizeColumns();
- }
-
- void SizeColumns()
- {
- int w = GetSize().x;
-#ifdef __WXMSW__
- w -= wxSystemSettings::GetMetric(wxSYS_VSCROLL_X) + 6;
-#else
- w -= 2*wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
-#endif
- SetColumnWidth(0, w);
- }
-
-private:
- DECLARE_EVENT_TABLE()
- void OnSize(wxSizeEvent& event)
- {
- SizeColumns();
- event.Skip();
- }
-};
-
-BEGIN_EVENT_TABLE(CleverListCtrl, wxListCtrl)
- EVT_SIZE(CleverListCtrl::OnSize)
-END_EVENT_TABLE()
-
-#include "eldel.xpm"
-#include "eldown.xpm"
-#include "eledit.xpm"
-#include "elnew.xpm"
-#include "elup.xpm"
-
-IMPLEMENT_CLASS(wxEditableListBox, wxPanel)
-
-// NB: generate the IDs at runtime to avoid conflict with XRCID values,
-// they could cause XRCCTRL() failures in XRC-based dialogs
-const int wxID_ELB_DELETE = wxNewId();
-const int wxID_ELB_EDIT = wxNewId();
-const int wxID_ELB_NEW = wxNewId();
-const int wxID_ELB_UP = wxNewId();
-const int wxID_ELB_DOWN = wxNewId();
-const int wxID_ELB_LISTCTRL = wxNewId();
-
-BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
- EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected)
- EVT_LIST_END_LABEL_EDIT(wxID_ELB_LISTCTRL, wxEditableListBox::OnEndLabelEdit)
- EVT_BUTTON(wxID_ELB_NEW, wxEditableListBox::OnNewItem)
- EVT_BUTTON(wxID_ELB_UP, wxEditableListBox::OnUpItem)
- EVT_BUTTON(wxID_ELB_DOWN, wxEditableListBox::OnDownItem)
- EVT_BUTTON(wxID_ELB_EDIT, wxEditableListBox::OnEditItem)
- EVT_BUTTON(wxID_ELB_DELETE, wxEditableListBox::OnDelItem)
-END_EVENT_TABLE()
-
-wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
- const wxString& label,
- const wxPoint& pos, const wxSize& size,
- long style,
- const wxString& name)
- : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name)
-{
- m_style = style;
- m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL;
-
- wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-
- wxPanel *subp = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
- wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
- wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL);
- subsizer->Add(new wxStaticText(subp, wxID_ANY, label), 1, wxALIGN_CENTRE_VERTICAL | wxLEFT, 4);
-
-#ifdef __WXMSW__
- #define BTN_BORDER 4
- // FIXME - why is this needed? There's some reason why sunken border is
- // ignored by sizers in wxMSW but not in wxGTK that I can't
- // figure out...
-#else
- #define BTN_BORDER 0
-#endif
-
- if ( m_style & wxEL_ALLOW_EDIT )
- {
- m_bEdit = new wxBitmapButton(subp, wxID_ELB_EDIT, wxBitmap(eledit_xpm));
- subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
- }
-
- if ( m_style & wxEL_ALLOW_NEW )
- {
- m_bNew = new wxBitmapButton(subp, wxID_ELB_NEW, wxBitmap(elnew_xpm));
- subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
- }
-
- if ( m_style & wxEL_ALLOW_DELETE )
- {
- m_bDel = new wxBitmapButton(subp, wxID_ELB_DELETE, wxBitmap(eldel_xpm));
- subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
- }
-
- if (!(m_style & wxEL_NO_REORDER))
- {
- m_bUp = new wxBitmapButton(subp, wxID_ELB_UP, wxBitmap(elup_xpm));
- subsizer->Add(m_bUp, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
-
- m_bDown = new wxBitmapButton(subp, wxID_ELB_DOWN, wxBitmap(eldown_xpm));
- subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
- }
-
-#if wxUSE_TOOLTIPS
- if ( m_bEdit ) m_bEdit->SetToolTip(_("Edit item"));
- if ( m_bNew ) m_bNew->SetToolTip(_("New item"));
- if ( m_bDel ) m_bDel->SetToolTip(_("Delete item"));
- if ( m_bUp ) m_bUp->SetToolTip(_("Move up"));
- if ( m_bDown ) m_bDown->SetToolTip(_("Move down"));
-#endif
-
- subp->SetSizer(subsizer);
- subsizer->Fit(subp);
-
- sizer->Add(subp, 0, wxEXPAND);
-
- long st = wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL | wxSUNKEN_BORDER;
- if ( style & wxEL_ALLOW_EDIT )
- st |= wxLC_EDIT_LABELS;
- m_listCtrl = new CleverListCtrl(this, wxID_ELB_LISTCTRL,
- wxDefaultPosition, wxDefaultSize, st);
- wxArrayString empty_ar;
- SetStrings(empty_ar);
-
- sizer->Add(m_listCtrl, 1, wxEXPAND);
-
- SetSizer(sizer);
- Layout();
-}
-
-void wxEditableListBox::SetStrings(const wxArrayString& strings)
-{
- m_listCtrl->DeleteAllItems();
- size_t i;
-
- for (i = 0; i < strings.GetCount(); i++)
- m_listCtrl->InsertItem(i, strings[i]);
-
- m_listCtrl->InsertItem(strings.GetCount(), wxEmptyString);
- m_listCtrl->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-}
-
-void wxEditableListBox::GetStrings(wxArrayString& strings) const
-{
- strings.Clear();
-
- for (int i = 0; i < m_listCtrl->GetItemCount()-1; i++)
- strings.Add(m_listCtrl->GetItemText(i));
-}
-
-void wxEditableListBox::OnItemSelected(wxListEvent& event)
-{
- m_selection = event.GetIndex();
- if (!(m_style & wxEL_NO_REORDER))
- {
- m_bUp->Enable(m_selection != 0 && m_selection < m_listCtrl->GetItemCount()-1);
- m_bDown->Enable(m_selection < m_listCtrl->GetItemCount()-2);
- }
-
- if (m_style & wxEL_ALLOW_EDIT)
- m_bEdit->Enable(m_selection < m_listCtrl->GetItemCount()-1);
- if (m_style & wxEL_ALLOW_DELETE)
- m_bDel->Enable(m_selection < m_listCtrl->GetItemCount()-1);
-}
-
-void wxEditableListBox::OnNewItem(wxCommandEvent& WXUNUSED(event))
-{
- m_listCtrl->SetItemState(m_listCtrl->GetItemCount()-1,
- wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
- m_listCtrl->EditLabel(m_selection);
-}
-
-void wxEditableListBox::OnEndLabelEdit(wxListEvent& event)
-{
- if ( event.GetIndex() == m_listCtrl->GetItemCount()-1 &&
- !event.GetText().empty() )
- {
- // The user edited last (empty) line, i.e. added new entry. We have to
- // add new empty line here so that adding one more line is still
- // possible:
- m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), wxEmptyString);
-
- // Simulate a wxEVT_COMMAND_LIST_ITEM_SELECTED event for the new item,
- // so that the buttons are enabled/disabled properly
- wxListEvent selectionEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED, m_listCtrl->GetId());
- selectionEvent.m_itemIndex = event.GetIndex();
- m_listCtrl->GetEventHandler()->ProcessEvent(selectionEvent);
- }
-}
-
-void wxEditableListBox::OnDelItem(wxCommandEvent& WXUNUSED(event))
-{
- m_listCtrl->DeleteItem(m_selection);
- m_listCtrl->SetItemState(m_selection,
- wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-}
-
-void wxEditableListBox::OnEditItem(wxCommandEvent& WXUNUSED(event))
-{
- m_listCtrl->EditLabel(m_selection);
-}
-
-void wxEditableListBox::OnUpItem(wxCommandEvent& WXUNUSED(event))
-{
- wxString t1, t2;
-
- t1 = m_listCtrl->GetItemText(m_selection - 1);
- t2 = m_listCtrl->GetItemText(m_selection);
- m_listCtrl->SetItemText(m_selection - 1, t2);
- m_listCtrl->SetItemText(m_selection, t1);
- m_listCtrl->SetItemState(m_selection - 1,
- wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-}
-
-void wxEditableListBox::OnDownItem(wxCommandEvent& WXUNUSED(event))
-{
- wxString t1, t2;
-
- t1 = m_listCtrl->GetItemText(m_selection + 1);
- t2 = m_listCtrl->GetItemText(m_selection);
- m_listCtrl->SetItemText(m_selection + 1, t2);
- m_listCtrl->SetItemText(m_selection, t1);
- m_listCtrl->SetItemState(m_selection + 1,
- wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-}
diff --git a/contrib/src/gizmos/eldel.xpm b/contrib/src/gizmos/eldel.xpm
deleted file mode 100644
index 9b83bb0441..0000000000
--- a/contrib/src/gizmos/eldel.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * eldel_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #7F0000",
-"+ c #FFFFFF",
-" ",
-" ",
-" ",
-" ..+ ..+ ",
-" ....+ ..+ ",
-" ....+ ..+ ",
-" ...+ .+ ",
-" .....+ ",
-" ...+ ",
-" .....+ ",
-" ...+ ..+ ",
-" ...+ ..+ ",
-" ...+ .+ ",
-" ...+ .+ ",
-" . . ",
-" "};
diff --git a/contrib/src/gizmos/eldown.xpm b/contrib/src/gizmos/eldown.xpm
deleted file mode 100644
index 656cb9c4f1..0000000000
--- a/contrib/src/gizmos/eldown.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * eldown_xpm[] = {
-"16 16 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ... ",
-" ... ",
-" ... ",
-" ... ",
-" ... ",
-" ... ",
-" ........... ",
-" ......... ",
-" ....... ",
-" ..... ",
-" ... ",
-" . ",
-" ",
-" "};
diff --git a/contrib/src/gizmos/eledit.xpm b/contrib/src/gizmos/eledit.xpm
deleted file mode 100644
index 4cbd05eafd..0000000000
--- a/contrib/src/gizmos/eledit.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * eledit_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #000000",
-"+ c #00007F",
-" ",
-" ",
-" .. .. ",
-" . ",
-" . ",
-" ++++ . ++++ ",
-" ++ . ++ ++",
-" +++++ . ++++++",
-" ++ ++ . ++ ",
-" ++ ++ . ++ ++",
-" +++++ . ++++ ",
-" . ",
-" . ",
-" .. .. ",
-" ",
-" "};
diff --git a/contrib/src/gizmos/elnew.xpm b/contrib/src/gizmos/elnew.xpm
deleted file mode 100644
index 3d0d67f4ac..0000000000
--- a/contrib/src/gizmos/elnew.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * elnew_xpm[] = {
-"16 16 5 1",
-" c None",
-". c #7F7F7F",
-"+ c #FFFFFF",
-"@ c #FFFF00",
-"# c #000000",
-" ",
-" ",
-" . .+ .@ ",
-" . .@.@# # # ",
-" @.@+.... # ",
-" ... @@ ",
-" @ . @. # ",
-" .# .@ ",
-" . # ",
-" # ",
-" # ",
-" # ",
-" # ",
-" # # # # # # ",
-" ",
-" "};
diff --git a/contrib/src/gizmos/elup.xpm b/contrib/src/gizmos/elup.xpm
deleted file mode 100644
index 01193ed821..0000000000
--- a/contrib/src/gizmos/elup.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * elup_xpm[] = {
-"16 16 2 1",
-" c None",
-". c #000000",
-" ",
-" . ",
-" ... ",
-" ..... ",
-" ....... ",
-" ......... ",
-" ........... ",
-" ... ",
-" ... ",
-" ... ",
-" ... ",
-" ... ",
-" ... ",
-" ",
-" ",
-" "};
diff --git a/contrib/src/gizmos/ledctrl.cpp b/contrib/src/gizmos/ledctrl.cpp
deleted file mode 100644
index 458af3f4cc..0000000000
--- a/contrib/src/gizmos/ledctrl.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-// ============================================================================
-// headers
-// ============================================================================
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif //__BORLANDC__
-
-#ifndef WX_PRECOMP
- #include "wx/dcclient.h"
- #include "wx/dcmemory.h"
- #include "wx/intl.h"
-#endif
-
-#include "wx/gizmos/ledctrl.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// A LED digit is build up like this, with maximum 7 Lines :
-//
-// 111
-// 6 2
-// 777
-// 5 3
-// 444
-//
-// Each number contains combinations of the lines, and they are set up below.
-
-const int LINE1 = 1;
-const int LINE2 = 2;
-const int LINE3 = 4;
-const int LINE4 = 8;
-const int LINE5 = 16;
-const int LINE6 = 32;
-const int LINE7 = 64;
-const int DECIMALSIGN = 128;
-
-const int DIGIT0 = LINE1 | LINE2 | LINE3 | LINE4 | LINE5 | LINE6;
-const int DIGIT1 = LINE2 | LINE3;
-const int DIGIT2 = LINE1 | LINE2 | LINE4 | LINE5 | LINE7;
-const int DIGIT3 = LINE1 | LINE2 | LINE3 | LINE4 | LINE7;
-const int DIGIT4 = LINE2 | LINE3 | LINE6 | LINE7;
-const int DIGIT5 = LINE1 | LINE3 | LINE4 | LINE6 | LINE7;
-const int DIGIT6 = LINE1 | LINE3 | LINE4 | LINE5 | LINE6 | LINE7;
-const int DIGIT7 = LINE1 | LINE2 | LINE3;
-const int DIGIT8 = LINE1 | LINE2 | LINE3 | LINE4 | LINE5 | LINE6 | LINE7;
-const int DIGIT9 = LINE1 | LINE2 | LINE3 | LINE6 | LINE7;
-const int DASH = LINE7;
-
-const int DIGITALL = -1;
-
-// ============================================================================
-// wxLEDNumberCtrl class implementation
-// ============================================================================
-
-wxLEDNumberCtrl::wxLEDNumberCtrl()
-: m_Alignment(wxLED_ALIGN_LEFT),
- m_LineMargin(-1),
- m_DigitMargin(-1),
- m_LineLength(-1),
- m_LineWidth(-1),
- m_DrawFaded(false),
- m_LeftStartPos(-1)
-{
-}
-
-
-wxLEDNumberCtrl::wxLEDNumberCtrl(wxWindow *parent, wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- long style)
-: m_Alignment(wxLED_ALIGN_LEFT),
- m_LineMargin(-1),
- m_DigitMargin(-1),
- m_LineLength(-1),
- m_LineWidth(-1),
- m_DrawFaded(false),
- m_LeftStartPos(-1)
-{
- Create(parent, id, pos, size, style);
-}
-
-
-bool wxLEDNumberCtrl::Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- long style)
-{
- bool RetVal = wxControl::Create(parent, id, pos, size, style);
-
- if ((style & wxLED_DRAW_FADED) != 0)
- SetDrawFaded(true);
- if ((style & wxLED_ALIGN_MASK) != 0)
- SetAlignment((wxLEDValueAlign)(style & wxLED_ALIGN_MASK));
-
- SetBackgroundColour(*wxBLACK);
- SetForegroundColour(*wxGREEN);
-
- return RetVal;
-}
-
-
-void wxLEDNumberCtrl::SetAlignment(wxLEDValueAlign Alignment, bool Redraw)
-{
- if (Alignment != m_Alignment)
- {
- m_Alignment = Alignment;
- RecalcInternals(GetClientSize());
-
- if (Redraw)
- Refresh(false);
- }
-}
-
-
-void wxLEDNumberCtrl::SetDrawFaded(bool DrawFaded, bool Redraw)
-{
- if (DrawFaded != m_DrawFaded)
- {
- m_DrawFaded = DrawFaded;
-
- if (Redraw)
- Refresh(false);
- }
-}
-
-
-void wxLEDNumberCtrl::SetValue(wxString const &Value, bool Redraw)
-{
- if (Value != m_Value)
- {
-#ifdef __WXDEBUG__
- if (!Value.empty())
- {
- for(size_t i=0; i='0' && ch<='9') || ch=='-' || ch==' ' || ch=='.',
- wxT("wxLEDNumberCtrl can only display numeric string values."));
- }
- }
-#endif
-
- m_Value = Value;
- RecalcInternals(GetClientSize());
-
- if (Redraw)
- Refresh(false);
- }
-}
-
-
-BEGIN_EVENT_TABLE(wxLEDNumberCtrl, wxControl)
- EVT_ERASE_BACKGROUND(wxLEDNumberCtrl::OnEraseBackground)
- EVT_PAINT(wxLEDNumberCtrl::OnPaint)
- EVT_SIZE(wxLEDNumberCtrl::OnSize)
-END_EVENT_TABLE()
-
-
-void wxLEDNumberCtrl::OnEraseBackground(wxEraseEvent &WXUNUSED(event))
-{
-}
-
-
-void wxLEDNumberCtrl::OnPaint(wxPaintEvent &WXUNUSED(event))
-{
- wxPaintDC Dc(this);
-
- int Width, Height;
- GetClientSize(&Width, &Height);
-
- wxBitmap *pMemoryBitmap = new wxBitmap(Width, Height);
- wxMemoryDC MemDc;
-
- MemDc.SelectObject(*pMemoryBitmap);
-
- // Draw background.
- MemDc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
- MemDc.DrawRectangle(wxRect(0, 0, Width, Height));
- MemDc.SetBrush(wxNullBrush);
-
- // Iterate each digit in the value, and draw.
- const int DigitCount = m_Value.Len();
- for (int offset=0, i = 0; offset < DigitCount; ++offset, ++i)
- {
- wxChar c = m_Value.GetChar(offset);
-
- // Draw faded lines if wanted.
- if (m_DrawFaded && (c != _T('.')))
- DrawDigit(MemDc, DIGITALL, i);
-
- // Draw the digits.
- switch (c)
- {
- case _T('0') :
- DrawDigit(MemDc, DIGIT0, i);
- break;
- case _T('1') :
- DrawDigit(MemDc, DIGIT1, i);
- break;
- case _T('2') :
- DrawDigit(MemDc, DIGIT2, i);
- break;
- case _T('3') :
- DrawDigit(MemDc, DIGIT3, i);
- break;
- case _T('4') :
- DrawDigit(MemDc, DIGIT4, i);
- break;
- case _T('5') :
- DrawDigit(MemDc, DIGIT5, i);
- break;
- case _T('6') :
- DrawDigit(MemDc, DIGIT6, i);
- break;
- case _T('7') :
- DrawDigit(MemDc, DIGIT7, i);
- break;
- case _T('8') :
- DrawDigit(MemDc, DIGIT8, i);
- break;
- case _T('9') :
- DrawDigit(MemDc, DIGIT9, i);
- break;
- case _T('-') :
- DrawDigit(MemDc, DASH, i);
- break;
- case _T('.') :
- // Display the decimal in the previous segment
- i--;
- DrawDigit(MemDc, DECIMALSIGN, i);
- break;
- case _T(' ') :
- // just skip it
- break;
- default :
- wxFAIL_MSG(wxT("Unknown digit value"));
- break;
- }
- }
-
- // Blit the memory dc to screen.
- Dc.Blit(0, 0, Width, Height, &MemDc, 0, 0, wxCOPY);
- delete pMemoryBitmap;
-}
-
-
-void wxLEDNumberCtrl::DrawDigit(wxDC &Dc, int Digit, int Column)
-{
- wxColour LineColor(GetForegroundColour());
-
- if (Digit == DIGITALL)
- {
- const unsigned char R = (unsigned char)(LineColor.Red() / 16);
- const unsigned char G = (unsigned char)(LineColor.Green() / 16);
- const unsigned char B = (unsigned char)(LineColor.Blue() / 16);
-
- LineColor.Set(R, G, B);
- }
-
- int XPos = m_LeftStartPos + Column * (m_LineLength + m_DigitMargin);
-
- // Create a pen and draw the lines.
- wxPen Pen(LineColor, m_LineWidth, wxSOLID);
- Dc.SetPen(Pen);
-
- if ((Digit & LINE1))
- {
- Dc.DrawLine(XPos + m_LineMargin*2, m_LineMargin,
- XPos + m_LineLength + m_LineMargin*2, m_LineMargin);
- }
-
- if (Digit & LINE2)
- {
- Dc.DrawLine(XPos + m_LineLength + m_LineMargin*3, m_LineMargin*2,
- XPos + m_LineLength + m_LineMargin*3, m_LineLength + (m_LineMargin*2));
- }
-
- if (Digit & LINE3)
- {
- Dc.DrawLine(XPos + m_LineLength + m_LineMargin*3, m_LineLength + (m_LineMargin*4),
- XPos + m_LineLength + m_LineMargin*3, m_LineLength*2 + (m_LineMargin*4));
- }
-
- if (Digit & LINE4)
- {
- Dc.DrawLine(XPos + m_LineMargin*2, m_LineLength*2 + (m_LineMargin*5),
- XPos + m_LineLength + m_LineMargin*2, m_LineLength*2 + (m_LineMargin*5));
- }
-
- if (Digit & LINE5)
- {
- Dc.DrawLine(XPos + m_LineMargin, m_LineLength + (m_LineMargin*4),
- XPos + m_LineMargin, m_LineLength*2 + (m_LineMargin*4));
- }
-
- if (Digit & LINE6)
- {
- Dc.DrawLine(XPos + m_LineMargin, m_LineMargin*2,
- XPos + m_LineMargin, m_LineLength + (m_LineMargin*2));
- }
-
- if (Digit & LINE7)
- {
- Dc.DrawLine(XPos + m_LineMargin*2, m_LineLength + (m_LineMargin*3),
- XPos + m_LineMargin*2 + m_LineLength, m_LineLength + (m_LineMargin*3));
- }
-
- if (Digit & DECIMALSIGN)
- {
- Dc.DrawLine(XPos + m_LineLength + m_LineMargin*4, m_LineLength*2 + (m_LineMargin*5),
- XPos + m_LineLength + m_LineMargin*4, m_LineLength*2 + (m_LineMargin*5));
- }
-
- Dc.SetPen(wxNullPen);
-}
-
-
-void wxLEDNumberCtrl::RecalcInternals(const wxSize &CurrentSize)
-{
- // Dimensions of LED segments
- //
- // Size of character is based on the HEIGH of the widget, NOT the width.
- // Segment height is calculated as follows:
- // Each segment is m_LineLength pixels long.
- // There is m_LineMargin pixels at the top and bottom of each line segment
- // There is m_LineMargin pixels at the top and bottom of each digit
- //
- // Therefore, the heigth of each character is:
- // m_LineMargin : Top digit boarder
- // m_LineMargin+m_LineLength+m_LineMargin : Top half of segment
- // m_LineMargin+m_LineLength+m_LineMargin : Bottom half of segment
- // m_LineMargin : Bottom digit boarder
- // ----------------------
- // m_LineMargin*6 + m_LineLength*2 == Total height of digit.
- // Therefore, (m_LineMargin*6 + m_LineLength*2) must equal Height
- //
- // Spacing between characters can then be calculated as follows:
- // m_LineMargin : before the digit,
- // m_LineMargin+m_LineLength+m_LineMargin : for the digit width
- // m_LineMargin : after the digit
- // = m_LineMargin*4 + m_LineLength
- const int Height = CurrentSize.GetHeight();
-
- if ((Height * 0.075) < 1)
- m_LineMargin = 1;
- else
- m_LineMargin = (int)(Height * 0.075);
-
- if ((Height * 0.275) < 1)
- m_LineLength = 1;
- else
- m_LineLength = (int)(Height * 0.275);
-
- m_LineWidth = m_LineMargin;
-
- m_DigitMargin = m_LineMargin * 4;
-
- // Count the number of characters in the string; '.' characters are not
- // included because they do not take up space in the display
- int count = 0;
- for (unsigned int i = 0; i < m_Value.Len(); i++)
- if (m_Value.GetChar(i) != '.')
- count++;
- const int ValueWidth = (m_LineLength + m_DigitMargin) * count;
- const int ClientWidth = CurrentSize.GetWidth();
-
- switch (m_Alignment)
- {
- case wxLED_ALIGN_LEFT :
- m_LeftStartPos = m_LineMargin;
- break;
- case wxLED_ALIGN_RIGHT :
- m_LeftStartPos = ClientWidth - ValueWidth - m_LineMargin;
- break;
- case wxLED_ALIGN_CENTER :
- m_LeftStartPos = (ClientWidth - ValueWidth) / 2;
- break;
- default :
- wxFAIL_MSG(wxT("Unknown alignent value for wxLEDNumberCtrl."));
- break;
- }
-}
-
-
-void wxLEDNumberCtrl::OnSize(wxSizeEvent &Event)
-{
- RecalcInternals(Event.GetSize());
-
- Event.Skip();
-}
diff --git a/contrib/src/gizmos/makedocs.vc b/contrib/src/gizmos/makedocs.vc
deleted file mode 100644
index 94d50692a6..0000000000
--- a/contrib/src/gizmos/makedocs.vc
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# File: makefile.vc
-WXDIR=$(WXWIN)
-
-NAME=gizmos
-WAITFLAG=/WAIT
-DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\$(NAME)
-DOCDIR=$(WXDIR)\docs
-THISDIR = $(WXDIR)\contrib\src\$(NAME)
-DOCSOURCES=$(DOCSOURCEDIR)\manual.tex \
- $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\topics.tex
-
-alldocs: mkdirs html htmlhelp htb hlp pdfrtf
-html: touchmanual $(DOCDIR)\html\$(NAME)\$(NAME).htm
-htmlhelp: touchmanual $(DOCDIR)\htmlhelp\$(NAME).chm
-htb: $(DOCDIR)\htb\$(NAME).htb
-hlp: touchmanual $(DOCDIR)\winhelp\$(NAME).hlp
-pdfrtf: $(DOCDIR)\pdf\$(NAME).rtf
-ps: $(DOCDIR)\ps\$(NAME).ps
-
-touchmanual:
- touch $(DOCSOURCEDIR)\manual.tex
-
-$(DOCDIR)\winhelp\$(NAME).hlp: $(DOCSOURCEDIR)\$(NAME).rtf $(DOCSOURCEDIR)\$(NAME).hpj
- cd $(DOCSOURCEDIR)
- -erase $(NAME).ph
- hcw /c /e $(NAME)
- move $(NAME).hlp $(DOCDIR)\winhelp\$(NAME).hlp
- move $(NAME).cnt $(DOCDIR)\winhelp\$(NAME).cnt
- cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).hpj:
- echo [OPTIONS] > $(DOCSOURCEDIR)\$(NAME).hpj
- echo BMROOT=$(WXDIR)\contrib\docs\latex\$(NAME) >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo TITLE=OGL Manual >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo CONTENTS=Contents >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo COMPRESS=HIGH >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [FILES] >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo $(NAME).rtf >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [CONFIG] >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo CreateButton("Up", "&Up", "JumpId(`$(NAME).hlp', `Contents')") >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo BrowseButtons() >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [MAP] >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [BITMAPS] >> $(DOCSOURCEDIR)\$(NAME).hpj
-
-$(DOCSOURCEDIR)\$(NAME).rtf: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\manual.tex $(DOCSOURCEDIR)\$(NAME).rtf -twice -winhelp
- cd $(THISDIR)
-
-$(DOCDIR)\pdf\$(NAME).rtf: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -copy *.bmp $(DOCDIR)\pdf
- -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\manual.tex $(DOCDIR)\pdf\$(NAME).rtf -twice -rtf
- cd $(THISDIR)
-
-$(DOCDIR)\html\$(NAME)\$(NAME).htm: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -mkdir $(DOCDIR)\html\$(NAME)
- copy *.gif $(DOCDIR)\html\$(NAME)
- -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\manual.tex $(DOCDIR)\html\$(NAME)\$(NAME) -html -twice
- -erase $(DOCDIR)\html\$(NAME)\*.con
- -erase *.con
- -erase $(DOCDIR)\html\$(NAME)\*.ref
- cd $(THISDIR)
-
-$(DOCDIR)\htmlhelp\$(NAME).chm: $(DOCDIR)\html\$(NAME)\$(NAME).htm $(DOCDIR)\html\$(NAME)\$(NAME).hhp
- cd $(DOCDIR)\html\$(NAME)
- -hhc $(NAME).hhp
- -erase $(DOCDIR)\htmlhelp\$(NAME).chm
- move $(NAME).chm $(DOCDIR)\htmlhelp\$(NAME).chm
- cd $(THISDIR)
-
-# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
-# files, renamed to htb.
-# This can then be used with e.g. helpview.
-# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\$(NAME).htb: $(DOCDIR)\html\$(NAME)\$(NAME).htm
- cd $(DOCDIR)\html\$(NAME)
- -erase $(NAME).zip $(NAME).htb
- zip $(NAME).zip *.htm *.gif *.hhp *.hhc *.hhk
- -mkdir $(DOCDIR)\htb
- -erase $(DOCDIR)\htb\$(NAME).htb
- -erase $(DOCDIR)\htb\$(NAME).htb
- move $(NAME).zip $(DOCDIR)\htb\$(NAME).htb
- cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).dvi: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -latex $(NAME)
- -latex $(NAME)
- -makeindx $(NAME)
- -bibtex $(NAME)
- -latex $(NAME)
- -latex $(NAME)
- cd $(THISDIR)
-
-$(WXDIR)\docs\ps\$(NAME).ps: $(DOCSOURCEDIR)\$(NAME).dvi
- cd $(DOCSOURCEDIR)
- -dvips32 -o $(NAME).ps $(NAME)
- move $(NAME).ps $(WXDIR)\docs\ps\$(NAME).ps
- cd $(THISDIR)
-
diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp
deleted file mode 100644
index 555bc6f659..0000000000
--- a/contrib/src/gizmos/multicell.cpp
+++ /dev/null
@@ -1,653 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: multicell.cpp
-// Purpose: provide two new classes for layout, wxMultiCellSizer and wxMultiCellCanvas
-// Author: Jonathan Bayer
-// Modified by:
-// Created:
-// RCS-ID: $Id$
-// Copyright: (c) Jonathan Bayer
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// This was inspired by the gbsizer class written by Alex Andruschak
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/gizmos/multicell.h"
-
-
-
-
-//---------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxMultiCellSizer, wxSizer);
-IMPLEMENT_ABSTRACT_CLASS(wxMultiCellItemHandle, wxObject);
-
-//---------------------------------------------------------------------------
-// wxMultiCellItemHandle
-//---------------------------------------------------------------------------
-/*
- *Function Name: wxMultiCellItemHandle :: wxMultiCellItemHandle
- *
- *Parameters: int row
- * int column
- * int height
- * int width
- * wxSize size
- * wxResizable Style
- * wxSize weight
- * int align
- *
- *Description: This is the constructor for the class.
- *
- */
-
-void wxMultiCellItemHandle :: Initialize( int row, int column, int height, int width, wxSize size, wxResizable Style, wxSize weight, int align)
-{
- m_column = column;
- m_row = row;
- m_width = width;
- m_height = height;
-
- m_style = Style;
- m_fixedSize = size;
- m_alignment = align;
- m_weight = weight;
-}
-//---------------------------------------------------------------------------
-wxMultiCellItemHandle :: wxMultiCellItemHandle( int row, int column, int height, int width, wxSize size, wxResizable Style, wxSize weight, int align)
-{
- Initialize(row, column,height, width, size, Style, weight, align);
-}
-//---------------------------------------------------------------------------
-wxMultiCellItemHandle :: wxMultiCellItemHandle( int row, int column, wxSize size, wxResizable style, wxSize weight, int align)
-{
- Initialize(row, column,1, 1, size, style, weight, align);
-}
-//---------------------------------------------------------------------------
-wxMultiCellItemHandle :: wxMultiCellItemHandle( int row, int column, wxResizable style, wxSize weight, int align)
-{
- Initialize(row, column, 1, 1, wxSize(1, 1), style, weight, align);
-}
-//---------------------------------------------------------------------------
-int wxMultiCellItemHandle::GetColumn() const
-{
- return m_column;
-}
-//---------------------------------------------------------------------------
-int wxMultiCellItemHandle::GetRow() const
-{
- return m_row;
-}
-//---------------------------------------------------------------------------
-int wxMultiCellItemHandle::GetWidth() const
-{
- return m_width;
-}
-//---------------------------------------------------------------------------
-int wxMultiCellItemHandle::GetHeight() const
-{
- return m_height;
-}
-//---------------------------------------------------------------------------
-wxResizable wxMultiCellItemHandle :: GetStyle() const
-{
- return m_style;
-};
-//---------------------------------------------------------------------------
-wxSize wxMultiCellItemHandle :: GetLocalSize() const
-{
- return m_fixedSize;
-};
-//---------------------------------------------------------------------------
-int wxMultiCellItemHandle :: GetAlignment() const
-{
- return m_alignment;
-};
-//---------------------------------------------------------------------------
-wxSize wxMultiCellItemHandle :: GetWeight() const
-{
- return m_weight;
-};
-
-
-
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-// wxMultiCellSizer
-//---------------------------------------------------------------------------
-
-/*
- *Function Name: wxMultiCellSizer::Initialize
- *
- *Parameters: wxsize Initial size of sizer
- *
- *Description: This is a common function to initialize all the members of
- * this class. It is only called from the constructors
- *
- */
-
-void wxMultiCellSizer::Initialize( wxSize size )
-{
- m_cell_count = size;
- m_maxHeight = (int *)malloc((1 + m_cell_count.GetHeight()) * sizeof(int));
- m_maxWidth = (int *)malloc( (1 + m_cell_count.GetWidth()) * sizeof(int));
- m_rowStretch = (int *)malloc( (1 + m_cell_count.GetHeight()) * sizeof(int));
- m_colStretch = (int *)malloc((1 + m_cell_count.GetWidth()) * sizeof(int));
-
- m_weights = (wxSize **)malloc((1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth())) * sizeof(wxSize *));
- m_minSizes = (wxSize **)malloc((1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth())) * sizeof(wxSize *));
- for (int x = 0; x < 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
- {
- m_weights[x] = new wxSize(0,0);
- m_minSizes[x] = new wxSize(0,0);
- }
-
- m_maxWeights = 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth());
- m_defaultCellSize = wxSize(5, 5);
- m_win = NULL;
- m_pen = wxRED_PEN;
-}
-//---------------------------------------------------------------------------
-wxMultiCellSizer::wxMultiCellSizer( wxSize & size )
-{
- Initialize(size);
-}
-//---------------------------------------------------------------------------
-wxMultiCellSizer::wxMultiCellSizer( int rows, int cols)
-{
- wxSize size(cols, rows);
- Initialize(size);
-}
-//---------------------------------------------------------------------------
-wxMultiCellSizer::~wxMultiCellSizer()
-{
- WX_CLEAR_LIST(wxSizerItemList, m_children);
-
- free(m_maxHeight);
- free(m_maxWidth);
- free(m_rowStretch);
- free(m_colStretch);
-
- for (int x = 0; x < 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
- {
- delete m_weights[x];
- delete m_minSizes[x];
- }
- free(m_weights);
- free(m_minSizes);
-}
-//---------------------------------------------------------------------------
-bool wxMultiCellSizer::EnableGridLines(wxWindow *win)
-{
- m_win = win;
- return true;
-}
-//---------------------------------------------------------------------------
-bool wxMultiCellSizer::SetGridPen(const wxPen *pen)
-{
- m_pen = pen;
- return true;
-}
-
-//---------------------------------------------------------------------------
-bool wxMultiCellSizer::SetDefaultCellSize(wxSize size)
-{
- m_defaultCellSize = size;
- return true;
-}
-//---------------------------------------------------------------------------
-bool wxMultiCellSizer::SetColumnWidth(int column, int colSize, bool expandable)
-{
- if (expandable)
- {
- m_minSizes[column]->SetWidth(-colSize);
- }
- else
- {
- m_minSizes[column]->SetWidth(colSize);
- }
- return true;
-}
-//---------------------------------------------------------------------------
-bool wxMultiCellSizer::SetRowHeight(int row, int rowSize, bool expandable)
-{
- if (expandable)
- {
- m_minSizes[row]->SetHeight(-rowSize);
- }
- else
- {
- m_minSizes[row]->SetHeight(rowSize);
- }
- return true;
-}
-//---------------------------------------------------------------------------
-void wxMultiCellSizer::RecalcSizes()
-{
- if (m_children.GetCount() == 0)
- return;
- wxSize size = GetSize();
- wxPoint pos = GetPosition();
-
- GetMinimums();
-
- // We need to take the unused space and equally give it out to all the rows/columns
- // which are stretchable
-
- int unUsedWidth = size.GetWidth() - Sum(m_maxWidth, m_cell_count.GetWidth());
- int unUsedHeight = size.GetHeight() - Sum(m_maxHeight, m_cell_count.GetHeight());
- int totalWidthWeight = 0;
- int totalHeightWeight = 0;
- int x;
-
- for (x = 0; x < wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
- {
- if (m_rowStretch[x])
- {
- totalHeightWeight += m_weights[x]->GetHeight();
- }
- if (x < m_cell_count.GetWidth() && m_colStretch[x])
- {
- totalWidthWeight += m_weights[x]->GetWidth();
- }
- }
- for (x = 0; x < wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
- {
- if (x < m_cell_count.GetHeight() && m_rowStretch[x])
- {
- m_maxHeight[x] += unUsedHeight * m_weights[x]->GetHeight() / totalHeightWeight;
- }
- if (x < m_cell_count.GetWidth() && m_colStretch[x])
- {
- m_maxWidth[x] += unUsedWidth * m_weights[x]->GetWidth() / totalWidthWeight;
- }
- }
- // We now have everything we need to figure each cell position and size
- // The arrays m_maxHeight and m_maxWidth now contain the final widths and height of
- // each row and column.
-
- double cell_width = (double)size.GetWidth() / (double)m_cell_count.GetWidth();
- double cell_height = (double)size.GetHeight() / (double)m_cell_count.GetHeight();
- wxPoint c_point;
- wxSize c_size;
-
- wxSizerItemList::compatibility_iterator current = m_children.GetFirst();
- while (current)
- {
- wxSizerItem *item = current->GetData();
-
- wxMultiCellItemHandle *rect;
- if (item != NULL &&
- (rect = (wxMultiCellItemHandle *)item->GetUserData()) != NULL)
- {
- c_point.x = pos.x + (int)(rect->GetColumn() * cell_width);
- c_point.y = pos.y + (int)(rect->GetRow() * cell_height);
-
- c_point.x = pos.x + Sum(m_maxWidth, rect->GetColumn());
- c_point.y = pos.y + Sum(m_maxHeight, rect->GetRow());
-
-
- c_size = rect->GetLocalSize();
- wxSize minSize( item->CalcMin() );
- if (c_size.GetHeight() != wxDefaultCoord ||
- c_size.GetWidth() != wxDefaultCoord)
- {
- minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
- minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
- }
- if (rect->GetStyle() & wxHORIZONTAL_RESIZABLE ||
- rect->GetWidth() > 1
- || m_minSizes[rect->GetColumn()]->GetWidth() < 0)
- {
- int w = 0;
- for (int x = 0; x < rect->GetWidth(); x++)
- {
- w += m_maxWidth[rect->GetColumn() + x];
- }
- c_size.SetWidth(w);
- }
- else
- {
- c_size.SetWidth(minSize.GetWidth() );
- }
- if (rect->GetStyle() & wxVERTICAL_RESIZABLE ||
- rect->GetHeight() > 1 ||
- m_minSizes[rect->GetRow()]->GetHeight() < 0)
- {
- int h = 0;
- for (int x = 0; x < rect->GetHeight(); x++)
- {
- h += m_maxHeight[rect->GetRow() + x];
- }
- c_size.SetHeight(h);
- }
- else
- {
- c_size.SetHeight(minSize.GetHeight());
- }
- int extraHeight = (m_maxHeight[rect->GetRow()] - c_size.GetHeight());
- int extraWidth = (m_maxWidth[rect->GetColumn()] - c_size.GetWidth());
-
- if (rect->GetWidth() == 1 && rect->GetAlignment() & wxALIGN_CENTER_HORIZONTAL)
- {
- c_point.x += extraWidth / 2;
- }
- if (rect->GetWidth() == 1 && rect->GetAlignment() & wxALIGN_RIGHT)
- {
- c_point.x += extraWidth;
- }
- if (rect->GetHeight() == 1 && rect->GetAlignment() & wxALIGN_CENTER_VERTICAL)
- {
- c_point.y += extraHeight / 2;
- }
- if (rect->GetHeight() == 1 && rect->GetAlignment() & wxALIGN_BOTTOM)
- {
- c_point.y += extraHeight;
- }
- item->SetDimension(c_point, c_size);
- }
- current = current->GetNext();
- }
-}
-//---------------------------------------------------------------------------
-wxSize wxMultiCellSizer::CalcMin()
-{
- if (m_children.GetCount() == 0)
- return wxSize(10,10);
-
- GetMinimums();
- int m_minWidth = Sum(m_maxWidth, m_cell_count.GetWidth());
- int m_minHeight = Sum(m_maxHeight, m_cell_count.GetHeight());
- return wxSize( m_minWidth, m_minHeight );
-}
-//---------------------------------------------------------------------------
-void wxMultiCellSizer :: GetMinimums()
-{
- // We first initial all the arrays EXCEPT for the m_minsizes array.
-
- memset(m_maxHeight, 0, sizeof(int) * m_cell_count.GetHeight());
- memset(m_maxWidth, 0, sizeof(int) * m_cell_count.GetWidth());
- memset(m_rowStretch, 0, sizeof(int) * m_cell_count.GetHeight());
- memset(m_colStretch, 0, sizeof(int) * m_cell_count.GetWidth());
- for (int x = 0; x < 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
- {
- m_weights[x]->SetHeight(0);
- m_weights[x]->SetWidth(0);
- }
-
- wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
- while (node)
- {
- wxSizerItem *item = node->GetData();
- wxMultiCellItemHandle *rect;
- if (item != NULL &&
- (rect = (wxMultiCellItemHandle *)item->GetUserData()) != NULL)
- {
- int row = rect->GetRow();
- int col = rect->GetColumn();
-
- // First make sure that the control knows about the max rows and columns
-
- int changed = false;
- if (row + 1 > m_cell_count.GetHeight())
- {
- changed++;
- m_maxHeight = (int *)realloc(m_maxHeight, (1 + row) * sizeof(int));
- m_rowStretch = (int *)realloc(m_rowStretch, (1 + row) * sizeof(int));
- for (int x = m_cell_count.GetHeight(); x < row + 1; x++)
- {
- m_maxHeight[x - 1] = 0;
- m_rowStretch[x - 1] = 0;
- }
- m_cell_count.SetHeight(row + 1);
- }
- if (col + 1 > m_cell_count.GetWidth())
- {
- changed++;
- m_maxWidth = (int *)realloc(m_maxWidth, (1 + col) * sizeof(int));
- m_colStretch = (int *)realloc(m_colStretch, ( 1 + col) * sizeof(int));
- for (int x = m_cell_count.GetWidth(); x < col + 1; x++)
- {
- m_maxWidth[x - 1] = 0;
- m_colStretch[x - 1] = 0;
- }
- m_cell_count.SetWidth(col + 1);
- }
- if (changed)
- {
- m_weights = (wxSize **)realloc(m_weights, (1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth())) * sizeof(wxSize *));
- m_minSizes = (wxSize **)realloc(m_minSizes, (1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth())) * sizeof(wxSize *));
- for (int x = m_maxWeights; x < 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
- {
- m_weights[x - 1] = new wxSize(0,0);
- m_minSizes[x - 1] = new wxSize(0,0);
- }
- m_maxWeights = 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth());
- }
-
- // Sum the m_weights for each row/column, but only if they are resizable
-
- wxSize minSize( item->CalcMin() );
- wxSize c_size = rect->GetLocalSize();
- if (c_size.GetHeight() != wxDefaultCoord ||
- c_size.GetWidth() != wxDefaultCoord)
- {
- minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
- minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
- }
-
- // For each row, calculate the max height for those fields which are not
- // resizable in the vertical pane
-
- if (!(rect->GetStyle() & wxVERTICAL_RESIZABLE || m_minSizes[row]->GetHeight() < 0))
- {
- m_maxHeight[row] = wxMax(m_maxHeight[row], minSize.GetHeight() / rect->GetHeight());
- }
- else
- {
- m_rowStretch[row] = 1;
- if (m_minSizes[row]->GetHeight())
- {
- m_maxHeight[row] = abs(m_minSizes[row]->GetHeight());
- }
- else
- {
- m_maxHeight[row] = wxMax(m_maxHeight[row], m_defaultCellSize.GetHeight());
- }
- m_weights[row]->SetHeight(wxMax(m_weights[row]->GetHeight(), rect->GetWeight().GetHeight()));
- }
-
- // For each column, calculate the max width for those fields which are not
- // resizable in the horizontal pane
-
- if (!(rect->GetStyle() & wxHORIZONTAL_RESIZABLE || m_minSizes[col]->GetWidth() < 0))
- {
- if (m_minSizes[col]->GetWidth())
- {
- m_maxWidth[col] = abs(m_minSizes[col]->GetWidth());
- }
- else
- {
- m_maxWidth[col] = wxMax(m_maxWidth[col], minSize.GetWidth() / rect->GetWidth());
- }
- }
- else
- {
- m_colStretch[col] = 1;
- m_maxWidth[col] = wxMax(m_maxWidth[col], m_defaultCellSize.GetWidth());
- m_weights[col]->SetWidth(wxMax(m_weights[col]->GetWidth(), rect->GetWeight().GetWidth()));
- }
- node = node->GetNext();
- }
- }
-} // wxMultiCellSizer :: GetMinimums
-//---------------------------------------------------------------------------
-/*
- *Function Name: wxMultiCellSizer :: Sum
- *
- *Parameters: int* pointer to array of ints
- * int Number of cells to sum up
- *
- *Description: This member function sums up all the elements of the array which
- * preceed the specified cell.
- *
- *Returns: int Sum
- *
- */
-
-/* static */ int wxMultiCellSizer :: Sum(int *array, int x)
-{
- int sum = 0;
- while (x--)
- {
- sum += array[x];
- }
- return sum;
-}
-//---------------------------------------------------------------------------
-/*
- *Function Name: wxMultiCellSizer :: DrawGridLines
- *
- *Parameters: wxDC Device context
- *
- *Description: This function draws the grid lines in the specified device context.
- *
- */
-
-void wxMultiCellSizer :: DrawGridLines(wxDC& dc)
-{
- RecalcSizes();
- int maxW = Sum(m_maxWidth, m_cell_count.GetWidth());
- int maxH = Sum(m_maxHeight, m_cell_count.GetHeight());
- int x;
-
- // Draw the columns
- dc.SetPen(* m_pen);
- for (x = 1; x < m_cell_count.GetWidth(); x++)
- {
- int colPos = Sum(m_maxWidth, x) ;
- dc.DrawLine(colPos, 0, colPos, maxH);
- }
-
- // Draw the rows
- for (x = 1; x < m_cell_count.GetHeight(); x++)
- {
- int rowPos = Sum(m_maxHeight, x);
- dc.DrawLine(0, rowPos, maxW, rowPos);
- }
-}
-//---------------------------------------------------------------------------
-// Define the repainting behaviour
-/*
- *Function Name: wxMultiCellSizer::OnPaint
- *
- *Parameters: wxDC Device context
- *
- *Description: This function calls the DrawGridLines() member if a window
- * has been previously specified. This functions MUST be called
- * from an OnPaint member belonging to the window which the sizer
- * is attached to.
- *
- */
-
-void wxMultiCellSizer::OnPaint(wxDC& dc )
-{
- if (m_win)
- {
- DrawGridLines(dc);
- }
-}
-
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-
-
-
-
-#define CELL_LOC(row, col) ((row) * m_maxCols + col)
-
-//---------------------------------------------------------------------------
-// wxCell
-//---------------------------------------------------------------------------
-/*
- *Function Name: wxCell : wxLayoutConstraints
- *
- *Description: This class is used by wxMultiCellCanvas for internal storage
- *
- */
-
-class wxCell : public wxLayoutConstraints
-{
-public:
- wxCell(wxWindow *win)
- {
- m_window = win;
- };
-
- wxWindow *m_window;
-};
-
-
-
-//---------------------------------------------------------------------------
-// wxMultiCellCanvas
-//---------------------------------------------------------------------------
-wxMultiCellCanvas :: wxMultiCellCanvas(wxWindow *par, int numRows, int numCols)
- : wxFlexGridSizer(numRows, numCols, 0, 0)
-{
- m_cells = (wxCell **)calloc(numRows * numCols, sizeof(wxCell *));
-
- m_parent = par;
- m_maxRows = numRows;
- m_maxCols = numCols;
- m_minCellSize = wxSize(5, 5);
-}
-//---------------------------------------------------------------------------
-void wxMultiCellCanvas :: Add(wxWindow *win, unsigned int row, unsigned int col)
-{
- // thanks to unsigned data row and col are always >= 0
- wxASSERT_MSG( /* row >= 0 && */ row < m_maxRows,
- wxString::Format(_T("Row %d out of bounds (0..%d)"), row, m_maxRows) );
- wxASSERT_MSG( /* col >= 0 && */ col < m_maxCols,
- wxString::Format(_T("Column %d out of bounds (0..%d)"), col, m_maxCols) );
-
- wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied"));
-
- wxCell *newCell = new wxCell(win);
- m_cells[CELL_LOC(row,col)] = newCell;
-}
-//---------------------------------------------------------------------------
-void wxMultiCellCanvas :: CalculateConstraints()
-{
- unsigned int row, col;
- for (row = 0; row < m_maxRows; row++)
- {
- for (col = 0; col < m_maxCols; col++)
- {
- if (!m_cells[CELL_LOC(row, col)])
- {
- // Create an empty static text field as a placeholder
- m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, wxID_ANY, wxEmptyString));
- }
- wxFlexGridSizer::Add(m_cells[CELL_LOC(row, col)]->m_window);
- }
- }
-}
-
-/*** End of File ***/
diff --git a/contrib/src/gizmos/multicell.txt b/contrib/src/gizmos/multicell.txt
deleted file mode 100644
index 5de8cb27a2..0000000000
--- a/contrib/src/gizmos/multicell.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-These two classes make it easier to lay objects out on a screen. The
-first class is the wxMultiCellCanvas, which uses the wxFlexGridSizer
-control, so it is subject to the same limitations of that control. Among
-them is the fact that if the window is resized smaller than the control,
-then some of the objects will be obscured by the window edge.
-
-The second class is the wxMultiCellSizer, which is significantly more
-powerful than the wxMultiCell Canvas. This control supports resizing of
-objects on the fly, objects spanning cells, etc.
-
-Use the wxMultiCellCanvas when you have a simple layout which won't resize
-and doesn't have any unusual requirements. Use the wxMultiCellSizer when
-your needs are greater
-
-
-wxMultiCellCanvas
-=================
-
-The wxMultiCellCanvas class allows you to add objects to a wxFlexGridSizer
-by specifying a row and a column location. When all objects have been
-added, you need to call a member function CalculateConstraints(), which
-will insert the objects into the wxFlexGridSizer. If there are empty
-cells the canvas will insert empty wxStaticText objects as placeholders.
-
-Upon creation of the canvas the size of the canvas needs to be specified.
-Attempting to insert a cell outside those limits will cause an assertion
-error.
-
-When adding cells, the cell locations are specified as a row,column
-location, both being zero-based. 0,0 is the upper left corner of the
-canvas.
-
-
-wxMultiCellSizer
-================
-
-The wxMultiCellSizer class manages a collection of child windows in a way
-similar to that of data stored in a spreadsheet. A multicell canvas is a
-two-dimensional array of cells with an origin of (0,0) in the upper-left
-corner. Windows are added to a multicell sizer by first creating a
-wxMultiCellItemHandle object which specifies a starting cell and,
-optionally, a number of contiguous columns, rows, or a combination
-thereof, and then adding it to the sizer.
-
-This class bases the initial cell sizes on the minimum sizes returned by
-each child window of the sizer. You can override the minimum sizes
-provided by the wxWindows Class Library by doing either of the following:
-
- o Specifying the size when creating the wxMultiCellItemHandle object
- o Creating a derived class and implementing a CalcMin function
-
-The wxMultiCellItemHandle must be passed the row and column of the item,
-at a minimum. Optionally, more information can be passed:
-
- int row Row position, zero based
- int column Column position, zero based
- int height Number of rows this cell will occupy, default is 1
- int width Number of columns this cell will occupy, default is 1
-
- Note that if the height or width is greater than one that
- dimension is assumed to be resizable because it is spanning
- multiple cells.
-
- wxSize minSize Minimum size of the object.
- wxResizable Style Is this object resizable, and if so, how. Allowable styles are:
- wxNOT_RESIZABLE
- wxHORIZENTAL_RESIZABLE
- wxVERTICAL_RESIZABLE
- wxRESIZABLE
- wxSize weight If this is a resizable object, the weight applied to the specific dimension.
- This is useful if you have several resizable rows and/or columns, and you want
- one to get more of the available space than the others.
- int align This is a wxAlignment value, it is an integer so you can 'or multiple
- values together. The acceptable values are:
- wxALIGN_NOT
- wxALIGN_CENTER_HORIZONTAL
- wxALIGN_CENTRE_HORIZONTAL
- wxALIGN_LEFT
- wxALIGN_TOP
- wxALIGN_RIGHT
- wxALIGN_BOTTOM
- wxALIGN_CENTER_VERTICAL
- wxALIGN_CENTRE_VERTICAL
- wxALIGN_CENTER
- wxALIGN_CENTRE
- Note that some combinations of these make no sense, for example wxALIGN_LEFT | wxALIGN_RIGHT.
- See the definition of wxAlignment for more information
-
-
-Other functions are:
-
-void RecalcSizes() Should not be called by the user, needed by the wxSizer class
-wxSize CalcMin() Should not be called by the user, needed by the wxSizer class
-bool SetDefaultCellSize Set the default cell size of an empty cell
-bool SetColumnWidth Set the width of a column, optionally specifying it as resizable
-bool SetRowHeight Set the height of a row, optionally specifying it as resizable
-
-Sometimes it can be very confusing to determine the relationship between rows, columns, and
-which ones are resizable or not. Three functions are supplied to make this easier:
-
-bool EnableGridLines(wxWindow *win); Call this to either enable or disable the grid lines.
- Pass the window the sizer is on, or NULL to disable.
- Currently the window is not used, but it may be in the
- future.
-bool SetGridPen(wxPen *pen); Set the pen color, the default pen color is red
-void OnPaint(wxDC& dc); Call this from an OnPaint function associated with the
- window the sizer is attached to. See the example program
- mtest.cpp for specific details on how to do this.
-
-
-Files Description
-===== ===========
-docs.txt This file
-
-// wxMultiCellCanvas and wxMultiCellSizer
-makefile Makefile for the MingW32 compiler
-multicell.cpp Class source code file
-multicell.h Class header file
-
-//Sample
-mtest.cpp Example program, demonstrates both classes
-mtest.rc
-mtest.gif
-makefile
-
-Acknowledgments
-===============
-This was inspired by the gbsizer class written by Alex Andruschak, and the IMultiCellCanvas
-class in the IBM Class Libraries in the VisualeAge C++ compilers.
-
diff --git a/contrib/src/gizmos/multicell_todo.txt b/contrib/src/gizmos/multicell_todo.txt
deleted file mode 100644
index 8e07fdc016..0000000000
--- a/contrib/src/gizmos/multicell_todo.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-2. Documentation
-
diff --git a/contrib/src/gizmos/splittree.cpp b/contrib/src/gizmos/splittree.cpp
deleted file mode 100644
index 0eaed896c2..0000000000
--- a/contrib/src/gizmos/splittree.cpp
+++ /dev/null
@@ -1,745 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: splittree.cpp
-// Purpose: Classes to achieve a remotely-scrolled tree in a splitter
-// window that can be scrolled by a scrolled window higher in the
-// hierarchy
-// Author: Julian Smart
-// Modified by:
-// Created: 8/7/2000
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers)
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#ifdef __WXMSW__
-#include
-#include "wx/msw/winundef.h"
-#endif
-
-#include "wx/gizmos/splittree.h"
-#include
-
-/*
- * wxRemotelyScrolledTreeCtrl
- */
-
-#if USE_GENERIC_TREECTRL
-IMPLEMENT_CLASS(wxRemotelyScrolledTreeCtrl, wxGenericTreeCtrl)
-#else
-IMPLEMENT_CLASS(wxRemotelyScrolledTreeCtrl, wxTreeCtrl)
-#endif
-
-#if USE_GENERIC_TREECTRL
-BEGIN_EVENT_TABLE(wxRemotelyScrolledTreeCtrl, wxGenericTreeCtrl)
-#else
-BEGIN_EVENT_TABLE(wxRemotelyScrolledTreeCtrl, wxTreeCtrl)
-#endif
- EVT_SIZE(wxRemotelyScrolledTreeCtrl::OnSize)
- EVT_PAINT(wxRemotelyScrolledTreeCtrl::OnPaint)
- EVT_TREE_ITEM_EXPANDED(wxID_ANY, wxRemotelyScrolledTreeCtrl::OnExpand)
- EVT_TREE_ITEM_COLLAPSED(wxID_ANY, wxRemotelyScrolledTreeCtrl::OnExpand)
- EVT_SCROLLWIN(wxRemotelyScrolledTreeCtrl::OnScroll)
-END_EVENT_TABLE()
-
-wxRemotelyScrolledTreeCtrl::wxRemotelyScrolledTreeCtrl(
- wxWindow* parent, wxWindowID id, const wxPoint& pt,
- const wxSize& sz, long style)
- : wxTreeCtrl(parent, id, pt, sz, style & ~wxTR_ROW_LINES)
-{
- m_companionWindow = NULL;
-
- // We draw the row lines ourself so they match what's done
- // by the companion window. That is why the flag is turned
- // off above, so wxGenericTreeCtrl doesn't draw them in a
- // different colour.
- m_drawRowLines = (style & wxTR_ROW_LINES) != 0;
-}
-
-wxRemotelyScrolledTreeCtrl::~wxRemotelyScrolledTreeCtrl()
-{
-}
-
-void wxRemotelyScrolledTreeCtrl::HideVScrollbar()
-{
-#if defined(__WXMSW__)
-#if USE_GENERIC_TREECTRL
- if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-#endif
- {
- ::ShowScrollBar((HWND) GetHWND(), SB_VERT, false);
- }
-#if USE_GENERIC_TREECTRL
- else
- {
- // Implicit in overriding SetScrollbars
- }
-#endif
-#endif
-}
-
-// Number of pixels per user unit (0 or -1 for no scrollbar)
-// Length of virtual canvas in user units
-// Length of page in user units
-void wxRemotelyScrolledTreeCtrl::SetScrollbars(
- #if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- int pixelsPerUnitX, int pixelsPerUnitY,
- int noUnitsX, int noUnitsY,
- int xPos, int yPos,
- bool noRefresh
- #else
- int WXUNUSED(pixelsPerUnitX), int WXUNUSED(pixelsPerUnitY),
- int WXUNUSED(noUnitsX), int WXUNUSED(noUnitsY),
- int WXUNUSED(xPos), int WXUNUSED(yPos),
- bool WXUNUSED(noRefresh)
- #endif
- )
-{
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
- {
- wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
- win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, 0, xPos, 0, /* noRefresh */ true);
-
- wxScrolledWindow* scrolledWindow = GetScrolledWindow();
- if (scrolledWindow)
- {
- scrolledWindow->SetScrollbars(0, pixelsPerUnitY, 0, noUnitsY, 0, yPos, noRefresh);
- }
- }
-#endif
-}
-
-// In case we're using the generic tree control.
-int wxRemotelyScrolledTreeCtrl::GetScrollPos(
- #if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- int orient
- #else
- int WXUNUSED(orient)
- #endif
- ) const
-{
-
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- // this condition fixes extsitence of warning but
- wxScrolledWindow* scrolledWindow =
- // but GetScrolledWindow is still executed in case internally does something
-#endif
- GetScrolledWindow();
-
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
- {
- wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
-
- if (orient == wxHORIZONTAL)
- return win->wxGenericTreeCtrl::GetScrollPos(orient);
- else
- {
- return scrolledWindow->GetScrollPos(orient);
- }
- }
-#endif
- return 0;
-}
-
-
-// In case we're using the generic tree control.
-// Get the view start
-void wxRemotelyScrolledTreeCtrl::GetViewStart(int *x, int *y) const
-{
- wxScrolledWindow* scrolledWindow = GetScrolledWindow();
-
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
- {
-
- wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
- int x1, y1, x2, y2;
- win->wxGenericTreeCtrl::GetViewStart(& x1, & y1);
- * x = x1; * y = y1;
- if (!scrolledWindow)
- return;
-
- scrolledWindow->GetViewStart(& x2, & y2);
- * y = y2;
- }
- else
-#endif
- {
- // x is wrong since the horizontal scrollbar is controlled by the
- // tree control, but we probably don't need it.
- scrolledWindow->GetViewStart(x, y);
- }
-}
-
-// In case we're using the generic tree control.
-void wxRemotelyScrolledTreeCtrl::PrepareDC(
- #if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- wxDC& dc
- #else
- wxDC& WXUNUSED(dc)
- #endif
- )
-{
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
- {
- wxScrolledWindow* scrolledWindow = GetScrolledWindow();
-
- wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
-
- int startX, startY;
- GetViewStart(& startX, & startY);
-
- int xppu1, yppu1, xppu2, yppu2;
- win->wxGenericTreeCtrl::GetScrollPixelsPerUnit(& xppu1, & yppu1);
- scrolledWindow->GetScrollPixelsPerUnit(& xppu2, & yppu2);
-
- dc.SetDeviceOrigin( -startX * xppu1, -startY * yppu2 );
- // dc.SetUserScale( win->GetScaleX(), win->GetScaleY() );
- }
-#endif
-}
-
-// Scroll to the given line (in scroll units where each unit is
-// the height of an item)
-void wxRemotelyScrolledTreeCtrl::ScrollToLine(int WXUNUSED(posHoriz), int posVert)
-{
-#ifdef __WXMSW__
-#if USE_GENERIC_TREECTRL
- if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-#endif // USE_GENERIC_TREECTRL
- {
- UINT sbCode = SB_THUMBPOSITION;
- HWND vertScrollBar = 0;
- MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar);
- }
-#if USE_GENERIC_TREECTRL
- else
-#endif // USE_GENERIC_TREECTRL
-#endif // __WXMSW__
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- {
- wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
- win->Refresh();
- /* Doesn't work yet because scrolling is ignored by Scroll
- int xppu, yppu;
- wxScrolledWindow* scrolledWindow = GetScrolledWindow();
- if (scrolledWindow)
- {
- scrolledWindow->GetScrollPixelsPerUnit(& xppu, & yppu);
- win->Scroll(-1, posVert*yppu);
- }
- */
- }
-#endif // USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- wxUnusedVar(posVert);
-}
-
-void wxRemotelyScrolledTreeCtrl::OnSize(wxSizeEvent& event)
-{
- HideVScrollbar();
- AdjustRemoteScrollbars();
- event.Skip();
-}
-
-void wxRemotelyScrolledTreeCtrl::OnExpand(wxTreeEvent& event)
-{
- AdjustRemoteScrollbars();
- event.Skip();
-
- // If we don't have this, we get some bits of lines still remaining
- if (event.GetEventType() == wxEVT_COMMAND_TREE_ITEM_COLLAPSED)
- Refresh();
-
- // Pass on the event
- if (m_companionWindow)
- m_companionWindow->GetEventHandler()->ProcessEvent(event);
-}
-
-void wxRemotelyScrolledTreeCtrl::OnPaint(wxPaintEvent& event)
-{
- wxPaintDC dc(this);
-
- wxTreeCtrl::OnPaint(event);
-
- if (! m_drawRowLines)
- return;
-
- // Reset the device origin since it may have been set
- dc.SetDeviceOrigin(0, 0);
-
- wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
- dc.SetPen(pen);
- dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
- wxSize clientSize = GetClientSize();
- wxRect itemRect;
- wxTreeItemId h, lastH;
- for (h=GetFirstVisibleItem();
- h.IsOk();
- h=GetNextVisible(h))
- {
- if (GetBoundingRect(h, itemRect))
- {
- int cy = itemRect.GetTop();
- dc.DrawLine(0, cy, clientSize.x, cy);
- lastH = h;
- }
- if (! IsVisible(h))
- break;
- }
- if (lastH.IsOk() && GetBoundingRect(lastH, itemRect))
- {
- int cy = itemRect.GetBottom();
- dc.DrawLine(0, cy, clientSize.x, cy);
- }
-}
-
-
-// Adjust the containing wxScrolledWindow's scrollbars appropriately
-void wxRemotelyScrolledTreeCtrl::AdjustRemoteScrollbars()
-{
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
- if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
- {
- // This is for the generic tree control.
- // It calls SetScrollbars which has been overridden
- // to adjust the parent scrolled window vertical
- // scrollbar.
- ((wxGenericTreeCtrl*) this)->AdjustMyScrollbars();
- return;
- }
- else
-#endif
- {
- // This is for the wxMSW tree control
- wxScrolledWindow* scrolledWindow = GetScrolledWindow();
- if (scrolledWindow)
- {
- wxRect itemRect;
- if (GetBoundingRect(GetFirstVisibleItem(), itemRect))
- {
- // Actually, the real height seems to be 1 less than reported
- // (e.g. 16 instead of 16)
- int itemHeight = itemRect.GetHeight() - 1;
-
- int w, h;
- GetClientSize(&w, &h);
-
- wxRect rect(0, 0, 0, 0);
- CalcTreeSize(rect);
-
- double f = ((double) (rect.GetHeight()) / (double) itemHeight) ;
- int treeViewHeight = (int) ceil(f);
-
- int scrollPixelsPerLine = itemHeight;
- int scrollPos = - (itemRect.y / itemHeight);
-
- scrolledWindow->SetScrollbars(0, scrollPixelsPerLine, 0, treeViewHeight, 0, scrollPos);
-
- // Ensure that when a scrollbar becomes hidden or visible,
- // the contained window sizes are right.
- // Problem: this is called too early (?)
- wxSizeEvent event(scrolledWindow->GetSize(), scrolledWindow->GetId());
- scrolledWindow->GetEventHandler()->ProcessEvent(event);
- }
- }
- }
-}
-
-
-// Calculate the area that contains both rectangles
-static wxRect CombineRectangles(const wxRect& rect1, const wxRect& rect2)
-{
- wxRect rect;
-
- int right1 = rect1.GetRight();
- int bottom1 = rect1.GetBottom();
- int right2 = rect2.GetRight();
- int bottom2 = rect2.GetBottom();
-
- wxPoint topLeft = wxPoint(wxMin(rect1.x, rect2.x), wxMin(rect1.y, rect2.y));
- wxPoint bottomRight = wxPoint(wxMax(right1, right2), wxMax(bottom1, bottom2));
-
- rect.x = topLeft.x; rect.y = topLeft.y;
- rect.SetRight(bottomRight.x);
- rect.SetBottom(bottomRight.y);
-
- return rect;
-}
-
-
-// Calculate the tree overall size so we can set the scrollbar
-// correctly
-void wxRemotelyScrolledTreeCtrl::CalcTreeSize(wxRect& rect)
-{
- CalcTreeSize(GetRootItem(), rect);
-}
-
-void wxRemotelyScrolledTreeCtrl::CalcTreeSize(const wxTreeItemId& id, wxRect& rect)
-{
- // More efficient implementation would be to find the last item (but how?)
- // Q: is the bounding rect relative to the top of the virtual tree workspace
- // or the top of the window? How would we convert?
- wxRect itemSize;
- if (GetBoundingRect(id, itemSize))
- {
- rect = CombineRectangles(rect, itemSize);
- }
-
- wxTreeItemIdValue cookie;
- wxTreeItemId childId = GetFirstChild(id, cookie);
- while (childId)
- {
- CalcTreeSize(childId, rect);
- childId = GetNextChild(childId, cookie);
- }
-}
-
-// Find the scrolled window that contains this control
-wxScrolledWindow* wxRemotelyScrolledTreeCtrl::GetScrolledWindow() const
-{
- wxWindow* parent = wxWindow::GetParent();
- while (parent)
- {
- if (parent->IsKindOf(CLASSINFO(wxScrolledWindow)))
- return (wxScrolledWindow*) parent;
- parent = parent->GetParent();
- }
- return NULL;
-}
-
-void wxRemotelyScrolledTreeCtrl::OnScroll(wxScrollWinEvent& event)
-{
- int orient = event.GetOrientation();
- if (orient == wxHORIZONTAL)
- {
- event.Skip();
- return;
- }
- wxScrolledWindow* scrollWin = GetScrolledWindow();
- if (!scrollWin)
- return;
-
- int x, y;
- scrollWin->GetViewStart(& x, & y);
-
- ScrollToLine(-1, y);
-}
-
-/*
- * wxTreeCompanionWindow
- *
- * A window displaying values associated with tree control items.
- */
-
-IMPLEMENT_CLASS(wxTreeCompanionWindow, wxWindow)
-
-BEGIN_EVENT_TABLE(wxTreeCompanionWindow, wxWindow)
- EVT_PAINT(wxTreeCompanionWindow::OnPaint)
- EVT_SCROLLWIN(wxTreeCompanionWindow::OnScroll)
- EVT_TREE_ITEM_EXPANDED(-1, wxTreeCompanionWindow::OnExpand)
- EVT_TREE_ITEM_COLLAPSED(-1, wxTreeCompanionWindow::OnExpand)
-END_EVENT_TABLE()
-
-wxTreeCompanionWindow::wxTreeCompanionWindow(wxWindow* parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& sz,
- long style):
- wxWindow(parent, id, pos, sz, style)
-{
- m_treeCtrl = NULL;
-}
-
-void wxTreeCompanionWindow::DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect)
-{
- // TEST CODE
-#if 1
- if (m_treeCtrl)
- {
- wxString text = m_treeCtrl->GetItemText(id);
- dc.SetTextForeground(* wxBLACK);
- dc.SetBackgroundMode(wxTRANSPARENT);
-
- int textW, textH;
- dc.GetTextExtent(text, & textW, & textH);
-
- int x = 5;
- int y = rect.GetY() + wxMax(0, (rect.GetHeight() - textH) / 2);
-
- dc.DrawText(text, x, y);
- }
-#endif
-}
-
-void wxTreeCompanionWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
- wxPaintDC dc(this);
-
- if (!m_treeCtrl)
- return;
-
- wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
- dc.SetPen(pen);
- dc.SetBrush(* wxTRANSPARENT_BRUSH);
- wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- dc.SetFont(font);
-
- wxSize clientSize = GetClientSize();
- wxRect itemRect;
- wxTreeItemId h, lastH;
- for (h=m_treeCtrl->GetFirstVisibleItem();
- h.IsOk();
- h=m_treeCtrl->GetNextVisible(h))
- {
- if (m_treeCtrl->GetBoundingRect(h, itemRect))
- {
- int cy = itemRect.GetTop();
- wxRect drawItemRect(0, cy, clientSize.x, itemRect.GetHeight());
-
- lastH = h;
-
- // Draw the actual item
- DrawItem(dc, h, drawItemRect);
- dc.DrawLine(0, cy, clientSize.x, cy);
- }
- if (! m_treeCtrl->IsVisible(h))
- break;
- }
- if (lastH.IsOk() && m_treeCtrl->GetBoundingRect(lastH, itemRect))
- {
- int cy = itemRect.GetBottom();
- dc.DrawLine(0, cy, clientSize.x, cy);
- }
-}
-
-void wxTreeCompanionWindow::OnScroll(wxScrollWinEvent& event)
-{
- int orient = event.GetOrientation();
- if (orient == wxHORIZONTAL)
- {
- event.Skip();
- return;
- }
- if (!m_treeCtrl)
- return;
-
- // TODO: scroll the window physically instead of just refreshing.
- Refresh(true);
-}
-
-void wxTreeCompanionWindow::OnExpand(wxTreeEvent& WXUNUSED(event))
-{
- // TODO: something more optimized than simply refresh the whole
- // window when the tree is expanded/collapsed. Tricky.
- Refresh();
-}
-
-/*
- * wxThinSplitterWindow
- */
-
-IMPLEMENT_CLASS(wxThinSplitterWindow, wxSplitterWindow)
-
-BEGIN_EVENT_TABLE(wxThinSplitterWindow, wxSplitterWindow)
- EVT_SIZE(wxThinSplitterWindow::OnSize)
-END_EVENT_TABLE()
-
-wxThinSplitterWindow::wxThinSplitterWindow(wxWindow* parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& sz,
- long style):
- wxSplitterWindow(parent, id, pos, sz, style)
-{
- wxColour faceColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
- m_facePen = new wxPen(faceColour, 1, wxSOLID);
- m_faceBrush = new wxBrush(faceColour, wxSOLID);
-}
-
-wxThinSplitterWindow::~wxThinSplitterWindow()
-{
- delete m_facePen;
- delete m_faceBrush;
-}
-
-
-void wxThinSplitterWindow::SizeWindows()
-{
- // The client size may have changed inbetween
- // the sizing of the first window and the sizing of
- // the second. So repeat SizeWindows.
- wxSplitterWindow::SizeWindows();
- wxSplitterWindow::SizeWindows();
-}
-
-// Tests for x, y over sash
-bool wxThinSplitterWindow::SashHitTest(int x, int y, int WXUNUSED(tolerance))
-{
- return wxSplitterWindow::SashHitTest(x, y, 4);
-}
-
-void wxThinSplitterWindow::DrawSash(wxDC& dc)
-{
- if ( m_sashPosition == 0 || !m_windowTwo)
- return;
- if (GetWindowStyle() & wxSP_NOSASH)
- return;
-
- int w, h;
- GetClientSize(&w, &h);
-
- if ( m_splitMode == wxSPLIT_VERTICAL )
- {
- dc.SetPen(* m_facePen);
- dc.SetBrush(* m_faceBrush);
- int h1 = h-1;
- int y1 = 0;
- if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
- h1 += 1; // Not sure why this is necessary...
- if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
- {
- y1 = 2; h1 -= 3;
- }
- dc.DrawRectangle(m_sashPosition, y1, GetSashSize(), h1);
- }
- else
- {
- dc.SetPen(* m_facePen);
- dc.SetBrush(* m_faceBrush);
- int w1 = w-1;
- int x1 = 0;
- if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
- w1 ++;
- if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
- {
- x1 = 2; w1 -= 3;
- }
- dc.DrawRectangle(x1, m_sashPosition, w1, GetSashSize());
- }
-
- dc.SetPen(wxNullPen);
- dc.SetBrush(wxNullBrush);
-}
-
-void wxThinSplitterWindow::OnSize(wxSizeEvent& event)
-{
- wxSplitterWindow::OnSize(event);
-}
-
-/*
- * wxSplitterScrolledWindow
- */
-
-IMPLEMENT_CLASS(wxSplitterScrolledWindow, wxScrolledWindow)
-
-BEGIN_EVENT_TABLE(wxSplitterScrolledWindow, wxScrolledWindow)
- EVT_SCROLLWIN(wxSplitterScrolledWindow::OnScroll)
- EVT_SIZE(wxSplitterScrolledWindow::OnSize)
-END_EVENT_TABLE()
-
-wxSplitterScrolledWindow::wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& sz,
- long style):
- wxScrolledWindow(parent, id, pos, sz, style)
-{
-}
-
-void wxSplitterScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
-{
- wxSize sz = GetClientSize();
- if (GetChildren().GetFirst())
- {
- ((wxWindow*) GetChildren().GetFirst()->GetData())->SetSize(0, 0, sz.x, sz.y);
- }
-}
-
-void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
-{
- // Ensure that events being propagated back up the window hierarchy
- // don't cause an infinite loop
- static bool inOnScroll = false;
- if (inOnScroll)
- {
- event.Skip();
- return;
- }
- inOnScroll = true;
-
- int orient = event.GetOrientation();
-
- int nScrollInc = CalcScrollInc(event);
- if (nScrollInc == 0)
- {
- inOnScroll = false;
- return;
- }
-
- if (orient == wxHORIZONTAL)
- {
- inOnScroll = false;
- event.Skip();
- return;
-#if 0
- int newPos = m_xScrollPosition + nScrollInc;
- SetScrollPos(wxHORIZONTAL, newPos, true );
-#endif
- }
- else
- {
- int newPos = m_yScrollPosition + nScrollInc;
- SetScrollPos(wxVERTICAL, newPos, true );
- }
-
- if (orient == wxHORIZONTAL)
- {
- m_xScrollPosition += nScrollInc;
- }
- else
- {
- m_yScrollPosition += nScrollInc;
- }
-
- // Find targets in splitter window and send the event to them
- wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
- while (node)
- {
- wxWindow* child = (wxWindow*) node->GetData();
- if (child->IsKindOf(CLASSINFO(wxSplitterWindow)))
- {
- wxSplitterWindow* splitter = (wxSplitterWindow*) child;
- if (splitter->GetWindow1())
- splitter->GetWindow1()->ProcessEvent(event);
- if (splitter->GetWindow2())
- splitter->GetWindow2()->ProcessEvent(event);
- break;
- }
- node = node->GetNext();
- }
-
- m_targetWindow->Update() ;
-
- inOnScroll = false;
-}
diff --git a/contrib/src/gizmos/statpict.cpp b/contrib/src/gizmos/statpict.cpp
deleted file mode 100644
index b8c1cdf99d..0000000000
--- a/contrib/src/gizmos/statpict.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: statpict.cpp
-// Purpose: wxStaticPicture
-// Author: Wade Brainerd (wadeb@wadeb.com)
-// Modified by:
-// Created: 2003-05-01
-// RCS-ID:
-// Copyright: (c) Wade Brainerd
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-#include "wx/defs.h"
-
-#include "wx/gizmos/statpict.h"
-#include "wx/dcclient.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxStaticPicture, wxControl)
-WXDLLIMPEXP_GIZMOS const wxChar * wxStaticPictureNameStr = wxT("staticPicture");
-
-/*
- * wxStaticPicture
- */
-
-BEGIN_EVENT_TABLE(wxStaticPicture, wxControl)
- EVT_PAINT(wxStaticPicture::OnPaint)
-END_EVENT_TABLE()
-
-bool wxStaticPicture::Create(wxWindow *parent, wxWindowID id,
- const wxBitmap& bitmap,
- const wxPoint& pos,
- const wxSize& s,
- long style,
- const wxString& name)
-{
- SetName(name);
-
- wxSize size = s ;
- if ( bitmap.Ok() )
- {
- if ( size.x == wxDefaultCoord )
- size.x = bitmap.GetWidth() ;
- if ( size.y == wxDefaultCoord )
- size.y = bitmap.GetHeight() ;
- }
-
- m_backgroundColour = parent->GetBackgroundColour() ;
- m_foregroundColour = parent->GetForegroundColour() ;
-
- Bitmap = bitmap;
- Align = 0;
- Scale = 0;
- ScaleX = ScaleY = 1;
-
-#ifndef __WXMSW__
- LastScaleX = LastScaleY = -1;
- if ( Bitmap.Ok() )
- OriginalImage = Bitmap.ConvertToImage();
-#endif
-
- if ( id == wxID_ANY )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
-
- m_windowStyle = style;
-
- bool ret = wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name );
-
- SetInitialSize( size ) ;
-
- return ret;
-}
-
-void wxStaticPicture::SetBitmap( const wxBitmap& bmp )
-{
- Bitmap = bmp;
-#ifndef __WXMSW__
- if ( Bitmap.Ok() )
- OriginalImage = Bitmap.ConvertToImage();
- LastScaleX = LastScaleY = -1;
-#endif
-}
-
-void wxStaticPicture::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
- if ( !Bitmap.Ok() )
- return;
-
- wxPaintDC dc( this );
- PrepareDC( dc );
-
- wxSize sz = GetSize();
- wxSize bmpsz( Bitmap.GetWidth(), Bitmap.GetHeight() );
- float sx = 1.0f, sy = 1.0f;
-
- if ( Scale & wxSCALE_UNIFORM )
- {
- float _sx = (float)sz.GetWidth() / (float)bmpsz.GetWidth();
- float _sy = (float)sz.GetHeight() / (float)bmpsz.GetHeight();
- sx = sy = _sx < _sy ? _sx : _sy;
- }
- else
- if ( Scale & wxSCALE_CUSTOM )
- {
- sx = ScaleX;
- sy = ScaleY;
- }
- else
- {
- if ( Scale & wxSCALE_HORIZONTAL )
- sx = (float)sz.x/(float)bmpsz.x;
- if ( Scale & wxSCALE_VERTICAL )
- sy = (float)sz.y/(float)bmpsz.y;
- }
-
- bmpsz = wxSize( (int)(bmpsz.x*sx), (int)(bmpsz.y*sy) );
-
- wxPoint pos( 0, 0 );
-
- if ( Align & wxALIGN_CENTER_HORIZONTAL ) pos.x = (sz.x-bmpsz.x)/2;
- else if ( Align & wxALIGN_RIGHT ) pos.x = sz.x-bmpsz.x;
-
- if ( Align & wxALIGN_CENTER_VERTICAL ) pos.y = (sz.y-bmpsz.y)/2;
- else if ( Align & wxALIGN_BOTTOM ) pos.y = sz.y-bmpsz.y;
-
- if ( Scale )
- {
-#ifdef __WXMSW__
- double ux, uy;
- dc.GetUserScale( &ux, &uy );
- dc.SetUserScale( ux*sx, uy*sy );
- dc.DrawBitmap( Bitmap, (int)((float)pos.x/sx), (int)((float)pos.y/sy) );
- dc.SetUserScale( ux, uy );
-#else
- if ( LastScaleX != sx || LastScaleY != sy )
- {
- LastScaleX = sx;
- LastScaleY = sy;
- ScaledBitmap = wxBitmap( OriginalImage.Scale( bmpsz.x, bmpsz.y ) );
- }
- dc.DrawBitmap( ScaledBitmap, pos.x, pos.y );
-#endif
- }
- else
- dc.DrawBitmap( Bitmap, pos.x, pos.y );
-}
-
diff --git a/contrib/src/gizmos/statpict.txt b/contrib/src/gizmos/statpict.txt
deleted file mode 100644
index 9a263285fb..0000000000
--- a/contrib/src/gizmos/statpict.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-wxStaticPicture class
-by Wade Brainerd (wadeb@wadeb.com)
-
-Description:
-
-This class is an improved version of wxStaticBitmap.
-
-Rather than using a native bitmap control, it uses DC operations to draw the
-control. This makes its appearance more consistent across platforms, and
-allows for additional features.
-
-Features include:
-
- wxStaticBitmap compatible API - drop-in replacement. Image alignment - top,
- left, bottom, right, center vertical and/or horizontal.
- Image scaling - scale horizontally and/or vertically, justified scaling
- (maintains image aspect ratio).
-
-Platforms tested:
-
- wxMSW
- wxGTK
- wxMac
-
-Implementation notes:
-
-Under MSW wxWindows uses the operating system to do an optimized (potentially
-hardware accelerated) blit in wxDC::DrawBitmap. This is usually fast enough to
-do image scaling without affecting the program's interactivity.
-
-On wxMac and wxGTK however, wxDC::DrawBitmap implicitly calls wxImage::Scale
-which is a much slower operation. Therefore, on these platforms wxStaticPicture
-caches the scaled image to make updates that don't change the image (overlapping
-windows, etc.) faster.
diff --git a/contrib/src/gizmos/xh_statpict.cpp b/contrib/src/gizmos/xh_statpict.cpp
deleted file mode 100644
index d537261fa7..0000000000
--- a/contrib/src/gizmos/xh_statpict.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: xh_statpict.cpp
-// Purpose: XRC resource handler for wxStaticPicture
-// Author: David A. Norris
-// Created: 2005/03/13
-// RCS-ID: $Id$
-// Copyright: David A. Norris
-// Licence: wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#if wxUSE_XRC
-
-#include "wx/gizmos/statpict.h"
-#include "wx/gizmos/xh_statpict.h"
-
-// Register with wxWindows' dynamic class subsystem.
-IMPLEMENT_DYNAMIC_CLASS(wxStaticPictureXmlHandler, wxXmlResourceHandler)
-
-// Constructor.
-wxStaticPictureXmlHandler::wxStaticPictureXmlHandler()
-{
- AddWindowStyles();
-}
-
-// Creates the control and returns a pointer to it.
-wxObject *wxStaticPictureXmlHandler::DoCreateResource()
-{
- XRC_MAKE_INSTANCE(control, wxStaticPicture)
-
- control->Create(m_parentAsWindow, GetID(),
- GetBitmap(wxT("bitmap"), wxART_OTHER, GetSize()),
- GetPosition(), GetSize(), GetStyle(), GetName());
-
- SetupWindow(control);
-
- return control;
-}
-
-// Returns true if we know how to create a control for the given node.
-bool wxStaticPictureXmlHandler::CanHandle(wxXmlNode *node)
-{
- return IsOfClass(node, wxT("wxStaticPicture"));
-}
-
-#endif // wxUSE_XRC
diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in
deleted file mode 100644
index 43552a5aa9..0000000000
--- a/contrib/src/mmedia/Makefile.in
+++ /dev/null
@@ -1,481 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-LIBEXT = @LIBEXT@
-LIBPREFIX = @LIBPREFIX@
-SO_SUFFIX = @SO_SUFFIX@
-DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
-LN_S = @LN_S@
-WINDRES = @WINDRES@
-PIC_FLAG = @PIC_FLAG@
-SONAME_FLAG = @SONAME_FLAG@
-STRIP = @STRIP@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = @INSTALL_DIR@
-BK_DEPS = @BK_DEPS@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-libdir = @libdir@
-includedir = @includedir@
-DLLPREFIX = @DLLPREFIX@
-LIBS = @LIBS@
-AR = @AR@
-AROPTIONS = @AROPTIONS@
-RANLIB = @RANLIB@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-VENDOR = @VENDOR@
-WX_FLAVOUR = @WX_FLAVOUR@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-wx_top_builddir = @wx_top_builddir@
-EXTRALIBS_ESD = @EXTRALIBS_ESD@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-MMEDIADLL_CXXFLAGS = $(__mmediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
- -DWXMAKINGDLL_MMEDIA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-MMEDIADLL_OBJECTS = \
- $(__mmediadll___win32rc) \
- $(__MMEDIA_PLATFORM_SRC_OBJECTS) \
- mmediadll_cdbase.o \
- mmediadll_g711.o \
- mmediadll_g721.o \
- mmediadll_g723_24.o \
- mmediadll_g723_40.o \
- mmediadll_g72x.o \
- mmediadll_sndaiff.o \
- mmediadll_sndbase.o \
- mmediadll_sndcodec.o \
- mmediadll_sndcpcm.o \
- mmediadll_sndfile.o \
- mmediadll_sndg72x.o \
- mmediadll_sndmsad.o \
- mmediadll_sndpcm.o \
- mmediadll_sndulaw.o \
- mmediadll_sndwav.o \
- mmediadll_vidbase.o
-MMEDIADLL_ODEP = $(___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname)
-MMEDIALIB_CXXFLAGS = $(__mmedialib_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-MMEDIALIB_OBJECTS = \
- $(__MMEDIA_PLATFORM_SRC_OBJECTS_1) \
- mmedialib_cdbase.o \
- mmedialib_g711.o \
- mmedialib_g721.o \
- mmedialib_g723_24.o \
- mmedialib_g723_40.o \
- mmedialib_g72x.o \
- mmedialib_sndaiff.o \
- mmedialib_sndbase.o \
- mmedialib_sndcodec.o \
- mmedialib_sndcpcm.o \
- mmedialib_sndfile.o \
- mmedialib_sndg72x.o \
- mmedialib_sndmsad.o \
- mmedialib_sndpcm.o \
- mmedialib_sndulaw.o \
- mmedialib_sndwav.o \
- mmedialib_vidbase.o
-MMEDIALIB_ODEP = $(___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
-@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-COND_SHARED_1___mmediadll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-@COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-@COND_SHARED_1@__install_mmediadll___depname = install_mmediadll
-@COND_SHARED_1@__uninstall_mmediadll___depname = uninstall_mmediadll
-COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd = -install_name \
- $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__mmediadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd)
-COND_PLATFORM_OS2_1___mmediadll___importlib = -import \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__mmediadll___importlib = $(COND_PLATFORM_OS2_1___mmediadll___importlib)
-COND_WINDOWS_IMPLIB_1___mmediadll___importlib = \
- -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__mmediadll___importlib = $(COND_WINDOWS_IMPLIB_1___mmediadll___importlib)
-@COND_GCC_PCH_1@__mmediadll_PCH_INC = -I.pch/wxprec_mmediadll
-@COND_ICC_PCH_1@__mmediadll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_mmediadll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_mmediadll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__mmediadll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__mmediadll___targetsuf2 = .$(SO_SUFFIX)
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__mmediadll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__mmediadll___targetsuf3 = .$(SO_SUFFIX)
-COND_USE_SOVERLINUX_1___mmediadll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__mmediadll___soname_flags = $(COND_USE_SOVERLINUX_1___mmediadll___soname_flags)
-COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__mmediadll___soname_flags = $(COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags)
-COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd = rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_uninst_cmd = rm -f \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__mmediadll___win32rc = mmediadll_version_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS = \
- mmediadll_cdunix.o \
- mmediadll_sndesd.o \
- mmediadll_sndoss.o \
- mmediadll_vidxanm.o
-@COND_PLATFORM_UNIX_1@__MMEDIA_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS)
-@COND_PLATFORM_WIN32_1@__MMEDIA_PLATFORM_SRC_OBJECTS \
-@COND_PLATFORM_WIN32_1@ = mmediadll_cdwin.o mmediadll_sndwin.o \
-@COND_PLATFORM_WIN32_1@ mmediadll_vidwin.o
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_SHARED_0___mmedialib___depname = \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__mmedialib___depname = $(COND_SHARED_0___mmedialib___depname)
-@COND_SHARED_0@__install_mmedialib___depname = install_mmedialib
-@COND_SHARED_0@__uninstall_mmedialib___depname = uninstall_mmedialib
-@COND_GCC_PCH_1@__mmedialib_PCH_INC = -I.pch/wxprec_mmedialib
-@COND_ICC_PCH_1@__mmedialib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_mmedialib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_mmedialib/wx/wxprec.h.gch
-COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 = \
- mmedialib_cdunix.o \
- mmedialib_sndesd.o \
- mmedialib_sndoss.o \
- mmedialib_vidxanm.o
-@COND_PLATFORM_UNIX_1@__MMEDIA_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1)
-@COND_PLATFORM_WIN32_1@__MMEDIA_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_WIN32_1@ = mmedialib_cdwin.o mmedialib_sndwin.o \
-@COND_PLATFORM_WIN32_1@ mmedialib_vidwin.o
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-
-### Targets: ###
-
-all: $(__mmediadll___depname) $(__mmedialib___depname)
-
-install: all $(__install_mmediadll___depname) $(__install_mmedialib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
- fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-uninstall: $(__uninstall_mmediadll___depname) $(__uninstall_mmedialib___depname)
- for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \
- rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-install-strip: install
- $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
-@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD) $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
-@COND_SHARED_1@
-@COND_SHARED_1@ $(__mmediadll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_mmediadll:
-@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_mmediadll:
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_mmediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIADLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MMEDIALIB_OBJECTS)
-@COND_SHARED_0@ rm -f $@
-@COND_SHARED_0@ $(AR) $(AROPTIONS) $@ $(MMEDIALIB_OBJECTS)
-@COND_SHARED_0@ $(RANLIB) $@
-
-@COND_SHARED_0@install_mmedialib:
-@COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_mmedialib:
-@COND_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS)
-
-mmediadll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(MMEDIADLL_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-mmediadll_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/cdunix.cpp
-
-mmediadll_sndesd.o: $(srcdir)/sndesd.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndesd.cpp
-
-mmediadll_sndoss.o: $(srcdir)/sndoss.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndoss.cpp
-
-mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/vidxanm.cpp
-
-mmediadll_cdwin.o: $(srcdir)/cdwin.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/cdwin.cpp
-
-mmediadll_sndwin.o: $(srcdir)/sndwin.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndwin.cpp
-
-mmediadll_vidwin.o: $(srcdir)/vidwin.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/vidwin.cpp
-
-mmediadll_cdbase.o: $(srcdir)/cdbase.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/cdbase.cpp
-
-mmediadll_g711.o: $(srcdir)/g711.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g711.cpp
-
-mmediadll_g721.o: $(srcdir)/g721.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g721.cpp
-
-mmediadll_g723_24.o: $(srcdir)/g723_24.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g723_24.cpp
-
-mmediadll_g723_40.o: $(srcdir)/g723_40.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g723_40.cpp
-
-mmediadll_g72x.o: $(srcdir)/g72x.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g72x.cpp
-
-mmediadll_sndaiff.o: $(srcdir)/sndaiff.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndaiff.cpp
-
-mmediadll_sndbase.o: $(srcdir)/sndbase.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndbase.cpp
-
-mmediadll_sndcodec.o: $(srcdir)/sndcodec.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndcodec.cpp
-
-mmediadll_sndcpcm.o: $(srcdir)/sndcpcm.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndcpcm.cpp
-
-mmediadll_sndfile.o: $(srcdir)/sndfile.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndfile.cpp
-
-mmediadll_sndg72x.o: $(srcdir)/sndg72x.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndg72x.cpp
-
-mmediadll_sndmsad.o: $(srcdir)/sndmsad.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndmsad.cpp
-
-mmediadll_sndpcm.o: $(srcdir)/sndpcm.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndpcm.cpp
-
-mmediadll_sndulaw.o: $(srcdir)/sndulaw.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndulaw.cpp
-
-mmediadll_sndwav.o: $(srcdir)/sndwav.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndwav.cpp
-
-mmediadll_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIADLL_ODEP)
- $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/vidbase.cpp
-
-mmedialib_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/cdunix.cpp
-
-mmedialib_sndesd.o: $(srcdir)/sndesd.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndesd.cpp
-
-mmedialib_sndoss.o: $(srcdir)/sndoss.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndoss.cpp
-
-mmedialib_vidxanm.o: $(srcdir)/vidxanm.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/vidxanm.cpp
-
-mmedialib_cdwin.o: $(srcdir)/cdwin.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/cdwin.cpp
-
-mmedialib_sndwin.o: $(srcdir)/sndwin.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndwin.cpp
-
-mmedialib_vidwin.o: $(srcdir)/vidwin.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/vidwin.cpp
-
-mmedialib_cdbase.o: $(srcdir)/cdbase.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/cdbase.cpp
-
-mmedialib_g711.o: $(srcdir)/g711.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g711.cpp
-
-mmedialib_g721.o: $(srcdir)/g721.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g721.cpp
-
-mmedialib_g723_24.o: $(srcdir)/g723_24.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g723_24.cpp
-
-mmedialib_g723_40.o: $(srcdir)/g723_40.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g723_40.cpp
-
-mmedialib_g72x.o: $(srcdir)/g72x.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g72x.cpp
-
-mmedialib_sndaiff.o: $(srcdir)/sndaiff.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndaiff.cpp
-
-mmedialib_sndbase.o: $(srcdir)/sndbase.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndbase.cpp
-
-mmedialib_sndcodec.o: $(srcdir)/sndcodec.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndcodec.cpp
-
-mmedialib_sndcpcm.o: $(srcdir)/sndcpcm.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndcpcm.cpp
-
-mmedialib_sndfile.o: $(srcdir)/sndfile.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndfile.cpp
-
-mmedialib_sndg72x.o: $(srcdir)/sndg72x.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndg72x.cpp
-
-mmedialib_sndmsad.o: $(srcdir)/sndmsad.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndmsad.cpp
-
-mmedialib_sndpcm.o: $(srcdir)/sndpcm.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndpcm.cpp
-
-mmedialib_sndulaw.o: $(srcdir)/sndulaw.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndulaw.cpp
-
-mmedialib_sndwav.o: $(srcdir)/sndwav.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndwav.cpp
-
-mmedialib_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIALIB_ODEP)
- $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/vidbase.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_mmediadll uninstall_mmediadll install_mmedialib uninstall_mmedialib
diff --git a/contrib/src/mmedia/cdbase.cpp b/contrib/src/mmedia/cdbase.cpp
deleted file mode 100644
index 8b10eab787..0000000000
--- a/contrib/src/mmedia/cdbase.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// ---------------------------------------------------------------------------
-// Name: cdbase.cpp
-// Purpose: wxMMedia
-// Author: Guilhem Lavaux
-// Created: 1997
-// Updated: 1999
-// Copyright: (C) 1997, 1998, 1999 Guilhem Lavaux
-// License: wxWindows license
-// ---------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-// ---------------------------------------------------------------------------
-// MMedia headers
-// ---------------------------------------------------------------------------
-
-#include "wx/mmedia/cdbase.h"
-
-// ---------------------------------------------------------------------------
-// Implementation
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxCDAudio, wxObject)
-
-wxCDtime wxCDAudio::CDtoc::GetTrackTime(wxUint8 track) const
-{
- if (track > total_time.track) {
- wxCDtime dummy_time = {0, 0, 0, 0};
- return dummy_time;
- }
- return tracks_time[track];
-}
-
-wxCDtime wxCDAudio::CDtoc::GetTrackPos(wxUint8 track) const
-{
- if (track > total_time.track) {
- wxCDtime dummy_time = {0, 0, 0, 0};
- return dummy_time;
- }
- return tracks_pos[track];
-}
-
-bool wxCDAudio::Play(const wxCDtime& beg_play)
-{
- return Play(beg_play, GetToc().GetTotalTime());
-}
-
-bool wxCDAudio::Play(wxUint8 beg_track, wxUint8 end_track)
-{
- wxCDtime beg_play = GetToc().GetTrackPos(beg_track);
- wxCDtime end_play;
-
- if (end_track)
- end_play = GetToc().GetTrackPos(end_track);
- else
- end_play = GetToc().GetTotalTime();
- return Play(beg_play, end_play);
-}
diff --git a/contrib/src/mmedia/cdunix.cpp b/contrib/src/mmedia/cdunix.cpp
deleted file mode 100644
index 17fab7bac5..0000000000
--- a/contrib/src/mmedia/cdunix.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Name: cdlinux.cpp
-// Purpose: wxMMedia
-// Author: Guilhem Lavaux
-// Created: 1997
-// Updated: 1998
-// Copyright: (C) 1997, 1998, Guilhem Lavaux
-// CVS Id: $Id$
-// License: wxWindows license
-////////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#if HAVE_KNOWN_CDROM_INTERFACE
-
-// ---------------------------------------------------------------------------
-// MMedia headers
-// ---------------------------------------------------------------------------
-
-#include "wx/mmedia/cdbase.h"
-#include "wx/mmedia/cdunix.h"
-
-// ---------------------------------------------------------------------------
-// System headers
-// ---------------------------------------------------------------------------
-
-#include
-#include
-#include
-#include
-#include
-
-#ifdef __linux__
-#include
-#else
-// For Solaris
-#include
-#endif
-
-// ---------------------------------------------------------------------------
-// Implementation
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxCDAudioLinux, wxCDAudio)
-
-wxCDAudioLinux::wxCDAudioLinux()
- : wxCDAudio(), m_fd(-1)
-{
- OpenDevice(wxT("/dev/cdrom"));
-}
-
-wxCDAudioLinux::wxCDAudioLinux(const wxString& dev_name)
- : wxCDAudio(), m_fd(-1)
-{
- OpenDevice(dev_name);
-}
-
-wxCDAudioLinux::~wxCDAudioLinux()
-{
- if (m_fd != -1) {
- close(m_fd);
- wxDELETE(m_trksize);
- wxDELETE(m_trkpos);
- }
-}
-
-void wxCDAudioLinux::OpenDevice(const wxString& dev_name)
-{
- struct cdrom_tocentry entry, old_entry;
- struct cdrom_tochdr diskinf;
- struct cdrom_msf0 *msf = &entry.cdte_addr.msf,
- *old_msf = &old_entry.cdte_addr.msf;
- wxCDtime *the_track;
- wxCDtime tot_tm;
- wxUint8 nb_tracks, i;
- int hour, minute, second;
-
- if (m_fd != -1)
- return;
-
- m_fd = open(dev_name.mb_str(), O_RDONLY);
- if (m_fd == -1) {
- m_toc = NULL;
- return;
- }
- m_status = STOPPED;
-
- ioctl(m_fd, CDROMREADTOCHDR, &diskinf);
-
- nb_tracks = diskinf.cdth_trk1-diskinf.cdth_trk0+1;
- m_trksize = new wxCDtime[nb_tracks+1];
- m_trkpos = new wxCDtime[nb_tracks+1];
-
- old_msf->minute = 0;
- old_msf->second = 0;
- for (i=diskinf.cdth_trk0;i<=diskinf.cdth_trk1;i++) {
- entry.cdte_track = i;
- entry.cdte_format = CDROM_MSF;
- ioctl(m_fd, CDROMREADTOCENTRY, &entry);
-
- minute = msf->minute - old_msf->minute;
- second = msf->second - old_msf->second;
- if (second < 0) {
- minute--;
- second += 60;
- }
-
- hour = minute / 60;
- minute %= 60;
-
- the_track = &m_trksize[i-diskinf.cdth_trk0];
- the_track->track = i-diskinf.cdth_trk0;
- the_track->hour = hour;
- the_track->min = minute;
- the_track->sec = second;
-
- the_track = &m_trkpos[i-diskinf.cdth_trk0];
- the_track->track = i-diskinf.cdth_trk0;
- the_track->hour = old_msf->minute / 60;
- the_track->min = old_msf->minute % 60;
- the_track->sec = old_msf->second;
- old_entry = entry;
- }
-
- entry.cdte_track = CDROM_LEADOUT;
- entry.cdte_format = CDROM_MSF;
- ioctl(m_fd, CDROMREADTOCENTRY, &entry);
-
- tot_tm.track = nb_tracks;
- tot_tm.hour = msf->minute / 60;
- tot_tm.min = msf->minute % 60;
- tot_tm.sec = msf->second % 60;
-
- m_trksize[nb_tracks].track = nb_tracks;
- minute = msf->minute - old_msf->minute;
- second = msf->second - old_msf->second;
- if (second < 0) {
- minute--;
- second += 60;
- }
- hour = minute / 60;
- minute %= 60;
-
- m_trksize[nb_tracks].hour = hour;
- m_trksize[nb_tracks].min = minute;
- m_trksize[nb_tracks].sec = second;
- m_trkpos[nb_tracks].track = nb_tracks;
- m_trkpos[nb_tracks].hour = old_msf->minute / 60;
- m_trkpos[nb_tracks].min = old_msf->minute % 60;
- m_trkpos[nb_tracks].sec = old_msf->second;
-
- m_toc = new CDtoc(tot_tm, m_trksize, m_trkpos);
-}
-
-bool wxCDAudioLinux::Play(const wxCDtime& beg_time, const wxCDtime& end_time)
-{
- struct cdrom_msf track_msf;
-
- track_msf.cdmsf_min0 = beg_time.hour * 60 + beg_time.min;
- track_msf.cdmsf_sec0 = beg_time.sec;
- track_msf.cdmsf_frame0 = 0;
- track_msf.cdmsf_min1 = end_time.hour * 60 + end_time.min;
- track_msf.cdmsf_sec1 = end_time.sec;
- track_msf.cdmsf_frame1 = 0;
- return (ioctl(m_fd, CDROMPLAYMSF, &track_msf) != -1);
-}
-
-bool wxCDAudioLinux::Pause()
-{
- return (ioctl(m_fd, CDROMPAUSE, 0) != -1);
-}
-
-bool wxCDAudioLinux::Resume()
-{
- return (ioctl(m_fd, CDROMRESUME, 0) != -1);
-}
-
-wxCDAudio::CDstatus wxCDAudioLinux::GetStatus()
-{
- struct cdrom_subchnl subchnl;
- ioctl(m_fd, CDROMSUBCHNL, &subchnl);
- switch (subchnl.cdsc_audiostatus) {
- case CDROM_AUDIO_PLAY: return PLAYING;
- case CDROM_AUDIO_PAUSED: return PAUSED;
- case CDROM_AUDIO_COMPLETED: return STOPPED;
- }
-
- return STOPPED;
-}
-
-wxCDtime wxCDAudioLinux::GetTime()
-{
- wxCDtime cdtime;
- struct cdrom_subchnl subchnl;
-
- ioctl(m_fd, CDROMSUBCHNL, &subchnl);
- cdtime.track = subchnl.cdsc_trk;
- cdtime.min = subchnl.cdsc_reladdr.msf.minute;
- cdtime.hour = cdtime.min / 60;
- cdtime.min %= 60;
- cdtime.sec = subchnl.cdsc_reladdr.msf.second;
-
- return cdtime;
-}
-
-wxCDAudio::CDtoc& wxCDAudioLinux::GetToc()
-{
- return *m_toc;
-}
-
-#endif
diff --git a/contrib/src/mmedia/cdwin.cpp b/contrib/src/mmedia/cdwin.cpp
deleted file mode 100644
index 8ccc325d11..0000000000
--- a/contrib/src/mmedia/cdwin.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Name: cdwin.cpp
-// Purpose: wxMMedia
-// Author: Guilhem Lavaux
-// Created: 1997
-// Updated: 1998
-// Copyright: (C) 1997, 1998, Guilhem Lavaux
-// License: wxWindows license
-////////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifdef __WINDOWS__
-
-// ---------------------------------------------------------------------------
-// System headers
-// ---------------------------------------------------------------------------
-
-#include
-#include
-#include
-
-// ---------------------------------------------------------------------------
-// MMedia headers
-// ---------------------------------------------------------------------------
-
-#define WXMMEDIA_INTERNAL
-#include "wx/mmedia/cdbase.h"
-#include "wx/mmedia/cdwin.h"
-
-// ---------------------------------------------------------------------------
-// Implementation
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxCDAudioWin, wxCDAudio)
-
-wxCDAudioWin::wxCDAudioWin(void)
- : wxCDAudio(), m_trksize(NULL), m_trkpos(NULL), m_toc(NULL), m_ok(true)
-{
- MCI_OPEN_PARMS open_struct;
- MCI_SET_PARMS set_struct;
-
- m_internal = new CDAW_Internal;
- open_struct.lpstrDeviceType = _T("cdaudio");
- DWORD ret = mciSendCommand((MCIDEVICEID)NULL, MCI_OPEN, MCI_OPEN_TYPE,
- (DWORD)&open_struct);
- if (ret) {
- m_ok = false;
- return;
- }
- m_internal->dev_id = open_struct.wDeviceID;
-
- set_struct.dwTimeFormat = MCI_FORMAT_MSF;
- mciSendCommand(m_internal->dev_id, MCI_SET, MCI_SET_TIME_FORMAT,
- (DWORD)(LPVOID)&set_struct);
-
- PrepareToc();
-
- set_struct.dwTimeFormat = MCI_FORMAT_TMSF;
- mciSendCommand(m_internal->dev_id, MCI_SET, MCI_SET_TIME_FORMAT,
- (DWORD)(LPVOID)&set_struct);
-}
-
-wxCDAudioWin::~wxCDAudioWin(void)
-{
- if (m_ok) {
- mciSendCommand(m_internal->dev_id, MCI_CLOSE, 0,(DWORD_PTR)NULL);
- delete m_toc;
- delete[] m_trksize;
- delete[] m_trkpos;
- }
- delete m_internal;
-}
-
-void wxCDAudioWin::PrepareToc(void)
-{
- MCI_STATUS_PARMS status_struct;
- wxUint16 i, nb_m_trksize;
- wxCDtime total_time, *trk;
- DWORD tmem;
-
- if (!m_ok)
- return;
-
- status_struct.dwItem = MCI_STATUS_NUMBER_OF_TRACKS;
- mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM,
- (DWORD)&status_struct);
- nb_m_trksize = status_struct.dwReturn;
-
- m_trksize = new wxCDtime[nb_m_trksize+1];
- m_trkpos = new wxCDtime[nb_m_trksize+1];
-
- status_struct.dwItem = MCI_STATUS_LENGTH;
- mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM,
- (DWORD)&status_struct);
- total_time.track = nb_m_trksize;
- tmem = status_struct.dwReturn;
- total_time.min = MCI_MSF_MINUTE(tmem);
- total_time.sec = MCI_MSF_SECOND(tmem);
- total_time.hour = total_time.min / 60;
- total_time.min %= 60;
-
- for (i=1;i<=nb_m_trksize;i++) {
- status_struct.dwItem = MCI_STATUS_POSITION;
- status_struct.dwTrack = i;
- mciSendCommand(m_internal->dev_id, MCI_STATUS,
- MCI_STATUS_ITEM | MCI_TRACK,
- (DWORD)(LPVOID)&status_struct);
- tmem = status_struct.dwReturn;
-
- trk = &m_trkpos[i];
- trk->track = i;
- trk->min = MCI_MSF_MINUTE(tmem);
- trk->sec = MCI_MSF_SECOND(tmem);
- trk->hour = trk->min / 60;
- trk->min %= 60;
-
- status_struct.dwItem = MCI_STATUS_LENGTH;
- status_struct.dwTrack = i;
- mciSendCommand(m_internal->dev_id, MCI_STATUS,
- MCI_STATUS_ITEM | MCI_TRACK,
- (DWORD)(LPVOID)&status_struct);
- tmem = status_struct.dwReturn;
-
- trk = &m_trksize[i];
- trk->track = i;
- trk->min = MCI_MSF_MINUTE(tmem);
- trk->sec = MCI_MSF_SECOND(tmem);
- trk->hour = trk->min / 60;
- trk->min %= 60;
- }
-
- m_toc = new CDtoc(total_time, m_trksize, m_trkpos);
-}
-
-bool wxCDAudioWin::Play(const wxCDtime& beg_time, const wxCDtime& end_time)
-{
- DWORD tmsf;
- MCI_PLAY_PARMS play_struct;
-
- if (!m_ok)
- return false;
-
- tmsf = MCI_MAKE_TMSF(beg_time.track, beg_time.min,
- beg_time.sec, 0);
- play_struct.dwFrom = tmsf;
- tmsf = MCI_MAKE_TMSF(end_time.track, end_time.min,
- end_time.sec, 0);
- play_struct.dwTo = tmsf;
-
- mciSendCommand(m_internal->dev_id, MCI_PLAY, 0, (DWORD)&play_struct);
- return true;
-}
-
-bool wxCDAudioWin::Pause(void)
-{
- if (!m_ok)
- return false;
-
- return (mciSendCommand(m_internal->dev_id, MCI_PAUSE, 0, 0) == 0);
-}
-
-bool wxCDAudioWin::Resume(void)
-{
- if (!m_ok)
- return false;
-
- return (mciSendCommand(m_internal->dev_id, MCI_RESUME, 0, 0) == 0);
-}
-
-wxCDAudio::CDstatus wxCDAudioWin::GetStatus(void)
-{
- MCI_STATUS_PARMS status_struct;
-
- if (!m_ok)
- return STOPPED;
-
- status_struct.dwItem = MCI_STATUS_MODE;
- mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM,
- (DWORD)&status_struct);
- switch (status_struct.dwReturn) {
- case MCI_MODE_PAUSE:
- return PAUSED;
- case MCI_MODE_PLAY:
- return PLAYING;
- }
- return STOPPED;
-}
-
-wxCDtime wxCDAudioWin::GetTime(void)
-{
- MCI_STATUS_PARMS status_struct;
- wxCDtime cd_time = {0,0,0,0};
-
- if (!m_ok)
- return cd_time;
-
- status_struct.dwItem = MCI_STATUS_TIME_FORMAT;
- mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM,
- (DWORD)&status_struct);
- cd_time.track = MCI_TMSF_TRACK(status_struct.dwReturn);
- cd_time.min = MCI_TMSF_MINUTE(status_struct.dwReturn);
- cd_time.sec = MCI_TMSF_SECOND(status_struct.dwReturn);
- cd_time.hour = cd_time.min / 60;
- cd_time.min %= 60;
- return cd_time;
-}
-
-const wxCDAudio::CDtoc& wxCDAudioWin::GetToc(void)
-{
- return *m_toc;
-}
-
-#endif
- // __WINDOWS__
diff --git a/contrib/src/mmedia/g711.cpp b/contrib/src/mmedia/g711.cpp
deleted file mode 100644
index 60517b2eb0..0000000000
--- a/contrib/src/mmedia/g711.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use. Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-#include "wx/wxprec.h"
-
-/*
- * g711.c
- *
- * u-law, A-law and linear PCM conversions.
- */
-#define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */
-#define QUANT_MASK (0xf) /* Quantization field mask. */
-#define NSEGS (8) /* Number of A-law segments. */
-#define SEG_SHIFT (4) /* Left shift for segment number. */
-#define SEG_MASK (0x70) /* Segment field mask. */
-
-static short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF,
- 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF};
-
-/* copy from CCITT G.711 specifications */
-unsigned char _u2a[128] = { /* u- to A-law conversions */
- 1, 1, 2, 2, 3, 3, 4, 4,
- 5, 5, 6, 6, 7, 7, 8, 8,
- 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 27, 29, 31, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44,
- 46, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62,
- 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79,
- 81, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128};
-
-unsigned char _a2u[128] = { /* A- to u-law conversions */
- 1, 3, 5, 7, 9, 11, 13, 15,
- 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 32, 33, 33, 34, 34, 35, 35,
- 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 48, 49, 49,
- 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 64,
- 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 79,
- 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103,
- 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127};
-
-static int
-search(
- int val,
- short *table,
- int size)
-{
- int i;
-
- for (i = 0; i < size; i++) {
- if (val <= *table++)
- return (i);
- }
- return (size);
-}
-
-/*
- * linear2alaw() - Convert a 16-bit linear PCM value to 8-bit A-law
- *
- * linear2alaw() accepts an 16-bit integer and encodes it as A-law data.
- *
- * Linear Input Code Compressed Code
- * ------------------------ ---------------
- * 0000000wxyza 000wxyz
- * 0000001wxyza 001wxyz
- * 000001wxyzab 010wxyz
- * 00001wxyzabc 011wxyz
- * 0001wxyzabcd 100wxyz
- * 001wxyzabcde 101wxyz
- * 01wxyzabcdef 110wxyz
- * 1wxyzabcdefg 111wxyz
- *
- * For further information see John C. Bellamy's Digital Telephony, 1982,
- * John Wiley & Sons, pps 98-111 and 472-476.
- */
-unsigned char
-linear2alaw(
- int pcm_val) /* 2's complement (16-bit range) */
-{
- int mask;
- int seg;
- unsigned char aval;
-
- if (pcm_val >= 0) {
- mask = 0xD5; /* sign (7th) bit = 1 */
- } else {
- mask = 0x55; /* sign bit = 0 */
- pcm_val = -pcm_val - 8;
- }
-
- /* Convert the scaled magnitude to segment number. */
- seg = search(pcm_val, seg_end, 8);
-
- /* Combine the sign, segment, and quantization bits. */
-
- if (seg >= 8) /* out of range, return maximum value. */
- return (0x7F ^ mask);
- else {
- aval = seg << SEG_SHIFT;
- if (seg < 2)
- aval |= (pcm_val >> 4) & QUANT_MASK;
- else
- aval |= (pcm_val >> (seg + 3)) & QUANT_MASK;
- return (aval ^ mask);
- }
-}
-
-/*
- * alaw2linear() - Convert an A-law value to 16-bit linear PCM
- *
- */
-int
-alaw2linear(
- unsigned char a_val)
-{
- int t;
- int seg;
-
- a_val ^= 0x55;
-
- t = (a_val & QUANT_MASK) << 4;
- seg = ((unsigned)a_val & SEG_MASK) >> SEG_SHIFT;
- switch (seg) {
- case 0:
- t += 8;
- break;
- case 1:
- t += 0x108;
- break;
- default:
- t += 0x108;
- t <<= seg - 1;
- }
- return ((a_val & SIGN_BIT) ? t : -t);
-}
-
-#define BIAS (0x84) /* Bias for linear code. */
-
-/*
- * linear2ulaw() - Convert a linear PCM value to u-law
- *
- * In order to simplify the encoding process, the original linear magnitude
- * is biased by adding 33 which shifts the encoding range from (0 - 8158) to
- * (33 - 8191). The result can be seen in the following encoding table:
- *
- * Biased Linear Input Code Compressed Code
- * ------------------------ ---------------
- * 00000001wxyza 000wxyz
- * 0000001wxyzab 001wxyz
- * 000001wxyzabc 010wxyz
- * 00001wxyzabcd 011wxyz
- * 0001wxyzabcde 100wxyz
- * 001wxyzabcdef 101wxyz
- * 01wxyzabcdefg 110wxyz
- * 1wxyzabcdefgh 111wxyz
- *
- * Each biased linear code has a leading 1 which identifies the segment
- * number. The value of the segment number is equal to 7 minus the number
- * of leading 0's. The quantization interval is directly available as the
- * four bits wxyz. * The trailing bits (a - h) are ignored.
- *
- * Ordinarily the complement of the resulting code word is used for
- * transmission, and so the code word is complemented before it is returned.
- *
- * For further information see John C. Bellamy's Digital Telephony, 1982,
- * John Wiley & Sons, pps 98-111 and 472-476.
- */
-unsigned char
-linear2ulaw(
- int pcm_val) /* 2's complement (16-bit range) */
-{
- int mask;
- int seg;
- unsigned char uval;
-
- /* Get the sign and the magnitude of the value. */
- if (pcm_val < 0) {
- pcm_val = BIAS - pcm_val;
- mask = 0x7F;
- } else {
- pcm_val += BIAS;
- mask = 0xFF;
- }
-
- /* Convert the scaled magnitude to segment number. */
- seg = search(pcm_val, seg_end, 8);
-
- /*
- * Combine the sign, segment, quantization bits;
- * and complement the code word.
- */
- if (seg >= 8) /* out of range, return maximum value. */
- return (0x7F ^ mask);
- else {
- uval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0xF);
- return (uval ^ mask);
- }
-
-}
-
-/*
- * ulaw2linear() - Convert a u-law value to 16-bit linear PCM
- *
- * First, a biased linear code is derived from the code word. An unbiased
- * output can then be obtained by subtracting 33 from the biased code.
- *
- * Note that this function expects to be passed the complement of the
- * original code word. This is in keeping with ISDN conventions.
- */
-int
-ulaw2linear(
- unsigned char u_val)
-{
- int t;
-
- /* Complement to obtain normal u-law value. */
- u_val = ~u_val;
-
- /*
- * Extract and bias the quantization bits. Then
- * shift up by the segment number and subtract out the bias.
- */
- t = ((u_val & QUANT_MASK) << 3) + BIAS;
- t <<= ((unsigned)u_val & SEG_MASK) >> SEG_SHIFT;
-
- return ((u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS));
-}
-
-/* A-law to u-law conversion */
-unsigned char
-alaw2ulaw(
- unsigned char aval)
-{
- aval &= 0xff;
- return ((aval & 0x80) ? (0xFF ^ _a2u[aval ^ 0xD5]) :
- (0x7F ^ _a2u[aval ^ 0x55]));
-}
-
-/* u-law to A-law conversion */
-unsigned char
-ulaw2alaw(
- unsigned char uval)
-{
- uval &= 0xff;
- return ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) :
- (0x55 ^ (_u2a[0x7F ^ uval] - 1)));
-}
diff --git a/contrib/src/mmedia/g721.cpp b/contrib/src/mmedia/g721.cpp
deleted file mode 100644
index 4068c5b85d..0000000000
--- a/contrib/src/mmedia/g721.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use. Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-#include "wx/wxprec.h"
-
-/*
- * g721.c
- *
- * Description:
- *
- * g721_encoder(), g721_decoder()
- *
- * These routines comprise an implementation of the CCITT G.721 ADPCM
- * coding algorithm. Essentially, this implementation is identical to
- * the bit level description except for a few deviations which
- * take advantage of work station attributes, such as hardware 2's
- * complement arithmetic and large memory. Specifically, certain time
- * consuming operations such as multiplications are replaced
- * with lookup tables and software 2's complement operations are
- * replaced with hardware 2's complement.
- *
- * The deviation from the bit level specification (lookup tables)
- * preserves the bit level performance specifications.
- *
- * As outlined in the G.721 Recommendation, the algorithm is broken
- * down into modules. Each section of code below is preceded by
- * the name of the module which it is implementing.
- *
- */
-#include "wx/mmedia/internal/g72x.h"
-
-static short qtab_721[7] = {-124, 80, 178, 246, 300, 349, 400};
-/*
- * Maps G.721 code word to reconstructed scale factor normalized log
- * magnitude values.
- */
-static short _dqlntab[16] = {-2048, 4, 135, 213, 273, 323, 373, 425,
- 425, 373, 323, 273, 213, 135, 4, -2048};
-
-/* Maps G.721 code word to log of scale factor multiplier. */
-static short _witab[16] = {-12, 18, 41, 64, 112, 198, 355, 1122,
- 1122, 355, 198, 112, 64, 41, 18, -12};
-/*
- * Maps G.721 code words to a set of values whose long and short
- * term averages are computed and then compared to give an indication
- * how stationary (steady state) the signal is.
- */
-static short _fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00,
- 0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0};
-
-/*
- * g721_encoder()
- *
- * Encodes the input vale of linear PCM, A-law or u-law data sl and returns
- * the resulting code. -1 is returned for unknown input coding value.
- */
-int
-g721_encoder(
- int sl,
- int in_coding,
- struct g72x_state *state_ptr)
-{
- short sezi, se, sez; /* ACCUM */
- short d; /* SUBTA */
- short sr; /* ADDB */
- short y; /* MIX */
- short dqsez; /* ADDC */
- short dq, i;
-
- switch (in_coding) { /* linearize input sample to 14-bit PCM */
- case AUDIO_ENCODING_ALAW:
- sl = alaw2linear(sl) >> 2;
- break;
- case AUDIO_ENCODING_ULAW:
- sl = ulaw2linear(sl) >> 2;
- break;
- case AUDIO_ENCODING_LINEAR:
- sl = ((short)sl) >> 2; /* 14-bit dynamic range */
- break;
- default:
- return (-1);
- }
-
- sezi = predictor_zero(state_ptr);
- sez = sezi >> 1;
- se = (sezi + predictor_pole(state_ptr)) >> 1; /* estimated signal */
-
- d = sl - se; /* estimation difference */
-
- /* quantize the prediction difference */
- y = step_size(state_ptr); /* quantizer step size */
- i = quantize(d, y, qtab_721, 7); /* i = ADPCM code */
-
- dq = reconstruct(i & 8, _dqlntab[i], y); /* quantized est diff */
-
- sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq; /* reconst. signal */
-
- dqsez = sr + sez - se; /* pole prediction diff. */
-
- update(4, y, _witab[i] << 5, _fitab[i], dq, sr, dqsez, state_ptr);
-
- return (i);
-}
-
-/*
- * g721_decoder()
- *
- * Description:
- *
- * Decodes a 4-bit code of G.721 encoded data of i and
- * returns the resulting linear PCM, A-law or u-law value.
- * return -1 for unknown out_coding value.
- */
-int
-g721_decoder(
- int i,
- int out_coding,
- struct g72x_state *state_ptr)
-{
- short sezi, sei, sez, se; /* ACCUM */
- short y; /* MIX */
- short sr; /* ADDB */
- short dq;
- short dqsez;
-
- i &= 0x0f; /* mask to get proper bits */
- sezi = predictor_zero(state_ptr);
- sez = sezi >> 1;
- sei = sezi + predictor_pole(state_ptr);
- se = sei >> 1; /* se = estimated signal */
-
- y = step_size(state_ptr); /* dynamic quantizer step size */
-
- dq = reconstruct(i & 0x08, _dqlntab[i], y); /* quantized diff. */
-
- sr = (dq < 0) ? (se - (dq & 0x3FFF)) : se + dq; /* reconst. signal */
-
- dqsez = sr - se + sez; /* pole prediction diff. */
-
- update(4, y, _witab[i] << 5, _fitab[i], dq, sr, dqsez, state_ptr);
-
- switch (out_coding) {
- case AUDIO_ENCODING_ALAW:
- return (tandem_adjust_alaw(sr, se, y, i, 8, qtab_721));
- case AUDIO_ENCODING_ULAW:
- return (tandem_adjust_ulaw(sr, se, y, i, 8, qtab_721));
- case AUDIO_ENCODING_LINEAR:
- return (sr << 2); /* sr was 14-bit dynamic range */
- default:
- return (-1);
- }
-}
diff --git a/contrib/src/mmedia/g723_24.cpp b/contrib/src/mmedia/g723_24.cpp
deleted file mode 100644
index 6e31578df1..0000000000
--- a/contrib/src/mmedia/g723_24.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use. Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-/*
- * g723_24.c
- *
- * Description:
- *
- * g723_24_encoder(), g723_24_decoder()
- *
- * These routines comprise an implementation of the CCITT G.723 24 Kbps
- * ADPCM coding algorithm. Essentially, this implementation is identical to
- * the bit level description except for a few deviations which take advantage
- * of workstation attributes, such as hardware 2's complement arithmetic.
- *
- */
-#include "wx/wxprec.h"
-#include "wx/mmedia/internal/g72x.h"
-
-/*
- * Maps G.723_24 code word to reconstructed scale factor normalized log
- * magnitude values.
- */
-static short _dqlntab[8] = {-2048, 135, 273, 373, 373, 273, 135, -2048};
-
-/* Maps G.723_24 code word to log of scale factor multiplier. */
-static short _witab[8] = {-128, 960, 4384, 18624, 18624, 4384, 960, -128};
-
-/*
- * Maps G.723_24 code words to a set of values whose long and short
- * term averages are computed and then compared to give an indication
- * how stationary (steady state) the signal is.
- */
-static short _fitab[8] = {0, 0x200, 0x400, 0xE00, 0xE00, 0x400, 0x200, 0};
-
-static short qtab_723_24[3] = {8, 218, 331};
-
-/*
- * g723_24_encoder()
- *
- * Encodes a linear PCM, A-law or u-law input sample and returns its 3-bit code.
- * Returns -1 if invalid input coding value.
- */
-int
-g723_24_encoder(
- int sl,
- int in_coding,
- struct g72x_state *state_ptr)
-{
- short sei, sezi, se, sez; /* ACCUM */
- short d; /* SUBTA */
- short y; /* MIX */
- short sr; /* ADDB */
- short dqsez; /* ADDC */
- short dq, i;
-
- switch (in_coding) { /* linearize input sample to 14-bit PCM */
- case AUDIO_ENCODING_ALAW:
- sl = alaw2linear(sl) >> 2;
- break;
- case AUDIO_ENCODING_ULAW:
- sl = ulaw2linear(sl) >> 2;
- break;
- case AUDIO_ENCODING_LINEAR:
- sl = ((short)sl) >> 2; /* sl of 14-bit dynamic range */
- break;
- default:
- return (-1);
- }
-
- sezi = predictor_zero(state_ptr);
- sez = sezi >> 1;
- sei = sezi + predictor_pole(state_ptr);
- se = sei >> 1; /* se = estimated signal */
-
- d = sl - se; /* d = estimation diff. */
-
- /* quantize prediction difference d */
- y = step_size(state_ptr); /* quantizer step size */
- i = quantize(d, y, qtab_723_24, 3); /* i = ADPCM code */
- dq = reconstruct(i & 4, _dqlntab[i], y); /* quantized diff. */
-
- sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq; /* reconstructed signal */
-
- dqsez = sr + sez - se; /* pole prediction diff. */
-
- update(3, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
- return (i);
-}
-
-/*
- * g723_24_decoder()
- *
- * Decodes a 3-bit CCITT G.723_24 ADPCM code and returns
- * the resulting 16-bit linear PCM, A-law or u-law sample value.
- * -1 is returned if the output coding is unknown.
- */
-int
-g723_24_decoder(
- int i,
- int out_coding,
- struct g72x_state *state_ptr)
-{
- short sezi, sei, sez, se; /* ACCUM */
- short y; /* MIX */
- short sr; /* ADDB */
- short dq;
- short dqsez;
-
- i &= 0x07; /* mask to get proper bits */
- sezi = predictor_zero(state_ptr);
- sez = sezi >> 1;
- sei = sezi + predictor_pole(state_ptr);
- se = sei >> 1; /* se = estimated signal */
-
- y = step_size(state_ptr); /* adaptive quantizer step size */
- dq = reconstruct(i & 0x04, _dqlntab[i], y); /* unquantize pred diff */
-
- sr = (dq < 0) ? (se - (dq & 0x3FFF)) : (se + dq); /* reconst. signal */
-
- dqsez = sr - se + sez; /* pole prediction diff. */
-
- update(3, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
- switch (out_coding) {
- case AUDIO_ENCODING_ALAW:
- return (tandem_adjust_alaw(sr, se, y, i, 4, qtab_723_24));
- case AUDIO_ENCODING_ULAW:
- return (tandem_adjust_ulaw(sr, se, y, i, 4, qtab_723_24));
- case AUDIO_ENCODING_LINEAR:
- return (sr << 2); /* sr was of 14-bit dynamic range */
- default:
- return (-1);
- }
-}
diff --git a/contrib/src/mmedia/g723_40.cpp b/contrib/src/mmedia/g723_40.cpp
deleted file mode 100644
index 30c5b431d6..0000000000
--- a/contrib/src/mmedia/g723_40.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use. Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-/*
- * g723_40.c
- *
- * Description:
- *
- * g723_40_encoder(), g723_40_decoder()
- *
- * These routines comprise an implementation of the CCITT G.723 40Kbps
- * ADPCM coding algorithm. Essentially, this implementation is identical to
- * the bit level description except for a few deviations which
- * take advantage of workstation attributes, such as hardware 2's
- * complement arithmetic.
- *
- * The deviation from the bit level specification (lookup tables),
- * preserves the bit level performance specifications.
- *
- * As outlined in the G.723 Recommendation, the algorithm is broken
- * down into modules. Each section of code below is preceded by
- * the name of the module which it is implementing.
- *
- */
-#include "wx/wxprec.h"
-#include "wx/mmedia/internal/g72x.h"
-
-/*
- * Maps G.723_40 code word to ructeconstructed scale factor normalized log
- * magnitude values.
- */
-static short _dqlntab[32] = {-2048, -66, 28, 104, 169, 224, 274, 318,
- 358, 395, 429, 459, 488, 514, 539, 566,
- 566, 539, 514, 488, 459, 429, 395, 358,
- 318, 274, 224, 169, 104, 28, -66, -2048};
-
-/* Maps G.723_40 code word to log of scale factor multiplier. */
-static short _witab[32] = {448, 448, 768, 1248, 1280, 1312, 1856, 3200,
- 4512, 5728, 7008, 8960, 11456, 14080, 16928, 22272,
- 22272, 16928, 14080, 11456, 8960, 7008, 5728, 4512,
- 3200, 1856, 1312, 1280, 1248, 768, 448, 448};
-
-/*
- * Maps G.723_40 code words to a set of values whose long and short
- * term averages are computed and then compared to give an indication
- * how stationary (steady state) the signal is.
- */
-static short _fitab[32] = {0, 0, 0, 0, 0, 0x200, 0x200, 0x200,
- 0x200, 0x200, 0x400, 0x600, 0x800, 0xA00, 0xC00, 0xC00,
- 0xC00, 0xC00, 0xA00, 0x800, 0x600, 0x400, 0x200, 0x200,
- 0x200, 0x200, 0x200, 0, 0, 0, 0, 0};
-
-static short qtab_723_40[15] = {-122, -16, 68, 139, 198, 250, 298, 339,
- 378, 413, 445, 475, 502, 528, 553};
-
-/*
- * g723_40_encoder()
- *
- * Encodes a 16-bit linear PCM, A-law or u-law input sample and retuens
- * the resulting 5-bit CCITT G.723 40Kbps code.
- * Returns -1 if the input coding value is invalid.
- */
-int
-g723_40_encoder(
- int sl,
- int in_coding,
- struct g72x_state *state_ptr)
-{
- short sei, sezi, se, sez; /* ACCUM */
- short d; /* SUBTA */
- short y; /* MIX */
- short sr; /* ADDB */
- short dqsez; /* ADDC */
- short dq, i;
-
- switch (in_coding) { /* linearize input sample to 14-bit PCM */
- case AUDIO_ENCODING_ALAW:
- sl = alaw2linear(sl) >> 2;
- break;
- case AUDIO_ENCODING_ULAW:
- sl = ulaw2linear(sl) >> 2;
- break;
- case AUDIO_ENCODING_LINEAR:
- sl = ((short) sl) >> 2; /* sl of 14-bit dynamic range */
- break;
- default:
- return (-1);
- }
-
- sezi = predictor_zero(state_ptr);
- sez = sezi >> 1;
- sei = sezi + predictor_pole(state_ptr);
- se = sei >> 1; /* se = estimated signal */
-
- d = sl - se; /* d = estimation difference */
-
- /* quantize prediction difference */
- y = step_size(state_ptr); /* adaptive quantizer step size */
- i = quantize(d, y, qtab_723_40, 15); /* i = ADPCM code */
-
- dq = reconstruct(i & 0x10, _dqlntab[i], y); /* quantized diff */
-
- sr = (dq < 0) ? se - (dq & 0x7FFF) : se + dq; /* reconstructed signal */
-
- dqsez = sr + sez - se; /* dqsez = pole prediction diff. */
-
- update(5, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
- return (i);
-}
-
-/*
- * g723_40_decoder()
- *
- * Decodes a 5-bit CCITT G.723 40Kbps code and returns
- * the resulting 16-bit linear PCM, A-law or u-law sample value.
- * -1 is returned if the output coding is unknown.
- */
-int
-g723_40_decoder(
- int i,
- int out_coding,
- struct g72x_state *state_ptr)
-{
- short sezi, sei, sez, se; /* ACCUM */
- short y; /* MIX */
- short sr; /* ADDB */
- short dq;
- short dqsez;
-
- i &= 0x1f; /* mask to get proper bits */
- sezi = predictor_zero(state_ptr);
- sez = sezi >> 1;
- sei = sezi + predictor_pole(state_ptr);
- se = sei >> 1; /* se = estimated signal */
-
- y = step_size(state_ptr); /* adaptive quantizer step size */
- dq = reconstruct(i & 0x10, _dqlntab[i], y); /* estimation diff. */
-
- sr = (dq < 0) ? (se - (dq & 0x7FFF)) : (se + dq); /* reconst. signal */
-
- dqsez = sr - se + sez; /* pole prediction diff. */
-
- update(5, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
- switch (out_coding) {
- case AUDIO_ENCODING_ALAW:
- return (tandem_adjust_alaw(sr, se, y, i, 0x10, qtab_723_40));
- case AUDIO_ENCODING_ULAW:
- return (tandem_adjust_ulaw(sr, se, y, i, 0x10, qtab_723_40));
- case AUDIO_ENCODING_LINEAR:
- return (sr << 2); /* sr was of 14-bit dynamic range */
- default:
- return (-1);
- }
-}
diff --git a/contrib/src/mmedia/g72x.cpp b/contrib/src/mmedia/g72x.cpp
deleted file mode 100644
index 97d3322c23..0000000000
--- a/contrib/src/mmedia/g72x.cpp
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use. Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-/*
- * g72x.c
- *
- * Common routines for G.721 and G.723 conversions.
- */
-
-#include "wx/wxprec.h"
-#include
-#include "wx/mmedia/internal/g72x.h"
-
-static short power2[15] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80,
- 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000};
-
-/*
- * quan()
- *
- * quantizes the input val against the table of size short integers.
- * It returns i if table[i - 1] <= val < table[i].
- *
- * Using linear search for simple coding.
- */
-static int
-quan(
- int val,
- short *table,
- int size)
-{
- int i;
-
- for (i = 0; i < size; i++)
- if (val < *table++)
- break;
- return (i);
-}
-
-static char quan2_tab[65536];
-static short base2_tab[65536];
-static int init_tabs_done = 0;
-
-inline char quan2 (unsigned short val)
-{
- return quan2_tab[val];
-}
-
-inline short base2 (unsigned short val)
-{
- return base2_tab[val];
-}
-
-static void init_quan2_tab (void)
-{
- long i;
-
- for (i = 0; i < 65536; i++) {
- quan2_tab[i] = quan (i, power2, 15);
- };
-}
-
-static void init_base2_tab (void)
-{
- long i;
- short exp;
-
- for (i = 0; i < 65536; i++) {
- exp = quan2 (short (i));
- base2_tab[i] = short ((exp << 6) + ((i << 6) >> exp));
- };
-}
-
-static void init_tabs (void)
-{
- if (init_tabs_done) return;
-
- init_quan2_tab();
- init_base2_tab();
-
- init_tabs_done = 1;
-}
-
-/*
- * fmult()
- *
- * returns the integer product of the 14-bit integer "an" and
- * "floating point" representation (4-bit exponent, 6-bit mantessa) "srn".
- */
-static int
-fmult(
- int an,
- int srn)
-{
- short anmag, anexp, anmant;
- short wanexp, wanmant;
- short retval;
-
- anmag = (an > 0) ? an : ((-an) & 0x1FFF);
- anexp = quan2(anmag) - 6;
- anmant = (anmag == 0) ? 32 :
- (anexp >= 0) ? anmag >> anexp : anmag << -anexp;
- wanexp = anexp + ((srn >> 6) & 0xF) - 13;
-
- wanmant = (anmant * (srn & 077) + 0x30) >> 4;
- retval = (wanexp >= 0) ? ((wanmant << wanexp) & 0x7FFF) :
- (wanmant >> -wanexp);
-
- return (((an ^ srn) < 0) ? -retval : retval);
-}
-
-/*
- * g72x_init_state()
- *
- * This routine initializes and/or resets the g72x_state structure
- * pointed to by 'state_ptr'.
- * All the initial state values are specified in the CCITT G.721 document.
- */
-void
-g72x_init_state(
- struct g72x_state *state_ptr)
-{
- int cnta;
-
- init_tabs ();
-
- state_ptr->yl = 34816;
- state_ptr->yu = 544;
- state_ptr->dms = 0;
- state_ptr->dml = 0;
- state_ptr->ap = 0;
- for (cnta = 0; cnta < 2; cnta++) {
- state_ptr->a[cnta] = 0;
- state_ptr->pk[cnta] = 0;
- state_ptr->sr[cnta] = 32;
- }
- for (cnta = 0; cnta < 6; cnta++) {
- state_ptr->b[cnta] = 0;
- state_ptr->dq[cnta] = 32;
- }
- state_ptr->td = 0;
-}
-
-/*
- * predictor_zero()
- *
- * computes the estimated signal from 6-zero predictor.
- *
- */
-int
-predictor_zero(
- struct g72x_state *state_ptr)
-{
- int i;
- int sezi;
-
- sezi = fmult(state_ptr->b[0] >> 2, state_ptr->dq[0]);
- for (i = 1; i < 6; i++) /* ACCUM */
- sezi += fmult(state_ptr->b[i] >> 2, state_ptr->dq[i]);
- return (sezi);
-}
-/*
- * predictor_pole()
- *
- * computes the estimated signal from 2-pole predictor.
- *
- */
-int
-predictor_pole(
- struct g72x_state *state_ptr)
-{
- return (fmult(state_ptr->a[1] >> 2, state_ptr->sr[1]) +
- fmult(state_ptr->a[0] >> 2, state_ptr->sr[0]));
-}
-/*
- * step_size()
- *
- * computes the quantization step size of the adaptive quantizer.
- *
- */
-int
-step_size(
- struct g72x_state *state_ptr)
-{
- int y;
- int dif;
- int al;
-
- if (state_ptr->ap >= 256)
- return (state_ptr->yu);
- else {
- y = state_ptr->yl >> 6;
- dif = state_ptr->yu - y;
- al = state_ptr->ap >> 2;
- if (dif > 0)
- y += (dif * al) >> 6;
- else if (dif < 0)
- y += (dif * al + 0x3F) >> 6;
- return (y);
- }
-}
-
-/*
- * quantize()
- *
- * Given a raw sample, 'd', of the difference signal and a
- * quantization step size scale factor, 'y', this routine returns the
- * ADPCM codeword to which that sample gets quantized. The step
- * size scale factor division operation is done in the log base 2 domain
- * as a subtraction.
- */
-int
-quantize(
- int d, /* Raw difference signal sample */
- int y, /* Step size multiplier */
- short *table, /* quantization table */
- int size) /* table size of short integers */
-{
- short dqm; /* Magnitude of 'd' */
- short exp; /* Integer part of base 2 log of 'd' */
- short mant; /* Fractional part of base 2 log */
- short dl; /* Log of magnitude of 'd' */
- short dln; /* Step size scale factor normalized log */
- int i;
-
- /*
- * LOG
- *
- * Compute base 2 log of 'd', and store in 'dl'.
- */
- dqm = abs(d);
- exp = quan2(dqm >> 1);
- mant = ((dqm << 7) >> exp) & 0x7F; /* Fractional portion. */
- dl = (exp << 7) + mant;
-
- /*
- * SUBTB
- *
- * "Divide" by step size multiplier.
- */
- dln = dl - (y >> 2);
-
- /*
- * QUAN
- *
- * Obtain codword i for 'd'.
- */
- i = quan(dln, table, size);
- if (d < 0) /* take 1's complement of i */
- return ((size << 1) + 1 - i);
- else if (i == 0) /* take 1's complement of 0 */
- return ((size << 1) + 1); /* new in 1988 */
- else
- return (i);
-}
-/*
- * reconstruct()
- *
- * Returns reconstructed difference signal 'dq' obtained from
- * codeword 'i' and quantization step size scale factor 'y'.
- * Multiplication is performed in log base 2 domain as addition.
- */
-int
-reconstruct(
- int sign, /* 0 for non-negative value */
- int dqln, /* G.72x codeword */
- int y) /* Step size multiplier */
-{
- short dql; /* Log of 'dq' magnitude */
- short dex; /* Integer part of log */
- short dqt;
- short dq; /* Reconstructed difference signal sample */
-
- dql = dqln + (y >> 2); /* ADDA */
-
- if (dql < 0) {
- return ((sign) ? -0x8000 : 0);
- } else { /* ANTILOG */
- dex = (dql >> 7) & 15;
- dqt = 128 + (dql & 127);
- dq = (dqt << 7) >> (14 - dex);
- return ((sign) ? (dq - 0x8000) : dq);
- }
-}
-
-
-/*
- * update()
- *
- * updates the state variables for each output code
- */
-void
-update(
- int code_size, /* distinguish 723_40 with others */
- int y, /* quantizer step size */
- int wi, /* scale factor multiplier */
- int fi, /* for long/short term energies */
- int dq, /* quantized prediction difference */
- int sr, /* reconstructed signal */
- int dqsez, /* difference from 2-pole predictor */
- struct g72x_state *state_ptr) /* coder state pointer */
-{
- int cnt;
- short mag; /* Adaptive predictor, FLOAT A */
- short a2p; /* LIMC */
- short a1ul; /* UPA1 */
- short pks1; /* UPA2 */
- short fa1;
- char tr; /* tone/transition detector */
- short ylint, thr2, dqthr;
- short ylfrac, thr1;
- short pk0;
-
- pk0 = (dqsez < 0) ? 1 : 0; /* needed in updating predictor poles */
-
- mag = dq & 0x7FFF; /* prediction difference magnitude */
- /* TRANS */
- ylint = short (state_ptr->yl >> 15); /* exponent part of yl */
- ylfrac = (state_ptr->yl >> 10) & 0x1F; /* fractional part of yl */
- thr1 = (32 + ylfrac) << ylint; /* threshold */
- thr2 = (ylint > 9) ? 31 << 10 : thr1; /* limit thr2 to 31 << 10 */
- dqthr = (thr2 + (thr2 >> 1)) >> 1; /* dqthr = 0.75 * thr2 */
- if (state_ptr->td == 0) /* signal supposed voice */
- tr = 0;
- else if (mag <= dqthr) /* supposed data, but small mag */
- tr = 0; /* treated as voice */
- else /* signal is data (modem) */
- tr = 1;
-
- /*
- * Quantizer scale factor adaptation.
- */
-
- /* FUNCTW & FILTD & DELAY */
- /* update non-steady state step size multiplier */
- state_ptr->yu = y + ((wi - y) >> 5);
-
- /* LIMB */
- if (state_ptr->yu < 544) /* 544 <= yu <= 5120 */
- state_ptr->yu = 544;
- else if (state_ptr->yu > 5120)
- state_ptr->yu = 5120;
-
- /* FILTE & DELAY */
- /* update steady state step size multiplier */
- state_ptr->yl += state_ptr->yu + ((-state_ptr->yl) >> 6);
-
- /*
- * Adaptive predictor coefficients.
- */
- if (tr == 1) { /* reset a's and b's for modem signal */
- state_ptr->a[0] = 0;
- state_ptr->a[1] = 0;
- state_ptr->b[0] = 0;
- state_ptr->b[1] = 0;
- state_ptr->b[2] = 0;
- state_ptr->b[3] = 0;
- state_ptr->b[4] = 0;
- state_ptr->b[5] = 0;
-
- a2p = 0; /* eliminate Compiler Warnings */
- } else { /* update a's and b's */
- pks1 = pk0 ^ state_ptr->pk[0]; /* UPA2 */
-
- /* update predictor pole a[1] */
- a2p = state_ptr->a[1] - (state_ptr->a[1] >> 7);
- if (dqsez != 0) {
- fa1 = (pks1) ? state_ptr->a[0] : -state_ptr->a[0];
- if (fa1 < -8191) /* a2p = function of fa1 */
- a2p -= 0x100;
- else if (fa1 > 8191)
- a2p += 0xFF;
- else
- a2p += fa1 >> 5;
-
- if (pk0 ^ state_ptr->pk[1])
- /* LIMC */
- if (a2p <= -12160)
- a2p = -12288;
- else if (a2p >= 12416)
- a2p = 12288;
- else
- a2p -= 0x80;
- else if (a2p <= -12416)
- a2p = -12288;
- else if (a2p >= 12160)
- a2p = 12288;
- else
- a2p += 0x80;
- }
-
- /* TRIGB & DELAY */
- state_ptr->a[1] = a2p;
-
- /* UPA1 */
- /* update predictor pole a[0] */
- state_ptr->a[0] -= state_ptr->a[0] >> 8;
- if (dqsez != 0)
- if (pks1 == 0)
- state_ptr->a[0] += 192;
- else
- state_ptr->a[0] -= 192;
-
- /* LIMD */
- a1ul = 15360 - a2p;
- if (state_ptr->a[0] < -a1ul)
- state_ptr->a[0] = -a1ul;
- else if (state_ptr->a[0] > a1ul)
- state_ptr->a[0] = a1ul;
-
- /* UPB : update predictor zeros b[6] */
- for (cnt = 0; cnt < 6; cnt++) {
- if (code_size == 5) /* for 40Kbps G.723 */
- state_ptr->b[cnt] -= state_ptr->b[cnt] >> 9;
- else /* for G.721 and 24Kbps G.723 */
- state_ptr->b[cnt] -= state_ptr->b[cnt] >> 8;
- if (dq & 0x7FFF) { /* XOR */
- if ((dq ^ state_ptr->dq[cnt]) >= 0)
- state_ptr->b[cnt] += 128;
- else
- state_ptr->b[cnt] -= 128;
- }
- }
- }
-
- for (cnt = 5; cnt > 0; cnt--)
- state_ptr->dq[cnt] = state_ptr->dq[cnt-1];
- /* FLOAT A : convert dq[0] to 4-bit exp, 6-bit mantissa f.p. */
- if (mag == 0) {
- state_ptr->dq[0] = (dq >= 0) ? 0x20 : 0xFC20;
- } else {
- state_ptr->dq[0] = (dq >= 0) ?
- base2 (mag) : base2 (mag) - 0x400;
- }
-
- state_ptr->sr[1] = state_ptr->sr[0];
- /* FLOAT B : convert sr to 4-bit exp., 6-bit mantissa f.p. */
- if (sr == 0) {
- state_ptr->sr[0] = 0x20;
- } else if (sr > 0) {
- state_ptr->sr[0] = base2(sr);
- } else if (sr > -32768) {
- mag = -sr;
- state_ptr->sr[0] = base2(mag) - 0x400;
- } else {
- const unsigned short c = 0xFC20;
- state_ptr->sr[0] = short(c);
- }
-
- /* DELAY A */
- state_ptr->pk[1] = state_ptr->pk[0];
- state_ptr->pk[0] = pk0;
-
- /* TONE */
- if (tr == 1) /* this sample has been treated as data */
- state_ptr->td = 0; /* next one will be treated as voice */
- else if (a2p < -11776) /* small sample-to-sample correlation */
- state_ptr->td = 1; /* signal may be data */
- else /* signal is voice */
- state_ptr->td = 0;
-
- /*
- * Adaptation speed control.
- */
- state_ptr->dms += (fi - state_ptr->dms) >> 5; /* FILTA */
- state_ptr->dml += (((fi << 2) - state_ptr->dml) >> 7); /* FILTB */
-
- if (tr == 1)
- state_ptr->ap = 256;
- else if (y < 1536) /* SUBTC */
- state_ptr->ap += (0x200 - state_ptr->ap) >> 4;
- else if (state_ptr->td == 1)
- state_ptr->ap += (0x200 - state_ptr->ap) >> 4;
- else if (abs((state_ptr->dms << 2) - state_ptr->dml) >=
- (state_ptr->dml >> 3))
- state_ptr->ap += (0x200 - state_ptr->ap) >> 4;
- else
- state_ptr->ap += (-state_ptr->ap) >> 4;
-}
-
-/*
- * tandem_adjust(sr, se, y, i, sign)
- *
- * At the end of ADPCM decoding, it simulates an encoder which may be receiving
- * the output of this decoder as a tandem process. If the output of the
- * simulated encoder differs from the input to this decoder, the decoder output
- * is adjusted by one level of A-law or u-law codes.
- *
- * Input:
- * sr decoder output linear PCM sample,
- * se predictor estimate sample,
- * y quantizer step size,
- * i decoder input code,
- * sign sign bit of code i
- *
- * Return:
- * adjusted A-law or u-law compressed sample.
- */
-int
-tandem_adjust_alaw(
- int sr, /* decoder output linear PCM sample */
- int se, /* predictor estimate sample */
- int y, /* quantizer step size */
- int i, /* decoder input code */
- int sign,
- short *qtab)
-{
- unsigned char sp; /* A-law compressed 8-bit code */
- short dx; /* prediction error */
- char id; /* quantized prediction error */
- int sd; /* adjusted A-law decoded sample value */
- int im; /* biased magnitude of i */
- int imx; /* biased magnitude of id */
-
- if (sr <= -32768)
- sr = -1;
- sp = linear2alaw((sr >> 1) << 3); /* short to A-law compression */
- dx = (alaw2linear(sp) >> 2) - se; /* 16-bit prediction error */
- id = quantize(dx, y, qtab, sign - 1);
-
- if (id == i) { /* no adjustment on sp */
- return (sp);
- } else { /* sp adjustment needed */
- /* ADPCM codes : 8, 9, ... F, 0, 1, ... , 6, 7 */
- im = i ^ sign; /* 2's complement to biased unsigned */
- imx = id ^ sign;
-
- if (imx > im) { /* sp adjusted to next lower value */
- if (sp & 0x80) {
- sd = (sp == 0xD5) ? 0x55 :
- ((sp ^ 0x55) - 1) ^ 0x55;
- } else {
- sd = (sp == 0x2A) ? 0x2A :
- ((sp ^ 0x55) + 1) ^ 0x55;
- }
- } else { /* sp adjusted to next higher value */
- if (sp & 0x80)
- sd = (sp == 0xAA) ? 0xAA :
- ((sp ^ 0x55) + 1) ^ 0x55;
- else
- sd = (sp == 0x55) ? 0xD5 :
- ((sp ^ 0x55) - 1) ^ 0x55;
- }
- return (sd);
- }
-}
-
-int
-tandem_adjust_ulaw(
- int sr, /* decoder output linear PCM sample */
- int se, /* predictor estimate sample */
- int y, /* quantizer step size */
- int i, /* decoder input code */
- int sign,
- short *qtab)
-{
- unsigned char sp; /* u-law compressed 8-bit code */
- short dx; /* prediction error */
- char id; /* quantized prediction error */
- int sd; /* adjusted u-law decoded sample value */
- int im; /* biased magnitude of i */
- int imx; /* biased magnitude of id */
-
- if (sr <= -32768)
- sr = 0;
- sp = linear2ulaw(sr << 2); /* short to u-law compression */
- dx = (ulaw2linear(sp) >> 2) - se; /* 16-bit prediction error */
- id = quantize(dx, y, qtab, sign - 1);
- if (id == i) {
- return (sp);
- } else {
- /* ADPCM codes : 8, 9, ... F, 0, 1, ... , 6, 7 */
- im = i ^ sign; /* 2's complement to biased unsigned */
- imx = id ^ sign;
- if (imx > im) { /* sp adjusted to next lower value */
- if (sp & 0x80)
- sd = (sp == 0xFF) ? 0x7E : sp + 1;
- else
- sd = (sp == 0) ? 0 : sp - 1;
-
- } else { /* sp adjusted to next higher value */
- if (sp & 0x80)
- sd = (sp == 0x80) ? 0x80 : sp - 1;
- else
- sd = (sp == 0x7F) ? 0xFE : sp + 1;
- }
- return (sd);
- }
-}
diff --git a/contrib/src/mmedia/makedocs.vc b/contrib/src/mmedia/makedocs.vc
deleted file mode 100644
index cc416a5f20..0000000000
--- a/contrib/src/mmedia/makedocs.vc
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# File: makefile.vc
-WXDIR=$(WXWIN)
-
-NAME=mmedia
-DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\$(NAME)
-DOCDIR=$(WXDIR)\docs
-THISDIR = $(WXDIR)\contrib\src\$(NAME)
-DOCSOURCES=$(DOCSOURCEDIR)\$(NAME).tex \
- $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\topics.tex
-
-alldocs: mkdirs html htmlhelp htb hlp pdfrtf
-html: $(DOCDIR)\html\$(NAME)\$(NAME).htm
-htmlhelp: $(DOCDIR)\htmlhelp\$(NAME).chm
-htb: $(DOCDIR)\htb\$(NAME).htb
-hlp: $(DOCDIR)\winhelp\$(NAME).hlp
-pdfrtf: $(DOCDIR)\pdf\$(NAME).rtf
-ps: $(DOCDIR)\ps\$(NAME).ps
-
-touchmanual:
- touch $(DOCSOURCEDIR)\$(NAME).tex
-
-$(DOCDIR)\winhelp\$(NAME).hlp: $(DOCSOURCEDIR)\$(NAME).rtf $(DOCSOURCEDIR)\$(NAME).hpj
- cd $(DOCSOURCEDIR)
- -erase $(NAME).ph
- hcw /c /e $(NAME)
- move $(NAME).hlp $(DOCDIR)\winhelp\$(NAME).hlp
- move $(NAME).cnt $(DOCDIR)\winhelp\$(NAME).cnt
- cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).hpj:
- echo [OPTIONS] > $(DOCSOURCEDIR)\$(NAME).hpj
- echo BMROOT=$(WXDIR)\contrib\docs\latex\$(NAME) >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo TITLE=OGL Manual >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo CONTENTS=Contents >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo COMPRESS=HIGH >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [FILES] >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo $(NAME).rtf >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [CONFIG] >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo CreateButton("Up", "&Up", "JumpId(`$(NAME).hlp', `Contents')") >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo BrowseButtons() >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [MAP] >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
- echo [BITMAPS] >> $(DOCSOURCEDIR)\$(NAME).hpj
-
-$(DOCSOURCEDIR)\$(NAME).rtf: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCSOURCEDIR)\$(NAME).rtf -twice -winhelp
- cd $(THISDIR)
-
-$(DOCDIR)\pdf\$(NAME).rtf: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -copy *.bmp $(DOCDIR)\pdf
- -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCDIR)\pdf\$(NAME).rtf -twice -rtf
- cd $(THISDIR)
-
-$(DOCDIR)\html\$(NAME)\$(NAME).htm: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -mkdir $(DOCDIR)\html\$(NAME)
- copy *.gif $(DOCDIR)\html\$(NAME)
- -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCDIR)\html\$(NAME)\$(NAME).htm -twice -html
- -erase $(DOCDIR)\html\$(NAME)\*.con
- -erase *.con
- -erase $(DOCDIR)\html\$(NAME)\*.ref
- cd $(THISDIR)
-
-$(DOCDIR)\htmlhelp\$(NAME).chm: $(DOCDIR)\html\$(NAME)\$(NAME).htm $(DOCDIR)\html\$(NAME)\$(NAME).hhp
- cd $(DOCDIR)\html\$(NAME)
- -hhc $(NAME).hhp
- -erase $(DOCDIR)\htmlhelp\$(NAME).chm
- move $(NAME).chm $(DOCDIR)\htmlhelp\$(NAME).chm
- cd $(THISDIR)
-
-# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
-# files, renamed to htb.
-# This can then be used with e.g. helpview.
-# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\$(NAME).htb: $(DOCDIR)\html\$(NAME)\$(NAME).htm
- cd $(DOCDIR)\html\$(NAME)
- -erase $(NAME).zip $(NAME).htb
- zip $(NAME).zip *.htm *.gif *.hhp *.hhc *.hhk
- -mkdir $(DOCDIR)\htb
- -erase $(DOCDIR)\htb\$(NAME).htb
- -erase $(DOCDIR)\htb\$(NAME).htb
- move $(NAME).zip $(DOCDIR)\htb\$(NAME).htb
- cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).dvi: $(DOCSOURCES)
- cd $(DOCSOURCEDIR)
- -latex $(NAME)
- -latex $(NAME)
- -makeindx $(NAME)
- -bibtex $(NAME)
- -latex $(NAME)
- -latex $(NAME)
- cd $(THISDIR)
-
-$(WXDIR)\docs\ps\$(NAME).ps: $(DOCSOURCEDIR)\$(NAME).dvi
- cd $(DOCSOURCEDIR)
- -dvips32 -o $(NAME).ps $(NAME)
- move $(NAME).ps $(WXDIR)\docs\ps\$(NAME).ps
- cd $(THISDIR)
-
diff --git a/contrib/src/mmedia/sndaiff.cpp b/contrib/src/mmedia/sndaiff.cpp
deleted file mode 100644
index 1ec1769119..0000000000
--- a/contrib/src/mmedia/sndaiff.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndaiff.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include "wx/stream.h"
-#include "wx/datstrm.h"
-#include "wx/filefn.h"
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndaiff.h"
-
-#define BUILD_SIGNATURE(a,b,c,d) (((wxUint32)a) | (((wxUint32)b) << 8) | (((wxUint32)c) << 16) | (((wxUint32)d) << 24))
-
-#define FORM_SIGNATURE BUILD_SIGNATURE('F','O','R','M')
-#define AIFF_SIGNATURE BUILD_SIGNATURE('A','I','F','F')
-#define AIFC_SIGNATURE BUILD_SIGNATURE('A','I','F','C')
-#define COMM_SIGNATURE BUILD_SIGNATURE('C','O','M','M')
-#define SSND_SIGNATURE BUILD_SIGNATURE('S','S','N','D')
-
-wxSoundAiff::wxSoundAiff(wxInputStream& stream, wxSoundStream& io_sound)
- : wxSoundFileStream(stream, io_sound)
-{
- m_base_offset = wxInvalidOffset;
-}
-
-wxSoundAiff::wxSoundAiff(wxOutputStream& stream, wxSoundStream& io_sound)
- : wxSoundFileStream(stream, io_sound)
-{
- m_base_offset = wxInvalidOffset;
-}
-
-wxSoundAiff::~wxSoundAiff()
-{
-}
-
-wxString wxSoundAiff::GetCodecName() const
-{
- return wxT("wxSoundAiff codec");
-}
-
-bool wxSoundAiff::CanRead()
-{
- wxUint32 signature1, signature2, len;
-
- if (m_input->Read(&signature1, 4).LastRead() != 4)
- return false;
-
- if (wxUINT32_SWAP_ON_BE(signature1) != FORM_SIGNATURE) {
- m_input->Ungetch(&signature1, 4);
- return false;
- }
-
- m_input->Read(&len, 4);
- if (m_input->LastRead() != 4) {
- m_input->Ungetch(&len, m_input->LastRead());
- m_input->Ungetch(&signature1, 4);
- return false;
- }
-
- if (m_input->Read(&signature2, 4).LastRead() != 4) {
- m_input->Ungetch(&signature2, m_input->LastRead());
- m_input->Ungetch(&len, 4);
- m_input->Ungetch(&signature1, 4);
- return false;
- }
-
- m_input->Ungetch(&signature2, 4);
- m_input->Ungetch(&len, 4);
- m_input->Ungetch(&signature1, 4);
-
- if (
- wxUINT32_SWAP_ON_BE(signature2) != AIFF_SIGNATURE &&
- wxUINT32_SWAP_ON_BE(signature2) != AIFC_SIGNATURE)
- return false;
-
- return true;
-}
-
-#define FAIL_WITH(condition, err) if (condition) { m_snderror = err; return false; }
-
-bool wxSoundAiff::PrepareToPlay()
-{
- wxDataInputStream data(*m_input);
- wxUint32 signature, len, ssnd;
- bool end_headers;
-
- if (!m_input) {
- m_snderror = wxSOUND_INVSTRM;
- return false;
- }
- m_snderror = wxSOUND_NOERROR;
-
- data.BigEndianOrdered(true);
-
- FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
- FAIL_WITH(wxUINT32_SWAP_ON_BE(signature) != FORM_SIGNATURE, wxSOUND_INVSTRM);
- // "FORM"
-
- len = data.Read32();
- wxUnusedVar(len);
- FAIL_WITH(m_input->LastRead() != 4, wxSOUND_INVSTRM);
- // dummy len
-
- FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
- FAIL_WITH(
- wxUINT32_SWAP_ON_BE(signature) != AIFF_SIGNATURE &&
- wxUINT32_SWAP_ON_BE(signature) != AIFC_SIGNATURE, wxSOUND_INVSTRM);
- // "AIFF" / "AIFC"
-
- end_headers = false;
- while (!end_headers) {
- FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
-
- len = data.Read32();
- FAIL_WITH(m_input->LastRead() != 4, wxSOUND_INVSTRM);
-
- switch (wxUINT32_SWAP_ON_BE(signature)) {
- case COMM_SIGNATURE: { // "COMM"
- wxUint16 channels, bps;
- wxUint32 num_samples;
- double srate;
- wxSoundFormatPcm sndformat;
-
- // Get sound data informations
- data >> channels >> num_samples >> bps >> srate;
-
- // Convert them in a wxSoundFormat object
- sndformat.SetSampleRate((wxUint32) srate);
- sndformat.SetBPS(bps);
- sndformat.SetChannels(channels);
- sndformat.Signed(false);
- sndformat.SetOrder(wxBIG_ENDIAN);
-
- if (!SetSoundFormat(sndformat))
- return false;
- // We pass all data left
- m_input->SeekI(len-18, wxFromCurrent);
- break;
- }
- case SSND_SIGNATURE: { // "SSND"
- data >> ssnd;
- // m_input->SeekI(4, wxFromCurrent); // Pass an INT32
- // m_input->SeekI(len-4, wxFromCurrent); // Pass the rest
- m_input->SeekI(ssnd + 4, wxFromCurrent);
- m_base_offset = m_input->TellI();
- // len-8 bytes of samples
- FinishPreparation(len - 8);
- end_headers = true;
- break;
- }
- default:
- m_input->SeekI(len, wxFromCurrent);
- break;
- }
- }
- return true;
-}
-
-bool wxSoundAiff::PrepareToRecord(wxUint32 WXUNUSED(time))
-{
- // TODO
- return false;
-}
-
-bool wxSoundAiff::FinishRecording()
-{
- // TODO
- return false;
-}
-
-bool wxSoundAiff::RepositionStream(wxUint32 WXUNUSED(position))
-{
- // If the stream is not seekable "TellI() returns wxInvalidOffset" we cannot reposition stream
- if (m_base_offset == wxInvalidOffset)
- return false;
- m_input->SeekI(m_base_offset, wxFromStart);
- return true;
-}
-
-wxUint32 wxSoundAiff::GetData(void *buffer, wxUint32 len)
-{
- return m_input->Read(buffer, len).LastRead();
-}
-
-wxUint32 wxSoundAiff::PutData(const void *buffer, wxUint32 len)
-{
- return m_output->Write(buffer, len).LastWrite();
-}
diff --git a/contrib/src/mmedia/sndbase.cpp b/contrib/src/mmedia/sndbase.cpp
deleted file mode 100644
index e0f2114d4e..0000000000
--- a/contrib/src/mmedia/sndbase.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndbase.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999, 2000
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/log.h"
-#endif
-
-#include "wx/mmedia/sndbase.h"
-
-
-// ---------------------------------------------------------------------------
-// wxSoundFormatBase
-// ---------------------------------------------------------------------------
-
-wxSoundFormatBase::wxSoundFormatBase()
-{
-}
-
-wxSoundFormatBase::~wxSoundFormatBase()
-{
-}
-
-wxSoundFormatBase *wxSoundFormatBase::Clone() const
-{
- wxLogFatalError(wxT("In wxSoundFormatBase::Clone() but I should")
- wxT(" not be there"));
- return NULL;
-}
-
-bool wxSoundFormatBase::operator!=(const wxSoundFormatBase& frmt2) const
-{
- return (GetType() != frmt2.GetType());
-}
-
-// ---------------------------------------------------------------------------
-// wxSoundStream
-// ---------------------------------------------------------------------------
-
-wxSoundStream::wxSoundStream()
-{
- int i;
-
- // Reset all variables to their neutral value.
- m_sndformat = NULL;
- m_handler = NULL;
- m_snderror = wxSOUND_NOERROR;
- m_lastcount = 0;
- for (i=0;i<2;i++)
- m_callback[i] = NULL;
-}
-
-wxSoundStream::~wxSoundStream()
-{
- if (m_sndformat)
- delete m_sndformat;
-}
-
-// --------------------------------------------------------------------------
-// SetSoundFormat(const wxSoundFormatBase& format) is one of the most
-// important function of the wxSoundStream class. It prepares the stream to
-// receive or send the data in a strict format. Normally, the sound stream
-// should be ready to accept any format it is asked to manage but in certain
-// cases, it really cannot: in that case it returns false. To have more
-// details in the functionnalities of SetSoundFormat see
-// wxSoundRouterStream::SetSoundFormat()
-// --------------------------------------------------------------------------
-bool wxSoundStream::SetSoundFormat(const wxSoundFormatBase& format)
-{
- // delete the previous prepared format
- if (m_sndformat)
- delete m_sndformat;
-
- // create a new one by cloning the format passed in parameter
- m_sndformat = format.Clone();
- return true;
-}
-
-
-// --------------------------------------------------------------------------
-// Register(int evt, ...) registers the callback for a specified async event.
-// Warning ! Only one callback by event is supported. It means that if you
-// call twice this function the previous registered callback is absolutely
-// ignored.
-// --------------------------------------------------------------------------
-void wxSoundStream::SetCallback(int evt, wxSoundCallback cbk, void *cdata)
-{
- int c;
-
- switch (evt) {
- case wxSOUND_INPUT:
- c = 0;
- break;
- case wxSOUND_OUTPUT:
- c = 1;
- break;
- default:
- return;
- }
- m_callback[c] = cbk;
- m_cdata[c] = cdata;
-}
-
-// --------------------------------------------------------------------------
-// OnSoundEvent(int evt) is called either when the driver is ready to receive
-// a new block to play or when the driver has a new recorded buffer. You
-// must be careful here and try not to spend a lot of time: this is a
-// real-time call. In the case, an "event handler" was specified previously,
-// it called him before everything.
-// --------------------------------------------------------------------------
-void wxSoundStream::OnSoundEvent(int evt)
-{
- int c;
-
- if (m_handler) {
- m_handler->OnSoundEvent(evt);
- return;
- }
-
- switch (evt) {
- case wxSOUND_INPUT:
- c = 0;
- break;
- case wxSOUND_OUTPUT:
- c = 1;
- break;
- default:
- return;
- }
- if (m_callback[c])
- m_callback[c](this, evt, m_cdata[c]);
-}
diff --git a/contrib/src/mmedia/sndcodec.cpp b/contrib/src/mmedia/sndcodec.cpp
deleted file mode 100644
index 3d84427016..0000000000
--- a/contrib/src/mmedia/sndcodec.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndcodec.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-
-wxSoundStreamCodec::wxSoundStreamCodec(wxSoundStream& snd_io)
- : m_sndio(&snd_io)
-{
-}
-
-wxSoundStreamCodec::~wxSoundStreamCodec()
-{
-}
-
-bool wxSoundStreamCodec::StartProduction(int evt)
-{
- return m_sndio->StartProduction(evt);
-}
-
-bool wxSoundStreamCodec::StopProduction()
-{
- return m_sndio->StopProduction();
-}
-
-wxUint32 wxSoundStreamCodec::GetBestSize() const
-{
- return m_sndio->GetBestSize();
-}
diff --git a/contrib/src/mmedia/sndcpcm.cpp b/contrib/src/mmedia/sndcpcm.cpp
deleted file mode 100644
index 8627e45617..0000000000
--- a/contrib/src/mmedia/sndcpcm.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndcpcm.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999, 2000
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
- #include "wx/debug.h"
- #include "wx/log.h"
-#endif
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndcpcm.h"
-
-wxSoundStreamPcm::wxSoundStreamPcm(wxSoundStream& sndio)
- : wxSoundStreamCodec(sndio)
-{
- m_function_in = NULL;
- m_function_out = NULL;
- m_prebuffer = NULL;
- m_prebuffer_size = 0;
- m_best_size = 0;
-}
-
-wxSoundStreamPcm::~wxSoundStreamPcm()
-{
- if (m_prebuffer)
- delete[] m_prebuffer;
-}
-
-wxUint32 wxSoundStreamPcm::GetBestSize() const
-{
- return m_best_size;
-}
-
-// -----------------------------------------------------------------------
-// "Converters" definitions/implementations
-// -----------------------------------------------------------------------
-
-#define DEFINE_CONV(name, input_type, output_type, convert) \
-static void Convert_##name(const void *buf_in, void *buf_out, wxUint32 len) \
-{\
- register input_type src; \
- register const input_type *t_buf_in = (input_type *)buf_in; \
- register output_type *t_buf_out = (output_type *)buf_out; \
-\
- while (len > 0) { \
- src = *t_buf_in++; \
- *t_buf_out++ = convert; \
- len -= sizeof(input_type); \
- } \
-}
-
-// TODO: define converters for all other formats (32, 24)
-
-DEFINE_CONV(8_8_sign, wxUint8, wxUint8, (src ^ 0x80))
-
-DEFINE_CONV(8_16, wxUint8, wxUint16, (((wxUint16)src) << 8))
-DEFINE_CONV(8_16_swap, wxUint8, wxUint16, (src))
-DEFINE_CONV(8_16_sign, wxUint8, wxUint16, (((wxUint16)(src ^ 0x80)) << 8))
-DEFINE_CONV(8_16_sign_swap, wxUint8, wxUint16, (src ^ 0x80))
-
-DEFINE_CONV(16_8, wxUint16, wxUint8, (wxUint8)(src >> 8))
-DEFINE_CONV(16_8_sign, wxUint16, wxUint8, (wxUint8)((src >> 8) ^ 0x80))
-DEFINE_CONV(16_swap_8, wxUint16, wxUint8, (wxUint8)(src & 0xff))
-DEFINE_CONV(16_swap_8_sign, wxUint16, wxUint8, (wxUint8)((src & 0xff) ^ 0x80))
-
-//DEFINE_CONV(24_8, wxUint32, wxUint8, (wxUint8)(src >> 16))
-//DEFINE_CONV(24_8_sig, wxUint32, wxUint8, (wxUint8)((src >> 16) ^ 0x80))
-
-//DEFINE_CONV(32_8, wxUint32, wxUint8, (wxUint8)(src >> 24))
-
-DEFINE_CONV(16_sign, wxUint16, wxUint16, (src ^ 0x8000))
-DEFINE_CONV(16_swap, wxUint16, wxUint16, (((src & 0xff) << 8) | ((src >> 8) & 0xff)))
-// Problem.
-DEFINE_CONV(16_swap_16_sign, wxUint16, wxUint16, ((((src & 0xff) << 8) | ((src >> 8) & 0xff)) ^ 0x80))
-// DEFINE_CONV(16_sign_16_swap, wxUint16, wxUint16, ((((src & 0xff) << 8) | ((src >> 8) & 0xff)) ^ 0x8000))
-DEFINE_CONV(16_swap_16_sign_swap, wxUint16, wxUint16, (src ^ 0x80))
-
-// -----------------------------------------------------------------------
-// Main PCM stream converter table
-// -----------------------------------------------------------------------
-// Definition
-// XX -> YY
-// XX -> YY sign
-//
-// XX swapped -> YY
-// XX swapped -> YY sign
-//
-// XX swapped -> YY swapped
-// XX swapped -> YY swapped sign
-//
-// XX stereo -> YY mono
-// XX stereo -> YY mono sign
-//
-// XX swapped stereo -> YY swapped mono
-// XX swapped stereo -> YY swapped mono sign
-//
-// XX swapped stereo -> YY swapped mono
-// XX swapped stereo -> YY swapped mono sign
-
-static wxSoundStreamPcm::ConverterType s_converters[4][3][2] = {
- {
- {
- NULL,
- Convert_8_8_sign /* 8 -> 8 sign */
- },
- {
- NULL,
- NULL
- },
- {
- NULL,
- NULL
- }
- },
- {
- {
- Convert_8_16, /* 8 -> 16 */
- Convert_8_16_sign /* 8 -> 16 sign */
- },
- {
- Convert_8_16_swap, /* 8 -> 16 swapped */
- Convert_8_16_sign_swap /* 8 -> 16 sign swapped */
- },
- {
- NULL,
- NULL
- }
- },
- {
- {
- Convert_16_8, /* 16 -> 8 */
- Convert_16_8_sign /* 16 -> 8 sign */
- },
- {
- Convert_16_swap_8, /* 16 swapped -> 8 */
- Convert_16_swap_8_sign /* 16 swapped -> 8 sign */
- },
- {
- NULL,
- NULL
- },
- },
-
- {
- {
- NULL, /* 16 -> 16 */
- Convert_16_sign /* 16 -> 16 sign */
- },
- {
- Convert_16_swap, /* 16 swapped -> 16 */
- Convert_16_swap_16_sign /* 16 swapped -> 16 sign */
- },
- {
- NULL,
- Convert_16_swap_16_sign_swap /* 16 swapped -> 16 sign swapped */
- }
- }
-};
-
-// This is the buffer size multiplier. It gives the needed size of the output size.
-static float s_converters_multip[] = {1, 2, 0.5, 1};
-
-//
-// TODO: Read() and Write() aren't really safe. If you give it a buffer which
-// is not aligned on 2, you may crash (See converter.def).
-//
-
-wxSoundStream& wxSoundStreamPcm::Read(void *buffer, wxUint32 len)
-{
- wxUint32 in_bufsize;
-
- // We must have a multiple of 2
- len &= 0x01;
-
- if (!m_function_in) {
- m_sndio->Read(buffer, len);
- m_lastcount = m_sndio->GetLastAccess();
- m_snderror = m_sndio->GetError();
- return *this;
- }
-
- in_bufsize = GetReadSize(len);
-
- if (len <= m_best_size) {
- m_sndio->Read(m_prebuffer, in_bufsize);
- m_snderror = m_sndio->GetError();
- if (m_snderror != wxSOUND_NOERROR) {
- m_lastcount = 0;
- return *this;
- }
-
- m_function_in(m_prebuffer, buffer, m_sndio->GetLastAccess());
- } else {
- char *temp_buffer;
-
- temp_buffer = new char[in_bufsize];
- m_sndio->Read(temp_buffer, in_bufsize);
-
- m_snderror = m_sndio->GetError();
- if (m_snderror != wxSOUND_NOERROR) {
- m_lastcount = 0;
- return *this;
- }
-
- m_function_in(temp_buffer, buffer, m_sndio->GetLastAccess());
-
- delete[] temp_buffer;
- }
-
- m_lastcount = (wxUint32)(m_sndio->GetLastAccess() * m_multiplier_in);
-
- return *this;
-}
-
-wxSoundStream& wxSoundStreamPcm::Write(const void *buffer, wxUint32 len)
-{
- wxUint32 out_bufsize;
-
- if (!m_function_out) {
- m_sndio->Write(buffer, len);
- m_lastcount = m_sndio->GetLastAccess();
- m_snderror = m_sndio->GetError();
- return *this;
- }
-
- out_bufsize = GetWriteSize(len);
-
- if (len <= m_best_size) {
- out_bufsize = GetWriteSize(len);
-
- m_function_out(buffer, m_prebuffer, len);
- m_sndio->Write(m_prebuffer, out_bufsize);
- m_snderror = m_sndio->GetError();
- if (m_snderror != wxSOUND_NOERROR) {
- m_lastcount = 0;
- return *this;
- }
- } else {
- char *temp_buffer;
-
- temp_buffer = new char[out_bufsize];
- m_function_out(buffer, temp_buffer, len);
-
- m_sndio->Write(temp_buffer, out_bufsize);
- m_snderror = m_sndio->GetError();
- if (m_snderror != wxSOUND_NOERROR) {
- m_lastcount = 0;
- return *this;
- }
-
- delete[] temp_buffer;
- }
-
- m_lastcount = (wxUint32)(m_sndio->GetLastAccess() / m_multiplier_out);
-
- return *this;
-}
-
-bool wxSoundStreamPcm::SetSoundFormat(const wxSoundFormatBase& format)
-{
- wxSoundFormatBase *new_format;
- wxSoundFormatPcm *pcm_format, *pcm_format2;
-
- if (m_sndio->SetSoundFormat(format)) {
- m_function_out = NULL;
- m_function_in = NULL;
- return true;
- }
- if (format.GetType() != wxSOUND_PCM) {
- m_snderror = wxSOUND_INVFRMT;
- return false;
- }
- if (m_sndformat)
- delete m_sndformat;
-
- new_format = m_sndio->GetSoundFormat().Clone();
- pcm_format = (wxSoundFormatPcm *)&format;
- pcm_format2 = (wxSoundFormatPcm *)new_format;
-
-#if 0
- // ----------------------------------------------------
- // Test whether we need to resample
- if (pcm_format->GetSampleRate() != pcm_format2->GetSampleRate()) {
- wxUint32 src_rate, dst_rate;
-
- src_rate = pcm_format->GetSampleRate();
- dst_rate = pcm_format2->GetSampleRate();
- m_needResampling = true;
- if (src_rate < dst_rate)
- m_expandSamples = true;
- else
- m_expandSamples = false;
- m_pitch = (src_rate << FLOATBITS) / dst_rate;
- }
-#endif
- // ----------------------------------------------------
- // Select table to use:
- // * 8 bits -> 8 bits
- // * 16 bits -> 8 bits
- // * 8 bits -> 16 bits
- // * 16 bits -> 16 bits
-
- int table_no, table_no2;
- int i_sign, i_swap;
-
- switch (pcm_format->GetBPS()) {
- case 8:
- table_no = 0;
- break;
- case 16:
- table_no = 1;
- break;
- default:
- // TODO: Add something here: error, log, ...
- return false;
- }
- switch (pcm_format2->GetBPS()) {
- case 8:
- table_no2 = 0;
- break;
- case 16:
- table_no2 = 1;
- break;
- default:
- // TODO: Add something here: error, log, ...
- return false;
- }
-
- if (pcm_format2->Signed() != pcm_format->Signed())
- i_sign = 1;
- else
- i_sign = 0;
-
-#define MY_ORDER wxBYTE_ORDER
-#if wxBYTE_ORDER == wxLITTLE_ENDIAN
-#define OTHER_ORDER wxBIG_ENDIAN
-#else
-#define OTHER_ORDER wxLITTLE_ENDIAN
-#endif
-
- // --------------------------------------------------------
- // Find the good converter !
-
- if (pcm_format->GetOrder() == OTHER_ORDER) {
- if (pcm_format->GetOrder() == pcm_format2->GetOrder())
- i_swap = 2;
- else
- i_swap = 1;
- } else {
- if (pcm_format->GetOrder() == pcm_format2->GetOrder())
- i_swap = 0;
- else
- i_swap = 1;
- }
-
- m_function_out = s_converters[table_no*2+table_no2][i_swap][i_sign];
- m_function_in = s_converters[table_no2*2+table_no][i_swap][i_sign];
- m_multiplier_out = s_converters_multip[table_no*2+table_no2];
- m_multiplier_in = s_converters_multip[table_no2*2+table_no2];
-
- if (m_prebuffer)
- delete[] m_prebuffer;
-
- // We try to minimize the need for dynamic memory allocation by preallocating a buffer. But
- // to be sure it will be efficient we minimize the best size.
- if (m_multiplier_in < m_multiplier_out) {
- m_prebuffer_size = (wxUint32)(m_sndio->GetBestSize() *
- m_multiplier_out);
- m_best_size = (wxUint32)(m_sndio->GetBestSize() *
- m_multiplier_in);
- } else {
- m_prebuffer_size = (wxUint32)(m_sndio->GetBestSize() *
- m_multiplier_in);
- m_best_size = (wxUint32)(m_sndio->GetBestSize() *
- m_multiplier_out);
- }
-
- m_prebuffer = new char[m_prebuffer_size];
-
- bool SetSoundFormatReturn;
-
- SetSoundFormatReturn = m_sndio->SetSoundFormat(*new_format);
- wxASSERT( SetSoundFormatReturn );
- wxUnusedVar( SetSoundFormatReturn );
-
- m_sndformat = new_format;
- return true;
-}
-
-wxUint32 wxSoundStreamPcm::GetWriteSize(wxUint32 len) const
-{
- // For the moment, it is simple but next time it will become more complicated
- // (Resampling)
- return (wxUint32)(len * m_multiplier_out);
-}
-
-wxUint32 wxSoundStreamPcm::GetReadSize(wxUint32 len) const
-{
- return (wxUint32)(len / m_multiplier_in);
-}
-
-// Resampling engine. NOT FINISHED and NOT INCLUDED but this is a first DRAFT.
-
-#if 0
-
-#define FLOATBITS 16
-#define INTBITS 16
-#define FLOATMASK 0xffff
-#define INTMASK 0xffff0000
-
-void ResamplingShrink_##DEPTH##(const void *source, void *destination, wxUint32 len)
-{
- wxUint##DEPTH## *source_data, *dest_data;
- wxUint32 pos;
-
- source_data = (wxUint##DEPTH## *)source;
- dest_data = (wxUint##DEPTH## *)destination;
-
- pos = m_saved_pos;
- while (len > 0) {
- // Increment the position in the input buffer
- pos += m_pitch;
- if (pos & INTMASK) {
- pos &= FLOATMASK;
-
- *dest_data ++ = *source_data;
- }
- len--;
- source_data++;
- }
- m_saved_pos = pos;
-}
-#endif
diff --git a/contrib/src/mmedia/sndesd.cpp b/contrib/src/mmedia/sndesd.cpp
deleted file mode 100644
index 8c38f4dea2..0000000000
--- a/contrib/src/mmedia/sndesd.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndesd.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
- #include "wx/string.h"
-#endif
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-// --------------------------------------------------------------------------
-// MMedia headers
-// --------------------------------------------------------------------------
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndesd.h"
-#include "wx/mmedia/sndpcm.h"
-
-// --------------------------------------------------------------------------
-// System headers
-// --------------------------------------------------------------------------
-
-#ifdef HAVE_ESD_H
-#include
-#include
-#include
-#include
-#ifdef __WXGTK__
-#include
-#endif
-#endif
-
-// --------------------------------------------------------------------------
-
-#define MY_ESD_NAME "wxWidgets/wxSoundStreamESD"
-
-// --------------------------------------------------------------------------
-// wxSoundStreamESD: ESD sound driver
-
-// --------------------------------------------------------------------------
-// Constructors/Destructors
-// --------------------------------------------------------------------------
-
-wxSoundStreamESD::wxSoundStreamESD(const wxString& hostname)
-{
-#ifndef HAVE_ESD_H
- m_snderror = wxSOUND_INVDEV;
- return;
-#else
- wxSoundFormatPcm pcm_default;
-
- // First, we make some basic test: is there ESD on this computer ?
- m_esd_ok = false;
-
- if (hostname.IsNull())
- m_fd_output = esd_play_stream(ESD_PLAY | ESD_STREAM, 22050,
- hostname.mb_str(), MY_ESD_NAME);
- else
- m_fd_output = esd_play_stream(ESD_PLAY | ESD_STREAM, 22050,
- NULL, MY_ESD_NAME);
- if (m_fd_output == -1) {
- // Answer: no. We return with an error.
- m_snderror = wxSOUND_INVDEV;
- return;
- }
-
- // Close this unuseful stream.
- esd_close(m_fd_output);
-
- m_hostname = hostname;
-
- // Set the default audio format
- SetSoundFormat(pcm_default);
-
- // Initialize some variable
- m_snderror = wxSOUND_NOERROR;
- m_esd_stop = true;
- m_q_filled = true;
- m_esd_ok = true;
- m_fd_output= -1;
- m_fd_input = -1;
-#endif // defined HAVE_ESD_H
-}
-
-wxSoundStreamESD::~wxSoundStreamESD()
-{
-#ifdef HAVE_ESD_H
- if (!m_esd_stop)
- StopProduction();
-#endif // defined HAVE_ESD_H
-}
-
-// --------------------------------------------------------------------------
-// Read several samples
-// --------------------------------------------------------------------------
-
-wxSoundStream& wxSoundStreamESD::Read(void *buffer, wxUint32 len)
-{
-#ifndef HAVE_ESD_H
- m_snderror = wxSOUND_INVDEV;
- return *this;
-#else
- int ret;
-
- if (m_esd_stop) {
- m_snderror = wxSOUND_NOTSTARTED;
- return *this;
- }
-
- ret = read(m_fd_input, buffer, len);
- m_lastcount = (wxUint32)ret;
-
- if (ret < 0)
- m_snderror = wxSOUND_IOERROR;
- else
- m_snderror = wxSOUND_NOERROR;
-
- return *this;
-#endif // defined HAVE_ESD_H
-}
-
-// --------------------------------------------------------------------------
-// Write several samples
-// --------------------------------------------------------------------------
-wxSoundStream& wxSoundStreamESD::Write(const void *buffer, wxUint32 len)
-{
-#ifndef HAVE_ESD_H
- m_snderror = wxSOUND_INVDEV;
- return *this;
-#else
- int ret;
-
- if (m_esd_stop) {
- m_lastcount = 0;
- m_snderror = wxSOUND_NOTSTARTED;
- return *this;
- }
-
- ret = write(m_fd_output, buffer, len);
- m_lastcount = (wxUint32)ret;
-
- if (ret < 0)
- m_snderror = wxSOUND_IOERROR;
- else
- m_snderror = wxSOUND_NOERROR;
-
- m_q_filled = true;
-
- return *this;
-#endif // defined HAVE_ESD_H
-}
-
-// --------------------------------------------------------------------------
-// SetSoundFormat(): this function specifies which format we want and which
-// format is available
-// --------------------------------------------------------------------------
-bool wxSoundStreamESD::SetSoundFormat(const wxSoundFormatBase& format)
-{
-#ifndef HAVE_ESD_H
- m_snderror = wxSOUND_INVDEV;
- return false;
-#else
- wxSoundFormatPcm *pcm_format;
-
- if (format.GetType() != wxSOUND_PCM) {
- m_snderror = wxSOUND_INVFRMT;
- return false;
- }
-
- if (!m_esd_ok) {
- m_snderror = wxSOUND_INVDEV;
- return false;
- }
-
- if (m_sndformat)
- delete m_sndformat;
-
- m_sndformat = format.Clone();
- if (!m_sndformat) {
- m_snderror = wxSOUND_MEMERROR;
- return false;
- }
- pcm_format = (wxSoundFormatPcm *)m_sndformat;
-
- // Detect the best format
- DetectBest(pcm_format);
-
- m_snderror = wxSOUND_NOERROR;
- if (*pcm_format != format) {
- m_snderror = wxSOUND_NOEXACT;
- return false;
- }
- return true;
-#endif // defined HAVE_ESD_H
-}
-
-// --------------------------------------------------------------------------
-// _wxSound_OSS_CBack (internal): it is called when the driver (ESD) is
-// ready for a next buffer.
-// --------------------------------------------------------------------------
-#if defined(__WXGTK__) && defined(HAVE_ESD_H)
-static void _wxSound_OSS_CBack(gpointer data, int source,
- GdkInputCondition condition)
-{
- wxSoundStreamESD *esd = (wxSoundStreamESD *)data;
-
- switch (condition) {
- case GDK_INPUT_READ:
- esd->WakeUpEvt(wxSOUND_INPUT);
- break;
- case GDK_INPUT_WRITE:
- esd->WakeUpEvt(wxSOUND_OUTPUT);
- break;
- default:
- break;
- }
-}
-#endif
-
-
-// --------------------------------------------------------------------------
-// WakeUpEvt() (internal): it is called by _wxSound_OSS_CBack to bypass the
-// C++ protection
-// --------------------------------------------------------------------------
-void wxSoundStreamESD::WakeUpEvt(int evt)
-{
- m_q_filled = false;
- OnSoundEvent(evt);
-}
-
-// --------------------------------------------------------------------------
-// StartProduction(): see wxSoundStream
-// --------------------------------------------------------------------------
-bool wxSoundStreamESD::StartProduction(int evt)
-{
-#ifndef HAVE_ESD_H
- m_snderror = wxSOUND_INVDEV;
- return false;
-#else
- wxSoundFormatPcm *pcm;
- int flag = 0;
-
- if (!m_esd_ok) {
- m_snderror = wxSOUND_INVDEV;
- return false;
- }
-
- if (!m_esd_stop)
- StopProduction();
-
- pcm = (wxSoundFormatPcm *)m_sndformat;
-
- flag |= (pcm->GetBPS() == 16) ? ESD_BITS16 : ESD_BITS8;
- flag |= (pcm->GetChannels() == 2) ? ESD_STEREO : ESD_MONO;
-
- if ((evt & wxSOUND_OUTPUT) != 0) {
- flag |= ESD_PLAY | ESD_STREAM;
- m_fd_output = esd_play_stream(flag, pcm->GetSampleRate(), NULL,
- MY_ESD_NAME);
- }
-
- if ((evt & wxSOUND_INPUT) != 0) {
- flag |= ESD_RECORD | ESD_STREAM;
- m_fd_input = esd_record_stream(flag, pcm->GetSampleRate(), NULL,
- MY_ESD_NAME);
- }
-
-#ifdef __WXGTK__
- if ((evt & wxSOUND_OUTPUT) != 0) {
- m_tag_output = gdk_input_add(m_fd_output, GDK_INPUT_WRITE,
- _wxSound_OSS_CBack, (gpointer)this);
- }
- if ((evt & wxSOUND_INPUT) != 0) {
- m_tag_input = gdk_input_add(m_fd_input, GDK_INPUT_READ,
- _wxSound_OSS_CBack, (gpointer)this);
- }
-#endif
-
- m_esd_stop = false;
- m_q_filled = false;
-
- return true;
-#endif // defined HAVE_ESD_H
-}
-
-// --------------------------------------------------------------------------
-// StopProduction(): see wxSoundStream
-// --------------------------------------------------------------------------
-bool wxSoundStreamESD::StopProduction()
-{
-#ifndef HAVE_ESD_H
- m_snderror = wxSOUND_INVDEV;
- return false;
-#else
- if (m_esd_stop)
- return false;
-
- if (m_fd_input != -1) {
- esd_close(m_fd_input);
-#ifdef __WXGTK__
- gdk_input_remove(m_tag_input);
-#endif
- }
- if (m_fd_output != -1) {
- esd_close(m_fd_output);
-#ifdef __WXGTK__
- gdk_input_remove(m_tag_output);
-#endif
- }
-
- m_fd_input = -1;
- m_fd_output= -1;
- m_esd_stop = true;
- m_q_filled = true;
- return true;
-#endif // defined HAVE_ESD_H
-}
-
-//
-// Detect the closest format (The best).
-//
-void wxSoundStreamESD::DetectBest(wxSoundFormatPcm *pcm)
-{
-#ifndef HAVE_ESD_H
- m_snderror = wxSOUND_INVDEV;
- return;
-#else
- wxSoundFormatPcm best_pcm;
-
- // We change neither the number of channels nor the sample rate
- // because ESD is clever.
-
- best_pcm.SetSampleRate(pcm->GetSampleRate());
- best_pcm.SetChannels(pcm->GetChannels());
-
- // It supports 16 bits
- if (pcm->GetBPS() >= 16)
- best_pcm.SetBPS(16);
- else
- best_pcm.SetBPS(8);
-
- best_pcm.SetOrder(wxLITTLE_ENDIAN);
- best_pcm.Signed(true);
-
- // Finally recopy the new format
- *pcm = best_pcm;
-#endif // defined HAVE_ESD_H
-}
-
diff --git a/contrib/src/mmedia/sndfile.cpp b/contrib/src/mmedia/sndfile.cpp
deleted file mode 100644
index 657fec23c9..0000000000
--- a/contrib/src/mmedia/sndfile.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndfile.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999, 2000
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/stream.h"
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndcpcm.h"
-#include "wx/mmedia/sndulaw.h"
-#include "wx/mmedia/sndg72x.h"
-#include "wx/mmedia/sndmsad.h"
-
-// --------------------------------------------------------------------------
-// Sound codec router
-// A very important class: it ensures that everybody is satisfied.
-// It is supposed to create as many codec as it is necessary to transform
-// a signal in a specific format in an another.
-// --------------------------------------------------------------------------
-wxSoundRouterStream::wxSoundRouterStream(wxSoundStream& sndio)
- : wxSoundStreamCodec(sndio)
-{
- m_router = NULL;
-}
-
-wxSoundRouterStream::~wxSoundRouterStream()
-{
- if (m_router)
- delete m_router;
-}
-
-// --------------------------------------------------------------------------
-// Read(void *buffer, wxUint32 len): It reads data synchronously. See sndbase.h
-// for possible errors and behaviours ...
-// --------------------------------------------------------------------------
-wxSoundStream& wxSoundRouterStream::Read(void *buffer, wxUint32 len)
-{
- if (m_router) {
- m_router->Read(buffer, len);
- m_snderror = m_router->GetError();
- m_lastcount = m_router->GetLastAccess();
- } else {
- m_sndio->Read(buffer, len);
- m_snderror = m_sndio->GetError();
- m_lastcount = m_sndio->GetLastAccess();
- }
- return *this;
-}
-
-// --------------------------------------------------------------------------
-// Write(const void *buffer, wxUint32 len): It writes data synchronously
-// --------------------------------------------------------------------------
-wxSoundStream& wxSoundRouterStream::Write(const void *buffer, wxUint32 len)
-{
- if (m_router) {
- m_router->Write(buffer, len);
- m_snderror = m_router->GetError();
- m_lastcount = m_router->GetLastAccess();
- } else {
- m_sndio->Write(buffer, len);
- m_snderror = m_sndio->GetError();
- m_lastcount = m_sndio->GetLastAccess();
- }
- return *this;
-}
-
-// --------------------------------------------------------------------------
-// SetSoundFormat(const wxSoundFormatBase& format) first tries to setup the
-// sound driver using the specified format. If this fails, it uses personnal
-// codec converters: for the moment there is a PCM converter (PCM to PCM:
-// with optional resampling, ...), an ULAW converter (ULAW to PCM), a G72X
-// converter (G72X to PCM). If nothing works, it returns false.
-// --------------------------------------------------------------------------
-bool wxSoundRouterStream::SetSoundFormat(const wxSoundFormatBase& format)
-{
- if (m_router)
- delete m_router;
-
- // First, we try to setup the sound device
- if (m_sndio->SetSoundFormat(format)) {
- // We are lucky, it is working.
- wxSoundStream::SetSoundFormat(m_sndio->GetSoundFormat());
- return true;
- }
-
- switch(format.GetType()) {
- case wxSOUND_NOFORMAT:
- return false;
- case wxSOUND_PCM:
- m_router = new wxSoundStreamPcm(*m_sndio);
- m_router->SetSoundFormat(format);
- break;
- case wxSOUND_ULAW:
- m_router = new wxSoundStreamUlaw(*m_sndio);
- m_router->SetSoundFormat(format);
- break;
- case wxSOUND_G72X:
- m_router = new wxSoundStreamG72X(*m_sndio);
- m_router->SetSoundFormat(format);
- break;
- case wxSOUND_MSADPCM:
- m_router = new wxSoundStreamMSAdpcm(*m_sndio);
- m_router->SetSoundFormat(format);
- break;
- default:
- return false;
-
- }
- wxSoundStream::SetSoundFormat(m_router->GetSoundFormat());
- return true;
-}
-
-// --------------------------------------------------------------------------
-// GetBestSize() returns the specific best buffer size a sound driver
-// can manage. It means that it will be easier for it to manage the buffer
-// and so it will be faster and in some case more accurate for real-time event.
-// --------------------------------------------------------------------------
-wxUint32 wxSoundRouterStream::GetBestSize() const
-{
- if (m_router)
- return m_router->GetBestSize();
- else
- return m_sndio->GetBestSize();
-}
-
-// --------------------------------------------------------------------------
-// StartProduction(int evt). See sndbase.h
-// --------------------------------------------------------------------------
-bool wxSoundRouterStream::StartProduction(int evt)
-{
- if (!m_router) {
- if (m_sndio->StartProduction(evt))
- return true;
-
- m_snderror = m_sndio->GetError();
- m_lastcount = m_sndio->GetLastAccess();
- return false;
- }
-
- if (m_router->StartProduction(evt))
- return true;
-
- m_snderror = m_router->GetError();
- m_lastcount = m_router->GetLastAccess();
- return false;
-}
-
-// --------------------------------------------------------------------------
-// StopProduction(). See sndbase.h
-// --------------------------------------------------------------------------
-bool wxSoundRouterStream::StopProduction()
-{
- if (!m_router) {
- if (m_sndio->StopProduction())
- return true;
-
- m_snderror = m_sndio->GetError();
- m_lastcount = m_sndio->GetLastAccess();
- return false;
- }
-
- if (m_router->StopProduction())
- return true;
-
- m_snderror = m_router->GetError();
- m_lastcount = m_router->GetLastAccess();
- return false;
-}
-
-// --------------------------------------------------------------------------
-// wxSoundFileStream: generic reader
-// --------------------------------------------------------------------------
-
-wxSoundFileStream::wxSoundFileStream(wxInputStream& stream,
- wxSoundStream& io_sound)
- : m_codec(io_sound), m_sndio(&io_sound),
- m_input(&stream), m_output(NULL), m_state(wxSOUND_FILE_STOPPED)
-{
- m_length = 0;
- m_bytes_left = 0;
- m_prepared = false;
-}
-
-wxSoundFileStream::wxSoundFileStream(wxOutputStream& stream,
- wxSoundStream& io_sound)
- : m_codec(io_sound), m_sndio(&io_sound),
- m_input(NULL), m_output(&stream), m_state(wxSOUND_FILE_STOPPED)
-{
- m_length = 0;
- m_bytes_left = 0;
- m_prepared = false;
-}
-
-wxSoundFileStream::~wxSoundFileStream()
-{
- if (m_state != wxSOUND_FILE_STOPPED)
- Stop();
-}
-
-bool wxSoundFileStream::Play()
-{
- if (m_state != wxSOUND_FILE_STOPPED)
- return false;
-
- if (!m_prepared)
- if (!PrepareToPlay())
- return false;
-
- m_state = wxSOUND_FILE_PLAYING;
-
- if (!StartProduction(wxSOUND_OUTPUT))
- return false;
-
- return true;
-}
-
-bool wxSoundFileStream::Record(wxUint32 time)
-{
- if (m_state != wxSOUND_FILE_STOPPED)
- return false;
-
- if (!PrepareToRecord(time))
- return false;
-
- FinishPreparation(m_sndformat->GetBytesFromTime(time));
-
- m_state = wxSOUND_FILE_RECORDING;
- if (!StartProduction(wxSOUND_INPUT))
- return false;
-
- return true;
-}
-
-bool wxSoundFileStream::Stop()
-{
- if (m_state == wxSOUND_FILE_STOPPED)
- return false;
-
- if (!StopProduction())
- return false;
-
- m_prepared = false;
-
- if (m_state == wxSOUND_FILE_RECORDING)
- if (!FinishRecording()) {
- m_state = wxSOUND_FILE_STOPPED;
- return false;
- }
-
- if (m_input)
- m_input->SeekI(0, wxFromStart);
-
- if (m_output)
- m_output->SeekO(0, wxFromStart);
-
- m_state = wxSOUND_FILE_STOPPED;
- return true;
-}
-
-bool wxSoundFileStream::Pause()
-{
- if (m_state == wxSOUND_FILE_PAUSED || m_state == wxSOUND_FILE_STOPPED)
- return false;
-
- if (!StopProduction())
- return false;
-
- m_oldstate = m_state;
- m_state = wxSOUND_FILE_PAUSED;
- return true;
-}
-
-bool wxSoundFileStream::Resume()
-{
- if (m_state == wxSOUND_FILE_PLAYING || m_state == wxSOUND_FILE_RECORDING ||
- m_state == wxSOUND_FILE_STOPPED)
- return false;
-
- if (!StartProduction( (m_oldstate == wxSOUND_FILE_PLAYING) ?
- wxSOUND_OUTPUT : wxSOUND_INPUT))
- return false;
-
- m_state = m_oldstate;
-
- return true;
-}
-
-wxSoundStream& wxSoundFileStream::Read(void *buffer, wxUint32 len)
-{
- if (!m_prepared || m_state != wxSOUND_FILE_PLAYING) {
- m_snderror = wxSOUND_NOTSTARTED;
- m_lastcount = 0;
- return *this;
- }
- m_lastcount = GetData(buffer, len);
- return *this;
-}
-
-wxSoundStream& wxSoundFileStream::Write(const void *buffer, wxUint32 len)
-{
- if (!m_prepared || m_state != wxSOUND_FILE_RECORDING) {
- m_snderror = wxSOUND_NOTSTARTED;
- m_lastcount = 0;
- return *this;
- }
- m_lastcount = PutData(buffer, len);
- return *this;
-}
-
-bool wxSoundFileStream::StartProduction(int evt)
-{
- m_sndio->SetEventHandler(this);
-
- if (!m_codec.StartProduction(evt))
- return false;
-
- return true;
-}
-
-bool wxSoundFileStream::StopProduction()
-{
- return m_codec.StopProduction();
-}
-
-void wxSoundFileStream::FinishPreparation(wxUint32 len)
-{
- m_bytes_left = m_length = len;
- m_prepared = true;
-}
-
-wxString wxSoundFileStream::GetCodecName() const
-{
- return wxString(wxT("wxSoundFileStream base codec"));
-}
-
-wxUint32 wxSoundFileStream::GetLength()
-{
- if (m_input && !m_prepared && GetError() == wxSOUND_NOERROR)
- return (PrepareToPlay()) ? m_length : 0;
-
- return m_length;
-}
-
-wxUint32 wxSoundFileStream::GetPosition()
-{
- if (!m_prepared && m_input != NULL && GetError() == wxSOUND_NOERROR)
- PrepareToPlay();
-
- return m_length-m_bytes_left;
-}
-
-wxUint32 wxSoundFileStream::SetPosition(wxUint32 new_position)
-{
- if (!m_prepared && m_input != NULL && GetError() == wxSOUND_NOERROR)
- PrepareToPlay();
-
- if (!m_prepared)
- return 0;
-
- if (!RepositionStream(new_position))
- return m_length-m_bytes_left;
-
- if (new_position >= m_length) {
- m_bytes_left = 0;
- return m_length;
- }
-
- m_bytes_left = m_length-new_position;
- return new_position;
-}
-
-void wxSoundFileStream::OnSoundEvent(int evt)
-{
- wxUint32 len = m_codec.GetBestSize();
- char *buffer;
-
- buffer = new char[len];
- wxSoundStream::OnSoundEvent(evt);
-
- while (!m_sndio->QueueFilled()) {
- switch(evt) {
- case wxSOUND_INPUT:
- if (len > m_bytes_left)
- len = m_bytes_left;
-
- len = m_codec.Read(buffer, len).GetLastAccess();
- PutData(buffer, len);
- m_bytes_left -= len;
- if (m_bytes_left == 0) {
- Stop();
- delete[] buffer;
- return;
- }
- break;
- case wxSOUND_OUTPUT:
- if (len > m_bytes_left)
- len = m_bytes_left;
-
- len = GetData(buffer, len);
- m_bytes_left -= len;
- if (m_bytes_left == 0) {
- Stop();
- delete[] buffer;
- return;
- }
- m_codec.Write(buffer, len);
- break;
- }
- }
- delete[] buffer;
-}
-
-bool wxSoundFileStream::SetSoundFormat(const wxSoundFormatBase& format)
-{
- wxSoundStream::SetSoundFormat(format);
- return m_codec.SetSoundFormat(format);
-}
diff --git a/contrib/src/mmedia/sndg72x.cpp b/contrib/src/mmedia/sndg72x.cpp
deleted file mode 100644
index a51e2d19a9..0000000000
--- a/contrib/src/mmedia/sndg72x.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndg72x.cpp
-// Purpose:
-// Date: 08/26/1999
-// Author: Guilhem Lavaux (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndg72x.h"
-#include "wx/mmedia/internal/g72x.h"
-
-// --------------------------------------------------------------------------
-// wxSoundFormatG72X
-// --------------------------------------------------------------------------
-
-wxSoundFormatG72X::wxSoundFormatG72X()
- : m_srate(22050)
-{
-}
-
-wxSoundFormatG72X::~wxSoundFormatG72X()
-{
-}
-
-void wxSoundFormatG72X::SetSampleRate(wxUint32 srate)
-{
- m_srate = srate;
-}
-
-wxUint32 wxSoundFormatG72X::GetSampleRate() const
-{
- return m_srate;
-}
-
-void wxSoundFormatG72X::SetG72XType(wxSoundG72XType type)
-{
- m_g72x_type = type;
-}
-
-wxSoundFormatBase *wxSoundFormatG72X::Clone() const
-{
- wxSoundFormatG72X *g72x = new wxSoundFormatG72X();
-
- g72x->m_srate = m_srate;
- g72x->m_g72x_type = m_g72x_type;
- return g72x;
-}
-
-wxUint32 wxSoundFormatG72X::GetTimeFromBytes(wxUint32 bytes) const
-{
- int n_bits;
-
- switch (m_g72x_type) {
- case wxSOUND_G721:
- n_bits = 4;
- break;
- case wxSOUND_G723_24:
- n_bits = 3;
- break;
- case wxSOUND_G723_40:
- n_bits = 5;
- break;
- default:
- n_bits = 0;
- break;
- }
- return (wxUint32)((bytes / m_srate) * n_bits) / 8;
-}
-
-wxUint32 wxSoundFormatG72X::GetBytesFromTime(wxUint32 time) const
-{
- int n_bits;
-
- switch (m_g72x_type) {
- case wxSOUND_G721:
- n_bits = 4;
- break;
- case wxSOUND_G723_24:
- n_bits = 3;
- break;
- case wxSOUND_G723_40:
- n_bits = 5;
- break;
- default:
- n_bits = 0;
- }
- return (wxUint32)((time * m_srate * n_bits) / 8);
-}
-
-bool wxSoundFormatG72X::operator !=(const wxSoundFormatBase& frmt2) const
-{
- wxSoundFormatG72X *g72x = (wxSoundFormatG72X *)&frmt2;
-
- if (frmt2.GetType() != wxSOUND_G72X)
- return true;
-
- return (g72x->m_srate != m_srate || g72x->m_g72x_type != m_g72x_type);
-}
-
-// --------------------------------------------------------------------------
-// wxSoundStreamG72X
-// --------------------------------------------------------------------------
-
-wxSoundStreamG72X::wxSoundStreamG72X(wxSoundStream& sndio)
- : wxSoundStreamCodec(sndio)
-{
- // PCM converter
- m_router = new wxSoundRouterStream(sndio);
- m_state = new g72state;
- g72x_init_state(m_state);
-}
-
-wxSoundStreamG72X::~wxSoundStreamG72X()
-{
- delete m_router;
-}
-
-wxSoundStream& wxSoundStreamG72X::Read(void *buffer, wxUint32 len)
-{
- wxUint16 *old_linear;
- register wxUint16 *linear_buffer;
- register wxUint32 real_len;
- register wxUint32 countdown = len;
-
- real_len = (len * 8 / m_n_bits);
-
- old_linear = linear_buffer = new wxUint16[real_len];
-
- m_router->Read(linear_buffer, real_len);
-
- real_len = (wxUint32)(m_router->GetLastAccess() * ((float)m_n_bits / 8));
- if (!real_len)
- return *m_router;
-
- m_io_buffer = (wxUint8 *)buffer;
- m_current_b_pos = 0;
-
- while (countdown != 0) {
- PutBits(m_coder(*linear_buffer++, AUDIO_ENCODING_LINEAR, m_state));
- countdown--;
- }
- m_lastcount = real_len;
- m_snderror = m_router->GetError();
-
- delete[] old_linear;
-
- return *this;
-}
-
-wxSoundStream& wxSoundStreamG72X::Write(const void *buffer, wxUint32 len)
-{
- wxUint16 *old_linear;
- register wxUint16 *linear_buffer;
- register wxUint32 countdown = len;
- register wxUint32 real_len;
-
- // Compute the real length (PCM format) to sendt to the sound card
- real_len = (len * m_n_bits / 8);
-
- // Allocate a temporary buffer
- old_linear = linear_buffer = new wxUint16[real_len];
-
- // Bad, we override the const
- m_io_buffer = (wxUint8 *)buffer;
- m_current_b_pos = 0;
-
- // Decode the datas
- while (countdown != 0) {
- *linear_buffer++ = m_decoder(GetBits(), AUDIO_ENCODING_LINEAR, m_state);
- countdown--;
- }
- m_lastcount = len;
-
- // Send them to the sound card
- m_router->Write(old_linear, real_len);
-
- // Destroy the temporary buffer
- delete[] old_linear;
-
- return *m_router;
-}
-
-bool wxSoundStreamG72X::SetSoundFormat(const wxSoundFormatBase& format)
-{
- if (format.GetType() != wxSOUND_G72X) {
- m_snderror = wxSOUND_INVFRMT;
- return false;
- }
-
- wxSoundFormatPcm pcm;
- wxSoundFormatG72X *g72x;
-
- wxSoundStreamCodec::SetSoundFormat(format);
-
- g72x = (wxSoundFormatG72X *)m_sndformat;
-
- // Set PCM as the output format of the codec
- pcm.SetSampleRate(g72x->GetSampleRate());
- pcm.SetBPS(16);
- pcm.SetChannels(1); // Only mono supported
- pcm.Signed(true);
- pcm.SetOrder(wxBYTE_ORDER);
-
- // Look for the correct codec to use and set its bit width
- switch (g72x->GetG72XType()) {
- case wxSOUND_G721:
- m_n_bits = 4;
- m_coder = g721_encoder;
- m_decoder = g721_decoder;
- break;
- case wxSOUND_G723_24:
- m_n_bits = 3;
- m_coder = g723_24_encoder;
- m_decoder = g723_24_decoder;
- break;
- case wxSOUND_G723_40:
- m_n_bits = 5;
- m_coder = g723_40_encoder;
- m_decoder = g723_40_decoder;
- break;
- }
-
- // Let the router finish the work
- m_router->SetSoundFormat(pcm);
-
- return true;
-}
-
-#define BYTE_SIZE 8
-
-wxUint8 wxSoundStreamG72X::GetBits()
-{
- register wxUint8 bits;
-
- // We have two bytes to compute
- if (m_current_b_pos < m_n_bits) {
- register wxUint8 b_left;
-
- // TRANSLATE the mask
- m_current_mask >>= m_current_b_pos;
-
- // GET the last bits: 0001..1
- bits = (m_current_byte & m_current_mask) << (m_n_bits - m_current_b_pos);
-
- // GEN: 1. n times .1000
- b_left = BYTE_SIZE-m_n_bits;
- m_current_mask = ((1 << m_n_bits) - 1) << b_left;
-
- // GET the next byte
- m_current_byte = *m_io_buffer++;
-
- register wxUint8 tmp_mask;
-
- // COMPUTE a new temporary mask to get the last bits
- b_left = m_n_bits - b_left;
- tmp_mask = (1 << b_left) - 1;
- // TRANSLATE the old mask to get ready for the next time
- m_current_mask >>= b_left;
-
- // COMPUTE the new bit position
- b_left = BYTE_SIZE - b_left;
- m_current_b_pos = b_left;
- tmp_mask <<= b_left;
-
- // GET the last bits
- bits |= (m_current_byte & tmp_mask) >> b_left;
- } else {
- m_current_mask >>= m_n_bits;
- m_current_b_pos -= m_n_bits;
- bits = (m_current_byte & m_current_mask) >> m_current_b_pos;
- }
- return bits;
-}
-
-void wxSoundStreamG72X::PutBits(wxUint8 bits)
-{
- if (m_current_b_pos < m_n_bits) {
- register wxUint8 tmp_mask;
- register wxUint8 diff;
-
- diff = m_n_bits - m_current_b_pos;
- // Pack bits and put the byte in the buffer
- m_current_byte |= bits >> diff;
- *m_io_buffer++ = m_current_byte;
-
- // Gen a mask
- tmp_mask = ~((1 << diff) - 1);
-
- m_current_b_pos = BYTE_SIZE - (m_n_bits - m_current_b_pos);
-
- m_current_byte = (bits & (tmp_mask)) << m_current_b_pos;
- } else {
- m_current_b_pos -= m_n_bits;
- bits <<= m_current_b_pos;
- m_current_byte |= bits;
- }
-}
diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp
deleted file mode 100644
index 3078d98d26..0000000000
--- a/contrib/src/mmedia/sndmsad.cpp
+++ /dev/null
@@ -1,387 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndulaw.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
- #include "wx/memory.h"
- #include "wx/log.h"
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndmsad.h"
-
-// --------------------------------------------------------------------------
-// wxSoundFormatMSAdpcm
-// --------------------------------------------------------------------------
-
-wxSoundFormatMSAdpcm::wxSoundFormatMSAdpcm()
- : m_srate(22050)
-{
- m_ncoefs = 0;
- m_coefs_len = 0;
- m_coefs = NULL;
-}
-
-wxSoundFormatMSAdpcm::~wxSoundFormatMSAdpcm()
-{
- if (m_ncoefs) {
- wxUint16 i;
-
- for (i=0;im_srate = m_srate;
- adpcm->SetCoefs(m_coefs, m_ncoefs, m_coefs_len);
- adpcm->m_nchannels = m_nchannels;
- adpcm->m_block_size = m_block_size;
- return adpcm;
-}
-
-wxUint32 wxSoundFormatMSAdpcm::GetTimeFromBytes(wxUint32 bytes) const
-{
- return 2 * bytes / (m_nchannels * m_srate);
-}
-
-wxUint32 wxSoundFormatMSAdpcm::GetBytesFromTime(wxUint32 time) const
-{
- return time * m_nchannels * m_srate / 2;
-}
-
-bool wxSoundFormatMSAdpcm::operator !=(const wxSoundFormatBase& frmt2) const
-{
- const wxSoundFormatMSAdpcm *adpcm = (const wxSoundFormatMSAdpcm *)&frmt2;
-
- if (frmt2.GetType() != wxSOUND_MSADPCM)
- return true;
-
- return (adpcm->m_srate != m_srate) && (adpcm->m_nchannels != m_nchannels);
-}
-
-// --------------------------------------------------------------------------
-// wxSoundStreamMSAdpcm
-// --------------------------------------------------------------------------
-wxSoundStreamMSAdpcm::wxSoundStreamMSAdpcm(wxSoundStream& sndio)
- : wxSoundStreamCodec(sndio)
-{
- // PCM converter
- m_router = new wxSoundRouterStream(sndio);
- m_got_header = false;
- m_stereo = false;
-}
-
-wxSoundStreamMSAdpcm::~wxSoundStreamMSAdpcm()
-{
- delete m_router;
-}
-
-wxSoundStream& wxSoundStreamMSAdpcm::Read(void *WXUNUSED(buffer), wxUint32 WXUNUSED(len))
-{
- m_snderror = wxSOUND_NOCODEC;
- m_lastcount = 0;
- return *this;
-}
-
-static wxInt16 gl_ADPCMcoeff_delta[] = {
- 230, 230, 230, 230, 307, 409, 512, 614, 768, 614, 512, 409, 307,
- 230, 230, 230
-};
-
-wxUint32 wxSoundStreamMSAdpcm::DecodeMonoADPCM(const void *in_buffer,
- void *out_buffer,
- wxUint32 in_len)
-{
- wxUint8 *ADPCMdata;
- wxInt16 *PCMdata;
- AdpcmState *state;
- wxUint32 out_len;
-
- ADPCMdata = (wxUint8 *)in_buffer;
- PCMdata = (wxInt16 *)out_buffer;
- state = &m_state[0];
-
-#define GET_DATA_16(i) i = *ADPCMdata++, i |= ((wxUint32)(*ADPCMdata++) << 8)
-#define GET_DATA_8(i) i = (*ADPCMdata++)
-
- out_len = 0;
- while (in_len != 0) {
- if (m_next_block == 0) {
- GET_DATA_8(state->predictor);
- GET_DATA_16(state->iDelta);
-
- GET_DATA_16(state->samp1);
- GET_DATA_16(state->samp2);
-
- state->coeff[0] = state->coeff[1] = m_coefs[0][ state->predictor ];
-
- *PCMdata++ = state->samp2;
- *PCMdata++ = state->samp1;
- in_len -= 7;
- out_len += 4;
- m_next_block = m_block_size;
- continue;
- }
-
- while (in_len != 0 && m_next_block != 0) {
- wxUint8 nib[2];
-
- GET_DATA_8(nib[0]);
- nib[1] = (nib[0] >> 4) & 0x0f;
- nib[0] &= 0x0f;
-
- Nibble(nib[0], state, &PCMdata);
- Nibble(nib[1], state, &PCMdata);
-
- in_len -= 4;
- out_len += 4;
- m_next_block -= 4;
- }
- }
-
- return out_len;
-
-#undef GET_DATA_16
-#undef GET_DATA_8
-}
-
-wxUint32 wxSoundStreamMSAdpcm::DecodeStereoADPCM(const void *in_buffer,
- void *out_buffer,
- wxUint32 in_len)
-{
- wxUint8 *ADPCMdata;
- wxInt16 *PCMdata;
- AdpcmState *state0, *state1;
- wxUint32 out_len;
-
- ADPCMdata = (wxUint8 *)in_buffer;
- PCMdata = (wxInt16 *)out_buffer;
-
- state0 = &m_state[0];
- state1 = &m_state[1];
-
-#define GET_DATA_16(i) i = *ADPCMdata++, i |= ((wxUint32)(*ADPCMdata++) << 8)
-#define GET_DATA_8(i) i = (*ADPCMdata++)
-
- out_len = 0;
- while (in_len != 0) {
- if (!m_next_block) {
- GET_DATA_8(state0->predictor);
- GET_DATA_8(state1->predictor);
-
- GET_DATA_16(state0->iDelta);
- GET_DATA_16(state1->iDelta);
-
- GET_DATA_16(state0->samp1);
- GET_DATA_16(state1->samp1);
- GET_DATA_16(state0->samp2);
- GET_DATA_16(state1->samp2);
-
- *PCMdata++ = state0->samp2;
- *PCMdata++ = state1->samp2;
- *PCMdata++ = state0->samp1;
- *PCMdata++ = state1->samp1;
-
- in_len -= 14;
- out_len += 8;
- m_next_block = m_block_size;
- continue;
- }
-
- while (in_len != 0 && m_next_block > 0) {
- wxUint8 nib[2];
-
- GET_DATA_8(nib[0]);
- nib[1] = (nib[0] >> 4) & 0x0f;
- nib[0] &= 0x0f;
-
- Nibble(nib[0], state0, &PCMdata);
- Nibble(nib[1], state1, &PCMdata);
-
- in_len -= 4;
- out_len += 4;
- m_next_block -= 4;
- }
- }
-
- return out_len;
-
-#undef GET_DATA_16
-#undef GET_DATA_8
-}
-
-void wxSoundStreamMSAdpcm::Nibble(wxInt8 nyb,
- AdpcmState *state,
- wxInt16 **out_buffer)
-{
- wxUint32 new_delta;
- wxInt32 new_sample;
-
- // First: compute the next delta value
- new_delta = (state->iDelta * gl_ADPCMcoeff_delta[nyb]) >> 8;
- // If null, minor it by 16
- if (!new_delta)
- new_delta = 16;
-
- // Barycentre
- new_sample = (state->samp1 * state->coeff[0] +
- state->samp2 * state->coeff[1]) / 256;
-
- // Regenerate the sign
- if (nyb & 0x08)
- nyb -= 0x10;
-
- new_sample += state->iDelta * nyb;
-
- // Samples must be in [-32767, 32768]
- if (new_sample < -32768)
- new_sample = -32768;
- else if (new_sample > 32767)
- new_sample = 32767;
-
- state->iDelta = new_delta;
- state->samp2 = state->samp1;
- state->samp1 = new_sample;
-
- *(*out_buffer)++ = new_sample;
-}
-
-wxSoundStream& wxSoundStreamMSAdpcm::Write(const void *buffer, wxUint32 len)
-{
- wxUint8 *out_buf;
- wxUint32 new_len;
-
- // TODO: prealloc the output buffer
- out_buf = new wxUint8[len*2];
-
- if (!m_stereo)
- new_len = DecodeMonoADPCM(buffer, out_buf, len);
- else
- new_len = DecodeStereoADPCM(buffer, out_buf, len);
-
- m_router->Write(out_buf, new_len);
-
- m_lastcount = len;
- m_snderror = wxSOUND_NOERROR;
-
- delete[] out_buf;
-
- return *this;
-}
-
-wxUint32 wxSoundStreamMSAdpcm::GetBestSize() const
-{
- return m_sndio->GetBestSize() / 2;
-}
-
-bool wxSoundStreamMSAdpcm::SetSoundFormat(const wxSoundFormatBase& format)
-{
- if (format.GetType() != wxSOUND_MSADPCM) {
- m_snderror = wxSOUND_INVFRMT;
- return false;
- }
-
- wxSoundFormatPcm pcm;
- wxSoundFormatMSAdpcm *adpcm;
- wxUint16 ncoefs, coefs_len;
-
- wxSoundStreamCodec::SetSoundFormat(format);
-
- adpcm = (wxSoundFormatMSAdpcm *)m_sndformat;
-
- adpcm->GetCoefs(m_coefs, ncoefs, coefs_len);
-
- if (!ncoefs) {
- wxLogError(wxT("Number of ADPCM coefficients must be non null"));
- return false;
- }
-
- pcm.SetSampleRate(adpcm->GetSampleRate());
- pcm.SetBPS(16);
- pcm.SetChannels(adpcm->GetChannels());
- pcm.Signed(true);
- pcm.SetOrder(wxBYTE_ORDER);
-
- m_stereo = (adpcm->GetChannels() == 2);
- m_block_size = adpcm->GetBlockSize();
- m_next_block = 0;
-
- m_router->SetSoundFormat(pcm);
-
- return true;
-}
-
diff --git a/contrib/src/mmedia/sndoss.cpp b/contrib/src/mmedia/sndoss.cpp
deleted file mode 100644
index aa36a1e18f..0000000000
--- a/contrib/src/mmedia/sndoss.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndoss.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999, 2000
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-// --------------------------------------------------------------------------
-// System dependent headers
-// --------------------------------------------------------------------------
-
-#include
-#include
-#include
-#include
-#include
-#include
-#ifdef __WXGTK__
-#include
-#endif
-
-// --------------------------------------------------------------------------
-// wxWidgets headers
-// --------------------------------------------------------------------------
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndoss.h"
-#include "wx/mmedia/sndpcm.h"
-
-wxSoundStreamOSS::wxSoundStreamOSS(const wxString& dev_name)
-{
- wxSoundFormatPcm pcm_default;
-
- // Open the OSS device
- m_fd = open(dev_name.mb_str(), O_WRONLY);
- if (m_fd == -1) {
- // OSS not found
- m_oss_ok = false;
- m_snderror = wxSOUND_INVDEV;
- return;
- }
-
- // Remember the device name
- m_devname = dev_name;
-
- // Initialize the default format
- wxSoundStreamOSS::SetSoundFormat(pcm_default);
-
- // Get the default best size for OSS
- ioctl(m_fd, SNDCTL_DSP_GETBLKSIZE, &m_bufsize);
-
- m_snderror = wxSOUND_NOERROR;
-
- // Close OSS
- close(m_fd);
-
- m_oss_ok = true;
- m_oss_stop = true;
- m_q_filled = true;
-}
-
-wxSoundStreamOSS::~wxSoundStreamOSS()
-{
- if (m_fd > 0)
- close(m_fd);
-}
-
-wxUint32 wxSoundStreamOSS::GetBestSize() const
-{
- return m_bufsize;
-}
-
-wxSoundStream& wxSoundStreamOSS::Read(void *buffer, wxUint32 len)
-{
- int ret;
-
- if (m_oss_stop) {
- m_snderror = wxSOUND_NOTSTARTED;
- m_lastcount = 0;
- return *this;
- }
-
- ret = read(m_fd, buffer, len);
- m_lastcount = (wxUint32)ret;
- m_q_filled = true;
-
- if (ret < 0)
- m_snderror = wxSOUND_IOERROR;
- else
- m_snderror = wxSOUND_NOERROR;
-
- return *this;
-}
-
-wxSoundStream& wxSoundStreamOSS::Write(const void *buffer, wxUint32 len)
-{
- int ret;
-
- if (m_oss_stop) {
- m_snderror = wxSOUND_NOTSTARTED;
- m_lastcount= 0;
- return *this;
- }
-
- ret = write(m_fd, buffer, len);
- m_q_filled = true;
-
- if (ret < 0) {
- m_lastcount = 0;
- m_snderror = wxSOUND_IOERROR;
- } else {
- m_snderror = wxSOUND_NOERROR;
- m_lastcount = (wxUint32)ret;
- }
-
- return *this;
-}
-
-bool wxSoundStreamOSS::SetSoundFormat(const wxSoundFormatBase& format)
-{
- int tmp;
- wxSoundFormatPcm *pcm_format;
-
- if (format.GetType() != wxSOUND_PCM) {
- m_snderror = wxSOUND_INVFRMT;
- return false;
- }
-
- if (!m_oss_ok) {
- m_snderror = wxSOUND_INVDEV;
- return false;
- }
-
- if (m_sndformat)
- delete m_sndformat;
-
- m_sndformat = format.Clone();
- if (!m_sndformat) {
- m_snderror = wxSOUND_MEMERROR;
- return false;
- }
- pcm_format = (wxSoundFormatPcm *)m_sndformat;
-
- // We temporary open the OSS device
- if (m_oss_stop) {
- m_fd = open(m_devname.mb_str(), O_WRONLY);
- if (m_fd == -1) {
- m_snderror = wxSOUND_INVDEV;
- return false;
- }
- }
-
- // Set the sample rate field.
- tmp = pcm_format->GetSampleRate();
- ioctl(m_fd, SNDCTL_DSP_SPEED, &tmp);
-
- pcm_format->SetSampleRate(tmp);
-
- // Detect the best format
- DetectBest(pcm_format);
- // Try to apply it
- SetupFormat(pcm_format);
-
- tmp = pcm_format->GetChannels();
- ioctl(m_fd, SNDCTL_DSP_CHANNELS, &tmp);
- pcm_format->SetChannels(tmp);
-
- // Close the OSS device
- if (m_oss_stop)
- close(m_fd);
-
- m_snderror = wxSOUND_NOERROR;
- if (*pcm_format != format) {
- m_snderror = wxSOUND_NOEXACT;
- return false;
- }
-
- return true;
-}
-
-bool wxSoundStreamOSS::SetupFormat(wxSoundFormatPcm *pcm_format)
-{
- int tmp;
-
- switch(pcm_format->GetBPS()) {
- case 8:
- if (pcm_format->Signed())
- tmp = AFMT_S8;
- else
- tmp = AFMT_U8;
- break;
- case 16:
- switch (pcm_format->GetOrder()) {
- case wxBIG_ENDIAN:
- if (pcm_format->Signed())
- tmp = AFMT_S16_BE;
- else
- tmp = AFMT_U16_BE;
- break;
- case wxLITTLE_ENDIAN:
- if (pcm_format->Signed())
- tmp = AFMT_S16_LE;
- else
- tmp = AFMT_U16_LE;
- break;
- }
- break;
- }
-
- ioctl(m_fd, SNDCTL_DSP_SETFMT, &tmp);
-
- // Demangling.
- switch (tmp) {
- case AFMT_U8:
- pcm_format->SetBPS(8);
- pcm_format->Signed(false);
- break;
- case AFMT_S8:
- pcm_format->SetBPS(8);
- pcm_format->Signed(true);
- break;
- case AFMT_U16_LE:
- pcm_format->SetBPS(16);
- pcm_format->Signed(false);
- pcm_format->SetOrder(wxLITTLE_ENDIAN);
- break;
- case AFMT_U16_BE:
- pcm_format->SetBPS(16);
- pcm_format->Signed(false);
- pcm_format->SetOrder(wxBIG_ENDIAN);
- break;
- case AFMT_S16_LE:
- pcm_format->SetBPS(16);
- pcm_format->Signed(true);
- pcm_format->SetOrder(wxLITTLE_ENDIAN);
- break;
- case AFMT_S16_BE:
- pcm_format->SetBPS(16);
- pcm_format->Signed(true);
- pcm_format->SetOrder(wxBIG_ENDIAN);
- break;
- }
- return true;
-}
-
-#ifdef __WXGTK__
-static void _wxSound_OSS_CBack(gpointer data, int source,
- GdkInputCondition condition)
-{
- wxSoundStreamOSS *oss = (wxSoundStreamOSS *)data;
-
- switch (condition) {
- case GDK_INPUT_READ:
- oss->WakeUpEvt(wxSOUND_INPUT);
- break;
- case GDK_INPUT_WRITE:
- oss->WakeUpEvt(wxSOUND_OUTPUT);
- break;
- default:
- break;
- }
-}
-#endif
-
-void wxSoundStreamOSS::WakeUpEvt(int evt)
-{
- m_q_filled = false;
- OnSoundEvent(evt);
-}
-
-bool wxSoundStreamOSS::StartProduction(int evt)
-{
- wxSoundFormatBase *old_frmt;
-
- if (!m_oss_stop)
- StopProduction();
-
- old_frmt = m_sndformat->Clone();
- if (!old_frmt) {
- m_snderror = wxSOUND_MEMERROR;
- return false;
- }
-
- if (evt == wxSOUND_OUTPUT)
- m_fd = open(m_devname.mb_str(), O_WRONLY);
- else if (evt == wxSOUND_INPUT)
- m_fd = open(m_devname.mb_str(), O_RDONLY);
-
- if (m_fd == -1) {
- m_snderror = wxSOUND_INVDEV;
- return false;
- }
-
- SetSoundFormat(*old_frmt);
- delete old_frmt;
-
- int trig;
-
- if (evt == wxSOUND_OUTPUT) {
-#ifdef __WXGTK__
- m_tag = gdk_input_add(m_fd, GDK_INPUT_WRITE, _wxSound_OSS_CBack, (gpointer)this);
-#endif
- trig = PCM_ENABLE_OUTPUT;
- } else {
-#ifdef __WXGTK__
- m_tag = gdk_input_add(m_fd, GDK_INPUT_READ, _wxSound_OSS_CBack, (gpointer)this);
-#endif
- trig = PCM_ENABLE_INPUT;
- }
-
- ioctl(m_fd, SNDCTL_DSP_SETTRIGGER, &trig);
-
- m_oss_stop = false;
- m_q_filled = false;
-
- return true;
-}
-
-bool wxSoundStreamOSS::StopProduction()
-{
- if (m_oss_stop)
- return false;
-
-#ifdef __WXGTK__
- gdk_input_remove(m_tag);
-#endif
-
- close(m_fd);
- m_oss_stop = true;
- m_q_filled = true;
- return true;
-}
-
-bool wxSoundStreamOSS::QueueFilled() const
-{
- return m_q_filled;
-}
-
-//
-// Detect the closest format (The best).
-//
-void wxSoundStreamOSS::DetectBest(wxSoundFormatPcm *pcm)
-{
-#define MASK_16BITS (AFMT_S16_LE | AFMT_S16_BE | AFMT_U16_LE | AFMT_U16_BE)
-
- int fmt_mask;
- wxSoundFormatPcm best_pcm;
-
- // We change neither the number of channels nor the sample rate
-
- best_pcm.SetSampleRate(pcm->GetSampleRate());
- best_pcm.SetChannels(pcm->GetChannels());
-
- // Get the supported format by the sound card
- ioctl(m_fd, SNDCTL_DSP_GETFMTS, &fmt_mask);
-
- // It supports 16 bits
- if (pcm->GetBPS() == 16 && ((fmt_mask & MASK_16BITS) != 0))
- best_pcm.SetBPS(16);
-
- // It supports big endianness
- if (pcm->GetOrder() == wxBIG_ENDIAN &&
- ((fmt_mask & (AFMT_S16_BE | AFMT_U16_BE)) != 0))
- best_pcm.SetOrder(wxBIG_ENDIAN);
-
- // It supports little endianness
- if (pcm->GetOrder() == wxLITTLE_ENDIAN &&
- ((fmt_mask & (AFMT_S16_LE | AFMT_U16_LE)) != 0))
- best_pcm.SetOrder(wxLITTLE_ENDIAN);
-
- // It supports signed samples
- if (pcm->Signed() &&
- ((fmt_mask & (AFMT_S16_LE | AFMT_S16_BE | AFMT_S8)) != 0))
- best_pcm.Signed(true);
-
- // It supports unsigned samples
- if (!pcm->Signed() &&
- ((fmt_mask & (AFMT_U16_LE | AFMT_U16_BE | AFMT_U8)) != 0))
- best_pcm.Signed(false);
-
- // Finally recopy the new format
- *pcm = best_pcm;
-}
diff --git a/contrib/src/mmedia/sndpcm.cpp b/contrib/src/mmedia/sndpcm.cpp
deleted file mode 100644
index b9eb7cdea1..0000000000
--- a/contrib/src/mmedia/sndpcm.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndpcm.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndpcm.h"
-
-wxSoundFormatPcm::wxSoundFormatPcm(wxUint32 srate, wxUint8 bps,
- wxUint16 nchannels, bool sign,
- int order)
- : m_srate(srate), m_bps(bps), m_nchan(nchannels), m_order(order),
- m_signed(sign)
-{
-}
-
-wxSoundFormatPcm::~wxSoundFormatPcm()
-{
-}
-
-void wxSoundFormatPcm::SetSampleRate(wxUint32 srate)
-{
- m_srate = srate;
-}
-
-void wxSoundFormatPcm::SetBPS(wxUint8 bps)
-{
- m_bps = bps;
-}
-
-void wxSoundFormatPcm::SetChannels(wxUint16 nchannels)
-{
- m_nchan = nchannels;
-}
-
-void wxSoundFormatPcm::SetOrder(int order)
-{
- m_order = order;
-}
-
-void wxSoundFormatPcm::Signed(bool sign)
-{
- m_signed = sign;
-}
-
-wxSoundFormatBase *wxSoundFormatPcm::Clone() const
-{
- wxSoundFormatPcm *new_pcm;
-
- new_pcm = new wxSoundFormatPcm();
- new_pcm->m_srate = m_srate;
- new_pcm->m_bps = m_bps;
- new_pcm->m_nchan = m_nchan;
- new_pcm->m_order = m_order;
- new_pcm->m_signed= m_signed;
-
- return new_pcm;
-}
-
-wxUint32 wxSoundFormatPcm::GetTimeFromBytes(wxUint32 bytes) const
-{
- return (bytes / (m_srate * (m_bps / 8) * m_nchan));
-}
-
-wxUint32 wxSoundFormatPcm::GetBytesFromTime(wxUint32 time) const
-{
- return (time * (m_srate * (m_bps / 8) * m_nchan));
-}
-
-bool wxSoundFormatPcm::operator!=(const wxSoundFormatBase& format) const
-{
- wxSoundFormatPcm *format2 = (wxSoundFormatPcm *)&format;
-
- if (format.GetType() != wxSOUND_PCM)
- return true;
-
- return ( (m_srate != format2->m_srate) ||
- (m_bps != format2->m_bps) ||
- (m_nchan != format2->m_nchan) ||
- (m_order != format2->m_order) ||
- (m_signed != format2->m_signed) );
-}
diff --git a/contrib/src/mmedia/sndulaw.cpp b/contrib/src/mmedia/sndulaw.cpp
deleted file mode 100644
index fd8e731513..0000000000
--- a/contrib/src/mmedia/sndulaw.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndulaw.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndulaw.h"
-#include "wx/mmedia/internal/g72x.h"
-
-// --------------------------------------------------------------------------
-// wxSoundFormatUlaw
-// --------------------------------------------------------------------------
-
-wxSoundFormatUlaw::wxSoundFormatUlaw()
- : m_srate(22050), m_channels(1)
-{
-}
-
-wxSoundFormatUlaw::~wxSoundFormatUlaw()
-{
-}
-
-void wxSoundFormatUlaw::SetSampleRate(wxUint32 srate)
-{
- m_srate = srate;
-}
-
-wxUint32 wxSoundFormatUlaw::GetSampleRate() const
-{
- return m_srate;
-}
-
-wxUint8 wxSoundFormatUlaw::GetChannels() const
-{
- return m_channels;
-}
-
-void wxSoundFormatUlaw::SetChannels(wxUint8 nchannels)
-{
- m_channels = nchannels;
-}
-
-wxSoundFormatBase *wxSoundFormatUlaw::Clone() const
-{
- wxSoundFormatUlaw *ulaw = new wxSoundFormatUlaw();
-
- ulaw->m_srate = m_srate;
- ulaw->m_channels = m_channels;
- return ulaw;
-}
-
-wxUint32 wxSoundFormatUlaw::GetTimeFromBytes(wxUint32 bytes) const
-{
- return (bytes / m_srate);
-}
-
-wxUint32 wxSoundFormatUlaw::GetBytesFromTime(wxUint32 time) const
-{
- return time * m_srate;
-}
-
-bool wxSoundFormatUlaw::operator !=(const wxSoundFormatBase& frmt2) const
-{
- wxSoundFormatUlaw *ulaw = (wxSoundFormatUlaw *)&frmt2;
-
- if (frmt2.GetType() != wxSOUND_ULAW)
- return true;
-
- return (ulaw->m_srate != m_srate);
-}
-
-// --------------------------------------------------------------------------
-// wxSoundStreamUlaw
-// --------------------------------------------------------------------------
-wxSoundStreamUlaw::wxSoundStreamUlaw(wxSoundStream& sndio)
- : wxSoundStreamCodec(sndio)
-{
- // PCM converter
- m_router = new wxSoundRouterStream(sndio);
-}
-
-wxSoundStreamUlaw::~wxSoundStreamUlaw()
-{
- delete m_router;
-}
-
-wxSoundStream& wxSoundStreamUlaw::Read(void *buffer, wxUint32 len)
-{
- wxUint16 *old_linear;
- register wxUint16 *linear_buffer;
- register const wxUint8 *ulaw_buffer;
- register wxUint32 countdown;
-
- old_linear = linear_buffer = new wxUint16[len*2];
- ulaw_buffer = (const wxUint8 *)buffer;
-
- m_router->Read(linear_buffer, len * 2);
-
- m_lastcount = countdown = m_router->GetLastAccess() / 2;
- m_snderror = m_router->GetError();
- if (m_snderror != wxSOUND_NOERROR)
- return *this;
-
- while (countdown > 0) {
- *linear_buffer++ = ulaw2linear(*ulaw_buffer++);
- countdown--;
- }
-
- delete[] old_linear;
-
- return *m_router;
-}
-
-wxSoundStream& wxSoundStreamUlaw::Write(const void *buffer, wxUint32 len)
-{
- wxUint16 *old_linear;
- register wxUint16 *linear_buffer;
- register const wxUint8 *ulaw_buffer;
- register wxUint32 countdown = len;
-
- old_linear = linear_buffer = new wxUint16[len*2];
- ulaw_buffer = (const wxUint8 *)buffer;
-
- while (countdown > 0) {
- *linear_buffer++ = ulaw2linear(*ulaw_buffer++);
- countdown--;
- }
-
- m_router->Write(old_linear, len * 2);
-
- delete[] old_linear;
-
- return *m_router;
-}
-
-wxUint32 wxSoundStreamUlaw::GetBestSize() const
-{
- return m_sndio->GetBestSize() / 2;
-}
-
-bool wxSoundStreamUlaw::SetSoundFormat(const wxSoundFormatBase& format)
-{
- if (format.GetType() != wxSOUND_ULAW) {
- m_snderror = wxSOUND_INVFRMT;
- return false;
- }
-
- // As the codec only support 16 bits, Mono we must use a wxSoundRouter
- // to filter the data and to translate them to a format supported
- // by the sound card.
-
- wxSoundFormatPcm pcm;
- wxSoundFormatUlaw *ulaw;
-
- wxSoundStreamCodec::SetSoundFormat(format);
-
- ulaw = (wxSoundFormatUlaw *)m_sndformat;
-
- pcm.SetSampleRate(ulaw->GetSampleRate());
- pcm.SetBPS(16);
- pcm.SetChannels(ulaw->GetChannels());
- pcm.Signed(true);
- pcm.SetOrder(wxBYTE_ORDER);
-
- m_router->SetSoundFormat(pcm);
-
- return true;
-}
diff --git a/contrib/src/mmedia/sndwav.cpp b/contrib/src/mmedia/sndwav.cpp
deleted file mode 100644
index 5bf9e7fd4e..0000000000
--- a/contrib/src/mmedia/sndwav.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndwav.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include "wx/stream.h"
-#include "wx/datstrm.h"
-#include "wx/filefn.h"
-#include "wx/mstream.h"
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndg72x.h"
-#include "wx/mmedia/sndmsad.h"
-#include "wx/mmedia/sndwav.h"
-
-#define BUILD_SIGNATURE(a,b,c,d) (((wxUint32)a) | (((wxUint32)b) << 8) | (((wxUint32)c) << 16) | (((wxUint32)d) << 24))
-
-#define RIFF_SIGNATURE BUILD_SIGNATURE('R','I','F','F')
-#define WAVE_SIGNATURE BUILD_SIGNATURE('W','A','V','E')
-#define FMT_SIGNATURE BUILD_SIGNATURE('f','m','t',' ')
-#define DATA_SIGNATURE BUILD_SIGNATURE('d','a','t','a')
-
-#define HEADER_SIZE 4+4 + 4+4+16 + 4+4
-// 4+4 => NAME + LEN
-// 16 => fmt size
-
-wxSoundWave::wxSoundWave(wxInputStream& stream, wxSoundStream& io_sound)
- : wxSoundFileStream(stream, io_sound)
-{
- m_base_offset = wxInvalidOffset;
-}
-
-wxSoundWave::wxSoundWave(wxOutputStream& stream, wxSoundStream& io_sound)
- : wxSoundFileStream(stream, io_sound)
-{
- m_base_offset = wxInvalidOffset;
-}
-
-wxSoundWave::~wxSoundWave()
-{
-}
-
-wxString wxSoundWave::GetCodecName() const
-{
- return wxString(wxT("wxSoundWave codec"));
-}
-
-#define FAIL_WITH(condition, err) if (condition) { m_snderror = err; return false; }
-
-bool wxSoundWave::CanRead()
-{
- wxUint32 len, signature1, signature2;
- m_snderror = wxSOUND_NOERROR;
-
- // Test the main signatures:
- // "RIFF"
- FAIL_WITH(m_input->Read(&signature1, 4).LastRead() != 4, wxSOUND_INVSTRM);
-
- if (wxUINT32_SWAP_ON_BE(signature1) != RIFF_SIGNATURE) {
- m_input->Ungetch(&signature1, 4);
- return false;
- }
-
- // Pass the global length
- m_input->Read(&len, 4);
- FAIL_WITH(m_input->LastRead() != 4, wxSOUND_INVSTRM);
-
- // Get the second signature
- FAIL_WITH(m_input->Read(&signature2, 4).LastRead() != 4, wxSOUND_INVSTRM);
- // Ungetch all
- m_input->Ungetch(&signature2, 4);
- m_input->Ungetch(&len, 4);
- m_input->Ungetch(&signature1, 4);
-
- // Test the second signature
- if (wxUINT32_SWAP_ON_BE(signature2) != WAVE_SIGNATURE)
- return false;
-
- return true;
-}
-
-bool wxSoundWave::HandleOutputPCM(wxDataInputStream& WXUNUSED(data), wxUint32 len,
- wxUint16 channels,
- wxUint32 sample_fq, wxUint32 WXUNUSED(byte_p_sec),
- wxUint16 WXUNUSED(byte_p_spl), wxUint16 bits_p_spl)
-{
- wxSoundFormatPcm sndformat;
-
- sndformat.SetSampleRate(sample_fq);
- sndformat.SetBPS(bits_p_spl);
- sndformat.SetChannels(channels);
- sndformat.Signed(true);
- sndformat.SetOrder(wxLITTLE_ENDIAN);
-
- if (!SetSoundFormat(sndformat))
- return false;
-
- m_input->SeekI(len, wxFromCurrent);
-
- return true;
-}
-
-bool wxSoundWave::HandleOutputMSADPCM(wxDataInputStream& data, wxUint32 len,
- wxUint16 channels,
- wxUint32 sample_fq, wxUint32 WXUNUSED(byte_p_sec),
- wxUint16 WXUNUSED(byte_p_spl), wxUint16 WXUNUSED(bits_p_spl))
-{
- wxSoundFormatMSAdpcm sndformat;
- wxInt16 *coefs[2];
- wxUint16 coefs_len, i;
- wxUint16 block_size;
-
- sndformat.SetSampleRate(sample_fq);
- sndformat.SetChannels(channels);
-
- block_size = data.Read16();
- coefs_len = data.Read16();
-
- coefs[0] = new wxInt16[coefs_len];
- coefs[1] = new wxInt16[coefs_len];
-
- for (i=0;iSeekI(len, wxFromCurrent);
-
- return true;
-}
-
-bool wxSoundWave::HandleOutputG721(wxDataInputStream& WXUNUSED(data), wxUint32 len,
- wxUint16 WXUNUSED(channels),
- wxUint32 sample_fq, wxUint32 WXUNUSED(byte_p_sec),
- wxUint16 WXUNUSED(byte_p_spl), wxUint16 WXUNUSED(bits_p_spl))
-{
- wxSoundFormatG72X sndformat;
-
- sndformat.SetSampleRate(sample_fq);
- sndformat.SetG72XType(wxSOUND_G721);
-
- if (!SetSoundFormat(sndformat))
- return false;
-
- m_input->SeekI(len, wxFromCurrent);
-
- return true;
-}
-
-bool wxSoundWave::PrepareToPlay()
-{
- wxUint32 signature, len;
- bool end_headers;
-
- if (!m_input) {
- m_snderror = wxSOUND_INVSTRM;
- return false;
- }
-
- wxDataInputStream data(*m_input);
- data.BigEndianOrdered(false);
-
- // Get the first signature
- FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
- FAIL_WITH(wxUINT32_SWAP_ON_BE(signature) != RIFF_SIGNATURE, wxSOUND_INVSTRM);
- // "RIFF"
-
- len = data.Read32();
- wxUnusedVar(len);
- FAIL_WITH(m_input->LastRead() != 4, wxSOUND_INVSTRM);
- // dummy len
-
- // Get the second signature
- FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
- FAIL_WITH(wxUINT32_SWAP_ON_BE(signature) != WAVE_SIGNATURE, wxSOUND_INVSTRM);
- // "WAVE"
-
- end_headers = false;
- // Chunk loop
- while (!end_headers) {
- FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
-
- len = data.Read32();
- FAIL_WITH(m_input->LastRead() != 4, wxSOUND_INVSTRM);
-
- switch (wxUINT32_SWAP_ON_BE(signature)) {
- case FMT_SIGNATURE: { // "fmt "
- wxUint16 format, channels, byte_p_spl, bits_p_spl;
- wxUint32 sample_fq, byte_p_sec;
-
- // Get the common parameters
- data >> format >> channels >> sample_fq
- >> byte_p_sec >> byte_p_spl >> bits_p_spl;
- len -= 16;
-
- switch (format) {
- case 0x01: // PCM
- if (!HandleOutputPCM(data, len, channels, sample_fq,
- byte_p_sec, byte_p_spl,
- bits_p_spl))
- return false;
- break;
- case 0x02: // MS ADPCM
- if (!HandleOutputMSADPCM(data, len,
- channels, sample_fq,
- byte_p_sec, byte_p_spl,
- bits_p_spl))
- return false;
- break;
- case 0x40: // G721
- if (!HandleOutputG721(data, len,
- channels, sample_fq,
- byte_p_sec, byte_p_spl,
- bits_p_spl))
- return false;
- break;
- default:
- m_snderror = wxSOUND_NOCODEC;
- return false;
- }
- break;
- }
- case DATA_SIGNATURE: // "data"
- m_base_offset = m_input->TellI();
- end_headers = true;
- FinishPreparation(len);
- break;
- default:
- // We pass the chunk
- m_input->SeekI(len, wxFromCurrent);
- break;
- }
- }
- return true;
-}
-
-wxSoundFormatBase *wxSoundWave::HandleInputPCM(wxDataOutputStream& data)
-{
- wxUint16 format, channels, byte_p_spl, bits_p_spl;
- wxUint32 sample_fq, byte_p_sec;
- wxSoundFormatPcm *pcm;
-
- pcm = (wxSoundFormatPcm *)(m_sndformat->Clone());
-
- // Write block length
- data.Write32(16);
-
- sample_fq = pcm->GetSampleRate();
- bits_p_spl = pcm->GetBPS();
- channels = pcm->GetChannels();
- byte_p_spl = pcm->GetBPS() / 8;
- byte_p_sec = pcm->GetBytesFromTime(1);
- format = 0x01;
-
- pcm->Signed(true);
- pcm->SetOrder(wxLITTLE_ENDIAN);
-
- data << format << channels << sample_fq
- << byte_p_sec << byte_p_spl << bits_p_spl;
-
- return pcm;
-}
-
-wxSoundFormatBase *wxSoundWave::HandleInputG72X(wxDataOutputStream& data)
-{
- wxUint16 format, channels, byte_p_spl, bits_p_spl;
- wxUint32 sample_fq, byte_p_sec;
- wxSoundFormatG72X *g72x;
-
- // Write block length
- data.Write32(16);
-
- g72x = (wxSoundFormatG72X *)(m_sndformat->Clone());
- if (g72x->GetG72XType() != wxSOUND_G721) {
- delete g72x;
- return NULL;
- }
-
- sample_fq = g72x->GetSampleRate();
- bits_p_spl = 4;
- channels = 1;
- byte_p_spl = 0;
- byte_p_sec = g72x->GetBytesFromTime(1);
- format = 0x40;
- data << format << channels << sample_fq
- << byte_p_sec << byte_p_spl << bits_p_spl;
-
- return g72x;
-}
-
-bool wxSoundWave::PrepareToRecord(wxUint32 time)
-{
-#define WRITE_SIGNATURE(s,sig) \
-signature = sig; \
-signature = wxUINT32_SWAP_ON_BE(signature); \
-FAIL_WITH(s->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
-
- wxUint32 signature;
- wxMemoryOutputStream fmt_data;
-
- if (!m_output) {
- m_snderror = wxSOUND_INVSTRM;
- return false;
- }
-
- wxDataOutputStream data(*m_output);
- wxDataOutputStream fmt_d_data(fmt_data);
-
- data.BigEndianOrdered(false);
- fmt_d_data.BigEndianOrdered(false);
-
- WRITE_SIGNATURE(m_output, RIFF_SIGNATURE);
-
- FAIL_WITH(m_output->LastWrite() != 4, wxSOUND_INVSTRM);
-
- WRITE_SIGNATURE((&fmt_data), WAVE_SIGNATURE);
-
- {
- wxSoundFormatBase *frmt;
-
- WRITE_SIGNATURE((&fmt_data), FMT_SIGNATURE);
-
- switch (m_sndformat->GetType()) {
- case wxSOUND_PCM:
- frmt = HandleInputPCM(fmt_d_data);
- break;
- case wxSOUND_G72X:
- frmt = HandleInputG72X(fmt_d_data);
- break;
- default:
- m_snderror = wxSOUND_NOCODEC;
- return false;
- }
-
- FAIL_WITH(!frmt, wxSOUND_NOCODEC);
-
- if (!SetSoundFormat(*frmt)) {
- delete frmt;
- return false;
- }
-
- delete frmt;
- }
-
- data << (wxUint32)(fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
-
- // We, finally, copy the header block to the output stream
- {
- char *out_buf;
- out_buf = new char[fmt_data.GetSize()];
-
- fmt_data.CopyTo(out_buf, fmt_data.GetSize());
- m_output->Write(out_buf, fmt_data.GetSize());
-
- delete[] out_buf;
- }
-
- WRITE_SIGNATURE(m_output, DATA_SIGNATURE);
- data.Write32(m_sndformat->GetBytesFromTime(time));
- return true;
-}
-
-bool wxSoundWave::FinishRecording()
-{
- if (m_output->SeekO(0, wxFromStart) == wxInvalidOffset)
- // We can't but there is no error.
- return true;
-
- if (m_bytes_left == 0)
- return true;
-
- // TODO: Update headers when we stop before the specified time (if possible)
- return true;
-}
-
-bool wxSoundWave::RepositionStream(wxUint32 WXUNUSED(position))
-{
- if (m_base_offset == wxInvalidOffset)
- return false;
- m_input->SeekI(m_base_offset, wxFromStart);
- return true;
-}
-
-wxUint32 wxSoundWave::GetData(void *buffer, wxUint32 len)
-{
- return m_input->Read(buffer, len).LastRead();
-}
-
-wxUint32 wxSoundWave::PutData(const void *buffer, wxUint32 len)
-{
- return m_output->Write(buffer, len).LastWrite();
-}
diff --git a/contrib/src/mmedia/sndwin.cpp b/contrib/src/mmedia/sndwin.cpp
deleted file mode 100644
index 1085231a41..0000000000
--- a/contrib/src/mmedia/sndwin.cpp
+++ /dev/null
@@ -1,780 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndwin.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux (C) 1999, 2000
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef __WINDOWS__
-
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
- #include "wx/app.h"
- #include "wx/string.h"
-#endif
-
-#include "wx/module.h"
-#include "wx/msw/private.h"
-
-// -------------------------------------------------------------------------
-// MMedia headers
-// -------------------------------------------------------------------------
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndwin.h"
-#include "wx/mmedia/sndpcm.h"
-
-// -------------------------------------------------------------------------
-// System headers
-// -------------------------------------------------------------------------
-
-#include
-#include
-
-// -------------------------------------------------------------------------
-// External definitions, forward, ...
-// -------------------------------------------------------------------------
-
-typedef struct _wxSoundInternal wxSoundInternal;
-typedef struct _wxSoundInfoHeader wxSoundInfoHeader;
-
-extern const wxChar *wxCanvasClassName;
-
-wxList *wxSoundHandleList = NULL;
-
-static inline wxSoundStreamWin *wxFindSoundFromHandle(WXHWND hWnd)
-{
- wxObjectList::compatibility_iterator node = wxSoundHandleList->Find((long)hWnd);
- if (!node)
- return NULL;
- return (wxSoundStreamWin *)node->GetData();
-}
-
-struct _wxSoundInternal {
- HWND m_sndWin;
- HWAVEIN m_devin;
- HWAVEOUT m_devout;
- bool m_output_enabled, m_input_enabled;
-};
-
-struct _wxSoundInfoHeader {
- HGLOBAL m_h_header, m_h_data;
- char *m_data;
- WAVEHDR *m_header;
- int m_mode;
- bool m_playing, m_recording;
- wxUint32 m_position, m_size;
-
- wxSoundStreamWin *m_driver;
-};
-
-#define WXSOUND_MAX_QUEUE 10
-
-wxSoundStreamWin::wxSoundStreamWin()
-{
- wxSoundFormatPcm pcm;
-
- m_production_started = false;
- m_internal = new wxSoundInternal;
- if (!m_internal) {
- m_snderror = wxSOUND_MEMERROR;
- m_internal = NULL;
- return;
- }
- m_snderror = wxSOUND_NOERROR;
-
- // Setup defaults
- CreateSndWindow();
- SetSoundFormat(pcm);
-
- m_internal->m_input_enabled = false;
- m_internal->m_output_enabled = false;
-
- m_waiting_for = false;
-
- if (!OpenDevice(wxSOUND_OUTPUT)) {
- m_snderror = wxSOUND_NOERROR; //next call to OpenDevice won't do this
- if (!OpenDevice(wxSOUND_INPUT))
- return;
- }
-
- CloseDevice();
-}
-
-wxSoundStreamWin::~wxSoundStreamWin()
-{
- if (m_internal) {
- if (m_production_started)
- StopProduction();
- DestroySndWindow();
-
- delete m_internal;
- }
-}
-
-// -----------------------------------------------------------------------
-// _wxSoundHandlerWndProc: Window callback to handle buffer completion
-// -----------------------------------------------------------------------
-LRESULT APIENTRY _EXPORT
-
- _wxSoundHandlerWndProc(HWND hWnd, UINT message,
- WPARAM wParam, LPARAM WXUNUSED(lParam))
-{
- wxSoundStreamWin *sndwin;
-
- sndwin = wxFindSoundFromHandle((WXHWND)hWnd);
- if (!sndwin)
- return (LRESULT)0;
-
- switch (message) {
- case MM_WOM_DONE:
- sndwin->NotifyDoneBuffer(wParam, wxSOUND_OUTPUT);
- break;
- case MM_WIM_DATA:
- sndwin->NotifyDoneBuffer(wParam, wxSOUND_INPUT);
- break;
- default:
- break;
- }
- return (LRESULT)0;
-}
-
-// -----------------------------------------------------------------------
-// CreateSndWindow() creates an hidden window which will receive the sound
-// events
-// -----------------------------------------------------------------------
-
-void wxSoundStreamWin::CreateSndWindow()
-{
- FARPROC proc = MakeProcInstance((FARPROC)_wxSoundHandlerWndProc,
- wxGetInstance());
- // NB: class name must be kept in sync with wxCanvasClassName in
- // src/msw/app.cpp!
- m_internal->m_sndWin = ::CreateWindow(wxT("wxWindowClass"), NULL, 0,
- 0, 0, 0, 0, NULL, (HMENU) NULL,
- wxGetInstance(), NULL);
-
- GetLastError();
-
- ::SetWindowLong(m_internal->m_sndWin, GWL_WNDPROC, (LONG)proc);
-
- // Add this window to the sound handle list so we'll be able to redecode
- // the "magic" number.
- wxSoundHandleList->Append((long)m_internal->m_sndWin, (wxObject *)this);
-}
-
-// -----------------------------------------------------------------------
-// DestroySndWindow() destroys the hidden window
-// -----------------------------------------------------------------------
-
-void wxSoundStreamWin::DestroySndWindow()
-{
- if (m_internal->m_sndWin) {
- ::DestroyWindow(m_internal->m_sndWin);
- wxSoundHandleList->DeleteObject((wxObject *)this);
- }
-}
-
-// -------------------------------------------------------------------------
-// OpenDevice(int mode) initializes the windows driver for a "mode"
-// operation. mode is a bit mask: if the bit "wxSOUND_OUTPUT" is set,
-// the driver is opened for output operation, and if the bit "wxSOUND_INPUT"
-// is set, then the driver is opened for input operation. The two modes
-// aren't exclusive.
-// The initialization parameters (sample rate, ...) are taken from the
-// m_sndformat object.
-// At the end, OpenDevice() calls AllocHeaders() to initialize the Sound IO
-// queue.
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::OpenDevice(int mode)
-{
- wxSoundFormatPcm *pcm;
- WAVEFORMATEX wformat;
-
- if (!m_sndformat) {
- m_snderror = wxSOUND_INVFRMT;
- return false;
- }
-
- pcm = (wxSoundFormatPcm *)m_sndformat;
-
- wformat.wFormatTag = WAVE_FORMAT_PCM;
- wformat.nChannels = pcm->GetChannels();
- wformat.nBlockAlign = wformat.nChannels * pcm->GetBPS() / 8;
- wformat.nSamplesPerSec = pcm->GetSampleRate();
- wformat.nAvgBytesPerSec = wformat.nSamplesPerSec * wformat.nBlockAlign;
- wformat.wBitsPerSample = pcm->GetBPS();
- wformat.cbSize = 0;
-
- // -----------------------------------
- // Open the driver for Output operation
- // -----------------------------------
- if (mode & wxSOUND_OUTPUT) {
- MMRESULT result;
-
- result = waveOutOpen(&m_internal->m_devout,
- WAVE_MAPPER, &wformat,
- (DWORD)m_internal->m_sndWin, 0,
- CALLBACK_WINDOW);
-
- if (result != MMSYSERR_NOERROR) {
- m_snderror = wxSOUND_INVDEV;
- return false;
- }
-
- m_output_frag_out = WXSOUND_MAX_QUEUE-1;
- m_current_frag_out = 0;
-
- m_internal->m_output_enabled = true;
- }
- // -----------------------------------
- // Open the driver for Input operation
- // -----------------------------------
- if (mode & wxSOUND_INPUT) {
- MMRESULT result;
-
- result = waveInOpen(&m_internal->m_devin,
- WAVE_MAPPER, &wformat,
- (DWORD)m_internal->m_sndWin, 0,
- CALLBACK_WINDOW);
-
- if (result != MMSYSERR_NOERROR) {
- m_snderror = wxSOUND_INVDEV;
- return false;
- }
-
- m_current_frag_in = WXSOUND_MAX_QUEUE-1;
- m_input_frag_in = 0;
-
- m_internal->m_input_enabled = true;
- }
-
- if (mode & wxSOUND_OUTPUT) {
- if (!AllocHeaders(wxSOUND_OUTPUT)) {
- CloseDevice();
- return false;
- }
- }
- if (mode & wxSOUND_INPUT) {
- if (!AllocHeaders(wxSOUND_INPUT)) {
- CloseDevice();
- return false;
- }
- }
-
- return true;
-}
-
-// -------------------------------------------------------------------------
-// CloseDevice() closes the driver handles and frees memory allocated for
-// IO queues.
-// -------------------------------------------------------------------------
-void wxSoundStreamWin::CloseDevice()
-{
- if (m_internal->m_output_enabled) {
- FreeHeaders(wxSOUND_OUTPUT);
- m_internal->m_output_enabled = false;
- waveOutClose(m_internal->m_devout);
- }
-
- if (m_internal->m_input_enabled) {
- FreeHeaders(wxSOUND_INPUT);
- m_internal->m_input_enabled = false;
- waveInClose(m_internal->m_devin);
- }
-}
-
-// -------------------------------------------------------------------------
-// AllocHeader(int mode)
-//
-// mode has the same mean as in OpenDevice() except that here the two flags
-// must be exclusive.
-// AllocHeader() initializes an element of an operation (this can be input
-// or output). It means it allocates the sound header's memory block
-// and "prepares" it (It is needed by Windows). At the same time, it sets
-// private datas so we can the header's owner (See callback).
-//
-// It returns the new allocated block or NULL.
-// -------------------------------------------------------------------------
-wxSoundInfoHeader *wxSoundStreamWin::AllocHeader(int mode)
-{
- wxSoundInfoHeader *info;
- WAVEHDR *header;
-
- // Some memory allocation
- info = new wxSoundInfoHeader;
- info->m_h_data = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, GetBestSize());
- info->m_h_header = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, sizeof(WAVEHDR));
- if (!info->m_h_data || !info->m_h_header) {
- delete info;
- m_snderror = wxSOUND_MEMERROR;
- return NULL;
- }
-
- // Get the two pointers from the system
- info->m_data = (char *)GlobalLock(info->m_h_data);
- info->m_header = (WAVEHDR *)GlobalLock(info->m_h_header);
- // Set the header's mode
- info->m_mode = mode;
- // Set the parent of the header
- info->m_driver = this;
- // Clean it up
- ClearHeader(info);
-
- header = info->m_header;
- // Initialize Windows variables
- header->lpData = info->m_data;
- header->dwBufferLength = GetBestSize();
- header->dwUser = (DWORD)info;
- header->dwFlags = WHDR_DONE;
-
- // "Prepare" the header
- if (mode == wxSOUND_INPUT) {
- MMRESULT result;
-
- result = waveInPrepareHeader(m_internal->m_devin, header,
- sizeof(WAVEHDR));
-
- if (result != MMSYSERR_NOERROR) {
- // If something goes wrong, free everything.
- GlobalUnlock(info->m_data);
- GlobalUnlock(info->m_header);
- GlobalFree(info->m_h_data);
- GlobalFree(info->m_h_header);
- delete info;
-
- m_snderror = wxSOUND_IOERROR;
- return NULL;
- }
- } else if (mode == wxSOUND_OUTPUT) {
- MMRESULT result;
-
- result = waveOutPrepareHeader(m_internal->m_devout, header,
- sizeof(WAVEHDR));
-
- if (result != MMSYSERR_NOERROR) {
- // If something goes wrong, free everything.
- GlobalUnlock(info->m_data);
- GlobalUnlock(info->m_header);
- GlobalFree(info->m_h_data);
- GlobalFree(info->m_h_header);
- delete info;
-
- m_snderror = wxSOUND_IOERROR;
- return NULL;
- }
- }
- return info;
-}
-
-// -------------------------------------------------------------------------
-// AllocHeaders(int mode)
-//
-// "mode" has the same mean as for OpenDevice() except that the two flags must
-// be exclusive.
-// AllocHeaders() allocates WXSOUND_MAX_QUEUE (= 128) blocks for an operation
-// queue. It uses AllocHeader() for each element.
-//
-// Once it has allocated all blocks, it returns true and if an error occurred
-// it returns false.
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::AllocHeaders(int mode)
-{
- int i;
- wxSoundInfoHeader **headers;
-
- if (mode == wxSOUND_OUTPUT)
- headers = m_headers_play = new wxSoundInfoHeader *[WXSOUND_MAX_QUEUE];
- else
- headers = m_headers_rec = new wxSoundInfoHeader *[WXSOUND_MAX_QUEUE];
-
- memset(headers, 0, WXSOUND_MAX_QUEUE*sizeof(wxSoundInfoHeader *));
-
- for (i=0;im_devout, header->m_header, sizeof(WAVEHDR));
- else
- waveInUnprepareHeader(m_internal->m_devin, header->m_header, sizeof(WAVEHDR));
-
- GlobalUnlock(header->m_data);
- GlobalUnlock(header->m_header);
- GlobalFree(header->m_h_header);
- GlobalFree(header->m_h_data);
- delete header;
-}
-
-// -------------------------------------------------------------------------
-// FreeHeaders(int mode)
-//
-// "mode" has the same mean as for OpenDevice() except that the two flags must
-// be exclusive.
-// FreeHeaders() frees all an operation queue once it has checked that
-// all buffers have been terminated.
-// -------------------------------------------------------------------------
-void wxSoundStreamWin::FreeHeaders(int mode)
-{
- int i;
- wxSoundInfoHeader ***headers;
-
- if (mode == wxSOUND_OUTPUT)
- headers = &m_headers_play;
- else
- headers = &m_headers_rec;
-
- for (i=0;im_playing) {
-
- // We begun filling it: we must send it to the Windows queue
- if (info->m_position != 0) {
- memset(info->m_data + info->m_position, 0, info->m_size);
- AddToQueue(info);
- }
- }
-
- if (m_waiting_for) {
- // PROBLEM //
- return;
- }
- m_waiting_for = true;
- // Else, we wait for its termination
- while (info->m_playing || info->m_recording)
- wxYield();
- m_waiting_for = false;
-}
-
-// -------------------------------------------------------------------------
-// AddToQueue(wxSoundInfoHeader *info)
-//
-// For "info", see WaitFor()
-// AddToQueue() sends the IO queue element to the Windows queue.
-//
-// Warning: in the current implementation, it partially assume we send the
-// element in the right order. This is true in that implementation but if
-// you use it elsewhere, be careful: it may shuffle all your sound datas.
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::AddToQueue(wxSoundInfoHeader *info)
-{
- MMRESULT result;
-
- if (info->m_mode == wxSOUND_INPUT) {
- // Increment the input fragment pointer
- result = waveInAddBuffer(m_internal->m_devin,
- info->m_header, sizeof(WAVEHDR));
- if (result == MMSYSERR_NOERROR)
- info->m_recording = true;
- else
- return false;
- } else if (info->m_mode == wxSOUND_OUTPUT) {
- result = waveOutWrite(m_internal->m_devout,
- info->m_header, sizeof(WAVEHDR));
- if (result == MMSYSERR_NOERROR)
- info->m_playing = true;
- else
- return false;
- }
- return true;
-}
-
-// -------------------------------------------------------------------------
-// ClearHeader(wxSoundInfoHeader *info)
-//
-// ClearHeader() reinitializes the parameters of "info" to their default
-// value.
-// -------------------------------------------------------------------------
-void wxSoundStreamWin::ClearHeader(wxSoundInfoHeader *info)
-{
- info->m_playing = false;
- info->m_recording = false;
- info->m_position = 0;
- info->m_size = GetBestSize();
-}
-
-// -------------------------------------------------------------------------
-// wxSoundInfoHeader *NextFragmentOutput()
-//
-// NextFragmentOutput() looks for a free output block. It will always
-// return you a non-NULL pointer but it may waits for an empty buffer a long
-// time.
-// -------------------------------------------------------------------------
-wxSoundInfoHeader *wxSoundStreamWin::NextFragmentOutput()
-{
- if (m_headers_play[m_current_frag_out]->m_playing) {
- m_current_frag_out = (m_current_frag_out + 1) % WXSOUND_MAX_QUEUE;
-
- if (m_headers_play[m_current_frag_out]->m_playing)
- WaitFor(m_headers_play[m_current_frag_out]);
- }
- if (m_current_frag_out == m_output_frag_out)
- m_queue_filled = true;
- return m_headers_play[m_current_frag_out];
-}
-
-// -------------------------------------------------------------------------
-// The behaviour of Write is documented in the global documentation.
-// -------------------------------------------------------------------------
-wxSoundStream& wxSoundStreamWin::Write(const void *buffer, wxUint32 len)
-{
- m_lastcount = 0;
- if (!m_internal->m_output_enabled) {
- m_snderror = wxSOUND_NOTSTARTED;
- return *this;
- }
-
-
- while (len > 0) {
- wxSoundInfoHeader *header;
- wxUint32 to_copy;
-
- // Get a new output fragment
- header = NextFragmentOutput();
-
- to_copy = (len > header->m_size) ? header->m_size : len;
- memcpy(header->m_data + header->m_position, buffer, to_copy);
-
- header->m_position += to_copy;
- header->m_size -= to_copy;
- buffer = (((const char *)buffer) + to_copy);
- len -= to_copy;
- m_lastcount += to_copy;
-
- // If the fragment is full, we send it to the Windows queue.
- if (header->m_size == 0)
- if (!AddToQueue(header)) {
- m_snderror = wxSOUND_IOERROR;
- return *this;
- }
- }
- return *this;
-}
-
-// -------------------------------------------------------------------------
-// NextFragmentInput is not functional.
-// -------------------------------------------------------------------------
-wxSoundInfoHeader *wxSoundStreamWin::NextFragmentInput()
-{
- wxSoundInfoHeader *header;
-
- // Queue pointer: reader
- m_current_frag_in = (m_current_frag_in + 1) % WXSOUND_MAX_QUEUE;
-
- header = m_headers_rec[m_current_frag_in];
- // If the current buffer is in recording mode, we must wait for its
- // completion.
- if (header->m_recording)
- WaitFor(header);
-
- // We reached the writer position: the queue is full.
- if (m_current_frag_in == m_input_frag_in)
- m_queue_filled = true;
-
- return header;
-}
-
-// -------------------------------------------------------------------------
-// The behaviour of Read is documented in the global documentation.
-// -------------------------------------------------------------------------
-wxSoundStream& wxSoundStreamWin::Read(void *buffer, wxUint32 len)
-{
- wxSoundInfoHeader *header;
- wxUint32 to_copy;
-
- m_lastcount = 0;
- if (!m_internal->m_input_enabled)
- return *this;
-
- while (len > 0) {
- header = NextFragmentInput();
-
- to_copy = (len > header->m_size) ? header->m_size : len;
- memcpy(buffer, header->m_data + header->m_position, to_copy);
-
- header->m_position += to_copy;
- header->m_size -= to_copy;
- buffer = (((char *)buffer) + to_copy);
- len -= to_copy;
- m_lastcount += to_copy;
-
- if (header->m_size == 0) {
- ClearHeader(header);
- if (!AddToQueue(header)) {
- m_snderror = wxSOUND_IOERROR;
- return *this;
- }
- }
- }
- return *this;
-}
-
-// -------------------------------------------------------------------------
-// NotifyDoneBuffer(wxUint32 dev_handle)
-//
-// NotifyDoneBuffer() is called by wxSoundHandlerProc each time a sound
-// fragment finished. It reinitializes the parameters of the fragment and
-// sends an event to the clients.
-// -------------------------------------------------------------------------
-void wxSoundStreamWin::NotifyDoneBuffer(wxUint32 WXUNUSED(dev_handle), int flag)
-{
- wxSoundInfoHeader *info;
-
- if (flag == wxSOUND_OUTPUT) {
- if (!m_internal->m_output_enabled)
- return;
-
- // Queue pointer: reader
- m_output_frag_out = (m_output_frag_out + 1) % WXSOUND_MAX_QUEUE;
- info = m_headers_play[m_output_frag_out];
- // Clear header to tell the system the buffer is free now
- ClearHeader(info);
- m_queue_filled = false;
- if (!m_waiting_for)
- // Try to requeue a new buffer.
- OnSoundEvent(wxSOUND_OUTPUT);
- } else {
- if (!m_internal->m_input_enabled)
- return;
-
- // Recording completed
- m_headers_rec[m_input_frag_in]->m_recording = false;
- // Queue pointer: writer
- m_input_frag_in = (m_input_frag_in + 1) % WXSOUND_MAX_QUEUE;
- if (!m_waiting_for)
- OnSoundEvent(wxSOUND_INPUT);
- m_queue_filled = false;
- }
-}
-
-// -------------------------------------------------------------------------
-// SetSoundFormat()
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::SetSoundFormat(const wxSoundFormatBase& base)
-{
- // TODO: detect best format
- return wxSoundStream::SetSoundFormat(base);
-}
-
-// -------------------------------------------------------------------------
-// StartProduction()
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::StartProduction(int evt)
-{
- if (!m_internal)
- return false;
-
- if ((m_internal->m_output_enabled && (evt & wxSOUND_OUTPUT)) ||
- (m_internal->m_input_enabled && (evt & wxSOUND_INPUT)))
- CloseDevice();
-
- if (!OpenDevice(evt))
- return false;
-
- m_production_started = true;
- m_queue_filled = false;
- // Send a dummy event to start.
- if (evt & wxSOUND_OUTPUT)
- OnSoundEvent(wxSOUND_OUTPUT);
-
- if (evt & wxSOUND_INPUT) {
- int i;
- for (i=0;im_devin);
- }
-
- return true;
-}
-
-// -------------------------------------------------------------------------
-// StopProduction()
-// ------------------------------------------------------------------------
-bool wxSoundStreamWin::StopProduction()
-{
- if (!m_production_started) {
- m_snderror = wxSOUND_NOTSTARTED;
- return false;
- }
-
- m_snderror = wxSOUND_NOERROR;
- m_production_started = false;
- CloseDevice();
- return true;
-}
-
-// -------------------------------------------------------------------------
-// QueueFilled()
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::QueueFilled() const
-{
- return (!m_production_started || m_queue_filled);
-}
-
-
-// --------------------------------------------------------------------------
-// wxSoundWinModule
-// --------------------------------------------------------------------------
-
-class wxSoundWinModule : public wxModule {
- DECLARE_DYNAMIC_CLASS(wxSoundWinModule)
- public:
- bool OnInit();
- void OnExit();
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxSoundWinModule, wxModule)
-
-bool wxSoundWinModule::OnInit() {
- wxSoundHandleList = new wxList(wxKEY_INTEGER);
- return true;
-}
-
-void wxSoundWinModule::OnExit() {
- delete wxSoundHandleList;
-}
-
-#endif
- // __WINDOWS__
diff --git a/contrib/src/mmedia/vidbase.cpp b/contrib/src/mmedia/vidbase.cpp
deleted file mode 100644
index 00ff2dcc95..0000000000
--- a/contrib/src/mmedia/vidbase.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Name: vidbdrv.cpp
-// Purpose: wxMMedia
-// Author: Guilhem Lavaux
-// Created: 1997
-// Updated: 1998
-// Copyright: (C) 1997, 1998, Guilhem Lavaux
-// License: wxWindows license
-////////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/stream.h"
-#include "wx/wfstream.h"
-#include "wx/intl.h"
-#endif
-
-#include "wx/mmedia/vidbase.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-IMPLEMENT_ABSTRACT_CLASS(wxVideoBaseDriver, wxObject)
-
-///
-wxVideoBaseDriver::wxVideoBaseDriver()
-{
- m_video_output = NULL;
-}
-
-wxVideoBaseDriver::wxVideoBaseDriver(wxInputStream& WXUNUSED(str))
-{
- m_video_output = NULL;
-}
-
-wxVideoBaseDriver::wxVideoBaseDriver(const wxString& WXUNUSED(filename))
-{
- m_video_output = NULL;
-}
-
-wxVideoBaseDriver::~wxVideoBaseDriver()
-{
-}
-
-bool wxVideoBaseDriver::AttachOutput(wxWindow& output)
-{
- m_video_output = &output;
- return true;
-}
-
-void wxVideoBaseDriver::DetachOutput()
-{
- m_video_output = NULL;
-}
-
-// Use an external frame for video output
-
-wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv)
-{
- wxFrame *frame = new wxFrame(NULL, wxID_ANY, _("Video Output"), wxDefaultPosition, wxSize(100, 100));
- wxWindow *vid_out = new wxWindow(frame, wxID_ANY, wxPoint(0, 0), wxSize(300, 300));
-
- frame->Layout();
- frame->Show(true);
-
- vid_drv->AttachOutput(*vid_out);
- vid_drv->Play();
-
- return frame;
-}
diff --git a/contrib/src/mmedia/vidwin.cpp b/contrib/src/mmedia/vidwin.cpp
deleted file mode 100644
index 1c951ee22f..0000000000
--- a/contrib/src/mmedia/vidwin.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-// -----------------------------------------------------------------------------
-// Name: vidwin.h
-// Purpose: wxMMedia
-// Author: Guilhem Lavaux
-// Created: February 1998
-// Updated:
-// Copyright: (C) 1998, 1999, 2000 Guilhem Lavaux
-// License: wxWindows license
-// -----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__) && !defined(__CYGWIN__)
-// versions of Open Watcom and MinGW tested against this source does not
-// deliver "digitalv.h" required in this feature
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include "wx/stream.h"
-#include "wx/wfstream.h"
-
-#define WXMMEDIA_INTERNAL
-#include
-#include
-#include
-#include "wx/mmedia/vidwin.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxVideoWindows, wxVideoBaseDriver)
-
-wxVideoWindows::wxVideoWindows()
-{
-}
-
-wxVideoWindows::wxVideoWindows(wxInputStream& str)
- : wxVideoBaseDriver(str)
-{
- m_internal = new wxVIDWinternal;
- m_remove_file = true;
- m_filename = wxGetTempFileName(_T("wxvid"));
- m_paused = false;
- m_stopped = true;
- m_frameRate = 1.0;
-
- wxFileOutputStream temp_file(m_filename);
- temp_file << str;
-
- OpenFile();
-}
-
-wxVideoWindows::wxVideoWindows(const wxString& filename)
- : wxVideoBaseDriver(filename)
-{
- m_internal = new wxVIDWinternal;
- m_remove_file = false;
- m_filename = filename;
- m_paused = false;
- m_stopped = true;
- m_frameRate = 1.0;
- OpenFile();
-}
-
-wxVideoWindows::~wxVideoWindows(void)
-{
- mciSendCommand(m_internal->m_dev_id, MCI_CLOSE, 0, 0);
-
- if (m_internal)
- delete m_internal;
-}
-
-void wxVideoWindows::OpenFile()
-{
- MCI_DGV_OPEN_PARMS openStruct;
- MCI_DGV_SET_PARMS setStruct;
- MCI_STATUS_PARMS statusStruct;
-
- openStruct.lpstrDeviceType = _T("avivideo");
- openStruct.lpstrElementName = (wxChar *)m_filename.c_str();
- openStruct.hWndParent = 0;
-
- mciSendCommand(0, MCI_OPEN,
- MCI_OPEN_ELEMENT|MCI_DGV_OPEN_PARENT|MCI_OPEN_TYPE|MCI_DGV_OPEN_32BIT,
- (DWORD)(LPVOID)&openStruct);
- m_internal->m_dev_id = openStruct.wDeviceID;
-
-
- setStruct.dwCallback = 0;
- setStruct.dwTimeFormat = MCI_FORMAT_FRAMES;
-
- mciSendCommand(m_internal->m_dev_id, MCI_SET, MCI_SET_TIME_FORMAT,
- (DWORD)(LPVOID)&setStruct);
-
-
- statusStruct.dwCallback = 0;
- statusStruct.dwItem = MCI_DGV_STATUS_FRAME_RATE;
- mciSendCommand(m_internal->m_dev_id, MCI_STATUS,
- MCI_STATUS_ITEM,
- (DWORD)(LPVOID)&statusStruct);
-
- m_frameRate = ((double)statusStruct.dwReturn) / 1000;
-
- statusStruct.dwItem = MCI_DGV_STATUS_BITSPERSAMPLE;
- mciSendCommand(m_internal->m_dev_id, MCI_STATUS, MCI_STATUS_ITEM,
- (DWORD)(LPVOID)&statusStruct);
- m_bps = statusStruct.dwReturn;
-
-}
-
-bool wxVideoWindows::Pause()
-{
- if (m_paused || m_stopped)
- return true;
- m_paused = true;
- return (mciSendCommand(m_internal->m_dev_id, MCI_PAUSE, MCI_WAIT, 0) == 0);
-}
-
-bool wxVideoWindows::Resume()
-{
- if (!m_paused || m_stopped)
- return true;
- m_paused = false;
- return (mciSendCommand(m_internal->m_dev_id, MCI_RESUME, 0, 0) == 0);
-}
-
-bool wxVideoWindows::IsPaused() const
-{
- return m_paused;
-}
-
-bool wxVideoWindows::IsStopped() const
-{
- return m_stopped;
-}
-
-bool wxVideoWindows::GetSize(wxSize& size) const
-{
- size.SetWidth(200);
- size.SetHeight(200);
- return true;
-}
-
-bool wxVideoWindows::SetSize(wxSize WXUNUSED(size))
-{
- return true;
-}
-
-bool wxVideoWindows::IsCapable(wxVideoType v_type) const
-{
- return (v_type == wxVIDEO_MSAVI);
-}
-
-bool wxVideoWindows::AttachOutput(wxWindow& output)
-{
- MCI_DGV_WINDOW_PARMS win_struct;
-
- if (!wxVideoBaseDriver::AttachOutput(output))
- return false;
-
- win_struct.hWnd = (HWND)output.GetHWND();
- mciSendCommand(m_internal->m_dev_id, MCI_WINDOW,
- MCI_DGV_WINDOW_HWND, (DWORD)(LPVOID)&win_struct);
- return true;
-}
-
-void wxVideoWindows::DetachOutput()
-{
- MCI_DGV_WINDOW_PARMS win_struct;
-
- wxVideoBaseDriver::DetachOutput();
-
- win_struct.hWnd = 0;
- mciSendCommand(m_internal->m_dev_id, MCI_WINDOW,
- MCI_DGV_WINDOW_HWND, (DWORD)(LPVOID)&win_struct);
-}
-
-bool wxVideoWindows::Play()
-{
- if (!m_stopped)
- return false;
- m_stopped = false;
- return (mciSendCommand(m_internal->m_dev_id, MCI_PLAY, 0, NULL) == 0);
-}
-
-bool wxVideoWindows::Stop()
-{
- MCI_SEEK_PARMS seekStruct;
-
- if (m_stopped)
- return false;
- m_stopped = true;
- if (::mciSendCommand(m_internal->m_dev_id, MCI_STOP, MCI_WAIT, NULL) != 0)
- return false;
-
- seekStruct.dwCallback = 0;
- seekStruct.dwTo = 0;
- return (::mciSendCommand(m_internal->m_dev_id, MCI_SEEK, MCI_SEEK_TO_START|MCI_WAIT, (DWORD)(LPVOID)&seekStruct) == 0);
-}
-
-// TODO TODO
-// I hate windows :-(. The doc says MCI_STATUS should return all info I want but when I call it
-// it returns to me with an UNSUPPORTED_FUNCTION error. I will have to do all by myself. Grrrr !
-
-wxString wxVideoWindows::GetMovieCodec() const
-{
- return wxT("No info");
-}
-
-wxString wxVideoWindows::GetAudioCodec() const
-{
- return wxT("No info");
-}
-
-wxUint32 wxVideoWindows::GetSampleRate() const
-{
- return 22500;
-}
-
-wxUint8 wxVideoWindows::GetChannels() const
-{
- return 1;
-}
-
-wxUint8 wxVideoWindows::GetBPS() const
-{
- return m_bps;
-}
-
-double wxVideoWindows::GetFrameRate() const
-{
- return m_frameRate;
-}
-
-wxUint32 wxVideoWindows::GetNbFrames() const
-{
- return 0;
-}
-
-#endif
- // __WINDOWS__
diff --git a/contrib/src/mmedia/vidxanm.cpp b/contrib/src/mmedia/vidxanm.cpp
deleted file mode 100644
index 9dd6965577..0000000000
--- a/contrib/src/mmedia/vidxanm.cpp
+++ /dev/null
@@ -1,511 +0,0 @@
-// -------------------------------------------------------------------------
-// Name: vidxanm.cpp
-// Purpose: wxMMedia
-// Author: Guilhem Lavaux
-// Created: 1997
-// Updated: 1998
-// Copyright: (C) 1997, 1998, 1999 Guilhem Lavaux
-// License: wxWindows license
-// -------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#ifdef __WXGTK__
-// Pizza !
-#include "wx/gtk/win_gtk.h"
-#endif
-
-#include
-#include
-#ifdef __WXGTK__
-#include
-#include
-#include
-#include
-#include
-#endif
-
-#include "wx/filefn.h"
-#include "wx/wfstream.h"
-#include "wx/datstrm.h"
-#include "wx/tokenzr.h"
-
-#define WXMMEDIA_INTERNAL
-#include "wx/mmedia/vidbase.h"
-#include "wx/mmedia/vidxanm.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxVideoXANIM, wxVideoBaseDriver)
-
-// -------------------------------------------------------------------------
-// End process detector
-
-class wxVideoXANIMProcess: public wxProcess {
-public:
- wxVideoXANIMProcess(wxVideoXANIM *xanim);
-
- void OnTerminate(int pid, int status);
-
-protected:
- wxVideoXANIM *m_vid_xanim;
-};
-
-class wxVideoXANIMOutput: public wxProcess {
-public:
- wxVideoXANIMOutput();
-
- void OnTerminate(int pid, int status);
-
- bool IsTerminated() const;
-protected:
- bool m_terminated;
-};
-
-// -------------------------------------------------------------------------
-// XAnim video driver (process handling implementation)
-
-wxVideoXANIMProcess::wxVideoXANIMProcess(wxVideoXANIM *xanim)
-{
- m_vid_xanim = xanim;
-}
-
-void wxVideoXANIMProcess::OnTerminate(int WXUNUSED(pid), int WXUNUSED(status))
-{
- m_vid_xanim->m_xanim_started = false;
- m_vid_xanim->OnFinished();
-}
-
-wxVideoXANIMOutput::wxVideoXANIMOutput()
- : wxProcess(NULL, wxID_ANY)
-{
- m_terminated = false;
- Redirect();
-}
-
-bool wxVideoXANIMOutput::IsTerminated() const
-{
- return m_terminated;
-}
-
-void wxVideoXANIMOutput::OnTerminate(int pid, int status)
-{
- m_terminated = true;
-}
-
-// -------------------------------------------------------------------------
-// XAnim video driver (implementation)
-
-wxVideoXANIM::wxVideoXANIM()
- : wxVideoBaseDriver()
-{
- m_internal = new wxXANIMinternal;
- m_xanim_detector = new wxVideoXANIMProcess(this);
- m_xanim_started = false;
- m_paused = false;
- m_filename = wxEmptyString;
- m_remove_file = false;
-}
-
-wxVideoXANIM::wxVideoXANIM(wxInputStream& str)
- : wxVideoBaseDriver(str)
-{
- m_internal = new wxXANIMinternal;
- m_xanim_detector = new wxVideoXANIMProcess(this);
- m_xanim_started = false;
- m_paused = false;
- m_size[0] = 0;
- m_size[1] = 0;
-
- m_filename = wxGetTempFileName(_T("vidxa"));
- m_remove_file = true;
- wxFileOutputStream fout(m_filename);
-
- fout << str;
-
- CollectInfo();
-}
-
-wxVideoXANIM::wxVideoXANIM(const wxString& filename)
-{
- m_internal = new wxXANIMinternal;
- m_xanim_detector = new wxVideoXANIMProcess(this);
- m_xanim_started = false;
- m_paused = false;
-
- m_filename = filename;
- m_remove_file = false;
- m_size[0] = 0;
- m_size[1] = 0;
-
- CollectInfo();
-}
-
-wxVideoXANIM::~wxVideoXANIM()
-{
- if (m_xanim_started)
- Stop();
- delete m_internal;
- delete m_xanim_detector;
-
- if (m_remove_file)
- wxRemoveFile(m_filename);
-}
-
-// -------------------------------------------------------------------------
-// Movie controller
-
-bool wxVideoXANIM::Play()
-{
- if (!m_paused && m_xanim_started)
- return true;
- if (!m_video_output) {
- wxVideoCreateFrame(this);
- return true;
- }
-
- // The movie starts with xanim
- if (RestartXANIM()) {
- m_paused = false;
- return true;
- }
- return false;
-}
-
-bool wxVideoXANIM::Pause()
-{
- if (!m_paused && SendCommand(" ")) {
- m_paused = true;
- return true;
- }
- return false;
-}
-
-bool wxVideoXANIM::Resume()
-{
- if (m_paused && SendCommand(" ")) {
- m_paused = false;
- return true;
- }
- return false;
-}
-
-bool wxVideoXANIM::Stop()
-{
- if (!m_xanim_started)
- return false;
-
- SendCommand("q");
-
- // We are waiting for the termination of the subprocess.
- while (m_xanim_started) {
- wxYield();
- }
-
- m_paused = false;
-
- return true;
-}
-
-// -------------------------------------------------------------------------
-// Movie size controller
-
-bool wxVideoXANIM::SetSize(wxSize size)
-{
- if (!m_video_output)
- return false;
-
- m_video_output->SetSize(size.GetWidth(), size.GetHeight());
- return false;
-}
-
-bool wxVideoXANIM::GetSize(wxSize& size) const
-{
- if (m_size[0] == 0)
- return false;
- size.Set(m_size[0], m_size[1]);
- return true;
-}
-
-// -------------------------------------------------------------------------
-// Capabilities of XAnim
-
-bool wxVideoXANIM::IsCapable(wxVideoType v_type) const
-{
- if (v_type == wxVIDEO_MSAVI || v_type == wxVIDEO_MPEG ||
- v_type == wxVIDEO_QT || v_type == wxVIDEO_GIF || v_type == wxVIDEO_JMOV ||
- v_type == wxVIDEO_FLI || v_type == wxVIDEO_IFF || v_type == wxVIDEO_SGI)
- return true;
- else
- return false;
-}
-
-// -------------------------------------------------------------------------
-// Movie state
-
-wxString wxVideoXANIM::GetMovieCodec() const
-{
- if (m_size[0] == 0)
- return wxT("");
- return m_movieCodec;
-}
-
-wxString wxVideoXANIM::GetAudioCodec() const
-{
- if (m_size[0] == 0)
- return wxT("");
- return m_audioCodec;
-}
-
-wxUint32 wxVideoXANIM::GetSampleRate() const
-{
- if (m_size[0] == 0)
- return 0;
- return m_sampleRate;
-}
-
-wxUint8 wxVideoXANIM::GetChannels() const
-{
- if (m_size[0] == 0)
- return 0;
- return m_channels;
-}
-
-wxUint8 wxVideoXANIM::GetBPS() const
-{
- if (m_size[0] == 0)
- return 0;
- return m_bps;
-}
-
-double wxVideoXANIM::GetFrameRate() const
-{
- if (m_size[0] == 0)
- return 0.0;
- return m_frameRate;
-}
-
-wxUint32 wxVideoXANIM::GetNbFrames() const
-{
- if (m_size[0] == 0)
- return 0;
- return m_frames;
-}
-
-
-bool wxVideoXANIM::IsPaused() const
-{
- return m_paused;
-}
-
-bool wxVideoXANIM::IsStopped() const
-{
- return !m_xanim_started;
-}
-
-// -------------------------------------------------------------------------
-// Output management
-
-bool wxVideoXANIM::AttachOutput(wxWindow& out)
-{
- if (!wxVideoBaseDriver::AttachOutput(out))
- return false;
-
- return true;
-}
-
-void wxVideoXANIM::DetachOutput()
-{
- SendCommand("q");
- m_xanim_started = false;
- m_paused = false;
-
- wxVideoBaseDriver::DetachOutput();
-}
-
-// -------------------------------------------------------------------------
-// Lowlevel XAnim controller
-
-bool wxVideoXANIM::SendCommand(const char *command, char **ret,
- wxUint32 *size)
-{
- if (!m_xanim_started)
- if (!RestartXANIM())
- return false;
-
- // Send a command to XAnim through X11 Property
- XChangeProperty(m_internal->xanim_dpy, m_internal->xanim_window,
- m_internal->xanim_atom,
- XA_STRING, 8, PropModeReplace, (unsigned char *)command,
- strlen(command));
- XFlush(m_internal->xanim_dpy);
- if (ret) {
- int prop_format;
- Atom prop_type;
- unsigned long extra;
-
- XGetWindowProperty(m_internal->xanim_dpy, m_internal->xanim_window,
- m_internal->xanim_ret, 0, 16, True, AnyPropertyType,
- &prop_type, &prop_format, (unsigned long *)size,
- &extra, (unsigned char **)ret);
- }
- return true;
-}
-
-bool wxVideoXANIM::CollectInfo()
-{
- wxVideoXANIMOutput *xanimProcess;
- wxString xanim_command;
- wxStringTokenizer tokenizer;
-
- xanimProcess = new wxVideoXANIMOutput;
- xanim_command = wxT("xanim +v +Zv -Ae ");
- xanim_command += m_filename;
- if (!wxExecute(xanim_command, false, xanimProcess))
- return false;
-
- wxInputStream *infoStream = xanimProcess->GetInputStream();
- wxString totalOutput;
-
- while (infoStream->GetLastError() == wxSTREAM_NO_ERROR) {
- char line[100];
-
- infoStream->Read(line, sizeof(line)-1);
- if (infoStream->LastRead() == 0)
- break;
-
- line[infoStream->LastRead()] = 0;
-
- totalOutput += wxString::FromAscii(line);
- }
-
- // This is good for everything ... :-)
- int position = totalOutput.Find(wxT("Video Codec:"));
-
- totalOutput.Remove(0, position+13);
-
- position = totalOutput.Find(wxT("depth="));
- m_movieCodec = totalOutput(0, position);
-
- totalOutput.Remove(0, position);
- tokenizer.SetString(totalOutput, wxT("\n\r"));
-
- // the rest of the line
- wxString token = tokenizer.GetNextToken();
- unsigned long my_long;
-
-#define GETINT(i) \
-totalOutput.ToULong(&my_long); \
-i = my_long;
-
- // 'Audio Codec:'
- totalOutput = tokenizer.GetString();
- totalOutput.Remove(0, totalOutput.Find(wxT(":"))+2);
-
- position = totalOutput.Find(wxT("Rate"));
- m_audioCodec = totalOutput(0, position-1);
-
- // 'Rate='
- totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
- GETINT(m_sampleRate);
- // 'Chans='
- totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
- GETINT(m_channels);
- // 'Bps='
- totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
- GETINT(m_bps);
- // 'Frame Stats:'
- tokenizer.Reinit(totalOutput);
- tokenizer.GetNextToken();
- totalOutput = tokenizer.GetString();
- totalOutput.Remove(0, totalOutput.Find(wxT(":"))+2);
- // 'Size='
- totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
- GETINT(m_size[0]);
- // 'x'
- totalOutput.Remove(0,1);
- GETINT(m_size[1]);
- // 'Frames='
- totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
- GETINT(m_frames);
- // 'avfps='
- totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
- totalOutput.ToDouble(&m_frameRate);
-
- // We wait for the conclusion
- while (!xanimProcess->IsTerminated())
- wxYield();
-
- delete xanimProcess;
-
- return true;
-}
-
-bool wxVideoXANIM::RestartXANIM()
-{
- wxString xanim_command;
- int ret;
- Atom prop_type;
- int prop_format;
- unsigned long nitems;
- unsigned long extra;
- char prop[4];
- bool xanim_chg_size;
-
- if (!m_video_output || m_xanim_started)
- return false;
-
- // Check if we can change the size of the window dynamicly
- xanim_chg_size = true;
- // Get current display
-#ifdef __WXGTK__
- m_internal->xanim_dpy = gdk_display;
- GtkPizza *pizza = GTK_PIZZA( m_video_output->m_wxwindow );
- GdkWindow *window = pizza->bin_window;
-
- m_internal->xanim_window = GDK_WINDOW_XWINDOW(window);
-#endif
- // Get the XANIM atom
- m_internal->xanim_atom = XInternAtom(m_internal->xanim_dpy,
- "XANIM_PROPERTY", False);
-
- // Build the command
- xanim_command.Printf(
- wxT("xanim -Zr +Ze +Sr +f +W%d +f +q +Av70 %s %s"),
- (int)m_internal->xanim_window,
- (xanim_chg_size) ? _T("") : _T(""), // ??? why ???
- WXSTRINGCAST m_filename);
-
- // Execute it
- if (!wxExecute(xanim_command, false, m_xanim_detector))
- return false;
-
- // Wait for XAnim to be ready
- nitems = 0;
- m_xanim_started = true;
- while (nitems == 0 && m_xanim_started) {
- ret = XGetWindowProperty(m_internal->xanim_dpy, m_internal->xanim_window,
- m_internal->xanim_atom,
- 0, 4, False, AnyPropertyType, &prop_type,
- &prop_format, &nitems, &extra,
- (unsigned char **)&prop);
- wxYield();
- }
-
- wxSize vibrato_size;
-
- vibrato_size = m_video_output->GetSize();
-
- vibrato_size.SetWidth(vibrato_size.GetWidth()+1);
- m_video_output->SetSize(vibrato_size);
- vibrato_size.SetWidth(vibrato_size.GetWidth()-1);
- m_video_output->SetSize(vibrato_size);
- // Very useful ! Actually it "should" sends a SETSIZE event to XAnim
- // FIXME: This event is not sent !!
-
- m_paused = false;
-
- return true;
-}
diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in
deleted file mode 100644
index e7ea259f0f..0000000000
--- a/contrib/src/net/Makefile.in
+++ /dev/null
@@ -1,307 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-LIBEXT = @LIBEXT@
-LIBPREFIX = @LIBPREFIX@
-SO_SUFFIX = @SO_SUFFIX@
-DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
-LN_S = @LN_S@
-WINDRES = @WINDRES@
-PIC_FLAG = @PIC_FLAG@
-SONAME_FLAG = @SONAME_FLAG@
-STRIP = @STRIP@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = @INSTALL_DIR@
-BK_DEPS = @BK_DEPS@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-libdir = @libdir@
-includedir = @includedir@
-DLLPREFIX = @DLLPREFIX@
-LIBS = @LIBS@
-AR = @AR@
-AROPTIONS = @AROPTIONS@
-RANLIB = @RANLIB@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-VENDOR = @VENDOR@
-WX_FLAVOUR = @WX_FLAVOUR@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-NETUTILSDLL_CXXFLAGS = $(__netutilsdll_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
- -DWXMAKINGDLL_NETUTILS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-NETUTILSDLL_OBJECTS = \
- $(__netutilsdll___win32rc) \
- netutilsdll_email.o \
- netutilsdll_smapi.o \
- netutilsdll_web.o
-NETUTILSDLL_ODEP = $(___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname)
-NETUTILSLIB_CXXFLAGS = $(__netutilslib_PCH_INC) -D__WX$(TOOLKIT)__ \
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-NETUTILSLIB_OBJECTS = \
- netutilslib_email.o \
- netutilslib_smapi.o \
- netutilslib_web.o
-NETUTILSLIB_ODEP = $(___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
-@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-COND_SHARED_1___netutilsdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
-@COND_SHARED_1@__netutilsdll___depname = $(COND_SHARED_1___netutilsdll___depname)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-@COND_SHARED_1@__install_netutilsdll___depname = install_netutilsdll
-@COND_SHARED_1@__uninstall_netutilsdll___depname = uninstall_netutilsdll
-COND_PLATFORM_MACOSX_1___netutilsdll___macinstnamecmd = -install_name \
- $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__netutilsdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___netutilsdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___netutilsdll___importlib = -import \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__netutilsdll___importlib = $(COND_PLATFORM_OS2_1___netutilsdll___importlib)
-COND_WINDOWS_IMPLIB_1___netutilsdll___importlib = \
- -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__netutilsdll___importlib = $(COND_WINDOWS_IMPLIB_1___netutilsdll___importlib)
-@COND_GCC_PCH_1@__netutilsdll_PCH_INC = -I.pch/wxprec_netutilsdll
-@COND_ICC_PCH_1@__netutilsdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_netutilsdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_netutilsdll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__netutilsdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__netutilsdll___targetsuf2 = .$(SO_SUFFIX)
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__netutilsdll___targetsuf3 = .$(SO_SUFFIX)
-COND_USE_SOVERLINUX_1___netutilsdll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__netutilsdll___soname_flags = $(COND_USE_SOVERLINUX_1___netutilsdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__netutilsdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags)
-COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
- -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd = rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_uninst_cmd = rm -f \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__netutilsdll___win32rc = netutilsdll_version_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_SHARED_0___netutilslib___depname = \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__netutilslib___depname = $(COND_SHARED_0___netutilslib___depname)
-@COND_SHARED_0@__install_netutilslib___depname = install_netutilslib
-@COND_SHARED_0@__uninstall_netutilslib___depname = uninstall_netutilslib
-@COND_GCC_PCH_1@__netutilslib_PCH_INC = -I.pch/wxprec_netutilslib
-@COND_ICC_PCH_1@__netutilslib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_netutilslib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_netutilslib/wx/wxprec.h.gch
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-
-### Targets: ###
-
-all: $(__netutilsdll___depname) $(__netutilslib___depname)
-
-install: all $(__install_netutilsdll___depname) $(__install_netutilslib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/net/email.h wx/net/msg.h wx/net/smapi.h wx/net/web.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
- fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-uninstall: $(__uninstall_netutilsdll___depname) $(__uninstall_netutilslib___depname)
- for f in wx/net/email.h wx/net/msg.h wx/net/smapi.h wx/net/web.h; do \
- rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-install-strip: install
- $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(NETUTILSDLL_OBJECTS) $(__netutilsdll___win32rc)
-@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
-@COND_SHARED_1@
-@COND_SHARED_1@ $(__netutilsdll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_netutilsdll:
-@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netutilsdll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_netutilsdll:
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netutilsdll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_netutilsdll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_netutilsdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(NETUTILSLIB_OBJECTS)
-@COND_SHARED_0@ rm -f $@
-@COND_SHARED_0@ $(AR) $(AROPTIONS) $@ $(NETUTILSLIB_OBJECTS)
-@COND_SHARED_0@ $(RANLIB) $@
-
-@COND_SHARED_0@install_netutilslib:
-@COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_netutilslib:
-@COND_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_netutilslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSLIB_CXXFLAGS)
-
-netutilsdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(NETUTILSDLL_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-netutilsdll_email.o: $(srcdir)/email.cpp $(NETUTILSDLL_ODEP)
- $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(srcdir)/email.cpp
-
-netutilsdll_smapi.o: $(srcdir)/smapi.cpp $(NETUTILSDLL_ODEP)
- $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(srcdir)/smapi.cpp
-
-netutilsdll_web.o: $(srcdir)/web.cpp $(NETUTILSDLL_ODEP)
- $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(srcdir)/web.cpp
-
-netutilslib_email.o: $(srcdir)/email.cpp $(NETUTILSLIB_ODEP)
- $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(srcdir)/email.cpp
-
-netutilslib_smapi.o: $(srcdir)/smapi.cpp $(NETUTILSLIB_ODEP)
- $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(srcdir)/smapi.cpp
-
-netutilslib_web.o: $(srcdir)/web.cpp $(NETUTILSLIB_ODEP)
- $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(srcdir)/web.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_netutilsdll uninstall_netutilsdll install_netutilslib uninstall_netutilslib
diff --git a/contrib/src/net/email.cpp b/contrib/src/net/email.cpp
deleted file mode 100644
index 7ca1633ab7..0000000000
--- a/contrib/src/net/email.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: email.h
-// Purpose: wxEmail: portable email client class
-// Author: Julian Smart
-// Modified by:
-// Created: 2001-08-21
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/string.h"
-#include "wx/net/email.h"
-
-#ifdef __WXMSW__
-#include "wx/net/smapi.h"
-#endif
-
-#ifdef __UNIX__
-#include "wx/filefn.h"
-#include "wx/timer.h"
-#include "wx/wfstream.h"
-#include "stdlib.h"
-#include "unistd.h"
-#endif
-
-// Send a message.
-// Specify profile, or leave it to wxWidgets to find the current user name
-
-#ifdef __WXMSW__
-bool wxEmail::Send(wxMailMessage& message, const wxString& profileName, const wxString& WXUNUSED(sendMail))
-{
- wxASSERT (message.m_to.GetCount() > 0) ;
-
- wxString profile(profileName);
- if (profile.IsEmpty())
- profile = wxGetUserName();
-
- wxMapiSession session;
-
- if (!session.MapiInstalled())
- return FALSE;
- if (!session.Logon(profile))
- return FALSE;
-
- return session.Send(message);
-}
-#elif defined(__UNIX__)
-bool
-wxEmail::Send(wxMailMessage& message,
- const wxString& profileName,
- const wxString& sendMail)
-{
- wxASSERT_MSG( !message.m_to.IsEmpty(), _T("no recipients to send mail to") ) ;
-
-
- // The 'from' field is optionally supplied by the app; it's not needed
- // by MAPI, and on Unix, will be guessed if not supplied.
- wxString from = message.m_from;
- if ( from.empty() )
- {
- from = wxGetEmailAddress();
- }
-
- wxString msg;
- msg << wxT("To: ");
-
- const size_t rcptCount = message.m_to.GetCount();
- for (size_t rcpt = 0; rcpt < rcptCount; rcpt++)
- {
- if ( rcpt )
- msg << wxT(", ");
- msg << message.m_to[rcpt];
- }
-
- msg << wxT("\nFrom: ") << from << wxT("\nSubject: ") << message.m_subject;
- msg << wxT("\n\n") << message.m_body;
-
- wxString filename;
- filename.Printf(wxT("/tmp/msg-%ld-%ld-%ld.txt"), (long) getpid(), wxGetLocalTime(),
- (long) rand());
-
- {
- wxFileOutputStream stream(filename);
- if (stream.Ok())
- {
- stream.Write(msg, msg.Length());
- }
- else
- {
- return FALSE ;
- }
- }
-
- // TODO search for a suitable sendmail if sendMail is empty
- wxString sendmail(sendMail);
-
- wxString cmd;
- cmd << sendmail << wxT(" < ") << filename;
-
- // TODO: check return code
- wxSystem(cmd.c_str());
-
- wxRemoveFile(filename);
-
- return TRUE;
-}
-#else
-#error Send not yet implemented for this platform.
-#endif
-
diff --git a/contrib/src/net/readme.txt b/contrib/src/net/readme.txt
deleted file mode 100644
index 1fb7e4f43e..0000000000
--- a/contrib/src/net/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Net library
-===========
-
-This is a library of email and other Internet-related functionality.
-
-wxMailMessage Populate this before sending a message
-wxMapiSession Encapsulates Simple MAPI functionality on Windows
-wxEmail Platform-independent mail functions, such as Send
-wxWeb Platform-independent web functions, such as OpenURL
-
diff --git a/contrib/src/net/smapi.cpp b/contrib/src/net/smapi.cpp
deleted file mode 100644
index d5db18bf06..0000000000
--- a/contrib/src/net/smapi.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: smapi.cpp
-// Purpose: Simple MAPI classes
-// Author: PJ Naughter
-// Modified by: Julian Smart
-// Created: 2001-08-21
-// RCS-ID: $Id$
-// Copyright: (c) PJ Naughter
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifdef __WXMSW__
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/string.h"
-#include "wx/msw/private.h"
-
-// mapi.h in Cygwin's include directory isn't a full implementation and is
-// not sufficient for this lib. However recent versions of Cygwin also
-// have another mapi.h in include/w32api which can be used.
-//
-#ifdef __CYGWIN__
-#include
-#else
-#include
-#endif
-
-#include "wx/net/smapi.h"
-
-class WXDLLIMPEXP_NETUTILS wxMapiData
-{
-public:
- wxMapiData()
- {
- m_hSession = 0;
- m_nLastError = 0;
- m_hMapi = NULL;
- m_lpfnMAPILogon = NULL;
- m_lpfnMAPILogoff = NULL;
- m_lpfnMAPISendMail = NULL;
- m_lpfnMAPIResolveName = NULL;
- m_lpfnMAPIFreeBuffer = NULL;
- }
-
- //Data
- LHANDLE m_hSession; //Mapi Session handle
- long m_nLastError; //Last Mapi error value
- HINSTANCE m_hMapi; //Instance handle of the MAPI dll
- LPMAPILOGON m_lpfnMAPILogon; //MAPILogon function pointer
- LPMAPILOGOFF m_lpfnMAPILogoff; //MAPILogoff function pointer
- LPMAPISENDMAIL m_lpfnMAPISendMail; //MAPISendMail function pointer
- LPMAPIRESOLVENAME m_lpfnMAPIResolveName; //MAPIResolveName function pointer
- LPMAPIFREEBUFFER m_lpfnMAPIFreeBuffer; //MAPIFreeBuffer function pointer
-};
-
-
-////////////////////////////////// Implementation /////////////////////////////
-
-wxMapiSession::wxMapiSession()
-{
- m_data = new wxMapiData;
-
- Initialise();
-}
-
-wxMapiSession::~wxMapiSession()
-{
- //Logoff if logged on
- Logoff();
-
- //Unload the MAPI dll
- Deinitialise();
-
- delete m_data;
-}
-
-void wxMapiSession::Initialise()
-{
- //First make sure the "WIN.INI" entry for MAPI is present aswell
- //as the MAPI32 dll being present on the system
- bool bMapiInstalled = (GetProfileInt(_T("MAIL"), _T("MAPI"), 0) != 0) &&
- (SearchPath(NULL, _T("MAPI32.DLL"), NULL, 0, NULL, NULL) != 0);
-
- if (bMapiInstalled)
- {
- //Load up the MAPI dll and get the function pointers we are interested in
- m_data->m_hMapi = ::LoadLibrary(_T("MAPI32.DLL"));
- if (m_data->m_hMapi)
- {
- m_data->m_lpfnMAPILogon = (LPMAPILOGON) GetProcAddress(m_data->m_hMapi, "MAPILogon");
- m_data->m_lpfnMAPILogoff = (LPMAPILOGOFF) GetProcAddress(m_data->m_hMapi, "MAPILogoff");
- m_data->m_lpfnMAPISendMail = (LPMAPISENDMAIL) GetProcAddress(m_data->m_hMapi, "MAPISendMail");
- m_data->m_lpfnMAPIResolveName = (LPMAPIRESOLVENAME) GetProcAddress(m_data->m_hMapi, "MAPIResolveName");
- m_data->m_lpfnMAPIFreeBuffer = (LPMAPIFREEBUFFER) GetProcAddress(m_data->m_hMapi, "MAPIFreeBuffer");
-
- //If any of the functions are not installed then fail the load
- if (m_data->m_lpfnMAPILogon == NULL ||
- m_data->m_lpfnMAPILogoff == NULL ||
- m_data->m_lpfnMAPISendMail == NULL ||
- m_data->m_lpfnMAPIResolveName == NULL ||
- m_data->m_lpfnMAPIFreeBuffer == NULL)
- {
- wxLogDebug(_T("Failed to get one of the functions pointer in MAPI32.DLL\n"));
- Deinitialise();
- }
- }
- }
- else
- wxLogDebug(_T("Mapi is not installed on this computer\n"));
-}
-
-void wxMapiSession::Deinitialise()
-{
- if (m_data->m_hMapi)
- {
- //Unload the MAPI dll and reset the function pointers to NULL
- FreeLibrary(m_data->m_hMapi);
- m_data->m_hMapi = NULL;
- m_data->m_lpfnMAPILogon = NULL;
- m_data->m_lpfnMAPILogoff = NULL;
- m_data->m_lpfnMAPISendMail = NULL;
- m_data->m_lpfnMAPIResolveName = NULL;
- m_data->m_lpfnMAPIFreeBuffer = NULL;
- }
-}
-
-bool wxMapiSession::Logon(const wxString& sProfileName, const wxString& sPassword, wxWindow* pParentWnd)
-{
- wxASSERT(MapiInstalled()); //MAPI must be installed
- wxASSERT(m_data->m_lpfnMAPILogon); //Function pointer must be valid
-
- //Initialise the function return value
- bool bSuccess = FALSE;
-
- //Just in case we are already logged in
- Logoff();
-
- //Setup the ascii versions of the profile name and password
- int nProfileLength = sProfileName.Length();
-
- LPSTR pszProfileName = NULL;
- LPSTR pszPassword = NULL;
- wxCharBuffer cbProfile(1),cbPassword(1);
- if (nProfileLength)
- {
-#ifndef UNICODE
- pszProfileName = (LPSTR) sProfileName.c_str();
- pszPassword = (LPSTR) sPassword.c_str();
-#else
- cbProfile = sProfileName.mb_str();
- cbPassword = sPassword.mb_str();
- pszProfileName = cbProfile.data();
- pszPassword = cbPassword.data();
-#endif
- }
-
- //Setup the flags & UIParam parameters used in the MapiLogon call
- FLAGS flags = 0;
- ULONG nUIParam = 0;
- if (nProfileLength == 0)
- {
- //No profile name given, then we must interactively request a profile name
- if (pParentWnd)
- {
- nUIParam = (ULONG) (HWND) pParentWnd->GetHWND();
- flags |= MAPI_LOGON_UI;
- }
- else
- {
- //No window given, just use the main window of the app as the parent window
- if (wxTheApp->GetTopWindow())
- {
- nUIParam = (ULONG) (HWND) wxTheApp->GetTopWindow()->GetHWND();
- flags |= MAPI_LOGON_UI;
- }
- }
- }
-
- //First try to acquire a new MAPI session using the supplied settings using the MAPILogon functio
- ULONG nError = m_data->m_lpfnMAPILogon(nUIParam, pszProfileName, pszPassword, flags | MAPI_NEW_SESSION, 0, &m_data->m_hSession);
- if (nError != SUCCESS_SUCCESS && nError != MAPI_E_USER_ABORT)
- {
- //Failed to create a create mapi session, try to acquire a shared mapi session
- wxLogDebug(_T("Failed to logon to MAPI using a new session, trying to acquire a shared one\n"));
- nError = m_data->m_lpfnMAPILogon(nUIParam, NULL, NULL, 0, 0, &m_data->m_hSession);
- if (nError == SUCCESS_SUCCESS)
- {
- m_data->m_nLastError = SUCCESS_SUCCESS;
- bSuccess = TRUE;
- }
- else
- {
- wxLogDebug(_T("Failed to logon to MAPI using a shared session, Error:%ld\n"), nError);
- m_data->m_nLastError = nError;
- }
- }
- else if (nError == SUCCESS_SUCCESS)
- {
- m_data->m_nLastError = SUCCESS_SUCCESS;
- bSuccess = TRUE;
- }
-
- return bSuccess;
-}
-
-bool wxMapiSession::LoggedOn() const
-{
- return (m_data->m_hSession != 0);
-}
-
-bool wxMapiSession::MapiInstalled() const
-{
- return (m_data->m_hMapi != NULL);
-}
-
-bool wxMapiSession::Logoff()
-{
- wxASSERT(MapiInstalled()); //MAPI must be installed
- wxASSERT(m_data->m_lpfnMAPILogoff); //Function pointer must be valid
-
- //Initialise the function return value
- bool bSuccess = FALSE;
-
- if (m_data->m_hSession)
- {
- //Call the MAPILogoff function
- ULONG nError = m_data->m_lpfnMAPILogoff(m_data->m_hSession, 0, 0, 0);
- if (nError != SUCCESS_SUCCESS)
- {
- wxLogDebug(_T("Failed in call to MapiLogoff, Error:%ld"), nError);
- m_data->m_nLastError = nError;
- bSuccess = TRUE;
- }
- else
- {
- m_data->m_nLastError = SUCCESS_SUCCESS;
- bSuccess = TRUE;
- }
- m_data->m_hSession = 0;
- }
-
- return bSuccess;
-}
-
-bool wxMapiSession::Resolve(const wxString& sName, void* lppRecip1)
-{
- lpMapiRecipDesc* lppRecip = (lpMapiRecipDesc*) lppRecip1;
-
- wxASSERT(MapiInstalled()); //MAPI must be installed
- wxASSERT(m_data->m_lpfnMAPIResolveName); //Function pointer must be valid
- wxASSERT(LoggedOn()); //Must be logged on to MAPI
- wxASSERT(m_data->m_hSession); //MAPI session handle must be valid
-
- //Call the MAPIResolveName function
-#ifndef UNICODE
- LPSTR lpszAsciiName = (LPSTR) sName.c_str();
-#else
- wxCharBuffer cbName(1);
- cbName = sName.mb_str();
- LPSTR lpszAsciiName = cbName.data();
-#endif
- ULONG nError = m_data->m_lpfnMAPIResolveName(m_data->m_hSession, 0, lpszAsciiName, 0, 0, lppRecip);
- if (nError != SUCCESS_SUCCESS)
- {
- wxLogDebug(_T("Failed to resolve the name: %s, Error:%ld\n"),
- sName.c_str(), nError);
- m_data->m_nLastError = nError;
- }
-
- return (nError == SUCCESS_SUCCESS);
-}
-
-bool wxMapiSession::Send(wxMailMessage& message)
-{
- wxASSERT(MapiInstalled()); //MAPI must be installed
- wxASSERT(m_data->m_lpfnMAPISendMail); //Function pointer must be valid
- wxASSERT(m_data->m_lpfnMAPIFreeBuffer); //Function pointer must be valid
- wxASSERT(LoggedOn()); //Must be logged on to MAPI
- wxASSERT(m_data->m_hSession); //MAPI session handle must be valid
-
- //Initialise the function return value
- bool bSuccess = FALSE;
-
- //Create the MapiMessage structure to match the message parameter send into us
- MapiMessage mapiMessage;
- ZeroMemory(&mapiMessage, sizeof(mapiMessage));
-#ifndef UNICODE
- mapiMessage.lpszSubject = (LPSTR) message.m_subject.c_str();
- mapiMessage.lpszNoteText = (LPSTR) message.m_body.c_str();
-#else
- wxCharBuffer cbSubject(1),cbBody(1),cbOriginator(1);
- cbSubject = message.m_subject.mb_str();
- cbBody = message.m_body.mb_str();
- mapiMessage.lpszSubject = cbSubject.data();
- mapiMessage.lpszNoteText = cbBody.data();
-#endif
- mapiMessage.nRecipCount = message.m_to.GetCount() + message.m_cc.GetCount() + message.m_bcc.GetCount();
- wxASSERT(mapiMessage.nRecipCount); //Must have at least 1 recipient!
-
- //Allocate the recipients array
- mapiMessage.lpRecips = new MapiRecipDesc[mapiMessage.nRecipCount];
-
- // If we have a 'From' field, use it
- if (!message.m_from.IsEmpty())
- {
- mapiMessage.lpOriginator = new MapiRecipDesc;
- ZeroMemory(mapiMessage.lpOriginator, sizeof(MapiRecipDesc));
-
- mapiMessage.lpOriginator->ulRecipClass = MAPI_ORIG;
- // TODO Do we have to call Resolve?
-#ifndef UNICODE
- mapiMessage.lpOriginator->lpszName = (LPSTR) message.m_from.c_str();
-#else
- cbOriginator = message.m_from.mb_str();
- mapiMessage.lpOriginator->lpszName = cbOriginator.data();
-#endif
- }
-
- //Setup the "To" recipients
- int nRecipIndex = 0;
- int nToSize = message.m_to.GetCount();
- int i;
- for (i=0; ilpszName,*wxConvCurrent);
-
- //Don't forget to free up the memory MAPI allocated for us
- m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
- }
-#ifndef UNICODE
- recip.lpszName = (LPSTR) sName.c_str();
-#else
- recip.lpszName = sName.mb_str().release();
-#endif
-
- ++nRecipIndex;
- }
-
- //Setup the "CC" recipients
- int nCCSize = message.m_cc.GetCount();
- for (i=0; ilpszName,*wxConvCurrent);
-
- //Don't forget to free up the memory MAPI allocated for us
- m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
- }
-#ifndef UNICODE
- recip.lpszName = (LPSTR) sName.c_str();
-#else
- recip.lpszName = sName.mb_str().release();
-#endif
-
- ++nRecipIndex;
- }
-
- //Setup the "BCC" recipients
- int nBCCSize = message.m_bcc.GetCount();
- for (i=0; ilpszName,wxConvCurrent);
-
- //Don't forget to free up the memory MAPI allocated for us
- m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
- }
-#ifndef UNICODE
- recip.lpszName = (LPSTR) sName.c_str();
-#else
- recip.lpszName = sName.mb_str().release();
-#endif
-
- ++nRecipIndex;
- }
-
- //Setup the attachments
- int nAttachmentSize = message.m_attachments.GetCount();
- int nTitleSize = message.m_attachmentTitles.GetCount();
- if (nTitleSize)
- {
- wxASSERT(nTitleSize == nAttachmentSize); //If you are going to set the attachment titles then you must set
- //the attachment title for each attachment
- }
- if (nAttachmentSize)
- {
- mapiMessage.nFileCount = nAttachmentSize;
- mapiMessage.lpFiles = new MapiFileDesc[nAttachmentSize];
- for (i=0; im_lpfnMAPISendMail(m_data->m_hSession, 0, &mapiMessage, MAPI_DIALOG, 0);
- if (nError == SUCCESS_SUCCESS)
- {
- bSuccess = TRUE;
- m_data->m_nLastError = SUCCESS_SUCCESS;
- }
- else
- {
- wxLogDebug(_T("Failed to send mail message, Error:%ld\n"), nError);
- m_data->m_nLastError = nError;
- }
-
- //Tidy up the Attachements
- if (nAttachmentSize)
- {
-#ifdef UNICODE
- for (i = 0;i < nAttachmentSize;i++)
- {
- free(mapiMessage.lpFiles[i].lpszPathName);
- free(mapiMessage.lpFiles[i].lpszFileName);
- }
-#endif
- delete [] mapiMessage.lpFiles;
- }
-
- //Free up the Recipients and Originator memory
-#ifdef UNICODE
- for (i = 0;i < nRecipIndex;i++)
- free(mapiMessage.lpRecips[i].lpszName);
-#endif
- delete [] mapiMessage.lpRecips;
-
- delete mapiMessage.lpOriginator;
-
- return bSuccess;
-}
-
-long wxMapiSession::GetLastError() const
-{
- return m_data->m_nLastError;
-}
-
-#endif // __WXMSW__
diff --git a/contrib/src/net/web.cpp b/contrib/src/net/web.cpp
deleted file mode 100644
index c41593bbd9..0000000000
--- a/contrib/src/net/web.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: web.h
-// Purpose: wxWeb: portable web browser-related class
-// Author: Julian Smart
-// Modified by:
-// Created: 2001-08-21
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/string.h"
-
-
diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in
deleted file mode 100644
index 99df9e56b8..0000000000
--- a/contrib/src/ogl/Makefile.in
+++ /dev/null
@@ -1,378 +0,0 @@
-# =========================================================================
-# This makefile was generated by
-# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-# Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-LIBEXT = @LIBEXT@
-LIBPREFIX = @LIBPREFIX@
-SO_SUFFIX = @SO_SUFFIX@
-DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
-LN_S = @LN_S@
-WINDRES = @WINDRES@
-PIC_FLAG = @PIC_FLAG@
-SONAME_FLAG = @SONAME_FLAG@
-STRIP = @STRIP@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = @INSTALL_DIR@
-BK_DEPS = @BK_DEPS@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-libdir = @libdir@
-includedir = @includedir@
-DLLPREFIX = @DLLPREFIX@
-LIBS = @LIBS@
-AR = @AR@
-AROPTIONS = @AROPTIONS@
-RANLIB = @RANLIB@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-VENDOR = @VENDOR@
-WX_FLAVOUR = @WX_FLAVOUR@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR =
-WX_RELEASE = 2.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(PIC_FLAG) \
- $(CPPFLAGS) $(CXXFLAGS)
-OGLDLL_OBJECTS = \
- $(__ogldll___win32rc) \
- ogldll_basic2.o \
- ogldll_canvas.o \
- ogldll_divided.o \
- ogldll_mfutils.o \
- ogldll_oglmisc.o \
- ogldll_basic.o \
- ogldll_composit.o \
- ogldll_drawn.o \
- ogldll_bmpshape.o \
- ogldll_constrnt.o \
- ogldll_lines.o \
- ogldll_ogldiag.o
-OGLDLL_ODEP = $(___pch_wxprec_ogldll_wx_wxprec_h_gch___depname)
-OGLLIB_CXXFLAGS = $(__ogllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-OGLLIB_OBJECTS = \
- ogllib_basic2.o \
- ogllib_canvas.o \
- ogllib_divided.o \
- ogllib_mfutils.o \
- ogllib_oglmisc.o \
- ogllib_basic.o \
- ogllib_composit.o \
- ogllib_drawn.o \
- ogllib_bmpshape.o \
- ogllib_constrnt.o \
- ogllib_lines.o \
- ogllib_ogldiag.o
-OGLLIB_ODEP = $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
-@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
-COND_SHARED_1___ogldll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
-@COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-@COND_SHARED_1@__install_ogldll___depname = install_ogldll
-@COND_SHARED_1@__uninstall_ogldll___depname = uninstall_ogldll
-COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd = -install_name \
- $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__ogldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd)
-COND_PLATFORM_OS2_1___ogldll___importlib = -import \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__ogldll___importlib = $(COND_PLATFORM_OS2_1___ogldll___importlib)
-COND_WINDOWS_IMPLIB_1___ogldll___importlib = \
- -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__ogldll___importlib = $(COND_WINDOWS_IMPLIB_1___ogldll___importlib)
-@COND_GCC_PCH_1@__ogldll_PCH_INC = -I.pch/wxprec_ogldll
-@COND_ICC_PCH_1@__ogldll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_ogldll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_ogldll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_ogldll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__ogldll___targetsuf2 = .$(SO_SUFFIX)
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__ogldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX)
-COND_USE_SOVERLINUX_1___ogldll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__ogldll___soname_flags = $(COND_USE_SOVERLINUX_1___ogldll___soname_flags)
-COND_USE_SOVERSOLARIS_1___ogldll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__ogldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___ogldll___soname_flags)
-COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd = rm -f \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
- $(LN_S) \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_uninst_cmd = rm -f \
- $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
- $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__ogldll___win32rc = ogldll_version_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
- -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_SHARED_0___ogllib___depname = \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname)
-@COND_SHARED_0@__install_ogllib___depname = install_ogllib
-@COND_SHARED_0@__uninstall_ogllib___depname = uninstall_ogllib
-@COND_GCC_PCH_1@__ogllib_PCH_INC = -I.pch/wxprec_ogllib
-@COND_ICC_PCH_1@__ogllib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@ .pch/wxprec_ogllib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_ogllib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@ = .pch/wxprec_ogllib/wx/wxprec.h.gch
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-
-### Targets: ###
-
-all: $(__ogldll___depname) $(__ogllib___depname)
-
-install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
- fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-uninstall: $(__uninstall_ogldll___depname) $(__uninstall_ogllib___depname)
- for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
- rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
- done
-
-install-strip: install
- $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
- rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
-@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
-@COND_SHARED_1@
-@COND_SHARED_1@ $(__ogldll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_ogldll:
-@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_ogldll:
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
-@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_ogldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(OGLLIB_OBJECTS)
-@COND_SHARED_0@ rm -f $@
-@COND_SHARED_0@ $(AR) $(AROPTIONS) $@ $(OGLLIB_OBJECTS)
-@COND_SHARED_0@ $(RANLIB) $@
-
-@COND_SHARED_0@install_ogllib:
-@COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_ogllib:
-@COND_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch:
-@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS)
-
-ogldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(OGLDLL_ODEP)
- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-ogldll_basic2.o: $(srcdir)/basic2.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/basic2.cpp
-
-ogldll_canvas.o: $(srcdir)/canvas.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/canvas.cpp
-
-ogldll_divided.o: $(srcdir)/divided.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/divided.cpp
-
-ogldll_mfutils.o: $(srcdir)/mfutils.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/mfutils.cpp
-
-ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/oglmisc.cpp
-
-ogldll_basic.o: $(srcdir)/basic.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/basic.cpp
-
-ogldll_composit.o: $(srcdir)/composit.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/composit.cpp
-
-ogldll_drawn.o: $(srcdir)/drawn.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/drawn.cpp
-
-ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/bmpshape.cpp
-
-ogldll_constrnt.o: $(srcdir)/constrnt.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/constrnt.cpp
-
-ogldll_lines.o: $(srcdir)/lines.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/lines.cpp
-
-ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLDLL_ODEP)
- $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/ogldiag.cpp
-
-ogllib_basic2.o: $(srcdir)/basic2.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/basic2.cpp
-
-ogllib_canvas.o: $(srcdir)/canvas.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/canvas.cpp
-
-ogllib_divided.o: $(srcdir)/divided.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/divided.cpp
-
-ogllib_mfutils.o: $(srcdir)/mfutils.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/mfutils.cpp
-
-ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/oglmisc.cpp
-
-ogllib_basic.o: $(srcdir)/basic.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/basic.cpp
-
-ogllib_composit.o: $(srcdir)/composit.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/composit.cpp
-
-ogllib_drawn.o: $(srcdir)/drawn.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/drawn.cpp
-
-ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/bmpshape.cpp
-
-ogllib_constrnt.o: $(srcdir)/constrnt.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/constrnt.cpp
-
-ogllib_lines.o: $(srcdir)/lines.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/lines.cpp
-
-ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLLIB_ODEP)
- $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/ogldiag.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_ogldll uninstall_ogldll install_ogllib uninstall_ogllib
diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
deleted file mode 100644
index ab9c5a8334..0000000000
--- a/contrib/src/ogl/basic.cpp
+++ /dev/null
@@ -1,3286 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: basic.cpp
-// Purpose: Basic OGL classes
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#ifdef new
-#undef new
-#endif
-
-#include
-#include
-
-#include "wx/ogl/ogl.h"
-
-
-// Control point types
-// Rectangle and most other shapes
-#define CONTROL_POINT_VERTICAL 1
-#define CONTROL_POINT_HORIZONTAL 2
-#define CONTROL_POINT_DIAGONAL 3
-
-// Line
-#define CONTROL_POINT_ENDPOINT_TO 4
-#define CONTROL_POINT_ENDPOINT_FROM 5
-#define CONTROL_POINT_LINE 6
-
-IMPLEMENT_DYNAMIC_CLASS(wxShapeTextLine, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxAttachmentPoint, wxObject)
-
-wxShapeTextLine::wxShapeTextLine(double the_x, double the_y, const wxString& the_line)
-{
- m_x = the_x; m_y = the_y; m_line = the_line;
-}
-
-wxShapeTextLine::~wxShapeTextLine()
-{
-}
-
-IMPLEMENT_ABSTRACT_CLASS(wxShapeEvtHandler, wxObject)
-
-wxShapeEvtHandler::wxShapeEvtHandler(wxShapeEvtHandler *prev, wxShape *shape)
-{
- m_previousHandler = prev;
- m_handlerShape = shape;
-}
-
-wxShapeEvtHandler::~wxShapeEvtHandler()
-{
-}
-
-// Creates a copy of this event handler.
-wxShapeEvtHandler* wxShapeEvtHandler::CreateNewCopy()
-{
- wxShapeEvtHandler* newObject = (wxShapeEvtHandler*) GetClassInfo()->CreateObject();
-
- wxASSERT( (newObject != NULL) );
- wxASSERT( (newObject->IsKindOf(CLASSINFO(wxShapeEvtHandler))) );
-
- newObject->m_previousHandler = newObject;
-
- CopyData(*newObject);
-
- return newObject;
-}
-
-
-void wxShapeEvtHandler::OnDelete()
-{
- if (this != GetShape())
- delete this;
-}
-
-void wxShapeEvtHandler::OnDraw(wxDC& dc)
-{
- if (m_previousHandler)
- m_previousHandler->OnDraw(dc);
-}
-
-void wxShapeEvtHandler::OnMoveLinks(wxDC& dc)
-{
- if (m_previousHandler)
- m_previousHandler->OnMoveLinks(dc);
-}
-
-void wxShapeEvtHandler::OnMoveLink(wxDC& dc, bool moveControlPoints)
-{
- if (m_previousHandler)
- m_previousHandler->OnMoveLink(dc, moveControlPoints);
-}
-
-void wxShapeEvtHandler::OnDrawContents(wxDC& dc)
-{
- if (m_previousHandler)
- m_previousHandler->OnDrawContents(dc);
-}
-
-void wxShapeEvtHandler::OnDrawBranches(wxDC& dc, bool erase)
-{
- if (m_previousHandler)
- m_previousHandler->OnDrawBranches(dc, erase);
-}
-
-void wxShapeEvtHandler::OnSize(double x, double y)
-{
- if (m_previousHandler)
- m_previousHandler->OnSize(x, y);
-}
-
-bool wxShapeEvtHandler::OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display)
-{
- if (m_previousHandler)
- return m_previousHandler->OnMovePre(dc, x, y, old_x, old_y, display);
- else
- return true;
-}
-
-void wxShapeEvtHandler::OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display)
-{
- if (m_previousHandler)
- m_previousHandler->OnMovePost(dc, x, y, old_x, old_y, display);
-}
-
-void wxShapeEvtHandler::OnErase(wxDC& dc)
-{
- if (m_previousHandler)
- m_previousHandler->OnErase(dc);
-}
-
-void wxShapeEvtHandler::OnEraseContents(wxDC& dc)
-{
- if (m_previousHandler)
- m_previousHandler->OnEraseContents(dc);
-}
-
-void wxShapeEvtHandler::OnHighlight(wxDC& dc)
-{
- if (m_previousHandler)
- m_previousHandler->OnHighlight(dc);
-}
-
-void wxShapeEvtHandler::OnLeftClick(double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnLeftClick(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnLeftDoubleClick(double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnLeftDoubleClick(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnRightClick(double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnRightClick(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnDragLeft(draw, x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnBeginDragLeft(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnEndDragLeft(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnDragRight(bool draw, double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnDragRight(draw, x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnBeginDragRight(double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnBeginDragRight(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnEndDragRight(double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnEndDragRight(x, y, keys, attachment);
-}
-
-// Control points ('handles') redirect control to the actual shape, to make it easier
-// to override sizing behaviour.
-void wxShapeEvtHandler::OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnSizingDragLeft(pt, draw, x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnSizingBeginDragLeft(pt, x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys, int attachment)
-{
- if (m_previousHandler)
- m_previousHandler->OnSizingEndDragLeft(pt, x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnDrawOutline(wxDC& dc, double x, double y, double w, double h)
-{
- if (m_previousHandler)
- m_previousHandler->OnDrawOutline(dc, x, y, w, h);
-}
-
-void wxShapeEvtHandler::OnDrawControlPoints(wxDC& dc)
-{
- if (m_previousHandler)
- m_previousHandler->OnDrawControlPoints(dc);
-}
-
-void wxShapeEvtHandler::OnEraseControlPoints(wxDC& dc)
-{
- if (m_previousHandler)
- m_previousHandler->OnEraseControlPoints(dc);
-}
-
-// Can override this to prevent or intercept line reordering.
-void wxShapeEvtHandler::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)
-{
- if (m_previousHandler)
- m_previousHandler->OnChangeAttachment(attachment, line, ordering);
-}
-
-IMPLEMENT_ABSTRACT_CLASS(wxShape, wxShapeEvtHandler)
-
-wxShape::wxShape(wxShapeCanvas *can)
-{
- m_eventHandler = this;
- SetShape(this);
- m_id = 0;
- m_formatted = false;
- m_canvas = can;
- m_xpos = 0.0; m_ypos = 0.0;
- m_pen = g_oglBlackPen;
- m_brush = wxWHITE_BRUSH;
- m_font = g_oglNormalFont;
- m_textColour = wxT("BLACK");
- m_textColourName = wxT("BLACK");
- m_visible = false;
- m_selected = false;
- m_attachmentMode = ATTACHMENT_MODE_NONE;
- m_spaceAttachments = true;
- m_disableLabel = false;
- m_fixedWidth = false;
- m_fixedHeight = false;
- m_drawHandles = true;
- m_sensitivity = OP_ALL;
- m_draggable = true;
- m_parent = NULL;
- m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
- m_shadowMode = SHADOW_NONE;
- m_shadowOffsetX = 6;
- m_shadowOffsetY = 6;
- m_shadowBrush = wxBLACK_BRUSH;
- m_textMarginX = 5;
- m_textMarginY = 5;
- m_regionName = wxT("0");
- m_centreResize = true;
- m_maintainAspectRatio = false;
- m_highlighted = false;
- m_rotation = 0.0;
- m_branchNeckLength = 10;
- m_branchStemLength = 10;
- m_branchSpacing = 10;
- m_branchStyle = BRANCHING_ATTACHMENT_NORMAL;
-
- // Set up a default region. Much of the above will be put into
- // the region eventually (the duplication is for compatibility)
- wxShapeRegion *region = new wxShapeRegion;
- m_regions.Append(region);
- region->SetName(wxT("0"));
- region->SetFont(g_oglNormalFont);
- region->SetFormatMode(FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT);
- region->SetColour(wxT("BLACK"));
-}
-
-wxShape::~wxShape()
-{
- if (m_parent)
- m_parent->GetChildren().DeleteObject(this);
-
- ClearText();
- ClearRegions();
- ClearAttachments();
-
- if (m_canvas)
- m_canvas->RemoveShape(this);
-
- GetEventHandler()->OnDelete();
-}
-
-void wxShape::SetHighlight(bool hi, bool recurse)
-{
- m_highlighted = hi;
- if (recurse)
- {
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->SetHighlight(hi, recurse);
- node = node->GetNext();
- }
- }
-}
-
-void wxShape::SetSensitivityFilter(int sens, bool recursive)
-{
- if (sens & OP_DRAG_LEFT)
- m_draggable = true;
- else
- m_draggable = false;
-
- m_sensitivity = sens;
- if (recursive)
- {
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *obj = (wxShape *)node->GetData();
- obj->SetSensitivityFilter(sens, true);
- node = node->GetNext();
- }
- }
-}
-
-void wxShape::SetDraggable(bool drag, bool recursive)
-{
- m_draggable = drag;
- if (m_draggable)
- m_sensitivity |= OP_DRAG_LEFT;
- else
- if (m_sensitivity & OP_DRAG_LEFT)
- m_sensitivity = m_sensitivity - OP_DRAG_LEFT;
-
- if (recursive)
- {
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *obj = (wxShape *)node->GetData();
- obj->SetDraggable(drag, true);
- node = node->GetNext();
- }
- }
-}
-
-void wxShape::SetDrawHandles(bool drawH)
-{
- m_drawHandles = drawH;
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *obj = (wxShape *)node->GetData();
- obj->SetDrawHandles(drawH);
- node = node->GetNext();
- }
-}
-
-void wxShape::SetShadowMode(int mode, bool redraw)
-{
- if (redraw && GetCanvas())
- {
- wxClientDC dc(GetCanvas());
- GetCanvas()->PrepareDC(dc);
- Erase(dc);
-
- m_shadowMode = mode;
-
- Draw(dc);
- }
- else
- {
- m_shadowMode = mode;
- }
-}
-
-void wxShape::SetCanvas(wxShapeCanvas *theCanvas)
-{
- m_canvas = theCanvas;
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->SetCanvas(theCanvas);
- node = node->GetNext();
- }
-}
-
-void wxShape::AddToCanvas(wxShapeCanvas *theCanvas, wxShape *addAfter)
-{
- theCanvas->AddShape(this, addAfter);
- wxNode *node = m_children.GetFirst();
- wxShape *lastImage = this;
- while (node)
- {
- wxShape *object = (wxShape *)node->GetData();
- object->AddToCanvas(theCanvas, lastImage);
- lastImage = object;
-
- node = node->GetNext();
- }
-}
-
-// Insert at front of canvas
-void wxShape::InsertInCanvas(wxShapeCanvas *theCanvas)
-{
- theCanvas->InsertShape(this);
- wxNode *node = m_children.GetFirst();
- wxShape *lastImage = this;
- while (node)
- {
- wxShape *object = (wxShape *)node->GetData();
- object->AddToCanvas(theCanvas, lastImage);
- lastImage = object;
-
- node = node->GetNext();
- }
-}
-
-void wxShape::RemoveFromCanvas(wxShapeCanvas *theCanvas)
-{
- if (Selected())
- Select(false);
- theCanvas->RemoveShape(this);
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *object = (wxShape *)node->GetData();
- object->RemoveFromCanvas(theCanvas);
-
- node = node->GetNext();
- }
-}
-
-void wxShape::ClearAttachments()
-{
- wxNode *node = m_attachmentPoints.GetFirst();
- while (node)
- {
- wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
- delete point;
- node = node->GetNext();
- }
- m_attachmentPoints.Clear();
-}
-
-void wxShape::ClearText(int regionId)
-{
- if (regionId == 0)
- {
- m_text.DeleteContents(true);
- m_text.Clear();
- m_text.DeleteContents(false);
- }
- wxNode *node = m_regions.Item(regionId);
- if (!node)
- return;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- region->ClearText();
-}
-
-void wxShape::ClearRegions()
-{
- wxNode *node = m_regions.GetFirst();
- while (node)
- {
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- wxNode *next = node->GetNext();
- delete region;
- delete node;
- node = next;
- }
-}
-
-void wxShape::AddRegion(wxShapeRegion *region)
-{
- m_regions.Append(region);
-}
-
-void wxShape::SetDefaultRegionSize()
-{
- wxNode *node = m_regions.GetFirst();
- if (!node) return;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- double w, h;
- GetBoundingBoxMin(&w, &h);
- region->SetSize(w, h);
-}
-
-bool wxShape::HitTest(double x, double y, int *attachment, double *distance)
-{
-// if (!sensitive)
-// return false;
-
- double width = 0.0, height = 0.0;
- GetBoundingBoxMin(&width, &height);
- if (fabs(width) < 4.0) width = 4.0;
- if (fabs(height) < 4.0) height = 4.0;
-
- width += (double)4.0; height += (double)4.0; // Allowance for inaccurate mousing
-
- double left = (double)(m_xpos - (width/2.0));
- double top = (double)(m_ypos - (height/2.0));
- double right = (double)(m_xpos + (width/2.0));
- double bottom = (double)(m_ypos + (height/2.0));
-
- int nearest_attachment = 0;
-
- // If within the bounding box, check the attachment points
- // within the object.
-
- if (x >= left && x <= right && y >= top && y <= bottom)
- {
- int n = GetNumberOfAttachments();
- double nearest = 999999.0;
-
- // GetAttachmentPosition[Edge] takes a logical attachment position,
- // i.e. if it's rotated through 90%, position 0 is East-facing.
-
- for (int i = 0; i < n; i++)
- {
- double xp, yp;
- if (GetAttachmentPositionEdge(i, &xp, &yp))
- {
- double l = (double)sqrt(((xp - x) * (xp - x)) +
- ((yp - y) * (yp - y)));
-
- if (l < nearest)
- {
- nearest = l;
- nearest_attachment = i;
- }
- }
- }
- *attachment = nearest_attachment;
- *distance = nearest;
- return true;
- }
- else return false;
-}
-
-// Format a text string according to the region size, adding
-// strings with positions to region text list
-
-static bool GraphicsInSizeToContents = false; // Infinite recursion elimination
-void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
-{
- double w, h;
- ClearText(i);
-
- if (m_regions.GetCount() < 1)
- return;
- wxNode *node = m_regions.Item(i);
- if (!node)
- return;
-
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- // region->SetText(s); // don't set the formatted text yet, it will be done below
- region->m_regionText = s;
- dc.SetFont(* region->GetFont());
-
- region->GetSize(&w, &h);
-
- wxStringList *stringList = oglFormatText(dc, s, (w-2*m_textMarginX), (h-2*m_textMarginY), region->GetFormatMode());
- node = (wxNode*)stringList->GetFirst();
- while (node)
- {
- wxChar *s = (wxChar *)node->GetData();
- wxShapeTextLine *line = new wxShapeTextLine(0.0, 0.0, s);
- region->GetFormattedText().Append((wxObject *)line);
- node = node->GetNext();
- }
- delete stringList;
- double actualW = w;
- double actualH = h;
- // Don't try to resize an object with more than one image (this case should be dealt
- // with by overriden handlers)
- if ((region->GetFormatMode() & FORMAT_SIZE_TO_CONTENTS) &&
- (region->GetFormattedText().GetCount() > 0) &&
- (m_regions.GetCount() == 1) && !GraphicsInSizeToContents)
- {
- oglGetCentredTextExtent(dc, &(region->GetFormattedText()), m_xpos, m_ypos, w, h, &actualW, &actualH);
- if ((actualW+2*m_textMarginX != w ) || (actualH+2*m_textMarginY != h))
- {
- // If we are a descendant of a composite, must make sure the composite gets
- // resized properly
- wxShape *topAncestor = GetTopAncestor();
-
- if (topAncestor != this)
- {
- // Make sure we don't recurse infinitely
- GraphicsInSizeToContents = true;
-
- wxCompositeShape *composite = (wxCompositeShape *)topAncestor;
- composite->Erase(dc);
- SetSize(actualW+2*m_textMarginX, actualH+2*m_textMarginY);
- Move(dc, m_xpos, m_ypos);
- composite->CalculateSize();
- if (composite->Selected())
- {
- composite->DeleteControlPoints(& dc);
- composite->MakeControlPoints();
- composite->MakeMandatoryControlPoints();
- }
- // Where infinite recursion might happen if we didn't stop it
- composite->Draw(dc);
-
- GraphicsInSizeToContents = false;
- }
- else
- {
- Erase(dc);
- SetSize(actualW+2*m_textMarginX, actualH+2*m_textMarginY);
- Move(dc, m_xpos, m_ypos);
- }
- SetSize(actualW+2*m_textMarginX, actualH+2*m_textMarginY);
- Move(dc, m_xpos, m_ypos);
- EraseContents(dc);
- }
- }
- oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW-2*m_textMarginX, actualH-2*m_textMarginY, region->GetFormatMode());
- m_formatted = true;
-}
-
-void wxShape::Recentre(wxDC& dc)
-{
- double w, h;
- GetBoundingBoxMin(&w, &h);
-
- int noRegions = m_regions.GetCount();
- for (int i = 0; i < noRegions; i++)
- {
- wxNode *node = m_regions.Item(i);
- if (node)
- {
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, w-2*m_textMarginX, h-2*m_textMarginY, region->GetFormatMode());
- }
- }
-}
-
-bool wxShape::GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
- double WXUNUSED(x2), double WXUNUSED(y2),
- double *WXUNUSED(x3), double *WXUNUSED(y3))
-{
- return false;
-}
-
-void wxShape::SetPen(const wxPen *the_pen)
-{
- m_pen = the_pen;
-}
-
-void wxShape::SetBrush(const wxBrush *the_brush)
-{
- m_brush = the_brush;
-}
-
-// Get the top-most (non-division) ancestor, or self
-wxShape *wxShape::GetTopAncestor()
-{
- if (!GetParent())
- return this;
-
- if (GetParent()->IsKindOf(CLASSINFO(wxDivisionShape)))
- return this;
- else return GetParent()->GetTopAncestor();
-}
-
-/*
- * Region functions
- *
- */
-void wxShape::SetFont(wxFont *the_font, int regionId)
-{
- m_font = the_font;
- wxNode *node = m_regions.Item(regionId);
- if (!node)
- return;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- region->SetFont(the_font);
-}
-
-wxFont *wxShape::GetFont(int n) const
-{
- wxNode *node = m_regions.Item(n);
- if (!node)
- return NULL;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- return region->GetFont();
-}
-
-void wxShape::SetFormatMode(int mode, int regionId)
-{
- wxNode *node = m_regions.Item(regionId);
- if (!node)
- return;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- region->SetFormatMode(mode);
-}
-
-int wxShape::GetFormatMode(int regionId) const
-{
- wxNode *node = m_regions.Item(regionId);
- if (!node)
- return 0;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- return region->GetFormatMode();
-}
-
-void wxShape::SetTextColour(const wxString& the_colour, int regionId)
-{
- m_textColour = wxTheColourDatabase->Find(the_colour);
- m_textColourName = the_colour;
-
- wxNode *node = m_regions.Item(regionId);
- if (!node)
- return;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- region->SetColour(the_colour);
-}
-
-wxString wxShape::GetTextColour(int regionId) const
-{
- wxNode *node = m_regions.Item(regionId);
- if (!node)
- return wxEmptyString;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- return region->GetColour();
-}
-
-void wxShape::SetRegionName(const wxString& name, int regionId)
-{
- wxNode *node = m_regions.Item(regionId);
- if (!node)
- return;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- region->SetName(name);
-}
-
-wxString wxShape::GetRegionName(int regionId)
-{
- wxNode *node = m_regions.Item(regionId);
- if (!node)
- return wxEmptyString;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- return region->GetName();
-}
-
-int wxShape::GetRegionId(const wxString& name)
-{
- wxNode *node = m_regions.GetFirst();
- int i = 0;
- while (node)
- {
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- if (region->GetName() == name)
- return i;
- node = node->GetNext();
- i ++;
- }
- return -1;
-}
-
-// Name all m_regions in all subimages recursively.
-void wxShape::NameRegions(const wxString& parentName)
-{
- int n = GetNumberOfTextRegions();
- wxString buff;
- for (int i = 0; i < n; i++)
- {
- if (parentName.Length() > 0)
- buff << parentName << wxT(".") << i;
- else
- buff << i;
- SetRegionName(buff, i);
- }
- wxNode *node = m_children.GetFirst();
- int j = 0;
- while (node)
- {
- buff.Empty();
- wxShape *child = (wxShape *)node->GetData();
- if (parentName.Length() > 0)
- buff << parentName << wxT(".") << j;
- else
- buff << j;
- child->NameRegions(buff);
- node = node->GetNext();
- j ++;
- }
-}
-
-// Get a region by name, possibly looking recursively into composites.
-wxShape *wxShape::FindRegion(const wxString& name, int *regionId)
-{
- int id = GetRegionId(name);
- if (id > -1)
- {
- *regionId = id;
- return this;
- }
-
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- wxShape *actualImage = child->FindRegion(name, regionId);
- if (actualImage)
- return actualImage;
- node = node->GetNext();
- }
- return NULL;
-}
-
-// Finds all region names for this image (composite or simple).
-// Supply empty string list.
-void wxShape::FindRegionNames(wxStringList& list)
-{
- int n = GetNumberOfTextRegions();
- for (int i = 0; i < n; i++)
- {
- wxString name(GetRegionName(i));
- list.Add(name);
- }
-
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->FindRegionNames(list);
- node = node->GetNext();
- }
-}
-
-void wxShape::AssignNewIds()
-{
-// if (m_id == 0)
- m_id = wxNewId();
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->AssignNewIds();
- node = node->GetNext();
- }
-}
-
-void wxShape::OnDraw(wxDC& WXUNUSED(dc))
-{
-}
-
-void wxShape::OnMoveLinks(wxDC& dc)
-{
- // Want to set the ends of all attached links
- // to point to/from this object
-
- wxNode *current = m_lines.GetFirst();
- while (current)
- {
- wxLineShape *line = (wxLineShape *)current->GetData();
- line->GetEventHandler()->OnMoveLink(dc);
- current = current->GetNext();
- }
-}
-
-
-void wxShape::OnDrawContents(wxDC& dc)
-{
- double bound_x, bound_y;
- GetBoundingBoxMin(&bound_x, &bound_y);
- if (m_regions.GetCount() < 1) return;
-
- if (m_pen) dc.SetPen(* m_pen);
-
- wxShapeRegion *region = (wxShapeRegion *)m_regions.GetFirst()->GetData();
- if (region->GetFont()) dc.SetFont(* region->GetFont());
-
- dc.SetTextForeground(region->GetActualColourObject());
- dc.SetBackgroundMode(wxTRANSPARENT);
- if (!m_formatted)
- {
- oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, bound_x-2*m_textMarginX, bound_y-2*m_textMarginY, region->GetFormatMode());
- m_formatted = true;
- }
- if (!GetDisableLabel())
- {
- oglDrawFormattedText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, bound_x-2*m_textMarginX, bound_y-2*m_textMarginY, region->GetFormatMode());
- }
-}
-
-void wxShape::DrawContents(wxDC& dc)
-{
- GetEventHandler()->OnDrawContents(dc);
-}
-
-void wxShape::OnSize(double WXUNUSED(x), double WXUNUSED(y))
-{
-}
-
-bool wxShape::OnMovePre(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))
-{
- return true;
-}
-
-void wxShape::OnMovePost(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))
-{
-}
-
-void wxShape::OnErase(wxDC& dc)
-{
- if (!m_visible)
- return;
-
- // Erase links
- wxNode *current = m_lines.GetFirst();
- while (current)
- {
- wxLineShape *line = (wxLineShape *)current->GetData();
- line->GetEventHandler()->OnErase(dc);
- current = current->GetNext();
- }
- GetEventHandler()->OnEraseContents(dc);
-}
-
-void wxShape::OnEraseContents(wxDC& dc)
-{
- if (!m_visible)
- return;
-
- double maxX, maxY, minX, minY;
- double xp = GetX();
- double yp = GetY();
- GetBoundingBoxMin(&minX, &minY);
- GetBoundingBoxMax(&maxX, &maxY);
- double topLeftX = (double)(xp - (maxX / 2.0) - 2.0);
- double topLeftY = (double)(yp - (maxY / 2.0) - 2.0);
-
- int penWidth = 0;
- if (m_pen)
- penWidth = m_pen->GetWidth();
-
- dc.SetPen(GetBackgroundPen());
- dc.SetBrush(GetBackgroundBrush());
-
- dc.DrawRectangle(WXROUND(topLeftX - penWidth), WXROUND(topLeftY - penWidth),
- WXROUND(maxX + penWidth*2.0 + 4.0), WXROUND(maxY + penWidth*2.0 + 4.0));
-}
-
-void wxShape::EraseLinks(wxDC& dc, int attachment, bool recurse)
-{
- if (!m_visible)
- return;
-
- wxNode *current = m_lines.GetFirst();
- while (current)
- {
- wxLineShape *line = (wxLineShape *)current->GetData();
- if (attachment == -1 || ((line->GetTo() == this && line->GetAttachmentTo() == attachment) ||
- (line->GetFrom() == this && line->GetAttachmentFrom() == attachment)))
- line->GetEventHandler()->OnErase(dc);
- current = current->GetNext();
- }
- if (recurse)
- {
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->EraseLinks(dc, attachment, recurse);
- node = node->GetNext();
- }
- }
-}
-
-void wxShape::DrawLinks(wxDC& dc, int attachment, bool recurse)
-{
- if (!m_visible)
- return;
-
- wxNode *current = m_lines.GetFirst();
- while (current)
- {
- wxLineShape *line = (wxLineShape *)current->GetData();
- if (attachment == -1 ||
- (line->GetTo() == this && line->GetAttachmentTo() == attachment) ||
- (line->GetFrom() == this && line->GetAttachmentFrom() == attachment))
- line->Draw(dc);
- current = current->GetNext();
- }
- if (recurse)
- {
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->DrawLinks(dc, attachment, recurse);
- node = node->GetNext();
- }
- }
-}
-
-// Returns true if pt1 <= pt2 in the sense that one point comes before another on an
-// edge of the shape.
-// attachmentPoint is the attachment point (= side) in question.
-
-// This is the default, rectangular implementation.
-bool wxShape::AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2)
-{
- int physicalAttachment = LogicalToPhysicalAttachment(attachmentPoint);
- switch (physicalAttachment)
- {
- case 0:
- case 2:
- {
- return (pt1.x <= pt2.x) ;
- }
- case 1:
- case 3:
- {
- return (pt1.y <= pt2.y) ;
- }
- }
-
- return false;
-}
-
-bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
- double x, double y)
-{
- if (GetAttachmentMode() == ATTACHMENT_MODE_NONE)
- return false;
-
- int newAttachment, oldAttachment;
- double distance;
-
- // Is (x, y) on this object? If so, find the new attachment point
- // the user has moved the point to
- bool hit = HitTest(x, y, &newAttachment, &distance);
- if (!hit)
- return false;
-
- EraseLinks(dc);
-
- if (to_move->GetTo() == this)
- oldAttachment = to_move->GetAttachmentTo();
- else
- oldAttachment = to_move->GetAttachmentFrom();
-
- // The links in a new ordering.
- wxList newOrdering;
-
- // First, add all links to the new list.
- wxNode *node = m_lines.GetFirst();
- while (node)
- {
- newOrdering.Append(node->GetData());
- node = node->GetNext();
- }
-
- // Delete the line object from the list of links; we're going to move
- // it to another position in the list
- newOrdering.DeleteObject(to_move);
-
- double old_x = (double) -99999.9;
- double old_y = (double) -99999.9;
-
- node = newOrdering.GetFirst();
- bool found = false;
-
- while (!found && node)
- {
- wxLineShape *line = (wxLineShape *)node->GetData();
- if ((line->GetTo() == this && oldAttachment == line->GetAttachmentTo()) ||
- (line->GetFrom() == this && oldAttachment == line->GetAttachmentFrom()))
- {
- double startX, startY, endX, endY;
- double xp, yp;
- line->GetEnds(&startX, &startY, &endX, &endY);
- if (line->GetTo() == this)
- {
- xp = endX;
- yp = endY;
- } else
- {
- xp = startX;
- yp = startY;
- }
-
- wxRealPoint thisPoint(xp, yp);
- wxRealPoint lastPoint(old_x, old_y);
- wxRealPoint newPoint(x, y);
-
- if (AttachmentSortTest(newAttachment, newPoint, thisPoint) && AttachmentSortTest(newAttachment, lastPoint, newPoint))
- {
- found = true;
- newOrdering.Insert(node, to_move);
- }
-
- old_x = xp;
- old_y = yp;
- }
- node = node->GetNext();
- }
-
- if (!found)
- newOrdering.Append(to_move);
-
- GetEventHandler()->OnChangeAttachment(newAttachment, to_move, newOrdering);
-
- return true;
-}
-
-void wxShape::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)
-{
- if (line->GetTo() == this)
- line->SetAttachmentTo(attachment);
- else
- line->SetAttachmentFrom(attachment);
-
- ApplyAttachmentOrdering(ordering);
-
- wxClientDC dc(GetCanvas());
- GetCanvas()->PrepareDC(dc);
-
- MoveLinks(dc);
-
- if (!GetCanvas()->GetQuickEditMode()) GetCanvas()->Redraw(dc);
-}
-
-// Reorders the lines according to the given list.
-void wxShape::ApplyAttachmentOrdering(wxList& linesToSort)
-{
- // This is a temporary store of all the lines.
- wxList linesStore;
-
- wxNode *node = m_lines.GetFirst();
- while (node)
- {
- wxLineShape *line = (wxLineShape *)node->GetData();
- linesStore.Append(line);
- node = node->GetNext();;
- }
-
- m_lines.Clear();
-
- node = linesToSort.GetFirst();
- while (node)
- {
- wxLineShape *line = (wxLineShape *)node->GetData();
- if (linesStore.Member(line))
- {
- // Done this one
- linesStore.DeleteObject(line);
- m_lines.Append(line);
- }
- node = node->GetNext();
- }
-
- // Now add any lines that haven't been listed in linesToSort.
- node = linesStore.GetFirst();
- while (node)
- {
- wxLineShape *line = (wxLineShape *)node->GetData();
- m_lines.Append(line);
- node = node->GetNext();
- }
-}
-
-// Reorders the lines coming into the node image at this attachment
-// position, in the order in which they appear in linesToSort.
-// Any remaining lines not in the list will be added to the end.
-void wxShape::SortLines(int attachment, wxList& linesToSort)
-{
- // This is a temporary store of all the lines at this attachment
- // point. We'll tick them off as we've processed them.
- wxList linesAtThisAttachment;
-
- wxNode *node = m_lines.GetFirst();
- while (node)
- {
- wxLineShape *line = (wxLineShape *)node->GetData();
- wxNode *next = node->GetNext();
- if ((line->GetTo() == this && line->GetAttachmentTo() == attachment) ||
- (line->GetFrom() == this && line->GetAttachmentFrom() == attachment))
- {
- linesAtThisAttachment.Append(line);
- delete node;
- node = next;
- }
- else node = node->GetNext();
- }
-
- node = linesToSort.GetFirst();
- while (node)
- {
- wxLineShape *line = (wxLineShape *)node->GetData();
- if (linesAtThisAttachment.Member(line))
- {
- // Done this one
- linesAtThisAttachment.DeleteObject(line);
- m_lines.Append(line);
- }
- node = node->GetNext();
- }
-
- // Now add any lines that haven't been listed in linesToSort.
- node = linesAtThisAttachment.GetFirst();
- while (node)
- {
- wxLineShape *line = (wxLineShape *)node->GetData();
- m_lines.Append(line);
- node = node->GetNext();
- }
-}
-
-void wxShape::OnHighlight(wxDC& WXUNUSED(dc))
-{
-}
-
-void wxShape::OnLeftClick(double x, double y, int keys, int attachment)
-{
- if ((m_sensitivity & OP_CLICK_LEFT) != OP_CLICK_LEFT)
- {
- attachment = 0;
- double dist;
- if (m_parent)
- {
- m_parent->HitTest(x, y, &attachment, &dist);
- m_parent->GetEventHandler()->OnLeftClick(x, y, keys, attachment);
- }
- return;
- }
-}
-
-void wxShape::OnRightClick(double x, double y, int keys, int attachment)
-{
- if ((m_sensitivity & OP_CLICK_RIGHT) != OP_CLICK_RIGHT)
- {
- attachment = 0;
- double dist;
- if (m_parent)
- {
- m_parent->HitTest(x, y, &attachment, &dist);
- m_parent->GetEventHandler()->OnRightClick(x, y, keys, attachment);
- }
- return;
- }
-}
-
-double DragOffsetX = 0.0;
-double DragOffsetY = 0.0;
-
-void wxShape::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
- if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
- {
- attachment = 0;
- double dist;
- if (m_parent)
- {
- m_parent->HitTest(x, y, &attachment, &dist);
- m_parent->GetEventHandler()->OnDragLeft(draw, x, y, keys, attachment);
- }
- return;
- }
-
- wxClientDC dc(GetCanvas());
- GetCanvas()->PrepareDC(dc);
-
- dc.SetLogicalFunction(OGLRBLF);
-
- wxPen dottedPen(*wxBLACK, 1, wxDOT);
- dc.SetPen(dottedPen);
- dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
- double xx, yy;
- xx = x + DragOffsetX;
- yy = y + DragOffsetY;
-
- m_canvas->Snap(&xx, &yy);
-// m_xpos = xx; m_ypos = yy;
- double w, h;
- GetBoundingBoxMax(&w, &h);
- GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
-}
-
-void wxShape::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
- if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
- {
- attachment = 0;
- double dist;
- if (m_parent)
- {
- m_parent->HitTest(x, y, &attachment, &dist);
- m_parent->GetEventHandler()->OnBeginDragLeft(x, y, keys, attachment);
- }
- return;
- }
-
- DragOffsetX = m_xpos - x;
- DragOffsetY = m_ypos - y;
-
- wxClientDC dc(GetCanvas());
- GetCanvas()->PrepareDC(dc);
-
- // New policy: don't erase shape until end of drag.
-// Erase(dc);
-
- double xx, yy;
- xx = x + DragOffsetX;
- yy = y + DragOffsetY;
- m_canvas->Snap(&xx, &yy);
-// m_xpos = xx; m_ypos = yy;
- dc.SetLogicalFunction(OGLRBLF);
-
- wxPen dottedPen(*wxBLACK, 1, wxDOT);
- dc.SetPen(dottedPen);
- dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
- double w, h;
- GetBoundingBoxMax(&w, &h);
- GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
- m_canvas->CaptureMouse();
-}
-
-void wxShape::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
- if (!m_draggable)
- return;
- m_canvas->ReleaseMouse();
- if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
- {
- attachment = 0;
- double dist;
- if (m_parent)
- {
- m_parent->HitTest(x, y, &attachment, &dist);
- m_parent->GetEventHandler()->OnEndDragLeft(x, y, keys, attachment);
- }
- return;
- }
-
- wxClientDC dc(GetCanvas());
- GetCanvas()->PrepareDC(dc);
-
- dc.SetLogicalFunction(wxCOPY);
-
- double xx = x + DragOffsetX;
- double yy = y + DragOffsetY;
- m_canvas->Snap(&xx, &yy);
-// canvas->Snap(&m_xpos, &m_ypos);
-
- // New policy: erase shape at end of drag.
- Erase(dc);
-
- Move(dc, xx, yy);
- if (m_canvas && !m_canvas->GetQuickEditMode()) m_canvas->Redraw(dc);
-}
-
-void wxShape::OnDragRight(bool draw, double x, double y, int keys, int attachment)
-{
- if ((m_sensitivity & OP_DRAG_RIGHT) != OP_DRAG_RIGHT)
- {
- attachment = 0;
- double dist;
- if (m_parent)
- {
- m_parent->HitTest(x, y, &attachment, &dist);
- m_parent->GetEventHandler()->OnDragRight(draw, x, y, keys, attachment);
- }
- return;
- }
-}
-
-void wxShape::OnBeginDragRight(double x, double y, int keys, int attachment)
-{
- if ((m_sensitivity & OP_DRAG_RIGHT) != OP_DRAG_RIGHT)
- {
- attachment = 0;
- double dist;
- if (m_parent)
- {
- m_parent->HitTest(x, y, &attachment, &dist);
- m_parent->GetEventHandler()->OnBeginDragRight(x, y, keys, attachment);
- }
- return;
- }
-}
-
-void wxShape::OnEndDragRight(double x, double y, int keys, int attachment)
-{
- if ((m_sensitivity & OP_DRAG_RIGHT) != OP_DRAG_RIGHT)
- {
- attachment = 0;
- double dist;
- if (m_parent)
- {
- m_parent->HitTest(x, y, &attachment, &dist);
- m_parent->GetEventHandler()->OnEndDragRight(x, y, keys, attachment);
- }
- return;
- }
-}
-
-void wxShape::OnDrawOutline(wxDC& dc, double x, double y, double w, double h)
-{
- double top_left_x = (double)(x - w/2.0);
- double top_left_y = (double)(y - h/2.0);
- double top_right_x = (double)(top_left_x + w);
- double top_right_y = (double)top_left_y;
- double bottom_left_x = (double)top_left_x;
- double bottom_left_y = (double)(top_left_y + h);
- double bottom_right_x = (double)top_right_x;
- double bottom_right_y = (double)bottom_left_y;
-
- wxPoint points[5];
- points[0].x = WXROUND(top_left_x); points[0].y = WXROUND(top_left_y);
- points[1].x = WXROUND(top_right_x); points[1].y = WXROUND(top_right_y);
- points[2].x = WXROUND(bottom_right_x); points[2].y = WXROUND(bottom_right_y);
- points[3].x = WXROUND(bottom_left_x); points[3].y = WXROUND(bottom_left_y);
- points[4].x = WXROUND(top_left_x); points[4].y = WXROUND(top_left_y);
-
- dc.DrawLines(5, points);
-}
-
-void wxShape::Attach(wxShapeCanvas *can)
-{
- m_canvas = can;
-}
-
-void wxShape::Detach()
-{
- m_canvas = NULL;
-}
-
-void wxShape::Move(wxDC& dc, double x, double y, bool display)
-{
- double old_x = m_xpos;
- double old_y = m_ypos;
-
- if (!GetEventHandler()->OnMovePre(dc, x, y, old_x, old_y, display))
- {
-// m_xpos = old_x;
-// m_ypos = old_y;
- return;
- }
-
- m_xpos = x; m_ypos = y;
-
- ResetControlPoints();
-
- if (display)
- Draw(dc);
-
- MoveLinks(dc);
-
- GetEventHandler()->OnMovePost(dc, x, y, old_x, old_y, display);
-}
-
-void wxShape::MoveLinks(wxDC& dc)
-{
- GetEventHandler()->OnMoveLinks(dc);
-}
-
-
-void wxShape::Draw(wxDC& dc)
-{
- if (m_visible)
- {
- GetEventHandler()->OnDraw(dc);
- GetEventHandler()->OnDrawContents(dc);
- GetEventHandler()->OnDrawControlPoints(dc);
- GetEventHandler()->OnDrawBranches(dc);
- }
-}
-
-void wxShape::Flash()
-{
- if (GetCanvas())
- {
- wxClientDC dc(GetCanvas());
- GetCanvas()->PrepareDC(dc);
-
- dc.SetLogicalFunction(OGLRBLF);
- Draw(dc);
- dc.SetLogicalFunction(wxCOPY);
- Draw(dc);
- }
-}
-
-void wxShape::Show(bool show)
-{
- m_visible = show;
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *image = (wxShape *)node->GetData();
- image->Show(show);
- node = node->GetNext();
- }
-}
-
-void wxShape::Erase(wxDC& dc)
-{
- GetEventHandler()->OnErase(dc);
- GetEventHandler()->OnEraseControlPoints(dc);
- GetEventHandler()->OnDrawBranches(dc, true);
-}
-
-void wxShape::EraseContents(wxDC& dc)
-{
- GetEventHandler()->OnEraseContents(dc);
-}
-
-void wxShape::AddText(const wxString& string)
-{
- wxNode *node = m_regions.GetFirst();
- if (!node)
- return;
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- region->ClearText();
- wxShapeTextLine *new_line =
- new wxShapeTextLine(0.0, 0.0, string);
- region->GetFormattedText().Append(new_line);
-
- m_formatted = false;
-}
-
-void wxShape::SetSize(double x, double y, bool WXUNUSED(recursive))
-{
- SetAttachmentSize(x, y);
- SetDefaultRegionSize();
-}
-
-void wxShape::SetAttachmentSize(double w, double h)
-{
- double scaleX;
- double scaleY;
- double width, height;
- GetBoundingBoxMin(&width, &height);
- if (width == 0.0)
- scaleX = 1.0;
- else scaleX = w/width;
- if (height == 0.0)
- scaleY = 1.0;
- else scaleY = h/height;
-
- wxNode *node = m_attachmentPoints.GetFirst();
- while (node)
- {
- wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
- point->m_x = (double)(point->m_x * scaleX);
- point->m_y = (double)(point->m_y * scaleY);
- node = node->GetNext();
- }
-}
-
-// Add line FROM this object
-void wxShape::AddLine(wxLineShape *line, wxShape *other,
- int attachFrom, int attachTo,
- // The line ordering
- int positionFrom, int positionTo)
-{
- if (positionFrom == -1)
- {
- if (!m_lines.Member(line))
- m_lines.Append(line);
- }
- else
- {
- // Don't preserve old ordering if we have new ordering instructions
- m_lines.DeleteObject(line);
- if (positionFrom < (int) m_lines.GetCount())
- {
- wxNode* node = m_lines.Item(positionFrom);
- m_lines.Insert(node, line);
- }
- else
- m_lines.Append(line);
- }
-
- if (positionTo == -1)
- {
- if (!other->m_lines.Member(line))
- other->m_lines.Append(line);
- }
- else
- {
- // Don't preserve old ordering if we have new ordering instructions
- other->m_lines.DeleteObject(line);
- if (positionTo < (int) other->m_lines.GetCount())
- {
- wxNode* node = other->m_lines.Item(positionTo);
- other->m_lines.Insert(node, line);
- }
- else
- other->m_lines.Append(line);
- }
-#if 0
- // Wrong: doesn't preserve ordering of shape already linked
- m_lines.DeleteObject(line);
- other->m_lines.DeleteObject(line);
-
- if (positionFrom == -1)
- m_lines.Append(line);
- else
- {
- if (positionFrom < m_lines.GetCount())
- {
- wxNode* node = m_lines.Item(positionFrom);
- m_lines.Insert(node, line);
- }
- else
- m_lines.Append(line);
- }
-
- if (positionTo == -1)
- other->m_lines.Append(line);
- else
- {
- if (positionTo < other->m_lines.GetCount())
- {
- wxNode* node = other->m_lines.Item(positionTo);
- other->m_lines.Insert(node, line);
- }
- else
- other->m_lines.Append(line);
- }
-#endif
-
- line->SetFrom(this);
- line->SetTo(other);
- line->SetAttachments(attachFrom, attachTo);
-}
-
-void wxShape::RemoveLine(wxLineShape *line)
-{
- if (line->GetFrom() == this)
- line->GetTo()->m_lines.DeleteObject(line);
- else
- line->GetFrom()->m_lines.DeleteObject(line);
-
- m_lines.DeleteObject(line);
-}
-
-#if wxUSE_PROLOGIO
-void wxShape::WriteAttributes(wxExpr *clause)
-{
- clause->AddAttributeValueString(_T("type"), GetClassInfo()->GetClassName());
- clause->AddAttributeValue(_T("id"), m_id);
-
- if (m_pen)
- {
- int penWidth = m_pen->GetWidth();
- int penStyle = m_pen->GetStyle();
- if (penWidth != 1)
- clause->AddAttributeValue(_T("pen_width"), (long)penWidth);
- if (penStyle != wxSOLID)
- clause->AddAttributeValue(_T("pen_style"), (long)penStyle);
-
- wxString penColour = wxTheColourDatabase->FindName(m_pen->GetColour());
- if (penColour == wxEmptyString)
- {
- wxString hex(oglColourToHex(m_pen->GetColour()));
- hex = wxString(_T("#")) + hex;
- clause->AddAttributeValueString(_T("pen_colour"), hex);
- }
- else if (penColour != _T("BLACK"))
- clause->AddAttributeValueString(_T("pen_colour"), penColour);
- }
-
- if (m_brush)
- {
- wxString brushColour = wxTheColourDatabase->FindName(m_brush->GetColour());
-
- if (brushColour == wxEmptyString)
- {
- wxString hex(oglColourToHex(m_brush->GetColour()));
- hex = wxString(_T("#")) + hex;
- clause->AddAttributeValueString(_T("brush_colour"), hex);
- }
- else if (brushColour != _T("WHITE"))
- clause->AddAttributeValueString(_T("brush_colour"), brushColour);
-
- if (m_brush->GetStyle() != wxSOLID)
- clause->AddAttributeValue(_T("brush_style"), (long)m_brush->GetStyle());
- }
-
- // Output line ids
-
- int n_lines = m_lines.GetCount();
- if (n_lines > 0)
- {
- wxExpr *list = new wxExpr(wxExprList);
- wxNode *node = m_lines.GetFirst();
- while (node)
- {
- wxShape *line = (wxShape *)node->GetData();
- wxExpr *id_expr = new wxExpr(line->GetId());
- list->Append(id_expr);
- node = node->GetNext();
- }
- clause->AddAttributeValue(_T("arcs"), list);
- }
-
- // Miscellaneous members
- if (m_attachmentMode != 0)
- clause->AddAttributeValue(_T("use_attachments"), (long)m_attachmentMode);
- if (m_sensitivity != OP_ALL)
- clause->AddAttributeValue(_T("sensitivity"), (long)m_sensitivity);
- if (!m_spaceAttachments)
- clause->AddAttributeValue(_T("space_attachments"), (long)m_spaceAttachments);
- if (m_fixedWidth)
- clause->AddAttributeValue(_T("fixed_width"), (long)m_fixedWidth);
- if (m_fixedHeight)
- clause->AddAttributeValue(_T("fixed_height"), (long)m_fixedHeight);
- if (m_shadowMode != SHADOW_NONE)
- clause->AddAttributeValue(_T("shadow_mode"), (long)m_shadowMode);
- if (m_centreResize != true)
- clause->AddAttributeValue(_T("centre_resize"), (long)0);
- clause->AddAttributeValue(_T("maintain_aspect_ratio"), (long) m_maintainAspectRatio);
- if (m_highlighted != false)
- clause->AddAttributeValue(_T("hilite"), (long)m_highlighted);
-
- if (m_parent) // For composite objects
- clause->AddAttributeValue(_T("parent"), (long)m_parent->GetId());
-
- if (m_rotation != 0.0)
- clause->AddAttributeValue(_T("rotation"), m_rotation);
-
- if (!this->IsKindOf(CLASSINFO(wxLineShape)))
- {
- clause->AddAttributeValue(_T("neck_length"), (long) m_branchNeckLength);
- clause->AddAttributeValue(_T("stem_length"), (long) m_branchStemLength);
- clause->AddAttributeValue(_T("branch_spacing"), (long) m_branchSpacing);
- clause->AddAttributeValue(_T("branch_style"), (long) m_branchStyle);
- }
-
- // Write user-defined attachment points, if any
- if (m_attachmentPoints.GetCount() > 0)
- {
- wxExpr *attachmentList = new wxExpr(wxExprList);
- wxNode *node = m_attachmentPoints.GetFirst();
- while (node)
- {
- wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
- wxExpr *pointExpr = new wxExpr(wxExprList);
- pointExpr->Append(new wxExpr((long)point->m_id));
- pointExpr->Append(new wxExpr(point->m_x));
- pointExpr->Append(new wxExpr(point->m_y));
- attachmentList->Append(pointExpr);
- node = node->GetNext();
- }
- clause->AddAttributeValue(_T("user_attachments"), attachmentList);
- }
-
- // Write text regions
- WriteRegions(clause);
-}
-
-void wxShape::WriteRegions(wxExpr *clause)
-{
- // Output regions as region1 = (...), region2 = (...), etc
- // and formatted text as text1 = (...), text2 = (...) etc.
- int regionNo = 1;
- wxChar regionNameBuf[20];
- wxChar textNameBuf[20];
- wxNode *node = m_regions.GetFirst();
- while (node)
- {
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- wxSprintf(regionNameBuf, _T("region%d"), regionNo);
- wxSprintf(textNameBuf, _T("text%d"), regionNo);
-
- // Original text and region attributes:
- // region1 = (regionName regionText x y width height minWidth minHeight proportionX proportionY
- // formatMode fontSize fontFamily fontStyle fontWeight textColour)
- wxExpr *regionExpr = new wxExpr(wxExprList);
- regionExpr->Append(new wxExpr(wxExprString, region->m_regionName));
- regionExpr->Append(new wxExpr(wxExprString, region->m_regionText));
-
- regionExpr->Append(new wxExpr(region->m_x));
- regionExpr->Append(new wxExpr(region->m_y));
- regionExpr->Append(new wxExpr(region->GetWidth()));
- regionExpr->Append(new wxExpr(region->GetHeight()));
-
- regionExpr->Append(new wxExpr(region->m_minWidth));
- regionExpr->Append(new wxExpr(region->m_minHeight));
- regionExpr->Append(new wxExpr(region->m_regionProportionX));
- regionExpr->Append(new wxExpr(region->m_regionProportionY));
-
- regionExpr->Append(new wxExpr((long)region->m_formatMode));
-
- regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetPointSize() : 10)));
- regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetFamily() : wxDEFAULT)));
- regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetStyle() : wxDEFAULT)));
- regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetWeight() : wxNORMAL)));
- regionExpr->Append(new wxExpr(wxExprString, region->m_textColour));
-
- // New members for pen colour/style
- regionExpr->Append(new wxExpr(wxExprString, region->m_penColour));
- regionExpr->Append(new wxExpr((long)region->m_penStyle));
-
- // Formatted text:
- // text1 = ((x y string) (x y string) ...)
- wxExpr *textExpr = new wxExpr(wxExprList);
-
- wxNode *textNode = region->m_formattedText.GetFirst();
- while (textNode)
- {
- wxShapeTextLine *line = (wxShapeTextLine *)textNode->GetData();
- wxExpr *list2 = new wxExpr(wxExprList);
- list2->Append(new wxExpr(line->GetX()));
- list2->Append(new wxExpr(line->GetY()));
- list2->Append(new wxExpr(wxExprString, line->GetText()));
- textExpr->Append(list2);
- textNode = textNode->GetNext();
- }
-
- // Now add both attributes to the clause
- clause->AddAttributeValue(regionNameBuf, regionExpr);
- clause->AddAttributeValue(textNameBuf, textExpr);
-
- node = node->GetNext();
- regionNo ++;
- }
-}
-
-void wxShape::ReadAttributes(wxExpr *clause)
-{
- clause->GetAttributeValue(_T("id"), m_id);
- wxRegisterId(m_id);
-
- clause->GetAttributeValue(_T("x"), m_xpos);
- clause->GetAttributeValue(_T("y"), m_ypos);
-
- // Input text strings (FOR COMPATIBILITY WITH OLD FILES ONLY. SEE REGION CODE BELOW.)
- ClearText();
- wxExpr *strings = clause->AttributeValue(_T("text"));
- if (strings && strings->Type() == wxExprList)
- {
- m_formatted = true; // Assume text is formatted unless we prove otherwise
- wxExpr *node = strings->value.first;
- while (node)
- {
- wxExpr *string_expr = node;
- double the_x = 0.0;
- double the_y = 0.0;
- wxString the_string = wxEmptyString;
-
- // string_expr can either be a string, or a list of
- // 3 elements: x, y, and string.
- if (string_expr->Type() == wxExprString)
- {
- the_string = string_expr->StringValue();
- m_formatted = false;
- }
- else if (string_expr->Type() == wxExprList)
- {
- wxExpr *first = string_expr->value.first;
- wxExpr *second = first ? first->next : (wxExpr*) NULL;
- wxExpr *third = second ? second->next : (wxExpr*) NULL;
-
- if (first && second && third &&
- (first->Type() == wxExprReal || first->Type() == wxExprInteger) &&
- (second->Type() == wxExprReal || second->Type() == wxExprInteger) &&
- third->Type() == wxExprString)
- {
- if (first->Type() == wxExprReal)
- the_x = first->RealValue();
- else the_x = (double)first->IntegerValue();
-
- if (second->Type() == wxExprReal)
- the_y = second->RealValue();
- else the_y = (double)second->IntegerValue();
-
- the_string = third->StringValue();
- }
- }
- wxShapeTextLine *line =
- new wxShapeTextLine(the_x, the_y, the_string);
- m_text.Append(line);
-
- node = node->next;
- }
- }
-
- wxString pen_string = wxEmptyString;
- wxString brush_string = wxEmptyString;
- int pen_width = 1;
- int pen_style = wxSOLID;
- int brush_style = wxSOLID;
- m_attachmentMode = ATTACHMENT_MODE_NONE;
-
- clause->GetAttributeValue(_T("pen_colour"), pen_string);
- clause->GetAttributeValue(_T("text_colour"), m_textColourName);
-
- SetTextColour(m_textColourName);
-
- clause->GetAttributeValue(_T("region_name"), m_regionName);
-
- clause->GetAttributeValue(_T("brush_colour"), brush_string);
- clause->GetAttributeValue(_T("pen_width"), pen_width);
- clause->GetAttributeValue(_T("pen_style"), pen_style);
- clause->GetAttributeValue(_T("brush_style"), brush_style);
-
- int iVal = (int) m_attachmentMode;
- clause->GetAttributeValue(_T("use_attachments"), iVal);
- m_attachmentMode = iVal;
-
- clause->GetAttributeValue(_T("sensitivity"), m_sensitivity);
-
- iVal = (int) m_spaceAttachments;
- clause->GetAttributeValue(_T("space_attachments"), iVal);
- m_spaceAttachments = (iVal != 0);
-
- iVal = (int) m_fixedWidth;
- clause->GetAttributeValue(_T("fixed_width"), iVal);
- m_fixedWidth = (iVal != 0);
-
- iVal = (int) m_fixedHeight;
- clause->GetAttributeValue(_T("fixed_height"), iVal);
- m_fixedHeight = (iVal != 0);
-
- clause->GetAttributeValue(_T("format_mode"), m_formatMode);
- clause->GetAttributeValue(_T("shadow_mode"), m_shadowMode);
-
- iVal = m_branchNeckLength;
- clause->GetAttributeValue(_T("neck_length"), iVal);
- m_branchNeckLength = iVal;
-
- iVal = m_branchStemLength;
- clause->GetAttributeValue(_T("stem_length"), iVal);
- m_branchStemLength = iVal;
-
- iVal = m_branchSpacing;
- clause->GetAttributeValue(_T("branch_spacing"), iVal);
- m_branchSpacing = iVal;
-
- clause->GetAttributeValue(_T("branch_style"), m_branchStyle);
-
- iVal = (int) m_centreResize;
- clause->GetAttributeValue(_T("centre_resize"), iVal);
- m_centreResize = (iVal != 0);
-
- iVal = (int) m_maintainAspectRatio;
- clause->GetAttributeValue(_T("maintain_aspect_ratio"), iVal);
- m_maintainAspectRatio = (iVal != 0);
-
- iVal = (int) m_highlighted;
- clause->GetAttributeValue(_T("hilite"), iVal);
- m_highlighted = (iVal != 0);
-
- clause->GetAttributeValue(_T("rotation"), m_rotation);
-
- if (pen_string == wxEmptyString)
- pen_string = _T("BLACK");
- if (brush_string == wxEmptyString)
- brush_string = _T("WHITE");
-
- if (pen_string.GetChar(0) == '#')
- {
- wxColour col(oglHexToColour(pen_string.After('#')));
- m_pen = wxThePenList->FindOrCreatePen(col, pen_width, pen_style);
- }
- else
- m_pen = wxThePenList->FindOrCreatePen(pen_string, pen_width, pen_style);
-
- if (!m_pen)
- m_pen = wxBLACK_PEN;
-
- if (brush_string.GetChar(0) == '#')
- {
- wxColour col(oglHexToColour(brush_string.After('#')));
- m_brush = wxTheBrushList->FindOrCreateBrush(col, brush_style);
- }
- else
- m_brush = wxTheBrushList->FindOrCreateBrush(brush_string, brush_style);
-
- if (!m_brush)
- m_brush = wxWHITE_BRUSH;
-
- int point_size = 10;
- clause->GetAttributeValue(_T("point_size"), point_size);
- SetFont(oglMatchFont(point_size));
-
- // Read user-defined attachment points, if any
- wxExpr *attachmentList = clause->AttributeValue(_T("user_attachments"));
- if (attachmentList)
- {
- wxExpr *pointExpr = attachmentList->GetFirst();
- while (pointExpr)
- {
- wxExpr *idExpr = pointExpr->Nth(0);
- wxExpr *xExpr = pointExpr->Nth(1);
- wxExpr *yExpr = pointExpr->Nth(2);
- if (idExpr && xExpr && yExpr)
- {
- wxAttachmentPoint *point = new wxAttachmentPoint;
- point->m_id = (int)idExpr->IntegerValue();
- point->m_x = xExpr->RealValue();
- point->m_y = yExpr->RealValue();
- m_attachmentPoints.Append((wxObject *)point);
- }
- pointExpr = pointExpr->GetNext();
- }
- }
-
- // Read text regions
- ReadRegions(clause);
-}
-
-void wxShape::ReadRegions(wxExpr *clause)
-{
- ClearRegions();
-
- // region1 = (regionName regionText x y width height minWidth minHeight proportionX proportionY
- // formatMode fontSize fontFamily fontStyle fontWeight textColour)
- int regionNo = 1;
- wxChar regionNameBuf[20];
- wxChar textNameBuf[20];
-
- wxExpr *regionExpr;
- wxExpr *textExpr = NULL;
- wxSprintf(regionNameBuf, _T("region%d"), regionNo);
- wxSprintf(textNameBuf, _T("text%d"), regionNo);
-
- m_formatted = true; // Assume text is formatted unless we prove otherwise
-
- while ((regionExpr = clause->AttributeValue(regionNameBuf)) != NULL)
- {
- /*
- * Get the region information
- *
- */
-
- wxString regionName = wxEmptyString;
- wxString regionText = wxEmptyString;
- double x = 0.0;
- double y = 0.0;
- double width = 0.0;
- double height = 0.0;
- double minWidth = 5.0;
- double minHeight = 5.0;
- double m_regionProportionX = -1.0;
- double m_regionProportionY = -1.0;
- int formatMode = FORMAT_NONE;
- int fontSize = 10;
- int fontFamily = wxSWISS;
- int fontStyle = wxNORMAL;
- int fontWeight = wxNORMAL;
- wxString regionTextColour = wxEmptyString;
- wxString penColour = wxEmptyString;
- int penStyle = wxSOLID;
-
- if (regionExpr->Type() == wxExprList)
- {
- wxExpr *nameExpr = regionExpr->Nth(0);
- wxExpr *textExpr = regionExpr->Nth(1);
- wxExpr *xExpr = regionExpr->Nth(2);
- wxExpr *yExpr = regionExpr->Nth(3);
- wxExpr *widthExpr = regionExpr->Nth(4);
- wxExpr *heightExpr = regionExpr->Nth(5);
- wxExpr *minWidthExpr = regionExpr->Nth(6);
- wxExpr *minHeightExpr = regionExpr->Nth(7);
- wxExpr *propXExpr = regionExpr->Nth(8);
- wxExpr *propYExpr = regionExpr->Nth(9);
- wxExpr *formatExpr = regionExpr->Nth(10);
- wxExpr *sizeExpr = regionExpr->Nth(11);
- wxExpr *familyExpr = regionExpr->Nth(12);
- wxExpr *styleExpr = regionExpr->Nth(13);
- wxExpr *weightExpr = regionExpr->Nth(14);
- wxExpr *colourExpr = regionExpr->Nth(15);
- wxExpr *penColourExpr = regionExpr->Nth(16);
- wxExpr *penStyleExpr = regionExpr->Nth(17);
-
- regionName = nameExpr->StringValue();
- regionText = textExpr->StringValue();
-
- x = xExpr->RealValue();
- y = yExpr->RealValue();
-
- width = widthExpr->RealValue();
- height = heightExpr->RealValue();
-
- minWidth = minWidthExpr->RealValue();
- minHeight = minHeightExpr->RealValue();
-
- m_regionProportionX = propXExpr->RealValue();
- m_regionProportionY = propYExpr->RealValue();
-
- formatMode = (int) formatExpr->IntegerValue();
- fontSize = (int)sizeExpr->IntegerValue();
- fontFamily = (int)familyExpr->IntegerValue();
- fontStyle = (int)styleExpr->IntegerValue();
- fontWeight = (int)weightExpr->IntegerValue();
-
- if (colourExpr)
- {
- regionTextColour = colourExpr->StringValue();
- }
- else
- regionTextColour = _T("BLACK");
-
- if (penColourExpr)
- penColour = penColourExpr->StringValue();
- if (penStyleExpr)
- penStyle = (int)penStyleExpr->IntegerValue();
- }
- wxFont *font = wxTheFontList->FindOrCreateFont(fontSize, fontFamily, fontStyle, fontWeight);
-
- wxShapeRegion *region = new wxShapeRegion;
- region->SetProportions(m_regionProportionX, m_regionProportionY);
- region->SetFont(font);
- region->SetSize(width, height);
- region->SetPosition(x, y);
- region->SetMinSize(minWidth, minHeight);
- region->SetFormatMode(formatMode);
- region->SetPenStyle(penStyle);
- if (penColour != wxEmptyString)
- region->SetPenColour(penColour);
-
- region->m_textColour = regionTextColour;
- region->m_regionText = regionText;
- region->m_regionName = regionName;
-
- m_regions.Append(region);
-
- /*
- * Get the formatted text strings
- *
- */
- textExpr = clause->AttributeValue(textNameBuf);
- if (textExpr && (textExpr->Type() == wxExprList))
- {
- wxExpr *node = textExpr->value.first;
- while (node)
- {
- wxExpr *string_expr = node;
- double the_x = 0.0;
- double the_y = 0.0;
- wxString the_string = wxEmptyString;
-
- // string_expr can either be a string, or a list of
- // 3 elements: x, y, and string.
- if (string_expr->Type() == wxExprString)
- {
- the_string = string_expr->StringValue();
- m_formatted = false;
- }
- else if (string_expr->Type() == wxExprList)
- {
- wxExpr *first = string_expr->value.first;
- wxExpr *second = first ? first->next : (wxExpr*) NULL;
- wxExpr *third = second ? second->next : (wxExpr*) NULL;
-
- if (first && second && third &&
- (first->Type() == wxExprReal || first->Type() == wxExprInteger) &&
- (second->Type() == wxExprReal || second->Type() == wxExprInteger) &&
- third->Type() == wxExprString)
- {
- if (first->Type() == wxExprReal)
- the_x = first->RealValue();
- else the_x = (double)first->IntegerValue();
-
- if (second->Type() == wxExprReal)
- the_y = second->RealValue();
- else the_y = (double)second->IntegerValue();
-
- the_string = third->StringValue();
- }
- }
- if (the_string)
- {
- wxShapeTextLine *line =
- new wxShapeTextLine(the_x, the_y, the_string);
- region->m_formattedText.Append(line);
- }
- node = node->next;
- }
- }
-
- regionNo ++;
- wxSprintf(regionNameBuf, _T("region%d"), regionNo);
- wxSprintf(textNameBuf, _T("text%d"), regionNo);
- }
-
- // Compatibility: check for no regions (old file).
- // Lines and divided rectangles must deal with this compatibility
- // theirselves. Composites _may_ not have any regions anyway.
- if ((m_regions.GetCount() == 0) &&
- !this->IsKindOf(CLASSINFO(wxLineShape)) && !this->IsKindOf(CLASSINFO(wxDividedShape)) &&
- !this->IsKindOf(CLASSINFO(wxCompositeShape)))
- {
- wxShapeRegion *newRegion = new wxShapeRegion;
- newRegion->SetName(_T("0"));
- m_regions.Append((wxObject *)newRegion);
- if (m_text.GetCount() > 0)
- {
- newRegion->ClearText();
- wxNode *node = m_text.GetFirst();
- while (node)
- {
- wxShapeTextLine *textLine = (wxShapeTextLine *)node->GetData();
- wxNode *next = node->GetNext();
- newRegion->GetFormattedText().Append((wxObject *)textLine);
- delete node;
- node = next;
- }
- }
- }
-}
-
-#endif
-
-void wxShape::Copy(wxShape& copy)
-{
- copy.m_id = m_id;
- copy.m_xpos = m_xpos;
- copy.m_ypos = m_ypos;
- copy.m_pen = m_pen;
- copy.m_brush = m_brush;
- copy.m_textColour = m_textColour;
- copy.m_centreResize = m_centreResize;
- copy.m_maintainAspectRatio = m_maintainAspectRatio;
- copy.m_attachmentMode = m_attachmentMode;
- copy.m_spaceAttachments = m_spaceAttachments;
- copy.m_highlighted = m_highlighted;
- copy.m_rotation = m_rotation;
- copy.m_textColourName = m_textColourName;
- copy.m_regionName = m_regionName;
-
- copy.m_sensitivity = m_sensitivity;
- copy.m_draggable = m_draggable;
- copy.m_fixedWidth = m_fixedWidth;
- copy.m_fixedHeight = m_fixedHeight;
- copy.m_formatMode = m_formatMode;
- copy.m_drawHandles = m_drawHandles;
-
- copy.m_visible = m_visible;
- copy.m_shadowMode = m_shadowMode;
- copy.m_shadowOffsetX = m_shadowOffsetX;
- copy.m_shadowOffsetY = m_shadowOffsetY;
- copy.m_shadowBrush = m_shadowBrush;
-
- copy.m_branchNeckLength = m_branchNeckLength;
- copy.m_branchStemLength = m_branchStemLength;
- copy.m_branchSpacing = m_branchSpacing;
-
- // Copy text regions
- copy.ClearRegions();
- wxNode *node = m_regions.GetFirst();
- while (node)
- {
- wxShapeRegion *region = (wxShapeRegion *)node->GetData();
- wxShapeRegion *newRegion = new wxShapeRegion(*region);
- copy.m_regions.Append(newRegion);
- node = node->GetNext();
- }
-
- // Copy attachments
- copy.ClearAttachments();
- node = m_attachmentPoints.GetFirst();
- while (node)
- {
- wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
- wxAttachmentPoint *newPoint = new wxAttachmentPoint;
- newPoint->m_id = point->m_id;
- newPoint->m_x = point->m_x;
- newPoint->m_y = point->m_y;
- copy.m_attachmentPoints.Append((wxObject *)newPoint);
- node = node->GetNext();
- }
-
- // Copy lines
- copy.m_lines.Clear();
- node = m_lines.GetFirst();
- while (node)
- {
- wxLineShape* line = (wxLineShape*) node->GetData();
- copy.m_lines.Append(line);
- node = node->GetNext();
- }
-}
-
-// Create and return a new, fully copied object.
-wxShape *wxShape::CreateNewCopy(bool resetMapping, bool recompute)
-{
- if (resetMapping)
- oglObjectCopyMapping.Clear();
-
- wxShape* newObject = (wxShape*) GetClassInfo()->CreateObject();
-
- wxASSERT( (newObject != NULL) );
- wxASSERT( (newObject->IsKindOf(CLASSINFO(wxShape))) );
-
- Copy(*newObject);
-
- if (GetEventHandler() != this)
- {
- wxShapeEvtHandler* newHandler = GetEventHandler()->CreateNewCopy();
- newObject->SetEventHandler(newHandler);
- newObject->SetPreviousHandler(NULL);
- newHandler->SetPreviousHandler(newObject);
- newHandler->SetShape(newObject);
- }
-
- if (recompute)
- newObject->Recompute();
- return newObject;
-}
-
-// Does the copying for this object, including copying event
-// handler data if any. Calls the virtual Copy function.
-void wxShape::CopyWithHandler(wxShape& copy)
-{
- Copy(copy);
-
- if (GetEventHandler() != this)
- {
- wxASSERT( copy.GetEventHandler() != NULL );
- wxASSERT( copy.GetEventHandler() != (©) );
- wxASSERT( GetEventHandler()->GetClassInfo() == copy.GetEventHandler()->GetClassInfo() );
- GetEventHandler()->CopyData(* (copy.GetEventHandler()));
- }
-}
-
-
-// Default - make 6 control points
-void wxShape::MakeControlPoints()
-{
- double maxX, maxY, minX, minY;
-
- GetBoundingBoxMax(&maxX, &maxY);
- GetBoundingBoxMin(&minX, &minY);
-
- double widthMin = (double)(minX + CONTROL_POINT_SIZE + 2);
- double heightMin = (double)(minY + CONTROL_POINT_SIZE + 2);
-
- // Offsets from main object
- double top = (double)(- (heightMin / 2.0));
- double bottom = (double)(heightMin / 2.0 + (maxY - minY));
- double left = (double)(- (widthMin / 2.0));
- double right = (double)(widthMin / 2.0 + (maxX - minX));
-
- wxControlPoint *control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, top,
- CONTROL_POINT_DIAGONAL);
- m_canvas->AddShape(control);
- m_controlPoints.Append(control);
-
- control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, 0, top,
- CONTROL_POINT_VERTICAL);
- m_canvas->AddShape(control);
- m_controlPoints.Append(control);
-
- control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, top,
- CONTROL_POINT_DIAGONAL);
- m_canvas->AddShape(control);
- m_controlPoints.Append(control);
-
- control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, 0,
- CONTROL_POINT_HORIZONTAL);
- m_canvas->AddShape(control);
- m_controlPoints.Append(control);
-
- control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, bottom,
- CONTROL_POINT_DIAGONAL);
- m_canvas->AddShape(control);
- m_controlPoints.Append(control);
-
- control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, 0, bottom,
- CONTROL_POINT_VERTICAL);
- m_canvas->AddShape(control);
- m_controlPoints.Append(control);
-
- control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, bottom,
- CONTROL_POINT_DIAGONAL);
- m_canvas->AddShape(control);
- m_controlPoints.Append(control);
-
- control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, 0,
- CONTROL_POINT_HORIZONTAL);
- m_canvas->AddShape(control);
- m_controlPoints.Append(control);
-
-}
-
-void wxShape::MakeMandatoryControlPoints()
-{
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->MakeMandatoryControlPoints();
- node = node->GetNext();
- }
-}
-
-void wxShape::ResetMandatoryControlPoints()
-{
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->ResetMandatoryControlPoints();
- node = node->GetNext();
- }
-}
-
-void wxShape::ResetControlPoints()
-{
- ResetMandatoryControlPoints();
-
- if (m_controlPoints.GetCount() < 1)
- return;
-
- double maxX, maxY, minX, minY;
-
- GetBoundingBoxMax(&maxX, &maxY);
- GetBoundingBoxMin(&minX, &minY);
-
- double widthMin = (double)(minX + CONTROL_POINT_SIZE + 2);
- double heightMin = (double)(minY + CONTROL_POINT_SIZE + 2);
-
- // Offsets from main object
- double top = (double)(- (heightMin / 2.0));
- double bottom = (double)(heightMin / 2.0 + (maxY - minY));
- double left = (double)(- (widthMin / 2.0));
- double right = (double)(widthMin / 2.0 + (maxX - minX));
-
- wxNode *node = m_controlPoints.GetFirst();
- wxControlPoint *control = (wxControlPoint *)node->GetData();
- control->m_xoffset = left; control->m_yoffset = top;
-
- node = node->GetNext(); control = (wxControlPoint *)node->GetData();
- control->m_xoffset = 0; control->m_yoffset = top;
-
- node = node->GetNext(); control = (wxControlPoint *)node->GetData();
- control->m_xoffset = right; control->m_yoffset = top;
-
- node = node->GetNext(); control = (wxControlPoint *)node->GetData();
- control->m_xoffset = right; control->m_yoffset = 0;
-
- node = node->GetNext(); control = (wxControlPoint *)node->GetData();
- control->m_xoffset = right; control->m_yoffset = bottom;
-
- node = node->GetNext(); control = (wxControlPoint *)node->GetData();
- control->m_xoffset = 0; control->m_yoffset = bottom;
-
- node = node->GetNext(); control = (wxControlPoint *)node->GetData();
- control->m_xoffset = left; control->m_yoffset = bottom;
-
- node = node->GetNext(); control = (wxControlPoint *)node->GetData();
- control->m_xoffset = left; control->m_yoffset = 0;
-}
-
-void wxShape::DeleteControlPoints(wxDC *dc)
-{
- wxNode *node = m_controlPoints.GetFirst();
- while (node)
- {
- wxControlPoint *control = (wxControlPoint *)node->GetData();
- if (dc)
- control->GetEventHandler()->OnErase(*dc);
- m_canvas->RemoveShape(control);
- delete control;
- delete node;
- node = m_controlPoints.GetFirst();
- }
- // Children of divisions are contained objects,
- // so stop here
- if (!IsKindOf(CLASSINFO(wxDivisionShape)))
- {
- node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->DeleteControlPoints(dc);
- node = node->GetNext();
- }
- }
-}
-
-void wxShape::OnDrawControlPoints(wxDC& dc)
-{
- if (!m_drawHandles)
- return;
-
- dc.SetBrush(* wxBLACK_BRUSH);
- dc.SetPen(* wxBLACK_PEN);
-
- wxNode *node = m_controlPoints.GetFirst();
- while (node)
- {
- wxControlPoint *control = (wxControlPoint *)node->GetData();
- control->Draw(dc);
- node = node->GetNext();
- }
- // Children of divisions are contained objects,
- // so stop here.
- // This test bypasses the type facility for speed
- // (critical when drawing)
- if (!IsKindOf(CLASSINFO(wxDivisionShape)))
- {
- node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->GetEventHandler()->OnDrawControlPoints(dc);
- node = node->GetNext();
- }
- }
-}
-
-void wxShape::OnEraseControlPoints(wxDC& dc)
-{
- wxNode *node = m_controlPoints.GetFirst();
- while (node)
- {
- wxControlPoint *control = (wxControlPoint *)node->GetData();
- control->Erase(dc);
- node = node->GetNext();
- }
- if (!IsKindOf(CLASSINFO(wxDivisionShape)))
- {
- node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->GetEventHandler()->OnEraseControlPoints(dc);
- node = node->GetNext();
- }
- }
-}
-
-void wxShape::Select(bool select, wxDC* dc)
-{
- m_selected = select;
- if (select)
- {
- MakeControlPoints();
- // Children of divisions are contained objects,
- // so stop here
- if (!IsKindOf(CLASSINFO(wxDivisionShape)))
- {
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->MakeMandatoryControlPoints();
- node = node->GetNext();
- }
- }
- if (dc)
- GetEventHandler()->OnDrawControlPoints(*dc);
- }
- if (!select)
- {
- DeleteControlPoints(dc);
- if (!IsKindOf(CLASSINFO(wxDivisionShape)))
- {
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- child->DeleteControlPoints(dc);
- node = node->GetNext();
- }
- }
- }
-}
-
-bool wxShape::Selected() const
-{
- return m_selected;
-}
-
-bool wxShape::AncestorSelected() const
-{
- if (m_selected) return true;
- if (!GetParent())
- return false;
- else
- return GetParent()->AncestorSelected();
-}
-
-int wxShape::GetNumberOfAttachments() const
-{
- // Should return the MAXIMUM attachment point id here,
- // so higher-level functions can iterate through all attachments,
- // even if they're not contiguous.
- if (m_attachmentPoints.GetCount() == 0)
- return 4;
- else
- {
- int maxN = 3;
- wxNode *node = m_attachmentPoints.GetFirst();
- while (node)
- {
- wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
- if (point->m_id > maxN)
- maxN = point->m_id;
- node = node->GetNext();
- }
- return maxN+1;;
- }
-}
-
-bool wxShape::AttachmentIsValid(int attachment) const
-{
- if (m_attachmentPoints.GetCount() == 0)
- {
- return ((attachment >= 0) && (attachment < 4)) ;
- }
-
- wxNode *node = m_attachmentPoints.GetFirst();
- while (node)
- {
- wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
- if (point->m_id == attachment)
- return true;
- node = node->GetNext();
- }
- return false;
-}
-
-bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
- int nth, int no_arcs, wxLineShape *line)
-{
- if (m_attachmentMode == ATTACHMENT_MODE_NONE)
- {
- *x = m_xpos; *y = m_ypos;
- return true;
- }
- else if (m_attachmentMode == ATTACHMENT_MODE_BRANCHING)
- {
- wxRealPoint pt, stemPt;
- GetBranchingAttachmentPoint(attachment, nth, pt, stemPt);
- *x = pt.x;
- *y = pt.y;
- return true;
- }
- else if (m_attachmentMode == ATTACHMENT_MODE_EDGE)
- {
- if (m_attachmentPoints.GetCount() > 0)
- {
- wxNode *node = m_attachmentPoints.GetFirst();
- while (node)
- {
- wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
- if (point->m_id == attachment)
- {
- *x = (double)(m_xpos + point->m_x);
- *y = (double)(m_ypos + point->m_y);
- return true;
- }
- node = node->GetNext();
- }
- *x = m_xpos; *y = m_ypos;
- return false;
- }
- else
- {
- // Assume is rectangular
- double w, h;
- GetBoundingBoxMax(&w, &h);
- double top = (double)(m_ypos + h/2.0);
- double bottom = (double)(m_ypos - h/2.0);
- double left = (double)(m_xpos - w/2.0);
- double right = (double)(m_xpos + w/2.0);
-
-#if 0
- /* bool isEnd = */ (line && line->IsEnd(this));
-#endif
-
- int physicalAttachment = LogicalToPhysicalAttachment(attachment);
-
- // Simplified code
- switch (physicalAttachment)
- {
- case 0:
- {
- wxRealPoint pt = CalcSimpleAttachment(wxRealPoint(left, bottom), wxRealPoint(right, bottom),
- nth, no_arcs, line);
-
- *x = pt.x; *y = pt.y;
- break;
- }
- case 1:
- {
- wxRealPoint pt = CalcSimpleAttachment(wxRealPoint(right, bottom), wxRealPoint(right, top),
- nth, no_arcs, line);
-
- *x = pt.x; *y = pt.y;
- break;
- }
- case 2:
- {
- wxRealPoint pt = CalcSimpleAttachment(wxRealPoint(left, top), wxRealPoint(right, top),
- nth, no_arcs, line);
-
- *x = pt.x; *y = pt.y;
- break;
- }
- case 3:
- {
- wxRealPoint pt = CalcSimpleAttachment(wxRealPoint(left, bottom), wxRealPoint(left, top),
- nth, no_arcs, line);
-
- *x = pt.x; *y = pt.y;
- break;
- }
- default:
- {
- return false;
- }
- }
- return true;
- }
- }
- return false;
-}
-
-void wxShape::GetBoundingBoxMax(double *w, double *h)
-{
- double ww, hh;
- GetBoundingBoxMin(&ww, &hh);
- if (m_shadowMode != SHADOW_NONE)
- {
- ww += m_shadowOffsetX;
- hh += m_shadowOffsetY;
- }
- *w = ww;
- *h = hh;
-}
-
-// Returns true if image is a descendant of this composite
-bool wxShape::HasDescendant(wxShape *image)
-{
- if (image == this)
- return true;
- wxNode *node = m_children.GetFirst();
- while (node)
- {
- wxShape *child = (wxShape *)node->GetData();
- bool ans = child->HasDescendant(image);
- if (ans)
- return true;
- node = node->GetNext();
- }
- return false;
-}
-
-// Clears points from a list of wxRealPoints, and clears list
-void wxShape::ClearPointList(wxList& list)
-{
- wxNode* node = list.GetFirst();
- while (node)
- {
- wxRealPoint* pt = (wxRealPoint*) node->GetData();
- delete pt;
-
- node = node->GetNext();
- }
- list.Clear();
-}
-
-// Assuming the attachment lies along a vertical or horizontal line,
-// calculate the position on that point.
-wxRealPoint wxShape::CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2,
- int nth, int noArcs, wxLineShape* line)
-{
- bool isEnd = (line && line->IsEnd(this));
-
- // Are we horizontal or vertical?
- bool isHorizontal = (oglRoughlyEqual(pt1.y, pt2.y) == true);
-
- double x, y;
-
- if (isHorizontal)
- {
- wxRealPoint firstPoint, secondPoint;
- if (pt1.x > pt2.x)
- {
- firstPoint = pt2;
- secondPoint = pt1;
- }
- else
- {
- firstPoint = pt1;
- secondPoint = pt2;
- }
-
- if (m_spaceAttachments)
- {
- if (line && (line->GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE))
- {
- // Align line according to the next handle along
- wxRealPoint *point = line->GetNextControlPoint(this);
- if (point->x < firstPoint.x)
- x = firstPoint.x;
- else if (point->x > secondPoint.x)
- x = secondPoint.x;
- else
- x = point->x;
- }
- else
- x = firstPoint.x + (nth + 1)*(secondPoint.x - firstPoint.x)/(noArcs + 1);
- }
- else x = (secondPoint.x - firstPoint.x)/2.0; // Midpoint
-
- y = pt1.y;
- }
- else
- {
- wxASSERT( oglRoughlyEqual(pt1.x, pt2.x) == true );
-
- wxRealPoint firstPoint, secondPoint;
- if (pt1.y > pt2.y)
- {
- firstPoint = pt2;
- secondPoint = pt1;
- }
- else
- {
- firstPoint = pt1;
- secondPoint = pt2;
- }
-
- if (m_spaceAttachments)
- {
- if (line && (line->GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE))
- {
- // Align line according to the next handle along
- wxRealPoint *point = line->GetNextControlPoint(this);
- if (point->y < firstPoint.y)
- y = firstPoint.y;
- else if (point->y > secondPoint.y)
- y = secondPoint.y;
- else
- y = point->y;
- }
- else
- y = firstPoint.y + (nth + 1)*(secondPoint.y - firstPoint.y)/(noArcs + 1);
- }
- else y = (secondPoint.y - firstPoint.y)/2.0; // Midpoint
-
- x = pt1.x;
- }
-
- return wxRealPoint(x, y);
-}
-
-// Return the zero-based position in m_lines of line.
-int wxShape::GetLinePosition(wxLineShape* line)
-{
- for (size_t i = 0; i < m_lines.GetCount(); i++)
- if ((wxLineShape*) (m_lines.Item(i)->GetData()) == line)
- return i;
-
- return 0;
-}
-
-//
-// |________|
-// | <- root
-// | <- neck
-// shoulder1 ->---------<- shoulder2
-// | | | | |
-// <- branching attachment point N-1
-
-// This function gets information about where branching connections go.
-// Returns false if there are no lines at this attachment.
-bool wxShape::GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck,
- wxRealPoint& shoulder1, wxRealPoint& shoulder2)
-{
- int physicalAttachment = LogicalToPhysicalAttachment(attachment);
-
- // Number of lines at this attachment.
- int lineCount = GetAttachmentLineCount(attachment);
-
- if (lineCount == 0)
- return false;
-
- int totalBranchLength = m_branchSpacing * (lineCount - 1);
-
- root = GetBranchingAttachmentRoot(attachment);
-
- // Assume that we have attachment points 0 to 3: top, right, bottom, left.
- switch (physicalAttachment)
- {
- case 0:
- {
- neck.x = GetX();
- neck.y = root.y - m_branchNeckLength;
-
- shoulder1.x = root.x - (totalBranchLength/2.0) ;
- shoulder2.x = root.x + (totalBranchLength/2.0) ;
-
- shoulder1.y = neck.y;
- shoulder2.y = neck.y;
- break;
- }
- case 1:
- {
- neck.x = root.x + m_branchNeckLength;
- neck.y = root.y;
-
- shoulder1.x = neck.x ;
- shoulder2.x = neck.x ;
-
- shoulder1.y = neck.y - (totalBranchLength/2.0) ;
- shoulder2.y = neck.y + (totalBranchLength/2.0) ;
- break;
- }
- case 2:
- {
- neck.x = GetX();
- neck.y = root.y + m_branchNeckLength;
-
- shoulder1.x = root.x - (totalBranchLength/2.0) ;
- shoulder2.x = root.x + (totalBranchLength/2.0) ;
-
- shoulder1.y = neck.y;
- shoulder2.y = neck.y;
- break;
- }
- case 3:
- {
- neck.x = root.x - m_branchNeckLength;
- neck.y = root.y ;
-
- shoulder1.x = neck.x ;
- shoulder2.x = neck.x ;
-
- shoulder1.y = neck.y - (totalBranchLength/2.0) ;
- shoulder2.y = neck.y + (totalBranchLength/2.0) ;
- break;
- }
- default:
- {
- wxFAIL_MSG( wxT("Unrecognised attachment point in GetBranchingAttachmentInfo.") );
- break;
- }
- }
- return true;
-}
-
-// n is the number of the adjoining line, from 0 to N-1 where N is the number of lines
-// at this attachment point.
-// Get the attachment point where the arc joins the stem, and also the point where the
-// the stem meets the shoulder.
-bool wxShape::GetBranchingAttachmentPoint(int attachment, int n, wxRealPoint& pt, wxRealPoint& stemPt)
-{
- int physicalAttachment = LogicalToPhysicalAttachment(attachment);
-
- wxRealPoint root, neck, shoulder1, shoulder2;
- GetBranchingAttachmentInfo(attachment, root, neck, shoulder1, shoulder2);
-
- // Assume that we have attachment points 0 to 3: top, right, bottom, left.
- switch (physicalAttachment)
- {
- case 0:
- {
- pt.y = neck.y - m_branchStemLength;
- pt.x = shoulder1.x + n*m_branchSpacing;
-
- stemPt.x = pt.x;
- stemPt.y = neck.y;
- break;
- }
- case 2:
- {
- pt.y = neck.y + m_branchStemLength;
- pt.x = shoulder1.x + n*m_branchSpacing;
-
- stemPt.x = pt.x;
- stemPt.y = neck.y;
- break;
- }
- case 1:
- {
- pt.x = neck.x + m_branchStemLength;
- pt.y = shoulder1.y + n*m_branchSpacing;
-
- stemPt.x = neck.x;
- stemPt.y = pt.y;
- break;
- }
- case 3:
- {
- pt.x = neck.x - m_branchStemLength;
- pt.y = shoulder1.y + n*m_branchSpacing;
-
- stemPt.x = neck.x;
- stemPt.y = pt.y;
- break;
- }
- default:
- {
- wxFAIL_MSG( wxT("Unrecognised attachment point in GetBranchingAttachmentPoint.") );
- break;
- }
- }
-
- return true;
-}
-
-// Get the number of lines at this attachment position.
-int wxShape::GetAttachmentLineCount(int attachment) const
-{
- int count = 0;
- wxNode* node = m_lines.GetFirst();
- while (node)
- {
- wxLineShape* lineShape = (wxLineShape*) node->GetData();
- if ((lineShape->GetFrom() == this) && (lineShape->GetAttachmentFrom() == attachment))
- count ++;
- else if ((lineShape->GetTo() == this) && (lineShape->GetAttachmentTo() == attachment))
- count ++;
-
- node = node->GetNext();
- }
- return count;
-}
-
-// This function gets the root point at the given attachment.
-wxRealPoint wxShape::GetBranchingAttachmentRoot(int attachment)
-{
- int physicalAttachment = LogicalToPhysicalAttachment(attachment);
-
- wxRealPoint root;
-
- double width, height;
- GetBoundingBoxMax(& width, & height);
-
- // Assume that we have attachment points 0 to 3: top, right, bottom, left.
- switch (physicalAttachment)
- {
- case 0:
- {
- root.x = GetX() ;
- root.y = GetY() - height/2.0;
- break;
- }
- case 1:
- {
- root.x = GetX() + width/2.0;
- root.y = GetY() ;
- break;
- }
- case 2:
- {
- root.x = GetX() ;
- root.y = GetY() + height/2.0;
- break;
- }
- case 3:
- {
- root.x = GetX() - width/2.0;
- root.y = GetY() ;
- break;
- }
- default:
- {
- wxFAIL_MSG( wxT("Unrecognised attachment point in GetBranchingAttachmentRoot.") );
- break;
- }
- }
- return root;
-}
-
-// Draw or erase the branches (not the actual arcs though)
-void wxShape::OnDrawBranches(wxDC& dc, int attachment, bool erase)
-{
- int count = GetAttachmentLineCount(attachment);
- if (count == 0)
- return;
-
- wxRealPoint root, neck, shoulder1, shoulder2;
- GetBranchingAttachmentInfo(attachment, root, neck, shoulder1, shoulder2);
-
- if (erase)
- {
- dc.SetPen(*wxWHITE_PEN);
- dc.SetBrush(*wxWHITE_BRUSH);
- }
- else
- {
- dc.SetPen(*wxBLACK_PEN);
- dc.SetBrush(*wxBLACK_BRUSH);
- }
-
- // Draw neck
- dc.DrawLine((long) root.x, (long) root.y, (long) neck.x, (long) neck.y);
-
- if (count > 1)
- {
- // Draw shoulder-to-shoulder line
- dc.DrawLine((long) shoulder1.x, (long) shoulder1.y, (long) shoulder2.x, (long) shoulder2.y);
- }
- // Draw all the little branches
- int i;
- for (i = 0; i < count; i++)
- {
- wxRealPoint pt, stemPt;
- GetBranchingAttachmentPoint(attachment, i, pt, stemPt);
- dc.DrawLine((long) stemPt.x, (long) stemPt.y, (long) pt.x, (long) pt.y);
-
- if ((GetBranchStyle() & BRANCHING_ATTACHMENT_BLOB) && (count > 1))
- {
- long blobSize=6;
-// dc.DrawEllipse((long) (stemPt.x + 0.5 - (blobSize/2.0)), (long) (stemPt.y + 0.5 - (blobSize/2.0)), blobSize, blobSize);
- dc.DrawEllipse((long) (stemPt.x - (blobSize/2.0)), (long) (stemPt.y - (blobSize/2.0)), blobSize, blobSize);
- }
- }
-}
-
-// Draw or erase the branches (not the actual arcs though)
-void wxShape::OnDrawBranches(wxDC& dc, bool erase)
-{
- if (m_attachmentMode != ATTACHMENT_MODE_BRANCHING)
- return;
-
- int count = GetNumberOfAttachments();
- int i;
- for (i = 0; i < count; i++)
- OnDrawBranches(dc, i, erase);
-}
-
-// Only get the attachment position at the _edge_ of the shape, ignoring
-// branching mode. This is used e.g. to indicate the edge of interest, not the point
-// on the attachment branch.
-bool wxShape::GetAttachmentPositionEdge(int attachment, double *x, double *y,
- int nth, int no_arcs, wxLineShape *line)
-{
- int oldMode = m_attachmentMode;
-
- // Calculate as if to edge, not branch
- if (m_attachmentMode == ATTACHMENT_MODE_BRANCHING)
- m_attachmentMode = ATTACHMENT_MODE_EDGE;
- bool success = GetAttachmentPosition(attachment, x, y, nth, no_arcs, line);
- m_attachmentMode = oldMode;
-
- return success;
-}
-
-// Rotate the standard attachment point from physical (0 is always North)
-// to logical (0 -> 1 if rotated by 90 degrees)
-int wxShape::PhysicalToLogicalAttachment(int physicalAttachment) const
-{
- const double pi = M_PI ;
- int i;
- if (oglRoughlyEqual(GetRotation(), 0.0))
- {
- i = physicalAttachment;
- }
- else if (oglRoughlyEqual(GetRotation(), (pi/2.0)))
- {
- i = physicalAttachment - 1;
- }
- else if (oglRoughlyEqual(GetRotation(), pi))
- {
- i = physicalAttachment - 2;
- }
- else if (oglRoughlyEqual(GetRotation(), (3.0*pi/2.0)))
- {
- i = physicalAttachment - 3;
- }
- else
- // Can't handle -- assume the same.
- return physicalAttachment;
-
- if (i < 0)
- i += 4;
-
- return i;
-}
-
-// Rotate the standard attachment point from logical
-// to physical (0 is always North)
-int wxShape::LogicalToPhysicalAttachment(int logicalAttachment) const
-{
- const double pi = M_PI ;
- int i;
- if (oglRoughlyEqual(GetRotation(), 0.0))
- {
- i = logicalAttachment;
- }
- else if (oglRoughlyEqual(GetRotation(), (pi/2.0)))
- {
- i = logicalAttachment + 1;
- }
- else if (oglRoughlyEqual(GetRotation(), pi))
- {
- i = logicalAttachment + 2;
- }
- else if (oglRoughlyEqual(GetRotation(), (3.0*pi/2.0)))
- {
- i = logicalAttachment + 3;
- }
- else
- // Can't handle -- assume the same.
- return logicalAttachment;
-
- if (i > 3)
- i -= 4;
-
- return i;
-}
-
-void wxShape::Rotate(double WXUNUSED(x), double WXUNUSED(y), double theta)
-{
- const double pi = M_PI ;
- m_rotation = theta;
- if (m_rotation < 0.0)
- {
- m_rotation += 2*pi;
- }
- else if (m_rotation > 2*pi)
- {
- m_rotation -= 2*pi;
- }
-}
-
-
-wxPen wxShape::GetBackgroundPen()
-{
- if (GetCanvas())
- {
- wxColour c = GetCanvas()->GetBackgroundColour();
- return wxPen(c, 1, wxSOLID);
- }
- return * g_oglWhiteBackgroundPen;
-}
-
-
-wxBrush wxShape::GetBackgroundBrush()
-{
- if (GetCanvas())
- {
- wxColour c = GetCanvas()->GetBackgroundColour();
- return wxBrush(c, wxSOLID);
- }
- return * g_oglWhiteBackgroundBrush;
-}
diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp
deleted file mode 100644
index cecd9d3dbf..0000000000
--- a/contrib/src/ogl/basic2.cpp
+++ /dev/null
@@ -1,1892 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: basic2.cpp
-// Purpose: Basic OGL classes (2)
-// Author: Julian Smart
-// Modified by:
-// Created: 12/07/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#ifdef new
-#undef new
-#endif
-
-#include
-#include
-#include
