added wxPropertyGrid from Jaakko Salli (#9934)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-12 20:57:41 +00:00
parent 2bed17c862
commit 1c4293cb91
100 changed files with 49644 additions and 265 deletions
--- a/samples/propgrid/Makefile.in
+++ b/samples/propgrid/Makefile.in
@@ -0,0 +1,217 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+@MAKE_SET@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+INSTALL = @INSTALL@
+EXEEXT = @EXEEXT@
+WINDRES = @WINDRES@
+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@
+EXTRALIBS_SDL = @EXTRALIBS_SDL@
+CXXWARNINGS = @CXXWARNINGS@
+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
+PROPGRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
+PROPGRID_OBJECTS =  \
+	$(__propgrid_os2_lib_res) \
+	propgrid_propgrid.o \
+	propgrid_propgrid_minimal.o \
+	propgrid_sampleprops.o \
+	propgrid_tests.o \
+	$(__propgrid___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_0@__propgrid___mac_setfilecmd = @true
+@COND_PLATFORM_MAC_1@__propgrid___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL propgrid$(EXEEXT)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -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_2 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_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_2 = --define wxNO_THREADS
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+COND_PLATFORM_OS2_1___propgrid___os2_emxbindcmd = $(NM) propgrid$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep propgrid$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__propgrid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___propgrid___os2_emxbindcmd)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_OS2_1@__propgrid_os2_lib_res = \
+@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__propgrid_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= propgrid.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@__propgrid_bundle___depname = propgrid_bundle
+@COND_TOOLKIT_MAC@____propgrid_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__propgrid_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_CARBON@____propgrid_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@	= $(__propgrid_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____propgrid_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@	= $(__propgrid_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____propgrid_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@	= $(__propgrid_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_COCOA@____propgrid_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@	$(__propgrid_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_PROPGRID_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_PROPGRID_p = $(COND_MONOLITHIC_0___WXLIB_PROPGRID_p)
+COND_MONOLITHIC_0___WXLIB_ADV_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_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@__propgrid___win32rc = propgrid_sample_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_REGEX_BUILTIN___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: propgrid$(EXEEXT) $(__propgrid_bundle___depname)
+
+install: all
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f propgrid$(EXEEXT)
+	rm -rf propgrid.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+propgrid$(EXEEXT): $(PROPGRID_OBJECTS) $(__propgrid___win32rc)
+	$(CXX) -o $@ $(PROPGRID_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+	
+	$(__propgrid___mac_setfilecmd)
+	$(__propgrid___os2_emxbindcmd)
+	$(SAMPLES_RPATH_POSTLINK)
+
+@COND_PLATFORM_MACOSX_1@propgrid.app/Contents/PkgInfo: propgrid$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	mkdir -p propgrid.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p propgrid.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p propgrid.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/propgrid/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >propgrid.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >propgrid.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	ln -f propgrid$(EXEEXT) propgrid.app/Contents/MacOS/propgrid
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns propgrid.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@propgrid_bundle: $(____propgrid_BUNDLE_TGT_REF_DEP)
+
+propgrid_propgrid.o: $(srcdir)/propgrid.cpp
+	$(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/propgrid.cpp
+
+propgrid_propgrid_minimal.o: $(srcdir)/propgrid_minimal.cpp
+	$(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/propgrid_minimal.cpp
+
+propgrid_sampleprops.o: $(srcdir)/sampleprops.cpp
+	$(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/sampleprops.cpp
+
+propgrid_tests.o: $(srcdir)/tests.cpp
+	$(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/tests.cpp
+
+propgrid_sample_rc.o: $(srcdir)/../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
+
+
+$(srcdir)/include/wx/stc/stc.h: \
+$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
+$(srcdir)/src/stc/stc.cpp.in \
+$(srcdir)/src/stc/stc.h.in \
+$(srcdir)/src/stc/gen_iface.py
+	cd $(srcdir)/src/stc && ./gen_iface.py
+monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
+$(srcdir)/include/wx/stc/stc.h
+
+# Include dependency info, if present:
+@IF_GNU_MAKE@-include .deps/*.d
+
+.PHONY: all install uninstall clean distclean propgrid_bundle
--- a/samples/propgrid/makefile.bcc
+++ b/samples/propgrid/makefile.bcc
@@ -0,0 +1,261 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     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
+COMPILER_PREFIX = bcc
+OBJS = \
+	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PROPGRID_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+	-I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+PROPGRID_OBJECTS =  \
+	$(OBJS)\propgrid_propgrid.obj \
+	$(OBJS)\propgrid_propgrid_minimal.obj \
+	$(OBJS)\propgrid_sampleprops.obj \
+	$(OBJS)\propgrid_tests.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)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!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_PROPGRID_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_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)\propgrid.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)\propgrid.exe del $(OBJS)\propgrid.exe
+	-if exist $(OBJS)\propgrid.tds del $(OBJS)\propgrid.tds
+	-if exist $(OBJS)\propgrid.ilc del $(OBJS)\propgrid.ilc
+	-if exist $(OBJS)\propgrid.ild del $(OBJS)\propgrid.ild
+	-if exist $(OBJS)\propgrid.ilf del $(OBJS)\propgrid.ilf
+	-if exist $(OBJS)\propgrid.ils del $(OBJS)\propgrid.ils
+
+$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS)  $(OBJS)\propgrid_sample.res
+	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+	c0w32.obj $(PROPGRID_OBJECTS),$@,, $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_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 import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\propgrid_sample.res
+|
+
+$(OBJS)\propgrid_propgrid.obj: .\propgrid.cpp
+	$(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\propgrid.cpp
+
+$(OBJS)\propgrid_propgrid_minimal.obj: .\propgrid_minimal.cpp
+	$(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\propgrid_minimal.cpp
+
+$(OBJS)\propgrid_sampleprops.obj: .\sampleprops.cpp
+	$(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\sampleprops.cpp
+
+$(OBJS)\propgrid_tests.obj: .\tests.cpp
+	$(CXX) -q -c -P -o$@ $(PROPGRID_CXXFLAGS) .\tests.cpp
+
+$(OBJS)\propgrid_sample.res: .\..\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 -dNOPCH .\..\sample.rc
+
--- a/samples/propgrid/makefile.gcc
+++ b/samples/propgrid/makefile.gcc
@@ -0,0 +1,261 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     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
+COMPILER_PREFIX = gcc
+OBJS = \
+	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PROPGRID_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
+	$(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+	$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+PROPGRID_OBJECTS =  \
+	$(OBJS)\propgrid_propgrid.o \
+	$(OBJS)\propgrid_propgrid_minimal.o \
+	$(OBJS)\propgrid_sampleprops.o \
+	$(OBJS)\propgrid_tests.o \
+	$(OBJS)\propgrid_sample_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),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+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_PROPGRID_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_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)\propgrid.exe
+
+clean: 
+	-if exist $(OBJS)\*.o del $(OBJS)\*.o
+	-if exist $(OBJS)\*.d del $(OBJS)\*.d
+	-if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe
+
+$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample_rc.o
+	$(CXX) -o $@ $(PROPGRID_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_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
+
+$(OBJS)\propgrid_propgrid.o: ./propgrid.cpp
+	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\propgrid_propgrid_minimal.o: ./propgrid_minimal.cpp
+	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\propgrid_sampleprops.o: ./sampleprops.cpp
+	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\propgrid_tests.o: ./tests.cpp
+	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\propgrid_sample_rc.o: ./../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 --define NOPCH
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
--- a/samples/propgrid/makefile.unx
+++ b/samples/propgrid/makefile.unx
@@ -0,0 +1,122 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# C++ compiler 
+CXX := g++
+
+# Standard flags for C++ 
+CXXFLAGS := 
+
+# Standard preprocessor flags (common for CC and CXX) 
+CPPFLAGS := 
+
+# Standard linker flags 
+LDFLAGS := 
+
+# Location and arguments of wx-config script 
+WX_CONFIG := wx-config
+
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
+WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+
+# Use DLL build of wx library to use? [0,1]
+WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+
+# Compile Unicode build of wxWidgets? [0,1]
+WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+
+# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
+WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+
+# Version of the wx library to build against. 
+WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+
+
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
+WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
+WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
+WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \
+	$(WX_CONFIG_SHARED_FLAG) --toolkit=$(WX_PORT) \
+	--version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+PROPGRID_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
+	$(CXXFLAGS)
+PROPGRID_OBJECTS =  \
+	propgrid_propgrid.o \
+	propgrid_propgrid_minimal.o \
+	propgrid_sampleprops.o \
+	propgrid_tests.o
+
+### Conditionally set variables: ###
+
+ifeq ($(WX_DEBUG),0)
+WX_CONFIG_DEBUG_FLAG = --debug=no
+endif
+ifeq ($(WX_DEBUG),1)
+WX_CONFIG_DEBUG_FLAG = --debug=yes
+endif
+ifeq ($(WX_UNICODE),0)
+WX_CONFIG_UNICODE_FLAG = --unicode=no
+endif
+ifeq ($(WX_UNICODE),1)
+WX_CONFIG_UNICODE_FLAG = --unicode=yes
+endif
+ifeq ($(WX_SHARED),0)
+WX_CONFIG_SHARED_FLAG = --static=yes
+endif
+ifeq ($(WX_SHARED),1)
+WX_CONFIG_SHARED_FLAG = --static=no
+endif
+
+
+### Targets: ###
+
+all: test_for_selected_wxbuild propgrid
+
+install: all
+
+uninstall: 
+
+clean: 
+	rm -f ./*.o
+	rm -f ./*.d
+	rm -f propgrid
+
+test_for_selected_wxbuild: 
+	@$(WX_CONFIG) $(WX_CONFIG_FLAGS)
+
+propgrid: $(PROPGRID_OBJECTS)
+	$(CXX) -o $@ $(PROPGRID_OBJECTS) $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs propgrid,adv,core,base`
+
+propgrid_propgrid.o: ./propgrid.cpp
+	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+propgrid_propgrid_minimal.o: ./propgrid_minimal.cpp
+	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+propgrid_sampleprops.o: ./sampleprops.cpp
+	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+propgrid_tests.o: ./tests.cpp
+	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all install uninstall clean
+
+
+# Dependencies tracking:
+-include ./*.d
--- a/samples/propgrid/makefile.vc
+++ b/samples/propgrid/makefile.vc
@@ -0,0 +1,337 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     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
+COMPILER_PREFIX = vc
+OBJS = \
+	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+	.\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PROPGRID_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
+	$(__DEBUGINFO_0) /Fd$(OBJS)\propgrid.pdb $(____DEBUGRUNTIME_2_p) \
+	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+	$(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \
+	/D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \
+	$(CPPFLAGS) $(CXXFLAGS)
+PROPGRID_OBJECTS =  \
+	$(OBJS)\propgrid_propgrid.obj \
+	$(OBJS)\propgrid_propgrid_minimal.obj \
+	$(OBJS)\propgrid_sampleprops.obj \
+	$(OBJS)\propgrid_tests.obj \
+	$(OBJS)\propgrid_sample.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)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!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_PROPGRID_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_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)\propgrid.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)\propgrid.exe del $(OBJS)\propgrid.exe
+	-if exist $(OBJS)\propgrid.ilk del $(OBJS)\propgrid.ilk
+	-if exist $(OBJS)\propgrid.pdb del $(OBJS)\propgrid.pdb
+
+$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res
+	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+	$(PROPGRID_OBJECTS)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_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
+<<
+
+$(OBJS)\propgrid_propgrid.obj: .\propgrid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid.cpp
+
+$(OBJS)\propgrid_propgrid_minimal.obj: .\propgrid_minimal.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid_minimal.cpp
+
+$(OBJS)\propgrid_sampleprops.obj: .\sampleprops.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\sampleprops.cpp
+
+$(OBJS)\propgrid_tests.obj: .\tests.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\tests.cpp
+
+$(OBJS)\propgrid_sample.res: .\..\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 /d NOPCH .\..\sample.rc
+
--- a/samples/propgrid/makefile.wat
+++ b/samples/propgrid/makefile.wat
@@ -0,0 +1,288 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     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_PROPGRID_p =
+!ifeq MONOLITHIC 0
+__WXLIB_PROPGRID_p = &
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_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 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!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
+COMPILER_PREFIX = wat
+OBJS = &
+	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+PROPGRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+	$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+	-i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+	-i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+	$(CXXFLAGS)
+PROPGRID_OBJECTS =  &
+	$(OBJS)\propgrid_propgrid.obj &
+	$(OBJS)\propgrid_propgrid_minimal.obj &
+	$(OBJS)\propgrid_sampleprops.obj &
+	$(OBJS)\propgrid_tests.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+	-if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\propgrid.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)\propgrid.exe del $(OBJS)\propgrid.exe
+
+$(OBJS)\propgrid.exe :  $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res
+	@%create $(OBJS)\propgrid.lbc
+	@%append $(OBJS)\propgrid.lbc option quiet
+	@%append $(OBJS)\propgrid.lbc name $^@
+	@%append $(OBJS)\propgrid.lbc option caseexact
+	@%append $(OBJS)\propgrid.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+	@for %i in ($(PROPGRID_OBJECTS)) do @%append $(OBJS)\propgrid.lbc file %i
+	@for %i in ( $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_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) do @%append $(OBJS)\propgrid.lbc library %i
+	@%append $(OBJS)\propgrid.lbc option resource=$(OBJS)\propgrid_sample.res
+	@for %i in () do @%append $(OBJS)\propgrid.lbc option stack=%i
+	wlink @$(OBJS)\propgrid.lbc
+
+$(OBJS)\propgrid_propgrid.obj :  .AUTODEPEND .\propgrid.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<
+
+$(OBJS)\propgrid_propgrid_minimal.obj :  .AUTODEPEND .\propgrid_minimal.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<
+
+$(OBJS)\propgrid_sampleprops.obj :  .AUTODEPEND .\sampleprops.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<
+
+$(OBJS)\propgrid_tests.obj :  .AUTODEPEND .\tests.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $<
+
+$(OBJS)\propgrid_sample.res :  .AUTODEPEND .\..\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 -dNOPCH $<
+
--- a/samples/propgrid/propgrid.bkl
+++ b/samples/propgrid/propgrid.bkl
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="propgrid" template="wx_sample" template_append="wx_append">
+        <sources>
+            propgrid.cpp
+            propgrid_minimal.cpp
+            sampleprops.cpp
+            tests.cpp
+        </sources>
+        <wx-lib>propgrid</wx-lib>
+        <wx-lib>adv</wx-lib>
+        <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
+        <win32-res>../sample.rc</win32-res>
+    </exe>
+
+</makefile>
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
--- a/samples/propgrid/propgrid.dsp
+++ b/samples/propgrid/propgrid.dsp
@@ -0,0 +1,276 @@
+# Microsoft Developer Studio Project File - Name="propgrid" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=propgrid - 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 "propgrid.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 "propgrid.mak" CFG="propgrid - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "propgrid - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
+!MESSAGE "propgrid - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
+!MESSAGE "propgrid - Win32 DLL Release" (based on "Win32 (x86) Application")
+!MESSAGE "propgrid - Win32 DLL Debug" (based on "Win32 (x86) Application")
+!MESSAGE "propgrid - Win32 Universal Release" (based on "Win32 (x86) Application")
+!MESSAGE "propgrid - Win32 Universal Debug" (based on "Win32 (x86) Application")
+!MESSAGE "propgrid - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "propgrid - 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)" == "propgrid - Win32 DLL Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivudll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\propgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivudll"
+# PROP Intermediate_Dir "vc_mswunivudll\propgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv29u_propgrid.lib wxmswuniv29u_adv.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 /nologo /machine:i386 /out:"vc_mswunivudll\propgrid.exe" /debug /pdb:"vc_mswunivudll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv29u_propgrid.lib wxmswuniv29u_adv.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 /nologo /machine:i386 /out:"vc_mswunivudll\propgrid.exe" /debug /pdb:"vc_mswunivudll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "propgrid - Win32 DLL Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivuddll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\propgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivuddll"
+# PROP Intermediate_Dir "vc_mswunivuddll\propgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.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 /nologo /machine:i386 /out:"vc_mswunivuddll\propgrid.exe" /debug /pdb:"vc_mswunivuddll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.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 /nologo /machine:i386 /out:"vc_mswunivuddll\propgrid.exe" /debug /pdb:"vc_mswunivuddll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "propgrid - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswudll"
+# PROP BASE Intermediate_Dir "vc_mswudll\propgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswudll"
+# PROP Intermediate_Dir "vc_mswudll\propgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw29u_propgrid.lib wxmsw29u_adv.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 /nologo /machine:i386 /out:"vc_mswudll\propgrid.exe" /debug /pdb:"vc_mswudll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw29u_propgrid.lib wxmsw29u_adv.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 /nologo /machine:i386 /out:"vc_mswudll\propgrid.exe" /debug /pdb:"vc_mswudll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "propgrid - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswuddll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\propgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswuddll"
+# PROP Intermediate_Dir "vc_mswuddll\propgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw29ud_propgrid.lib wxmsw29ud_adv.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 /nologo /machine:i386 /out:"vc_mswuddll\propgrid.exe" /debug /pdb:"vc_mswuddll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw29ud_propgrid.lib wxmsw29ud_adv.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 /nologo /machine:i386 /out:"vc_mswuddll\propgrid.exe" /debug /pdb:"vc_mswuddll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "propgrid - Win32 Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivu"
+# PROP BASE Intermediate_Dir "vc_mswunivu\propgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivu"
+# PROP Intermediate_Dir "vc_mswunivu\propgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv29u_propgrid.lib wxmswuniv29u_adv.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 /nologo /machine:i386 /out:"vc_mswunivu\propgrid.exe" /debug /pdb:"vc_mswunivu\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv29u_propgrid.lib wxmswuniv29u_adv.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 /nologo /machine:i386 /out:"vc_mswunivu\propgrid.exe" /debug /pdb:"vc_mswunivu\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "propgrid - Win32 Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivud"
+# PROP BASE Intermediate_Dir "vc_mswunivud\propgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivud"
+# PROP Intermediate_Dir "vc_mswunivud\propgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.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 /nologo /machine:i386 /out:"vc_mswunivud\propgrid.exe" /debug /pdb:"vc_mswunivud\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv29ud_propgrid.lib wxmswuniv29ud_adv.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 /nologo /machine:i386 /out:"vc_mswunivud\propgrid.exe" /debug /pdb:"vc_mswunivud\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "propgrid - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswu"
+# PROP BASE Intermediate_Dir "vc_mswu\propgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswu"
+# PROP Intermediate_Dir "vc_mswu\propgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw29u_propgrid.lib wxmsw29u_adv.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 /nologo /machine:i386 /out:"vc_mswu\propgrid.exe" /debug /pdb:"vc_mswu\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw29u_propgrid.lib wxmsw29u_adv.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 /nologo /machine:i386 /out:"vc_mswu\propgrid.exe" /debug /pdb:"vc_mswu\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF  "$(CFG)" == "propgrid - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswud"
+# PROP BASE Intermediate_Dir "vc_mswud\propgrid"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswud"
+# PROP Intermediate_Dir "vc_mswud\propgrid"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw29ud_propgrid.lib wxmsw29ud_adv.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 /nologo /machine:i386 /out:"vc_mswud\propgrid.exe" /debug /pdb:"vc_mswud\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw29ud_propgrid.lib wxmsw29ud_adv.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 /nologo /machine:i386 /out:"vc_mswud\propgrid.exe" /debug /pdb:"vc_mswud\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ENDIF
+
+# Begin Target
+
+# Name "propgrid - Win32 DLL Universal Release"
+# Name "propgrid - Win32 DLL Universal Debug"
+# Name "propgrid - Win32 DLL Release"
+# Name "propgrid - Win32 DLL Debug"
+# Name "propgrid - Win32 Universal Release"
+# Name "propgrid - Win32 Universal Debug"
+# Name "propgrid - Win32 Release"
+# Name "propgrid - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\propgrid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\propgrid_minimal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\..\sample.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\sampleprops.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\tests.cpp
+# End Source File
+# End Group
+# End Target
+# End Project
+
--- a/samples/propgrid/propgrid.h
+++ b/samples/propgrid/propgrid.h
@@ -0,0 +1,256 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        samples/propgrid/propgrid.h
+// Purpose:     wxPropertyGrid sample
+// Author:      Jaakko Salli
+// Modified by:
+// Created:     2004-09-25
+// RCS-ID:      $Id:
+// Copyright:   (c) Jaakko Salli
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SAMPLES_PROPGRID_PROPGRID_H_
+#define _WX_SAMPLES_PROPGRID_PROPGRID_H_
+
+// -----------------------------------------------------------------------
+
+class wxAdvImageFileProperty : public wxFileProperty
+{
+    WX_PG_DECLARE_PROPERTY_CLASS(wxAdvImageFileProperty)
+public:
+
+    wxAdvImageFileProperty( const wxString& label = wxPG_LABEL,
+                            const wxString& name = wxPG_LABEL,
+                            const wxString& value = wxEmptyString );
+    virtual ~wxAdvImageFileProperty ();
+
+    virtual void OnSetValue();  // Override to allow image loading.
+
+    WX_PG_DECLARE_CHOICE_METHODS()
+    WX_PG_DECLARE_EVENT_METHODS()
+    WX_PG_DECLARE_CUSTOM_PAINT_METHODS()
+
+    void LoadThumbnails( size_t n );
+
+protected:
+    wxImage*    m_pImage; // Temporary thumbnail data.
+
+    static wxPGChoices ms_choices;
+
+    int m_index; // Index required for choice behaviour.
+};
+
+// -----------------------------------------------------------------------
+
+class wxVector3f
+{
+public:
+    wxVector3f()
+    {
+        x = y = z = 0.0;
+    }
+    wxVector3f( double x, double y, double z )
+    {
+        x = x; y = y; z = z;
+    }
+
+    double x, y, z;
+};
+
+inline bool operator == (const wxVector3f& a, const wxVector3f& b)
+{
+    return (a.x == b.x && a.y == b.y && a.z == b.z);
+}
+
+WX_PG_DECLARE_VARIANT_DATA(wxVector3fVariantData, wxVector3f, wxEMPTY_PARAMETER_VALUE)
+
+class wxVectorProperty : public wxPGProperty
+{
+    WX_PG_DECLARE_PROPERTY_CLASS(wxVectorProperty)
+public:
+
+    wxVectorProperty( const wxString& label = wxPG_LABEL,
+                      const wxString& name = wxPG_LABEL,
+                      const wxVector3f& value = wxVector3f() );
+    virtual ~wxVectorProperty();
+
+    WX_PG_DECLARE_PARENTAL_METHODS()
+
+protected:
+};
+
+// -----------------------------------------------------------------------
+
+class wxTriangle
+{
+public:
+    wxVector3f a, b, c;
+};
+
+inline bool operator == (const wxTriangle& a, const wxTriangle& b)
+{
+    return (a.a == b.a && a.b == b.b && a.c == b.c);
+}
+
+WX_PG_DECLARE_VARIANT_DATA(wxTriangleVariantData, wxTriangle, wxEMPTY_PARAMETER_VALUE)
+
+class wxTriangleProperty : public wxPGProperty
+{
+    WX_PG_DECLARE_PROPERTY_CLASS(wxTriangleProperty)
+public:
+
+    wxTriangleProperty( const wxString& label = wxPG_LABEL,
+                        const wxString& name = wxPG_LABEL,
+                        const wxTriangle& value = wxTriangle() );
+    virtual ~wxTriangleProperty();
+
+    WX_PG_DECLARE_PARENTAL_METHODS()
+
+protected:
+};
+
+// -----------------------------------------------------------------------
+
+enum
+{
+    ID_COLOURSCHEME4 = 100
+};
+
+// -----------------------------------------------------------------------
+
+class FormMain : public wxFrame
+{
+public:
+    FormMain(const wxString& title, const wxPoint& pos, const wxSize& size );
+	~FormMain();
+
+    wxPropertyGridManager*  m_pPropGridManager;
+    wxPropertyGrid*     m_propGrid;
+
+    wxTextCtrl*     m_tcPropLabel;
+    wxWindow*       m_panel;
+    wxBoxSizer*     m_topSizer;
+
+    wxPGChoices     m_combinedFlags;
+
+    wxMenuItem*     m_itemCatColours;
+    wxMenuItem*     m_itemFreeze;
+    wxMenuItem*     m_itemEnable;
+
+    wxVariant       m_storedValues;
+
+    wxString        m_savedState;
+
+
+    void CreateGrid( int style, int extraStyle );
+
+    // These are used in CreateGrid(), and in tests to compose
+    // grids for testing purposes.
+    void InitPanel();
+    void PopulateGrid();
+    void FinalizePanel( bool wasCreated = true );
+
+    void PopulateWithStandardItems();
+    void PopulateWithExamples();
+    void PopulateWithLibraryConfig();
+
+    void OnCloseClick( wxCommandEvent& event );
+    void OnLabelTextChange( wxCommandEvent& event );
+
+    void OnColourScheme( wxCommandEvent& event );
+
+    void OnInsertPropClick( wxCommandEvent& event );
+    void OnAppendPropClick( wxCommandEvent& event );
+    void OnClearClick( wxCommandEvent& event );
+    void OnAppendCatClick( wxCommandEvent& event );
+    void OnInsertCatClick( wxCommandEvent& event );
+    void OnDelPropClick( wxCommandEvent& event );
+    void OnDelPropRClick( wxCommandEvent& event );
+
+    void OnContextMenu( wxContextMenuEvent& event );
+
+    void OnEnableDisable( wxCommandEvent& event );
+    void OnHideShow( wxCommandEvent& event );
+    void OnClearModifyStatusClick( wxCommandEvent& event );
+    void OnFreezeClick( wxCommandEvent& event );
+    void OnDumpList( wxCommandEvent& event );
+    void OnCatColours( wxCommandEvent& event );
+    void OnSetColumns( wxCommandEvent& event );
+    void OnMisc( wxCommandEvent& event );
+    void OnPopulateClick( wxCommandEvent& event );
+    void OnSetSpinCtrlEditorClick( wxCommandEvent& event );
+    void OnTestReplaceClick( wxCommandEvent& event );
+    void OnTestXRC( wxCommandEvent& event );
+    void OnEnableCommonValues( wxCommandEvent& event );
+    void OnSelectStyle( wxCommandEvent& event );
+
+    void OnFitColumnsClick( wxCommandEvent& event );
+
+    void OnChangeFlagsPropItemsClick( wxCommandEvent& event );
+
+    void OnSaveToFileClick( wxCommandEvent& event );
+    void OnLoadFromFileClick( wxCommandEvent& event );
+
+    void OnSetPropertyValue( wxCommandEvent& event );
+    void OnInsertChoice( wxCommandEvent& event );
+    void OnDeleteChoice( wxCommandEvent& event );
+    void OnInsertPage( wxCommandEvent& event );
+    void OnRemovePage( wxCommandEvent& event );
+
+    void OnSaveState( wxCommandEvent& event );
+    void OnRestoreState( wxCommandEvent& event );
+
+    void OnRunMinimalClick( wxCommandEvent& event );
+
+    void OnIterate1Click( wxCommandEvent& event );
+    void OnIterate2Click( wxCommandEvent& event );
+    void OnIterate3Click( wxCommandEvent& event );
+    void OnIterate4Click( wxCommandEvent& event );
+
+    void OnPropertyGridChange( wxPropertyGridEvent& event );
+    void OnPropertyGridChanging( wxPropertyGridEvent& event );
+    void OnPropertyGridSelect( wxPropertyGridEvent& event );
+    void OnPropertyGridHighlight( wxPropertyGridEvent& event );
+    void OnPropertyGridItemRightClick( wxPropertyGridEvent& event );
+    void OnPropertyGridItemDoubleClick( wxPropertyGridEvent& event );
+    void OnPropertyGridPageChange( wxPropertyGridEvent& event );
+    void OnPropertyGridButtonClick( wxCommandEvent& event );
+    void OnPropertyGridTextUpdate( wxCommandEvent& event );
+    void OnPropertyGridKeyEvent( wxKeyEvent& event );
+    void OnPropertyGridItemCollapse( wxPropertyGridEvent& event );
+    void OnPropertyGridItemExpand( wxPropertyGridEvent& event );
+
+    void OnAbout( wxCommandEvent& event );
+
+    void OnMove( wxMoveEvent& event );
+    void OnResize( wxSizeEvent& event );
+    void OnPaint( wxPaintEvent& event );
+    void OnCloseEvent( wxCloseEvent& event );
+
+    void OnIdle( wxIdleEvent& event );
+
+    void AddTestProperties( wxPropertyGridPage* pg );
+
+    bool RunTests( bool fullTest, bool interactive = false );
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+// -----------------------------------------------------------------------
+
+class cxApplication : public wxApp
+{
+public:
+
+    virtual bool OnInit();
+
+private:
+    FormMain    *Form1;
+};
+
+DECLARE_APP(cxApplication)
+
+// -----------------------------------------------------------------------
+
+#endif // _WX_SAMPLES_PROPGRID_PROPGRID_H_
--- a/samples/propgrid/propgrid_minimal.cpp
+++ b/samples/propgrid/propgrid_minimal.cpp
@@ -0,0 +1,107 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        samples/propgrid/propgrid_minimal.cpp
+// Purpose:     Minimal portion of wxPropertyGrid sample
+// Author:      Jaakko Salli
+// Modified by:
+// Created:     2008-08-23
+// RCS-ID:      $Id:
+// Copyright:   (c) Jaakko Salli
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wx.h"
+#include "wx/propgrid/propgrid.h"
+
+class MyFrame : public wxFrame 
+{ 
+public: 
+    MyFrame(wxWindow* parent); 
+ 
+    void OnAction(wxCommandEvent& event); 
+    void OnPropertyGridChange(wxPropertyGridEvent& event); 
+
+private:
+    wxPropertyGrid* m_pg;
+    DECLARE_EVENT_TABLE()
+};
+
+//
+// Called from propgridsample.cpp
+//
+void DisplayMinimalFrame(wxWindow* parent)
+{
+    MyFrame *frame = new MyFrame(parent);
+    frame->Show(true);
+}
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU(wxID_HIGHEST+1, MyFrame::OnAction)
+    EVT_PG_CHANGED( -1, MyFrame::OnPropertyGridChange )
+END_EVENT_TABLE()
+
+MyFrame::MyFrame(wxWindow* parent)
+    : wxFrame(parent, wxID_ANY, wxT("PropertyGrid Test"))
+{
+    wxMenu *Menu = new wxMenu; 
+    Menu->Append(wxID_HIGHEST+1, wxT("Action")); 
+    wxMenuBar *MenuBar = new wxMenuBar(); 
+    MenuBar->Append(Menu, wxT("Action")); 
+    SetMenuBar(MenuBar); 
+
+    wxPropertyGrid *pg = new wxPropertyGrid(this,-1,wxDefaultPosition,wxSize(400,400),
+                        wxPG_SPLITTER_AUTO_CENTER |
+                        wxPG_BOLD_MODIFIED );
+    m_pg = pg;
+
+    for ( int i=0; i< 20; i++ )
+        pg->Append(new wxStringProperty(wxString::Format(wxT("Item %i"),i), wxPG_LABEL));
+
+    wxPGProperty* topId;
+    wxPGProperty* medId;
+    wxPGProperty* botId;
+
+    topId = pg->Append( new wxStringProperty(wxT("Top Item"), wxPG_LABEL, wxT("<composed>")) );
+    pg->LimitPropertyEditing(topId, true);
+    medId = pg->AppendIn( topId, new wxStringProperty(wxT("Medium Level Item A"), wxPG_LABEL, wxT("<composed>")) );
+    pg->LimitPropertyEditing(medId, true);
+    botId = pg->AppendIn( medId, new wxStringProperty(wxT("Position"), wxPG_LABEL, wxT("<composed>")) );
+    pg->LimitPropertyEditing(botId, true);
+    pg->AppendIn( botId, new wxFloatProperty(wxT("x"), wxPG_LABEL, 1.0) );
+    pg->AppendIn( botId, new wxFloatProperty(wxT("y"), wxPG_LABEL, 2.0) );
+    pg->AppendIn( botId, new wxFloatProperty(wxT("z"), wxPG_LABEL, 3.0) );
+    pg->AppendIn( medId, new wxStringProperty(wxT("Name"), wxPG_LABEL, wxT("name")) );
+    medId = pg->AppendIn( topId, new wxStringProperty(wxT("Medium Level Item B"), wxPG_LABEL, wxT("<composed>")) );
+    pg->LimitPropertyEditing(medId, true);
+    botId = pg->AppendIn( medId, new wxStringProperty(wxT("Position"), wxPG_LABEL, wxT("<composed>")) );
+    pg->LimitPropertyEditing(botId, true);
+    pg->AppendIn( botId, new wxFloatProperty(wxT("x"), wxPG_LABEL, 1.0) );
+    pg->AppendIn( botId, new wxFloatProperty(wxT("y"), wxPG_LABEL, 2.0) );
+    pg->AppendIn( botId, new wxFloatProperty(wxT("z"), wxPG_LABEL, 3.0) );
+    pg->AppendIn( medId, new wxStringProperty(wxT("Name"), wxPG_LABEL, wxT("name")) );
+    medId = pg->AppendIn( topId, new wxStringProperty(wxT("Medium Level Item C"), wxPG_LABEL, wxT("<composed>")) );
+    pg->LimitPropertyEditing(medId, true);
+    botId = pg->AppendIn( medId, new wxStringProperty(wxT("Position"), wxPG_LABEL, wxT("<composed>")) );
+    pg->LimitPropertyEditing(botId, true);
+    pg->AppendIn( botId, new wxFloatProperty(wxT("x"), wxPG_LABEL, 1.0) );
+    pg->AppendIn( botId, new wxFloatProperty(wxT("y"), wxPG_LABEL, 2.0) );
+    pg->AppendIn( botId, new wxFloatProperty(wxT("z"), wxPG_LABEL, 3.0) );
+    pg->AppendIn( medId, new wxStringProperty(wxT("Name"), wxPG_LABEL, wxT("name")) );
+
+    SetSize(400, 600);
+}
+
+void MyFrame::OnPropertyGridChange(wxPropertyGridEvent &event)
+{
+    wxPGProperty* p = event.GetProperty();
+
+    wxLogDebug(wxT("OnPropertyGridChange(%s)"), p->GetName().c_str());
+
+    if ( p->GetBaseName() == wxT("x") )
+    {
+        wxLogDebug(wxT("double values=%.2f)"), m_pg->GetPropertyValueAsDouble(p));
+    }
+}
+
+void MyFrame::OnAction(wxCommandEvent &) 
+{
+}
--- a/samples/propgrid/propgrid_vc7.vcproj
+++ b/samples/propgrid/propgrid_vc7.vcproj
@@ -0,0 +1,649 @@
+<?xml version="1.0" ?>
+<!--
+
+  This makefile was generated by
+  Bakefile 0.2.3 (http://www.bakefile.org)
+  Do not modify, all changes will be overwritten!
+
+-->
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="propgrid"
+	ProjectGUID="{6A7A28DD-C53E-50B0-B8E2-8D5A1D4206C7}">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="vc_mswunivudll"
+			IntermediateDirectory="vc_mswunivudll\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1">
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCIDLTool"/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="2"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswunivudll\propgrid\"
+				ObjectFile="vc_mswunivudll\propgrid\"
+				ProgramDataBaseFileName="vc_mswunivudll\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmswuniv29u_propgrid.lib  wxmswuniv29u_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswunivudll\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswunivudll\propgrid.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCALinkTool"/>
+			<Tool
+				Name="VCXDCMakeTool"/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswunivudll\propgrid_vc7.bsc"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCFxCopTool"/>
+			<Tool
+				Name="VCAppVerifierTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="vc_mswunivuddll"
+			IntermediateDirectory="vc_mswunivuddll\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1">
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCIDLTool"/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="3"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswunivuddll\propgrid\"
+				ObjectFile="vc_mswunivuddll\propgrid\"
+				ProgramDataBaseFileName="vc_mswunivuddll\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmswuniv29ud_propgrid.lib  wxmswuniv29ud_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswunivuddll\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswunivuddll\propgrid.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCALinkTool"/>
+			<Tool
+				Name="VCXDCMakeTool"/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswunivuddll\propgrid_vc7.bsc"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCFxCopTool"/>
+			<Tool
+				Name="VCAppVerifierTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="DLL Release|Win32"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1">
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCIDLTool"/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="2"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswudll\propgrid\"
+				ObjectFile="vc_mswudll\propgrid\"
+				ProgramDataBaseFileName="vc_mswudll\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmsw29u_propgrid.lib  wxmsw29u_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswudll\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswudll\propgrid.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCALinkTool"/>
+			<Tool
+				Name="VCXDCMakeTool"/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswudll\propgrid_vc7.bsc"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCFxCopTool"/>
+			<Tool
+				Name="VCAppVerifierTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="DLL Debug|Win32"
+			OutputDirectory="vc_mswuddll"
+			IntermediateDirectory="vc_mswuddll\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1">
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCIDLTool"/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="3"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswuddll\propgrid\"
+				ObjectFile="vc_mswuddll\propgrid\"
+				ProgramDataBaseFileName="vc_mswuddll\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmsw29ud_propgrid.lib  wxmsw29ud_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswuddll\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswuddll\propgrid.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCALinkTool"/>
+			<Tool
+				Name="VCXDCMakeTool"/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswuddll\propgrid_vc7.bsc"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCFxCopTool"/>
+			<Tool
+				Name="VCAppVerifierTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="Universal Release|Win32"
+			OutputDirectory="vc_mswunivu"
+			IntermediateDirectory="vc_mswunivu\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1">
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCIDLTool"/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="2"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswunivu\propgrid\"
+				ObjectFile="vc_mswunivu\propgrid\"
+				ProgramDataBaseFileName="vc_mswunivu\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmswuniv29u_propgrid.lib  wxmswuniv29u_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswunivu\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswunivu\propgrid.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCALinkTool"/>
+			<Tool
+				Name="VCXDCMakeTool"/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswunivu\propgrid_vc7.bsc"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCFxCopTool"/>
+			<Tool
+				Name="VCAppVerifierTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="Universal Debug|Win32"
+			OutputDirectory="vc_mswunivud"
+			IntermediateDirectory="vc_mswunivud\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1">
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCIDLTool"/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="3"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswunivud\propgrid\"
+				ObjectFile="vc_mswunivud\propgrid\"
+				ProgramDataBaseFileName="vc_mswunivud\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmswuniv29ud_propgrid.lib  wxmswuniv29ud_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswunivud\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswunivud\propgrid.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCALinkTool"/>
+			<Tool
+				Name="VCXDCMakeTool"/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswunivud\propgrid_vc7.bsc"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCFxCopTool"/>
+			<Tool
+				Name="VCAppVerifierTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="vc_mswu"
+			IntermediateDirectory="vc_mswu\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1">
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCIDLTool"/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="2"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswu\propgrid\"
+				ObjectFile="vc_mswu\propgrid\"
+				ProgramDataBaseFileName="vc_mswu\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmsw29u_propgrid.lib  wxmsw29u_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswu\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswu\propgrid.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCALinkTool"/>
+			<Tool
+				Name="VCXDCMakeTool"/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswu\propgrid_vc7.bsc"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCFxCopTool"/>
+			<Tool
+				Name="VCAppVerifierTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="vc_mswud"
+			IntermediateDirectory="vc_mswud\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1">
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCIDLTool"/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="3"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswud\propgrid\"
+				ObjectFile="vc_mswud\propgrid\"
+				ProgramDataBaseFileName="vc_mswud\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmsw29ud_propgrid.lib  wxmsw29ud_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswud\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswud\propgrid.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCALinkTool"/>
+			<Tool
+				Name="VCXDCMakeTool"/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswud\propgrid_vc7.bsc"
+				SuppressStartupBanner="true"/>
+			<Tool
+				Name="VCFxCopTool"/>
+			<Tool
+				Name="VCAppVerifierTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+			<File
+				RelativePath=".\propgrid.cpp"/>
+			<File
+				RelativePath=".\propgrid_minimal.cpp"/>
+			<File
+				RelativePath=".\sampleprops.cpp"/>
+			<File
+				RelativePath=".\tests.cpp"/>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav">
+			<File
+				RelativePath=".\..\sample.rc"/>
+		</Filter>
+	</Files>
+	<Globals>
+		
+	</Globals>
+</VisualStudioProject>
+
--- a/samples/propgrid/propgrid_vc8.vcproj
+++ b/samples/propgrid/propgrid_vc8.vcproj
@@ -0,0 +1,813 @@
+<?xml version="1.0" ?>
+<!--
+
+  This makefile was generated by
+  Bakefile 0.2.3 (http://www.bakefile.org)
+  Do not modify, all changes will be overwritten!
+
+-->
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="propgrid"
+	ProjectGUID="{67938AAC-80E6-5FE3-BA5F-1B02DB39DBAC}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+		
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="vc_mswunivudll"
+			IntermediateDirectory="vc_mswunivudll\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="2"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswunivudll\propgrid\"
+				ObjectFile="vc_mswunivudll\propgrid\"
+				ProgramDataBaseFileName="vc_mswunivudll\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmswuniv29u_propgrid.lib  wxmswuniv29u_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswunivudll\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswunivudll\propgrid.pdb"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswunivudll\propgrid_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="vc_mswunivuddll"
+			IntermediateDirectory="vc_mswunivuddll\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="3"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswunivuddll\propgrid\"
+				ObjectFile="vc_mswunivuddll\propgrid\"
+				ProgramDataBaseFileName="vc_mswunivuddll\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmswuniv29ud_propgrid.lib  wxmswuniv29ud_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswunivuddll\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswunivuddll\propgrid.pdb"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswunivuddll\propgrid_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Release|Win32"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="2"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswudll\propgrid\"
+				ObjectFile="vc_mswudll\propgrid\"
+				ProgramDataBaseFileName="vc_mswudll\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmsw29u_propgrid.lib  wxmsw29u_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswudll\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswudll\propgrid.pdb"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswudll\propgrid_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Debug|Win32"
+			OutputDirectory="vc_mswuddll"
+			IntermediateDirectory="vc_mswuddll\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="3"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswuddll\propgrid\"
+				ObjectFile="vc_mswuddll\propgrid\"
+				ProgramDataBaseFileName="vc_mswuddll\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmsw29ud_propgrid.lib  wxmsw29ud_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswuddll\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswuddll\propgrid.pdb"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswuddll\propgrid_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Universal Release|Win32"
+			OutputDirectory="vc_mswunivu"
+			IntermediateDirectory="vc_mswunivu\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="2"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswunivu\propgrid\"
+				ObjectFile="vc_mswunivu\propgrid\"
+				ProgramDataBaseFileName="vc_mswunivu\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmswuniv29u_propgrid.lib  wxmswuniv29u_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswunivu\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswunivu\propgrid.pdb"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswunivu\propgrid_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Universal Debug|Win32"
+			OutputDirectory="vc_mswunivud"
+			IntermediateDirectory="vc_mswunivud\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="3"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswunivud\propgrid\"
+				ObjectFile="vc_mswunivud\propgrid\"
+				ProgramDataBaseFileName="vc_mswunivud\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmswuniv29ud_propgrid.lib  wxmswuniv29ud_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswunivud\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswunivud\propgrid.pdb"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswunivud\propgrid_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="vc_mswu"
+			IntermediateDirectory="vc_mswu\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="2"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswu\propgrid\"
+				ObjectFile="vc_mswu\propgrid\"
+				ProgramDataBaseFileName="vc_mswu\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmsw29u_propgrid.lib  wxmsw29u_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswu\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswu\propgrid.pdb"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswu\propgrid_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="vc_mswud"
+			IntermediateDirectory="vc_mswud\propgrid"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				AdditionalOptions=""
+				RuntimeLibrary="3"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+				BasicRuntimeChecks="3"
+				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="true"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="vc_mswud\propgrid\"
+				ObjectFile="vc_mswud\propgrid\"
+				ProgramDataBaseFileName="vc_mswud\propgrid.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wxmsw29ud_propgrid.lib  wxmsw29ud_adv.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"
+				AdditionalOptions=""
+				OutputFile="vc_mswud\propgrid.exe"
+				LinkIncremental="2"
+				SubSystem="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswud\propgrid.pdb"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswud\propgrid_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			>
+			<File
+				RelativePath=".\propgrid.cpp"
+			/>
+			<File
+				RelativePath=".\propgrid_minimal.cpp"
+			/>
+			<File
+				RelativePath=".\sampleprops.cpp"
+			/>
+			<File
+				RelativePath=".\tests.cpp"
+			/>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			>
+			<File
+				RelativePath=".\..\sample.rc"
+			/>
+		</Filter>
+	</Files>
+	<Globals>
+		
+	</Globals>
+</VisualStudioProject>
+
--- a/samples/propgrid/sampleprops.cpp
+++ b/samples/propgrid/sampleprops.cpp
@@ -0,0 +1,613 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        samples/propgrid/sampleprops.cpp
+// Purpose:     wxPropertyGrid Sample Properties
+// Author:      Jaakko Salli
+// Modified by:
+// Created:     2006-03-05
+// RCS-ID:      $Id:
+// Copyright:   (c) Jaakko Salli
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// 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/propgrid/propgrid.h>
+#include <wx/propgrid/advprops.h>
+
+#ifndef WX_PROPGRID_SAMPLEPROPS_H
+    #include "sampleprops.h"
+#endif
+
+
+// -----------------------------------------------------------------------
+// wxFontDataProperty
+// -----------------------------------------------------------------------
+
+// Dummy comparison required by value type implementation.
+bool operator == (const wxFontData&, const wxFontData&)
+{
+    return FALSE;
+}
+
+// Custom version of wxFontProperty that also holds colour in the value.
+// Original version by Vladimir Vainer.
+
+#include <wx/fontdlg.h>
+
+WX_PG_IMPLEMENT_WXOBJECT_VARIANT_DATA(wxPGVariantDataFontData, wxFontData)
+
+WX_PG_IMPLEMENT_PROPERTY_CLASS(wxFontDataProperty,wxFontProperty,
+                               wxFontData,const wxFontData&,TextCtrlAndButton)
+
+wxFontDataProperty::wxFontDataProperty( const wxString& label, const wxString& name,
+   const wxFontData& value ) : wxFontProperty(label,name,value.GetInitialFont())
+{
+    // Set initial value - should be done in a simpler way like this
+    // (instead of calling SetValue) in derived (wxObject) properties.
+    m_value_wxFontData << value;
+
+    wxFontData& fontData = wxFontDataFromVariant(m_value_wxFontData);
+
+    // Fix value.
+    fontData.SetChosenFont(value.GetInitialFont());
+    if ( !fontData.GetColour().Ok() )
+        fontData.SetColour(*wxBLACK);
+
+    // Add extra children.
+    AddChild( new wxColourProperty(_("Colour"),wxPG_LABEL,
+                                   fontData.GetColour() ) );
+
+}
+
+wxFontDataProperty::~wxFontDataProperty () { }
+
+void wxFontDataProperty::OnSetValue()
+{
+    if ( !(&wxFontDataFromVariant(m_value)) )
+    {
+        wxFont* pFont = &wxFontFromVariant(m_value);
+        if ( pFont )
+        {
+            wxFontData fontData;
+            fontData.SetChosenFont(*pFont);
+            m_value = WXVARIANT(fontData);
+        }
+        else
+        {
+            wxFAIL_MSG(wxT("Value to wxFontDataProperty must be eithe wxFontData or wxFont"));
+        }
+    }
+
+    // Set m_value to wxFont so that wxFontProperty methods will work
+    // correctly.
+    m_value_wxFontData = m_value;
+    wxFontData& fontData = wxFontDataFromVariant(m_value_wxFontData);
+
+    wxFont font = fontData.GetChosenFont();
+    if ( !font.Ok() )
+        font = wxFont(10,wxSWISS,wxNORMAL,wxNORMAL);
+    m_value = WXVARIANT(font);
+}
+
+wxVariant wxFontDataProperty::DoGetValue() const
+{
+    return m_value_wxFontData;
+}
+
+// Must re-create font dialog displayer.
+bool wxFontDataProperty::OnEvent( wxPropertyGrid* propgrid,
+                                  wxWindow* WXUNUSED(primary), wxEvent& event )
+{
+    if ( propgrid->IsMainButtonEvent(event) )
+    {
+        // Update value from last minute changes
+        PrepareValueForDialogEditing(propgrid);
+
+        wxFontData& fontData = wxFontDataFromVariant(m_value_wxFontData);
+
+        fontData.SetInitialFont(fontData.GetChosenFont());
+
+        wxFontDialog dlg(propgrid, fontData);
+
+        if ( dlg.ShowModal() == wxID_OK )
+        {
+            SetValueInEvent( wxFontDataToVariant(dlg.GetFontData()) );
+            return true;
+        }
+    }
+    return false;
+}
+
+void wxFontDataProperty::RefreshChildren()
+{
+    wxFontProperty::RefreshChildren();
+    if ( GetChildCount() < 6 ) // Number is count of inherit prop's children + 1.
+        return;
+    wxFontData& fontData = wxFontDataFromVariant(m_value_wxFontData);
+    wxVariant variant; variant << fontData.GetColour();
+    Item(6)->SetValue( variant );
+}
+
+void wxFontDataProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
+{
+    wxFontData& fontData = wxFontDataFromVariant(thisValue);
+    wxColour col;
+    wxVariant variant;
+
+    switch ( childIndex )
+    {
+        case 6:
+            col << childValue;
+            fontData.SetColour( col );
+            break;
+        default:
+            // Transfer between subset to superset.
+            variant = WXVARIANT(fontData.GetChosenFont());
+            wxFontProperty::ChildChanged( variant, childIndex, childValue );
+            fontData.SetChosenFont(wxFontFromVariant(variant));
+    }
+}
+
+// -----------------------------------------------------------------------
+// wxSizeProperty
+// -----------------------------------------------------------------------
+
+WX_PG_IMPLEMENT_PROPERTY_CLASS(wxSizeProperty,wxPGProperty,
+                               wxSize,const wxSize&,TextCtrl)
+
+wxSizeProperty::wxSizeProperty( const wxString& label, const wxString& name,
+    const wxSize& value) : wxPGProperty(label,name)
+{
+    SetValueI(value);
+    AddChild( new wxIntProperty(wxT("Width"),wxPG_LABEL,value.x) );
+    AddChild( new wxIntProperty(wxT("Height"),wxPG_LABEL,value.y) );
+}
+
+wxSizeProperty::~wxSizeProperty() { }
+
+void wxSizeProperty::RefreshChildren()
+{
+    if ( !GetChildCount() ) return;
+    const wxSize& size = wxSizeFromVariant(m_value);
+    Item(0)->SetValue( (long)size.x );
+    Item(1)->SetValue( (long)size.y );
+}
+
+void wxSizeProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
+{
+    wxSize& size = wxSizeFromVariant(thisValue);
+    int val = wxPGVariantToInt(childValue);
+    switch ( childIndex )
+    {
+        case 0: size.x = val; break;
+        case 1: size.y = val; break;
+    }
+}
+
+// -----------------------------------------------------------------------
+// wxPointProperty
+// -----------------------------------------------------------------------
+
+WX_PG_IMPLEMENT_PROPERTY_CLASS(wxPointProperty,wxPGProperty,
+                               wxPoint,const wxPoint&,TextCtrl)
+
+wxPointProperty::wxPointProperty( const wxString& label, const wxString& name,
+    const wxPoint& value) : wxPGProperty(label,name)
+{
+    SetValueI(value);
+    AddChild( new wxIntProperty(wxT("X"),wxPG_LABEL,value.x) );
+    AddChild( new wxIntProperty(wxT("Y"),wxPG_LABEL,value.y) );
+}
+
+wxPointProperty::~wxPointProperty() { }
+
+void wxPointProperty::RefreshChildren()
+{
+    if ( !GetChildCount() ) return;
+    const wxPoint& point = wxPointFromVariant(m_value);
+    Item(0)->SetValue( (long)point.x );
+    Item(1)->SetValue( (long)point.y );
+}
+
+void wxPointProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
+{
+    wxPoint& point = wxPointFromVariant(thisValue);
+    int val = wxPGVariantToInt(childValue);
+    switch ( childIndex )
+    {
+        case 0: point.x = val; break;
+        case 1: point.y = val; break;
+    }
+}
+
+
+// -----------------------------------------------------------------------
+// Dirs Property
+// -----------------------------------------------------------------------
+
+WX_PG_IMPLEMENT_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(wxDirsProperty,wxT(','),wxT("Browse"))
+
+#if wxUSE_VALIDATORS
+
+wxValidator* wxDirsProperty::DoGetValidator() const
+{
+    return wxFileProperty::GetClassValidator();
+}
+
+#endif
+
+
+bool wxDirsProperty::OnCustomStringEdit( wxWindow* parent, wxString& value )
+{
+    wxDirDialog dlg(parent,
+                    _("Select a directory to be added to the list:"),
+                    value,
+                    0);
+
+    if ( dlg.ShowModal() == wxID_OK )
+    {
+        value = dlg.GetPath();
+        return TRUE;
+    }
+    return FALSE;
+}
+
+// -----------------------------------------------------------------------
+// wxArrayDoubleEditorDialog
+// -----------------------------------------------------------------------
+
+
+//
+// You can *almost* convert wxArrayDoubleEditorDialog to wxArrayXXXEditorDialog
+// by replacing each ArrayDouble with ArrayXXX.
+//
+
+class wxArrayDoubleEditorDialog : public wxArrayEditorDialog
+{
+public:
+    wxArrayDoubleEditorDialog();
+
+    void Init();
+
+    wxArrayDoubleEditorDialog(wxWindow *parent,
+                              const wxString& message,
+                              const wxString& caption,
+                              wxArrayDouble& array,
+                              long style = wxAEDIALOG_STYLE,
+                              const wxPoint& pos = wxDefaultPosition,
+                              const wxSize& sz = wxDefaultSize );
+
+    bool Create(wxWindow *parent,
+                const wxString& message,
+                const wxString& caption,
+                wxArrayDouble& array,
+                long style = wxAEDIALOG_STYLE,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& sz = wxDefaultSize );
+
+    const wxArrayDouble& GetArray() const { return m_array; }
+
+    // Extra method for this type of array
+    void SetPrecision ( int precision )
+    {
+        m_precision = precision;
+        m_dtoaTemplate.Empty();
+    }
+
+protected:
+    // Mandatory array of type
+    wxArrayDouble   m_array;
+
+    // Use this to avoid extra wxString creation+Printf
+    // on double-to-wxString conversion.
+    wxString        m_dtoaTemplate;
+
+    int             m_precision;
+
+    // Mandatory overridden methods
+    virtual wxString ArrayGet( size_t index );
+    virtual size_t ArrayGetCount();
+    virtual bool ArrayInsert( const wxString& str, int index );
+    virtual bool ArraySet( size_t index, const wxString& str );
+    virtual void ArrayRemoveAt( int index );
+    virtual void ArraySwap( size_t first, size_t second );
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayDoubleEditorDialog)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxArrayDoubleEditorDialog, wxArrayEditorDialog)
+
+//
+// Array dialog array access and manipulation
+//
+
+wxString wxArrayDoubleEditorDialog::ArrayGet( size_t index )
+{
+    wxString str;
+    wxPropertyGrid::DoubleToString(str,m_array[index],m_precision,true,&m_dtoaTemplate);
+    return str;
+}
+
+size_t wxArrayDoubleEditorDialog::ArrayGetCount()
+{
+    return m_array.GetCount();
+}
+
+bool wxArrayDoubleEditorDialog::ArrayInsert( const wxString& str, int index )
+{
+    double d;
+    if ( !str.ToDouble(&d) )
+        return FALSE;
+
+    if (index<0)
+        m_array.Add(d);
+    else
+        m_array.Insert(d,index);
+    return TRUE;
+}
+
+bool wxArrayDoubleEditorDialog::ArraySet( size_t index, const wxString& str )
+{
+    double d;
+    if ( !str.ToDouble(&d) )
+        return FALSE;
+    m_array[index] = d;
+    return TRUE;
+}
+
+void wxArrayDoubleEditorDialog::ArrayRemoveAt( int index )
+{
+    m_array.RemoveAt(index);
+}
+
+void wxArrayDoubleEditorDialog::ArraySwap( size_t first, size_t second )
+{
+    double a = m_array[first];
+    double b = m_array[second];
+    m_array[first] = b;
+    m_array[second] = a;
+}
+
+//
+// Array dialog construction etc.
+//
+
+wxArrayDoubleEditorDialog::wxArrayDoubleEditorDialog()
+    : wxArrayEditorDialog()
+{
+    Init();
+}
+
+void wxArrayDoubleEditorDialog::Init()
+{
+    wxArrayEditorDialog::Init();
+    SetPrecision(-1);
+}
+
+wxArrayDoubleEditorDialog::wxArrayDoubleEditorDialog(wxWindow *parent,
+                              const wxString& message,
+                              const wxString& caption,
+                              wxArrayDouble& array,
+                              long style,
+                              const wxPoint& pos,
+                              const wxSize& sz )
+                              : wxArrayEditorDialog()
+{
+    Init();
+    Create(parent,message,caption,array,style,pos,sz);
+}
+
+bool wxArrayDoubleEditorDialog::Create(wxWindow *parent,
+                const wxString& message,
+                const wxString& caption,
+                wxArrayDouble& array,
+                long style,
+                const wxPoint& pos,
+                const wxSize& sz )
+{
+
+    m_array = array;
+
+    return wxArrayEditorDialog::Create (parent,message,caption,style,pos,sz);
+}
+
+// -----------------------------------------------------------------------
+// wxArrayDoubleProperty
+// -----------------------------------------------------------------------
+
+#include <math.h> // for fabs
+
+// Comparison required by value type implementation.
+bool operator == (const wxArrayDouble& a, const wxArrayDouble& b)
+{
+    if ( a.GetCount() != b.GetCount() )
+        return FALSE;
+
+    size_t i;
+
+    for ( i=0; i<a.GetCount(); i++ )
+    {
+        // Can't do direct equality comparison with floating point numbers.
+        if ( fabs(a[i] - b[i]) > 0.0000000001 )
+        {
+            //wxLogDebug(wxT("%f != %f"),a[i],b[i]);
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+WX_PG_IMPLEMENT_VARIANT_DATA(wxPGVariantDataArrayDouble, wxArrayDouble)
+
+WX_PG_IMPLEMENT_PROPERTY_CLASS(wxArrayDoubleProperty,
+                               wxPGProperty,
+                               wxArrayDouble,
+                               const wxArrayDouble&,
+                               TextCtrlAndButton)
+
+
+wxArrayDoubleProperty::wxArrayDoubleProperty (const wxString& label,
+                                                        const wxString& name,
+                                                        const wxArrayDouble& array )
+    : wxPGProperty(label,name)
+{
+    m_precision = -1;
+
+    //
+    // Need to figure out delimiter needed for this locale
+    // (ie. can't use comma when comma acts as decimal point in float).
+    wxChar use_delimiter = wxT(',');
+
+    if (wxString::Format(wxT("%.2f"),12.34).Find(use_delimiter) >= 0)
+        use_delimiter = wxT(';');
+
+    m_delimiter = use_delimiter;
+
+    SetValue( wxArrayDoubleToVariant(array) );
+}
+
+wxArrayDoubleProperty::~wxArrayDoubleProperty () { }
+
+void wxArrayDoubleProperty::OnSetValue()
+{
+    GenerateValueAsString( m_display, m_precision, true );
+}
+
+wxString wxArrayDoubleProperty::GetValueAsString( int arg_flags ) const
+{
+    if ( !(arg_flags & wxPG_FULL_VALUE ))
+        return m_display;
+
+    wxString s;
+    GenerateValueAsString(s,-1,false);
+    return s;
+}
+
+void wxArrayDoubleProperty::GenerateValueAsString( wxString& target, int prec, bool removeZeroes ) const
+{
+    wxString s;
+    wxString template_str;
+    wxChar between[3] = wxT(", ");
+    size_t i;
+
+    between[0] = m_delimiter;
+
+    target.Empty();
+
+    const wxArrayDouble& value = wxArrayDoubleFromVariant(m_value);
+
+    for ( i=0; i<value.GetCount(); i++ )
+    {
+
+        wxPropertyGrid::DoubleToString(s,value[i],prec,removeZeroes,&template_str);
+
+        target += s;
+
+        if ( i<(value.GetCount()-1) )
+            target += between;
+    }
+}
+
+bool wxArrayDoubleProperty::OnEvent( wxPropertyGrid* propgrid,
+                                     wxWindow* WXUNUSED(primary),
+                                     wxEvent& event)
+{
+    if ( propgrid->IsMainButtonEvent(event) )
+    {
+        wxArrayDouble& value = wxArrayDoubleFromVariant(m_value);
+
+        // Update the value in case of last minute changes
+        PrepareValueForDialogEditing(propgrid);
+
+        // Create editor dialog.
+        wxArrayDoubleEditorDialog dlg;
+        dlg.SetPrecision(m_precision);
+        dlg.Create( propgrid, wxEmptyString, m_label, value );
+        dlg.Move( propgrid->GetGoodEditorDialogPosition(this,dlg.GetSize()) );
+
+        // Execute editor dialog
+        int res = dlg.ShowModal();
+        if ( res == wxID_OK && dlg.IsModified() )
+        {
+            SetValueInEvent( wxArrayDoubleToVariant(dlg.GetArray()) );
+            return true;
+        }
+        return false;
+    }
+    return false;
+}
+
+bool wxArrayDoubleProperty::StringToValue( wxVariant& variant, const wxString& text, int ) const
+{
+    double tval;
+    wxString tstr;
+    // Add values to a temporary array so that in case
+    // of error we can opt not to use them.
+    wxArrayDouble new_array;
+
+    bool ok = true;
+
+    wxChar delimiter = m_delimiter;
+
+    WX_PG_TOKENIZER1_BEGIN(text,delimiter)
+
+        if ( token.length() )
+        {
+
+            // If token was invalid, exit the loop now
+            if ( !token.ToDouble(&tval) )
+            {
+                tstr.Printf ( _("\"%s\" is not a floating-point number."), token.c_str() );
+                ok = false;
+                break;
+            }
+            // TODO: Put validator code here
+
+            new_array.Add(tval);
+
+        }
+
+    WX_PG_TOKENIZER1_END()
+
+    // When invalid token found, show error message and don't change anything
+    if ( !ok )
+    {
+        //ShowError( tstr );
+        return false;
+    }
+
+    if ( !(wxArrayDoubleFromVariant(m_value) == new_array) )
+    {
+        variant = wxArrayDoubleToVariant(new_array);
+        return true;
+    }
+
+    return false;
+}
+
+bool wxArrayDoubleProperty::DoSetAttribute( const wxString& name, wxVariant& value )
+{
+    if ( name == wxPG_FLOAT_PRECISION )
+    {
+        m_precision = value.GetLong();
+        GenerateValueAsString( m_display, m_precision, true );
+        return true;
+    }
+    return false;
+}
+
--- a/samples/propgrid/sampleprops.h
+++ b/samples/propgrid/sampleprops.h
@@ -0,0 +1,125 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        samples/propgrid/sampleprops.h
+// Purpose:     wxPropertyGrid Sample Properties Header
+// Author:      Jaakko Salli
+// Modified by:
+// Created:     2006-03-05
+// RCS-ID:      $Id:
+// Copyright:   (c) Jaakko Salli
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SAMPLES_PROPGRID_SAMPLEPROPS_H_
+#define _WX_SAMPLES_PROPGRID_SAMPLEPROPS_H_
+
+
+WX_PG_DECLARE_WXOBJECT_VARIANT_DATA(wxPGVariantDataFontData, wxFontData, wxEMPTY_PARAMETER_VALUE)
+
+
+class wxFontDataProperty : public wxFontProperty
+{
+    WX_PG_DECLARE_PROPERTY_CLASS(wxFontDataProperty)
+public:
+
+    wxFontDataProperty( const wxString& label = wxPG_LABEL,
+                        const wxString& name = wxPG_LABEL,
+                        const wxFontData& value = wxFontData() );
+    virtual ~wxFontDataProperty ();
+
+    void OnSetValue();
+
+    // Inorder to have different value type in a derived property
+    // class, we will override GetValue to return custom variant,
+    // instead of changing the base m_value. This allows the methods
+    // in base class to function properly.
+    virtual wxVariant DoGetValue() const;
+
+    WX_PG_DECLARE_PARENTAL_METHODS()
+    WX_PG_DECLARE_EVENT_METHODS()
+
+protected:
+    // Value must be stored as variant - otherwise it will be
+    // decreffed to oblivion on GetValue().
+    wxVariant  m_value_wxFontData;
+};
+
+// -----------------------------------------------------------------------
+
+class wxSizeProperty : public wxPGProperty
+{
+    WX_PG_DECLARE_PROPERTY_CLASS(wxSizeProperty)
+public:
+
+    wxSizeProperty( const wxString& label = wxPG_LABEL, const wxString& name = wxPG_LABEL,
+                    const wxSize& value = wxSize() );
+    virtual ~wxSizeProperty();
+
+    WX_PG_DECLARE_PARENTAL_METHODS()
+
+protected:
+
+    // I stands for internal
+    void SetValueI( const wxSize& value )
+    {
+        m_value = wxSizeToVariant(value);
+    }
+};
+
+// -----------------------------------------------------------------------
+
+class wxPointProperty : public wxPGProperty
+{
+    WX_PG_DECLARE_PROPERTY_CLASS(wxPointProperty)
+public:
+
+    wxPointProperty( const wxString& label = wxPG_LABEL, const wxString& name = wxPG_LABEL,
+                     const wxPoint& value = wxPoint() );
+    virtual ~wxPointProperty();
+
+    WX_PG_DECLARE_PARENTAL_METHODS()
+
+protected:
+
+    // I stands for internal
+    void SetValueI( const wxPoint& value )
+    {
+        m_value = wxPointToVariant(value);
+    }
+};
+
+// -----------------------------------------------------------------------
+
+WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR_WITH_DECL(wxDirsProperty, class wxEMPTY_PARAMETER_VALUE)
+
+// -----------------------------------------------------------------------
+
+WX_PG_DECLARE_VARIANT_DATA(wxPGVariantDataArrayDouble, wxArrayDouble, wxEMPTY_PARAMETER_VALUE)
+
+class wxArrayDoubleProperty : public wxPGProperty
+{
+    WX_PG_DECLARE_PROPERTY_CLASS(wxArrayDoubleProperty)
+public:
+
+    wxArrayDoubleProperty( const wxString& label = wxPG_LABEL,
+                           const wxString& name = wxPG_LABEL,
+                           const wxArrayDouble& value = wxArrayDouble() );
+
+    virtual ~wxArrayDoubleProperty ();
+
+    virtual void OnSetValue();
+    WX_PG_DECLARE_BASIC_TYPE_METHODS()
+    WX_PG_DECLARE_EVENT_METHODS()
+    WX_PG_DECLARE_ATTRIBUTE_METHODS()
+
+    // Generates cache for displayed text
+    virtual void GenerateValueAsString ( wxString& target, int prec, bool removeZeroes ) const;
+
+protected:
+    wxString        m_display; // Stores cache for displayed text
+    int             m_precision; // Used when formatting displayed string.
+    wxChar          m_delimiter; // Delimiter between array entries.
+};
+
+// -----------------------------------------------------------------------
+
+#endif // _WX_SAMPLES_PROPGRID_SAMPLEPROPS_H_
--- a/samples/propgrid/tests.cpp
+++ b/samples/propgrid/tests.cpp