This commit was manufactured by cvs2svn to create tag 'WX_2_4_2_5'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_4_2_5@28574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Avoid warnings in the DLL builds
2004-07-31 21:05:38 +00:00 · 2004-07-31 21:05:38 +00:00 · 2004-07-31 20:25:51 +00:00 · 2004-07-31 20:25:29 +00:00 · 2004-07-31 20:25:13 +00:00 · 2004-07-31 20:24:29 +00:00
1582 changed files with 78417 additions and 56778 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -218,6 +218,7 @@ ALL_BASE_HEADERS =  \
 	wx/buffer.h \
 	wx/build.h \
 	wx/chkconf.h \
+	wx/clntdata.h \
 	wx/cmdline.h \
 	wx/confbase.h \
 	wx/config.h \
@@ -329,6 +330,7 @@ ALL_HEADERS =  \
 	$(ALL_GUI_HEADERS)
 ALL_BASE_SOURCES =  \
 	src/common/appbase.cpp \
+	src/common/clntdata.cpp \
 	src/common/cmdline.cpp \
 	src/common/config.cpp \
 	src/common/datetime.cpp \
@@ -452,6 +454,7 @@ MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
 	-DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
 	monodll_appbase.o \
+	monodll_clntdata.o \
 	monodll_cmdline.o \
 	monodll_config.o \
 	monodll_datetime.o \
@@ -535,6 +538,7 @@ MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
 	-DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
 	monolib_appbase.o \
+	monolib_clntdata.o \
 	monolib_cmdline.o \
 	monolib_config.o \
 	monolib_datetime.o \
@@ -619,6 +623,7 @@ BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
 	$(CXXFLAGS)
 BASEDLL_OBJECTS =  \
 	basedll_appbase.o \
+	basedll_clntdata.o \
 	basedll_cmdline.o \
 	basedll_config.o \
 	basedll_datetime.o \
@@ -687,6 +692,7 @@ BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
 	-DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
 	baselib_appbase.o \
+	baselib_clntdata.o \
 	baselib_cmdline.o \
 	baselib_config.o \
 	baselib_datetime.o \
@@ -822,6 +828,10 @@ CORELIB_OBJECTS =  \
 	$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5) \
 	$(__CORE_SRC_OBJECTS_3)
 CORELIB_ODEP =  $(___pch_wxprec_corelib_wx_wxprec_h_gch___depname)
+ADVDLL_CFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \
+	-DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
 ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
 	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \
@@ -840,6 +850,9 @@ ADVDLL_OBJECTS =  \
 	$(__ADVANCED_PLATFORM_SRC_OBJECTS_2) \
 	$(__PLUGIN_ADV_SRC_OBJECTS_2)
 ADVDLL_ODEP =  $(___pch_wxprec_advdll_wx_wxprec_h_gch___depname)
+ADVLIB_CFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CFLAGS)
 ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
 	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
@@ -1174,6 +1187,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
 	wx/cocoa/NSControl.h \
 	wx/cocoa/NSMenu.h \
 	wx/cocoa/NSPanel.h \
+	wx/cocoa/NSScroller.h \
 	wx/cocoa/NSTabView.h \
 	wx/cocoa/NSTableView.h \
 	wx/cocoa/NSTextField.h \
@@ -1209,6 +1223,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
 	wx/cocoa/gdiobj.h \
 	wx/cocoa/icon.h \
 	wx/cocoa/listbox.h \
+	wx/cocoa/log.h \
 	wx/cocoa/mbarman.h \
 	wx/cocoa/mdi.h \
 	wx/cocoa/menu.h \
@@ -1218,6 +1233,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
 	wx/cocoa/radiobox.h \
 	wx/cocoa/radiobut.h \
 	wx/cocoa/region.h \
+	wx/cocoa/scrolbar.h \
 	wx/cocoa/slider.h \
 	wx/cocoa/spinbutt.h \
 	wx/cocoa/statbmp.h \
@@ -1240,6 +1256,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
 	wx/generic/tabg.h
@COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR)
 COND_TOOLKIT_GTK_GUI_HDR =  \
+	wx/generic/colrdlgg.h \
 	wx/generic/dirdlgg.h \
 	wx/generic/fdrepdlg.h \
 	wx/generic/listctrl.h \
@@ -1253,6 +1270,7 @@ COND_TOOLKIT_GTK_GUI_HDR =  \
 	wx/gtk/button.h \
 	wx/gtk/checkbox.h \
 	wx/gtk/checklst.h \
+	wx/gtk/colordlg.h \
 	wx/gtk/choice.h \
 	wx/gtk/clipbrd.h \
 	wx/gtk/colour.h \
@@ -1880,7 +1898,8 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
 	wx/msw/wince/helpwce.h \
 	wx/msw/wince/libraries.h \
 	wx/msw/wince/missing.h \
-	wx/msw/wince/tbarwce.h
+	wx/msw/wince/tbarwce.h \
+	wx/msw/wince/resources.h
@COND_TOOLKIT_WINCE@GUI_HDR = $(COND_TOOLKIT_WINCE_GUI_HDR)
@COND_TOOLKIT_GTK@ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_GTK@	wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
@@ -1953,7 +1972,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/checklst.h \
 	wx/choicdlg.h \
 	wx/choice.h \
-	wx/clntdata.h \
 	wx/cmndata.h \
 	wx/combobox.h \
 	wx/control.h \
@@ -2319,7 +2337,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_bookctrl.o \
 	monodll_choiccmn.o \
 	monodll_clipcmn.o \
-	monodll_clntdata.o \
 	monodll_cmdproc.o \
 	monodll_cmndata.o \
 	monodll_containr.o \
@@ -2466,7 +2483,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_bookctrl.o \
 	monodll_choiccmn.o \
 	monodll_clipcmn.o \
-	monodll_clntdata.o \
 	monodll_cmdproc.o \
 	monodll_cmndata.o \
 	monodll_containr.o \
@@ -2560,6 +2576,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
 	monodll_NSControl.o \
 	monodll_NSMenu.o \
 	monodll_NSPanel.o \
+	monodll_NSScroller.o \
 	monodll_NSTabView.o \
 	monodll_NSTableView.o \
 	monodll_NSTextField.o \
@@ -2605,6 +2622,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
 	monodll_radiobox.o \
 	monodll_radiobut.o \
 	monodll_region.o \
+	monodll_scrolbar.o \
 	monodll_settings.o \
 	monodll_slider.o \
 	monodll_spinbutt.o \
@@ -2653,6 +2671,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \
 	monodll_checkbox.o \
 	monodll_checklst.o \
 	monodll_choice.o \
+	monodll_colordlg.o \
 	monodll_combobox.o \
 	monodll_control.o \
 	monodll_dialog.o \
@@ -3015,13 +3034,16 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
 	monodll_crt.o \
 	monodll_filedlgwce.o \
 	monodll_helpwce.o \
-	monodll_tbarwce.o
+	monodll_tbarwce.o \
+	monodll_menuce.o
@COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS)
 COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS =  \
 	monodll_taskbarcmn.o \
 	monodll_joystick.o \
 	monodll_sound.o \
-	monodll_taskbarx11.o
+	monodll_taskbarx11.o \
+	monodll_taskbar.o \
+	monodll_eggtrayicon.o
@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS)
@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS = \
@COND_TOOLKIT_MAC@	monodll_joystick.o monodll_sound.o
@@ -3175,7 +3197,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_bookctrl.o \
 	monolib_choiccmn.o \
 	monolib_clipcmn.o \
-	monolib_clntdata.o \
 	monolib_cmdproc.o \
 	monolib_cmndata.o \
 	monolib_containr.o \
@@ -3322,7 +3343,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_bookctrl.o \
 	monolib_choiccmn.o \
 	monolib_clipcmn.o \
-	monolib_clntdata.o \
 	monolib_cmdproc.o \
 	monolib_cmndata.o \
 	monolib_containr.o \
@@ -3416,6 +3436,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
 	monolib_NSControl.o \
 	monolib_NSMenu.o \
 	monolib_NSPanel.o \
+	monolib_NSScroller.o \
 	monolib_NSTabView.o \
 	monolib_NSTableView.o \
 	monolib_NSTextField.o \
@@ -3461,6 +3482,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
 	monolib_radiobox.o \
 	monolib_radiobut.o \
 	monolib_region.o \
+	monolib_scrolbar.o \
 	monolib_settings.o \
 	monolib_slider.o \
 	monolib_spinbutt.o \
@@ -3509,6 +3531,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \
 	monolib_checkbox.o \
 	monolib_checklst.o \
 	monolib_choice.o \
+	monolib_colordlg.o \
 	monolib_combobox.o \
 	monolib_control.o \
 	monolib_dialog.o \
@@ -3871,13 +3894,16 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
 	monolib_crt.o \
 	monolib_filedlgwce.o \
 	monolib_helpwce.o \
-	monolib_tbarwce.o
+	monolib_tbarwce.o \
+	monolib_menuce.o
@COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
 	monolib_taskbarcmn.o \
 	monolib_joystick.o \
 	monolib_sound.o \
-	monolib_taskbarx11.o
+	monolib_taskbarx11.o \
+	monolib_taskbar.o \
+	monolib_eggtrayicon.o
@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1)
@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
@COND_TOOLKIT_MAC@	monolib_joystick.o monolib_sound.o
@@ -4203,7 +4229,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_bookctrl.o \
 	coredll_choiccmn.o \
 	coredll_clipcmn.o \
-	coredll_clntdata.o \
 	coredll_cmdproc.o \
 	coredll_cmndata.o \
 	coredll_containr.o \
@@ -4350,7 +4375,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_bookctrl.o \
 	coredll_choiccmn.o \
 	coredll_clipcmn.o \
-	coredll_clntdata.o \
 	coredll_cmdproc.o \
 	coredll_cmndata.o \
 	coredll_containr.o \
@@ -4444,6 +4468,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
 	coredll_NSControl.o \
 	coredll_NSMenu.o \
 	coredll_NSPanel.o \
+	coredll_NSScroller.o \
 	coredll_NSTabView.o \
 	coredll_NSTableView.o \
 	coredll_NSTextField.o \
@@ -4489,6 +4514,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
 	coredll_radiobox.o \
 	coredll_radiobut.o \
 	coredll_region.o \
+	coredll_scrolbar.o \
 	coredll_settings.o \
 	coredll_slider.o \
 	coredll_spinbutt.o \
@@ -4537,6 +4563,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \
 	coredll_checkbox.o \
 	coredll_checklst.o \
 	coredll_choice.o \
+	coredll_colordlg.o \
 	coredll_combobox.o \
 	coredll_control.o \
 	coredll_dialog.o \
@@ -4899,7 +4926,8 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
 	coredll_crt.o \
 	coredll_filedlgwce.o \
 	coredll_helpwce.o \
-	coredll_tbarwce.o
+	coredll_tbarwce.o \
+	coredll_menuce.o
@COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2)
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(LIBEXT)
@@ -4928,7 +4956,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_bookctrl.o \
 	corelib_choiccmn.o \
 	corelib_clipcmn.o \
-	corelib_clntdata.o \
 	corelib_cmdproc.o \
 	corelib_cmndata.o \
 	corelib_containr.o \
@@ -5075,7 +5102,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_bookctrl.o \
 	corelib_choiccmn.o \
 	corelib_clipcmn.o \
-	corelib_clntdata.o \
 	corelib_cmdproc.o \
 	corelib_cmndata.o \
 	corelib_containr.o \
@@ -5169,6 +5195,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
 	corelib_NSControl.o \
 	corelib_NSMenu.o \
 	corelib_NSPanel.o \
+	corelib_NSScroller.o \
 	corelib_NSTabView.o \
 	corelib_NSTableView.o \
 	corelib_NSTextField.o \
@@ -5214,6 +5241,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
 	corelib_radiobox.o \
 	corelib_radiobut.o \
 	corelib_region.o \
+	corelib_scrolbar.o \
 	corelib_settings.o \
 	corelib_slider.o \
 	corelib_spinbutt.o \
@@ -5262,6 +5290,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \
 	corelib_checkbox.o \
 	corelib_checklst.o \
 	corelib_choice.o \
+	corelib_colordlg.o \
 	corelib_combobox.o \
 	corelib_control.o \
 	corelib_dialog.o \
@@ -5624,7 +5653,8 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
 	corelib_crt.o \
 	corelib_filedlgwce.o \
 	corelib_helpwce.o \
-	corelib_tbarwce.o
+	corelib_tbarwce.o \
+	corelib_menuce.o
@COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3)
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@@ -5669,9 +5699,14 @@ COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
 	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd)
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_GTK@	advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
-@COND_TOOLKIT_GTK@	advdll_taskbarx11.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
+	advdll_taskbarcmn.o \
+	advdll_joystick.o \
+	advdll_sound.o \
+	advdll_taskbarx11.o \
+	advdll_taskbar.o \
+	advdll_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_2)
@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
@COND_TOOLKIT_MAC@	advdll_joystick.o advdll_sound.o
@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
@@ -5697,9 +5732,14 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
@COND_GCC_PCH_1@__advlib_PCH_INC = -I.pch/wxprec_advlib
@COND_GCC_PCH_1@___pch_wxprec_advlib_wx_wxprec_h_gch___depname \
@COND_GCC_PCH_1@	= .pch/wxprec_advlib/wx/wxprec.h.gch
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_GTK@	advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
-@COND_TOOLKIT_GTK@	advlib_taskbarx11.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
+	advlib_taskbarcmn.o \
+	advlib_joystick.o \
+	advlib_sound.o \
+	advlib_taskbarx11.o \
+	advlib_taskbar.o \
+	advlib_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_3)
@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
@COND_TOOLKIT_MAC@	advlib_joystick.o advlib_sound.o
@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
@@ -6932,12 +6972,12 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
 	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
 	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5
 	for f in $(ALL_HEADERS); do \
-	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
+	if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \
 	fi; \
-	$(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/$$f; \
+	$(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \
 	done
 	@echo " "
 	@echo " ------------------------------------------------------"
@@ -7371,8 +7411,11 @@ samples:

 install-wxconfig: 
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
+	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+	$(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(libdir)/wx/config
+	(cd $(DESTDIR)$(libdir)/wx/config && rm -f $(TOOLCHAIN_NAME) && $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
+	$(INSTALL_PROGRAM) wx-config $(DESTDIR)$(bindir)
+	(cd $(DESTDIR)$(bindir) && rm -f wx$(TOOLCHAIN_NAME)-config && $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-config)

 locale_install: 
 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
@@ -7802,6 +7845,9 @@ wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c
 monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

+monodll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 monodll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -8075,6 +8121,9 @@ monodll_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(MONODLL_ODEP)
 monodll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

+monodll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 monodll_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -8111,6 +8160,9 @@ monodll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(MONODLL_ODEP)
 monodll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

+monodll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 monodll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -8213,6 +8265,9 @@ monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONODLL_ODEP)
 monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

+monodll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONODLL_ODEP)
+	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
 monodll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -9722,6 +9777,18 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monodll_choice.o: $(srcdir)/src/univ/choice.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/mac/carbon/colordlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -10013,6 +10080,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/mac/carbon/scrolbar.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -10250,15 +10320,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monodll_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/mac/carbon/colordlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -10394,9 +10455,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@monodll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

-@COND_USE_GUI_1@monodll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
@COND_USE_GUI_1@monodll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -10697,6 +10755,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -10733,6 +10794,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

+monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -11006,6 +11070,9 @@ monolib_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(MONOLIB_ODEP)
 monolib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

+monolib_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 monolib_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -11042,6 +11109,9 @@ monolib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(MONOLIB_ODEP)
 monolib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

+monolib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 monolib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -11144,6 +11214,9 @@ monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONOLIB_ODEP)
 monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

+monolib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONOLIB_ODEP)
+	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
 monolib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -12653,6 +12726,18 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monolib_choice.o: $(srcdir)/src/univ/choice.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/mac/carbon/colordlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -12944,6 +13029,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/mac/carbon/scrolbar.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -13181,15 +13269,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monolib_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/mac/carbon/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -13325,9 +13404,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@monolib_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

-@COND_USE_GUI_1@monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
@COND_USE_GUI_1@monolib_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -13628,6 +13704,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -13664,6 +13743,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<

+basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASEDLL_ODEP)
+	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 basedll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<

@@ -13967,6 +14049,9 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<

+baselib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASELIB_ODEP)
+	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 baselib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<

@@ -14420,6 +14505,9 @@ coredll_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(COREDLL_ODEP)
 coredll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

+coredll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(COREDLL_ODEP)
+	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 coredll_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -14459,6 +14547,9 @@ coredll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(COREDLL_ODEP)
 coredll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

+coredll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(COREDLL_ODEP)
+	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 coredll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -15854,6 +15945,18 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@coredll_choice.o: $(srcdir)/src/univ/choice.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/mac/carbon/colordlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -16145,6 +16248,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/mac/carbon/scrolbar.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -16382,15 +16488,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@coredll_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/mac/carbon/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -16526,9 +16623,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@coredll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

-@COND_USE_GUI_1@coredll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
@COND_USE_GUI_1@coredll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<

@@ -16844,6 +16938,9 @@ corelib_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(CORELIB_ODEP)
 corelib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

+corelib_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(CORELIB_ODEP)
+	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 corelib_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

@@ -16883,6 +16980,9 @@ corelib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(CORELIB_ODEP)
 corelib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

+corelib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(CORELIB_ODEP)
+	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 corelib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

@@ -18278,6 +18378,18 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@corelib_choice.o: $(srcdir)/src/univ/choice.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/mac/carbon/colordlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

@@ -18569,6 +18681,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/mac/carbon/scrolbar.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

@@ -18806,15 +18921,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@corelib_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/mac/carbon/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

@@ -18950,9 +19056,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@corelib_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

-@COND_USE_GUI_1@corelib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
@COND_USE_GUI_1@corelib_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

@@ -19241,6 +19344,9 @@ advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVDLL_ODEP)
 advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<

+advdll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVDLL_ODEP)
+	$(CCC) -c -o $@ $(ADVDLL_CFLAGS) $<
+
 advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<

@@ -19286,6 +19392,9 @@ advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE@advdll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<

+@COND_TOOLKIT_GTK@advdll_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
@COND_TOOLKIT_MSW@advdll_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<

@@ -19343,6 +19452,9 @@ advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVLIB_ODEP)
 advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<

+advlib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVLIB_ODEP)
+	$(CCC) -c -o $@ $(ADVLIB_CFLAGS) $<
+
 advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<

@@ -19388,6 +19500,9 @@ advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE@advlib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<

+@COND_TOOLKIT_GTK@advlib_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
@COND_TOOLKIT_MSW@advlib_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<

@@ -19714,6 +19829,7 @@ ALL_DIST: distrib_clean
 	cp $(WXDIR)/install-sh $(DISTDIR)
 	cp $(WXDIR)/mkinstalldirs $(DISTDIR)
 	cp $(WXDIR)/wx-config.in $(DISTDIR)
+	cp $(WXDIR)/wx-config-wrapper.in $(DISTDIR)
 	cp $(WXDIR)/version-script.in $(DISTDIR)
 	cp $(WXDIR)/setup.h.in $(DISTDIR)
 	cp $(WXDIR)/setup.h_vms $(DISTDIR)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -88,14 +88,11 @@ dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
 dnl or only the old <iostream.h> one - it may be generally assumed that if
 dnl <iostream> exists, the other "new" headers (without .h) exist too.
 dnl
-dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false-or-cross-compiling)
+dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
 dnl ---------------------------------------------------------------------------

 AC_DEFUN([WX_CPP_NEW_HEADERS],
 [
-  if test "$cross_compiling" = "yes"; then
-    ifelse([$2], , :, [$2])
-  else
    AC_LANG_SAVE
    AC_LANG_CPLUSPLUS

@@ -108,7 +105,6 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
    fi

    AC_LANG_RESTORE
-  fi
 ])

 dnl ---------------------------------------------------------------------------
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -417,6 +417,12 @@ dnl ### begin block 1_COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ###
        COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
    fi
    AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 1_COND_TOOLKIT_MAC_WXUNIV_0 ###
+    COND_TOOLKIT_MAC_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MAC_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MAC_WXUNIV_0)
 dnl ### begin block 1_COND_TOOLKIT_MGL ###
    COND_TOOLKIT_MGL="#"
    if test "x$TOOLKIT" = "xMGL" ; then
@@ -465,6 +471,12 @@ dnl ### begin block 1_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 ###
        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
    fi
    AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 1_COND_TOOLKIT_MSW_WXUNIV_0 ###
+    COND_TOOLKIT_MSW_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MSW_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
 dnl ### begin block 1_COND_TOOLKIT_PM ###
    COND_TOOLKIT_PM="#"
    if test "x$TOOLKIT" = "xPM" ; then
@@ -483,6 +495,12 @@ dnl ### begin block 1_COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 ###
        COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
    fi
    AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 1_COND_TOOLKIT_PM_WXUNIV_0 ###
+    COND_TOOLKIT_PM_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_PM_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_PM_WXUNIV_0)
 dnl ### begin block 1_COND_TOOLKIT_WINCE ###
    COND_TOOLKIT_WINCE="#"
    if test "x$TOOLKIT" = "xWINCE" ; then
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -23,7 +23,7 @@
                to cbuilderx are addressed. In particular, the project must
                be placed into build/msw(?) directory and store object files
                in its subdirectory and it must copy setup.h as others do.
-    cbx_unix  - Doesn't intergrate well and won't be used by most Unix people.
+    cbx_unix  - Doesn't integrate well and won't be used by most Unix people.
    -->
    
    <disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
@@ -139,7 +139,7 @@

    <add-formats files="wx.bkl">wx24dsp</add-formats>
    <add-flags formats="wx24dsp">
-        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWidgets.dsp
+        -DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
    </add-flags>
    
    <add-formats files="wx.bkl">rpmspec</add-formats>
--- a/build/bakefiles/README
+++ b/build/bakefiles/README
@@ -36,7 +36,7 @@ Note: the following files are generated using bakefile_gen:
    that contain "This makefile was generated by Bakefile" banner and
    VC++ project files in samples, demos and utils directories (inc. contrib
    ones)
-  * src/wxWidgets.dsp
+  * src/wxWindows.dsp
  * {wxGTK,wxMotif,wxX11}.spec (only wxBase headers list)
  * autoconf_inc.m4
  * all Makefile.in files
--- a/build/bakefiles/common_contrib.bkl
+++ b/build/bakefiles/common_contrib.bkl
@@ -33,5 +33,6 @@
    
    <template id="wx_contrib_headers">
        <srcdir>$(CONTRIB_HDR_DIR)</srcdir>
+        <install-to>$(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)</install-to>
    </template>
 </makefile>
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -142,6 +142,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!

 <set var="BASE_CMN_SRC" hints="files">
    src/common/appbase.cpp
+    src/common/clntdata.cpp
    src/common/cmdline.cpp
    src/common/config.cpp
    src/common/datetime.cpp
@@ -209,6 +210,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/buffer.h
    wx/build.h
    wx/chkconf.h
+    wx/clntdata.h
    wx/cmdline.h
    wx/confbase.h
    wx/config.h
@@ -381,7 +383,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/common/bookctrl.cpp
    src/common/choiccmn.cpp
    src/common/clipcmn.cpp
-    src/common/clntdata.cpp
    src/common/cmdproc.cpp
    src/common/cmndata.cpp
    src/common/containr.cpp
@@ -477,7 +478,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/checklst.h
    wx/choicdlg.h
    wx/choice.h
-    wx/clntdata.h
    wx/cmndata.h
    wx/combobox.h
    wx/control.h
@@ -727,6 +727,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/gtk/checkbox.cpp
    src/gtk/checklst.cpp
    src/gtk/choice.cpp
+    src/gtk/colordlg.cpp
    src/gtk/combobox.cpp
    src/gtk/control.cpp
    src/gtk/dialog.cpp
@@ -755,6 +756,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/gtk/utilsres.cpp
 </set>
 <set var="GTK_HDR" hints="files">
+    wx/generic/colrdlgg.h
    wx/generic/dirdlgg.h
    wx/generic/fdrepdlg.h
    wx/generic/listctrl.h
@@ -768,6 +770,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/gtk/button.h
    wx/gtk/checkbox.h
    wx/gtk/checklst.h
+    wx/gtk/colordlg.h
    wx/gtk/choice.h
    wx/gtk/clipbrd.h
    wx/gtk/colour.h
@@ -1316,6 +1319,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/msw/wince/filedlgwce.cpp
    src/msw/wince/helpwce.cpp
    src/msw/wince/tbarwce.cpp
+    src/msw/wince/menuce.cpp
 </set>
 <set var="WINCE_HDR" hints="files">
    wx/generic/fdrepdlg.h
@@ -1324,6 +1328,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/msw/wince/libraries.h
    wx/msw/wince/missing.h
    wx/msw/wince/tbarwce.h
+    wx/msw/wince/resources.h
 </set>


@@ -1846,6 +1851,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/cocoa/NSControl.mm
    src/cocoa/NSMenu.mm
    src/cocoa/NSPanel.mm
+    src/cocoa/NSScroller.mm
    src/cocoa/NSTabView.mm
    src/cocoa/NSTableView.mm
    src/cocoa/NSTextField.mm
@@ -1891,6 +1897,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/cocoa/radiobox.mm
    src/cocoa/radiobut.mm
    src/cocoa/region.mm
+    src/cocoa/scrolbar.mm
    src/cocoa/settings.cpp
    src/cocoa/slider.mm
    src/cocoa/spinbutt.mm
@@ -1930,6 +1937,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/cocoa/NSControl.h
    wx/cocoa/NSMenu.h
    wx/cocoa/NSPanel.h
+    wx/cocoa/NSScroller.h
    wx/cocoa/NSTabView.h
    wx/cocoa/NSTableView.h
    wx/cocoa/NSTextField.h
@@ -1975,6 +1983,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/cocoa/radiobox.h
    wx/cocoa/radiobut.h
    wx/cocoa/region.h
+    wx/cocoa/scrolbar.h
    wx/cocoa/slider.h
    wx/cocoa/spinbutt.h
    wx/cocoa/statbmp.h
@@ -2196,6 +2205,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/unix/taskbarx11.h
 </set>

+<set var="ADVANCED_GTK_SRC" hints="files">
+    src/gtk/taskbar.cpp
+    src/gtk/eggtrayicon.c
+</set>
+

 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
@@ -2450,7 +2464,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
        <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
    </set>
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -77,6 +77,7 @@ ALL_DIST: distrib_clean
 	cp $(WXDIR)/install-sh $(DISTDIR)
 	cp $(WXDIR)/mkinstalldirs $(DISTDIR)
 	cp $(WXDIR)/wx-config.in $(DISTDIR)
+	cp $(WXDIR)/wx-config-wrapper.in $(DISTDIR)
 	cp $(WXDIR)/version-script.in $(DISTDIR)
 	cp $(WXDIR)/setup.h.in $(DISTDIR)
 	cp $(WXDIR)/setup.h_vms $(DISTDIR)
@@ -528,6 +529,11 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
 	cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event

+	mkdir $(DISTDIR)/samples/except
+	cp $(SAMPDIR)/except/Makefile.in $(DISTDIR)/samples/except
+	cp $(SAMPDIR)/except/makefile.unx $(DISTDIR)/samples/except
+	cp $(SAMPDIR)/except/*.cpp $(DISTDIR)/samples/except
+
 	mkdir $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -28,6 +28,7 @@
        <define>$(UNICODE_DEFINE)</define>
        <dirname>$(LIBDIRNAME)</dirname>
        <cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>
+        <cflags-dmars>-w12</cflags-dmars>
        <sources>
            src/regex/regcomp.c
            src/regex/regexec.c
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -33,6 +33,7 @@
        <include>$(INC_ZLIB)</include>
        <include>$(INC_JPEG)</include>
        <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
+        <cflags-dmars>-w2</cflags-dmars>
        <sources>
            $(TIFF_PLATFORM_SRC)
 		    src/tiff/tif_aux.c
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -64,8 +64,11 @@
            <dependency-of>install</dependency-of>
            <command>
                $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-                $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(BINDIR)
-                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
+                $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
+                $(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(LIBDIR)/wx/config
+                (cd $(DESTDIR)$(LIBDIR)/wx/config &amp;&amp; rm -f $(TOOLCHAIN_NAME) &amp;&amp; $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
+                $(INSTALL_PROGRAM) wx-config $(DESTDIR)$(BINDIR)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx$(TOOLCHAIN_NAME)-config &amp;&amp; $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-config)
            </command>
        </action>

@@ -78,6 +81,9 @@
        <headers>
            <srcdir>$(SRCDIR)/include</srcdir>
            <files>$(ALL_HEADERS)</files>
+            <install-to>
+                $(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)
+            </install-to>
        </headers>

        <!-- Locales: -->
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -11,8 +11,15 @@ import utils
 # register a substitution function for it that provides additional knowledge
 # about the option (in this case that it does not contain dir separators and
 # so utils.nativePaths() doesn't have to do anything with it):
-def __noopSubst(func, name):
-    return '$(%s)' % name
+
+try:
+    # this fails in 0.1.4 and 0.1.5 has different subst.callbacks signature:
+    utils.checkBakefileVersion('0.1.5') 
+    def __noopSubst(name, func, caller):
+        return '$(%s)' % name
+except AttributeError:
+    def __noopSubst(func, name):
+        return '$(%s)' % name
 utils.addSubstituteCallback('CFG', __noopSubst)
 utils.addSubstituteCallback('LIBDIRNAME', __noopSubst)
 utils.addSubstituteCallback('SETUPHDIR', __noopSubst)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -187,6 +187,7 @@ MONODLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_dummy.obj \
 	$(OBJS)\monodll_appbase.obj \
+	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdline.obj \
 	$(OBJS)\monodll_config.obj \
 	$(OBJS)\monodll_datetime.obj \
@@ -284,6 +285,7 @@ MONOLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_dummy.obj \
 	$(OBJS)\monolib_appbase.obj \
+	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdline.obj \
 	$(OBJS)\monolib_config.obj \
 	$(OBJS)\monolib_datetime.obj \
@@ -382,6 +384,7 @@ BASEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_dummy.obj \
 	$(OBJS)\basedll_appbase.obj \
+	$(OBJS)\basedll_clntdata.obj \
 	$(OBJS)\basedll_cmdline.obj \
 	$(OBJS)\basedll_config.obj \
 	$(OBJS)\basedll_datetime.obj \
@@ -464,6 +467,7 @@ BASELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_dummy.obj \
 	$(OBJS)\baselib_appbase.obj \
+	$(OBJS)\baselib_clntdata.obj \
 	$(OBJS)\baselib_cmdline.obj \
 	$(OBJS)\baselib_config.obj \
 	$(OBJS)\baselib_datetime.obj \
@@ -1005,7 +1009,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.obj \
 	$(OBJS)\monodll_choiccmn.obj \
 	$(OBJS)\monodll_clipcmn.obj \
-	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdproc.obj \
 	$(OBJS)\monodll_cmndata.obj \
 	$(OBJS)\monodll_containr.obj \
@@ -1199,7 +1202,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.obj \
 	$(OBJS)\monodll_choiccmn.obj \
 	$(OBJS)\monodll_clipcmn.obj \
-	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdproc.obj \
 	$(OBJS)\monodll_cmndata.obj \
 	$(OBJS)\monodll_containr.obj \
@@ -1440,7 +1442,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.obj \
 	$(OBJS)\monolib_choiccmn.obj \
 	$(OBJS)\monolib_clipcmn.obj \
-	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdproc.obj \
 	$(OBJS)\monolib_cmndata.obj \
 	$(OBJS)\monolib_containr.obj \
@@ -1634,7 +1635,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.obj \
 	$(OBJS)\monolib_choiccmn.obj \
 	$(OBJS)\monolib_clipcmn.obj \
-	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdproc.obj \
 	$(OBJS)\monolib_cmndata.obj \
 	$(OBJS)\monolib_containr.obj \
@@ -1848,7 +1848,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.obj \
 	$(OBJS)\coredll_choiccmn.obj \
 	$(OBJS)\coredll_clipcmn.obj \
-	$(OBJS)\coredll_clntdata.obj \
 	$(OBJS)\coredll_cmdproc.obj \
 	$(OBJS)\coredll_cmndata.obj \
 	$(OBJS)\coredll_containr.obj \
@@ -2042,7 +2041,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.obj \
 	$(OBJS)\coredll_choiccmn.obj \
 	$(OBJS)\coredll_clipcmn.obj \
-	$(OBJS)\coredll_clntdata.obj \
 	$(OBJS)\coredll_cmdproc.obj \
 	$(OBJS)\coredll_cmndata.obj \
 	$(OBJS)\coredll_containr.obj \
@@ -2240,7 +2238,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.obj \
 	$(OBJS)\corelib_choiccmn.obj \
 	$(OBJS)\corelib_clipcmn.obj \
-	$(OBJS)\corelib_clntdata.obj \
 	$(OBJS)\corelib_cmdproc.obj \
 	$(OBJS)\corelib_cmndata.obj \
 	$(OBJS)\corelib_containr.obj \
@@ -2434,7 +2431,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.obj \
 	$(OBJS)\corelib_choiccmn.obj \
 	$(OBJS)\corelib_clipcmn.obj \
-	$(OBJS)\corelib_clntdata.obj \
 	$(OBJS)\corelib_cmdproc.obj \
 	$(OBJS)\corelib_cmndata.obj \
 	$(OBJS)\corelib_containr.obj \
@@ -3356,6 +3352,9 @@ $(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**

+$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**

@@ -4387,11 +4386,6 @@ $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif

-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -4828,6 +4822,9 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

+$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

@@ -5859,11 +5856,6 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif

-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -6300,6 +6292,9 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**

+$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**

@@ -6510,6 +6505,9 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**

+$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**

@@ -7484,11 +7482,6 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif

-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -8611,11 +8604,6 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif

-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -173,6 +173,7 @@ MONODLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_dummy.o \
 	$(OBJS)\monodll_appbase.o \
+	$(OBJS)\monodll_clntdata.o \
 	$(OBJS)\monodll_cmdline.o \
 	$(OBJS)\monodll_config.o \
 	$(OBJS)\monodll_datetime.o \
@@ -270,6 +271,7 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_dummy.o \
 	$(OBJS)\monolib_appbase.o \
+	$(OBJS)\monolib_clntdata.o \
 	$(OBJS)\monolib_cmdline.o \
 	$(OBJS)\monolib_config.o \
 	$(OBJS)\monolib_datetime.o \
@@ -367,6 +369,7 @@ BASEDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_dummy.o \
 	$(OBJS)\basedll_appbase.o \
+	$(OBJS)\basedll_clntdata.o \
 	$(OBJS)\basedll_cmdline.o \
 	$(OBJS)\basedll_config.o \
 	$(OBJS)\basedll_datetime.o \
@@ -449,6 +452,7 @@ BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H
 BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_dummy.o \
 	$(OBJS)\baselib_appbase.o \
+	$(OBJS)\baselib_clntdata.o \
 	$(OBJS)\baselib_cmdline.o \
 	$(OBJS)\baselib_config.o \
 	$(OBJS)\baselib_datetime.o \
@@ -993,7 +997,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.o \
 	$(OBJS)\monodll_choiccmn.o \
 	$(OBJS)\monodll_clipcmn.o \
-	$(OBJS)\monodll_clntdata.o \
 	$(OBJS)\monodll_cmdproc.o \
 	$(OBJS)\monodll_cmndata.o \
 	$(OBJS)\monodll_containr.o \
@@ -1189,7 +1192,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.o \
 	$(OBJS)\monodll_choiccmn.o \
 	$(OBJS)\monodll_clipcmn.o \
-	$(OBJS)\monodll_clntdata.o \
 	$(OBJS)\monodll_cmdproc.o \
 	$(OBJS)\monodll_cmndata.o \
 	$(OBJS)\monodll_containr.o \
@@ -1434,7 +1436,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.o \
 	$(OBJS)\monolib_choiccmn.o \
 	$(OBJS)\monolib_clipcmn.o \
-	$(OBJS)\monolib_clntdata.o \
 	$(OBJS)\monolib_cmdproc.o \
 	$(OBJS)\monolib_cmndata.o \
 	$(OBJS)\monolib_containr.o \
@@ -1630,7 +1631,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.o \
 	$(OBJS)\monolib_choiccmn.o \
 	$(OBJS)\monolib_clipcmn.o \
-	$(OBJS)\monolib_clntdata.o \
 	$(OBJS)\monolib_cmdproc.o \
 	$(OBJS)\monolib_cmndata.o \
 	$(OBJS)\monolib_containr.o \
@@ -1858,7 +1858,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.o \
 	$(OBJS)\coredll_choiccmn.o \
 	$(OBJS)\coredll_clipcmn.o \
-	$(OBJS)\coredll_clntdata.o \
 	$(OBJS)\coredll_cmdproc.o \
 	$(OBJS)\coredll_cmndata.o \
 	$(OBJS)\coredll_containr.o \
@@ -2054,7 +2053,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.o \
 	$(OBJS)\coredll_choiccmn.o \
 	$(OBJS)\coredll_clipcmn.o \
-	$(OBJS)\coredll_clntdata.o \
 	$(OBJS)\coredll_cmdproc.o \
 	$(OBJS)\coredll_cmndata.o \
 	$(OBJS)\coredll_containr.o \
@@ -2258,7 +2256,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.o \
 	$(OBJS)\corelib_choiccmn.o \
 	$(OBJS)\corelib_clipcmn.o \
-	$(OBJS)\corelib_clntdata.o \
 	$(OBJS)\corelib_cmdproc.o \
 	$(OBJS)\corelib_cmndata.o \
 	$(OBJS)\corelib_containr.o \
@@ -2454,7 +2451,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.o \
 	$(OBJS)\corelib_choiccmn.o \
 	$(OBJS)\corelib_clipcmn.o \
-	$(OBJS)\corelib_clntdata.o \
 	$(OBJS)\corelib_cmdproc.o \
 	$(OBJS)\corelib_cmndata.o \
 	$(OBJS)\corelib_containr.o \
@@ -3396,6 +3392,9 @@ $(OBJS)\monodll_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\monodll_appbase.o: ../../src/common/appbase.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<

+$(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_cmdline.o: ../../src/common/cmdline.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<

@@ -4527,11 +4526,6 @@ $(OBJS)\monodll_clipcmn.o: ../../src/common/clipcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 endif

-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_cmdproc.o: ../../src/common/cmdproc.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -4968,6 +4962,9 @@ $(OBJS)\monolib_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\monolib_appbase.o: ../../src/common/appbase.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<

+$(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_cmdline.o: ../../src/common/cmdline.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<

@@ -6099,11 +6096,6 @@ $(OBJS)\monolib_clipcmn.o: ../../src/common/clipcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 endif

-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_cmdproc.o: ../../src/common/cmdproc.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -6540,6 +6532,9 @@ $(OBJS)\basedll_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<

+$(OBJS)\basedll_clntdata.o: ../../src/common/clntdata.cpp
+	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_cmdline.o: ../../src/common/cmdline.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<

@@ -6750,6 +6745,9 @@ $(OBJS)\baselib_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\baselib_appbase.o: ../../src/common/appbase.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<

+$(OBJS)\baselib_clntdata.o: ../../src/common/clntdata.cpp
+	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_cmdline.o: ../../src/common/cmdline.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<

@@ -7824,11 +7822,6 @@ $(OBJS)\coredll_clipcmn.o: ../../src/common/clipcmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
 endif

-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_clntdata.o: ../../src/common/clntdata.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_cmdproc.o: ../../src/common/cmdproc.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -9051,11 +9044,6 @@ $(OBJS)\corelib_clipcmn.o: ../../src/common/clipcmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
 endif

-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_clntdata.o: ../../src/common/clntdata.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_cmdproc.o: ../../src/common/cmdproc.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -188,6 +188,7 @@ MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \
 MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_dummy.obj \
 	$(OBJS)\monodll_appbase.obj \
+	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdline.obj \
 	$(OBJS)\monodll_config.obj \
 	$(OBJS)\monodll_datetime.obj \
@@ -291,6 +292,7 @@ MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \
 MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_dummy.obj \
 	$(OBJS)\monolib_appbase.obj \
+	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdline.obj \
 	$(OBJS)\monolib_config.obj \
 	$(OBJS)\monolib_datetime.obj \
@@ -395,6 +397,7 @@ BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \
 BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_dummy.obj \
 	$(OBJS)\basedll_appbase.obj \
+	$(OBJS)\basedll_clntdata.obj \
 	$(OBJS)\basedll_cmdline.obj \
 	$(OBJS)\basedll_config.obj \
 	$(OBJS)\basedll_datetime.obj \
@@ -483,6 +486,7 @@ BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \
 BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_dummy.obj \
 	$(OBJS)\baselib_appbase.obj \
+	$(OBJS)\baselib_clntdata.obj \
 	$(OBJS)\baselib_cmdline.obj \
 	$(OBJS)\baselib_config.obj \
 	$(OBJS)\baselib_datetime.obj \
@@ -1212,7 +1216,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.obj \
 	$(OBJS)\monodll_choiccmn.obj \
 	$(OBJS)\monodll_clipcmn.obj \
-	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdproc.obj \
 	$(OBJS)\monodll_cmndata.obj \
 	$(OBJS)\monodll_containr.obj \
@@ -1406,7 +1409,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_bookctrl.obj \
 	$(OBJS)\monodll_choiccmn.obj \
 	$(OBJS)\monodll_clipcmn.obj \
-	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdproc.obj \
 	$(OBJS)\monodll_cmndata.obj \
 	$(OBJS)\monodll_containr.obj \
@@ -1665,7 +1667,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.obj \
 	$(OBJS)\monolib_choiccmn.obj \
 	$(OBJS)\monolib_clipcmn.obj \
-	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdproc.obj \
 	$(OBJS)\monolib_cmndata.obj \
 	$(OBJS)\monolib_containr.obj \
@@ -1859,7 +1860,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_bookctrl.obj \
 	$(OBJS)\monolib_choiccmn.obj \
 	$(OBJS)\monolib_clipcmn.obj \
-	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdproc.obj \
 	$(OBJS)\monolib_cmndata.obj \
 	$(OBJS)\monolib_containr.obj \
@@ -2163,7 +2163,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.obj \
 	$(OBJS)\coredll_choiccmn.obj \
 	$(OBJS)\coredll_clipcmn.obj \
-	$(OBJS)\coredll_clntdata.obj \
 	$(OBJS)\coredll_cmdproc.obj \
 	$(OBJS)\coredll_cmndata.obj \
 	$(OBJS)\coredll_containr.obj \
@@ -2357,7 +2356,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_bookctrl.obj \
 	$(OBJS)\coredll_choiccmn.obj \
 	$(OBJS)\coredll_clipcmn.obj \
-	$(OBJS)\coredll_clntdata.obj \
 	$(OBJS)\coredll_cmdproc.obj \
 	$(OBJS)\coredll_cmndata.obj \
 	$(OBJS)\coredll_containr.obj \
@@ -2573,7 +2571,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.obj \
 	$(OBJS)\corelib_choiccmn.obj \
 	$(OBJS)\corelib_clipcmn.obj \
-	$(OBJS)\corelib_clntdata.obj \
 	$(OBJS)\corelib_cmdproc.obj \
 	$(OBJS)\corelib_cmndata.obj \
 	$(OBJS)\corelib_containr.obj \
@@ -2767,7 +2764,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_bookctrl.obj \
 	$(OBJS)\corelib_choiccmn.obj \
 	$(OBJS)\corelib_clipcmn.obj \
-	$(OBJS)\corelib_clntdata.obj \
 	$(OBJS)\corelib_cmdproc.obj \
 	$(OBJS)\corelib_cmndata.obj \
 	$(OBJS)\corelib_containr.obj \
@@ -3911,6 +3907,9 @@ $(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**

+$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**

@@ -4942,11 +4941,6 @@ $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif

-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5383,6 +5377,9 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

+$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

@@ -6414,11 +6411,6 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif

-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6855,6 +6847,9 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**

+$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**

@@ -7065,6 +7060,9 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**

+$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**

@@ -8039,11 +8037,6 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif

-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9166,11 +9159,6 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif

-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_clntdata.obj: ..\..\src\common\clntdata.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -240,7 +240,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_bookctrl.obj &
 	$(OBJS)\monodll_choiccmn.obj &
 	$(OBJS)\monodll_clipcmn.obj &
-	$(OBJS)\monodll_clntdata.obj &
 	$(OBJS)\monodll_cmdproc.obj &
 	$(OBJS)\monodll_cmndata.obj &
 	$(OBJS)\monodll_containr.obj &
@@ -436,7 +435,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_bookctrl.obj &
 	$(OBJS)\monodll_choiccmn.obj &
 	$(OBJS)\monodll_clipcmn.obj &
-	$(OBJS)\monodll_clntdata.obj &
 	$(OBJS)\monodll_cmdproc.obj &
 	$(OBJS)\monodll_cmndata.obj &
 	$(OBJS)\monodll_containr.obj &
@@ -684,7 +682,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_bookctrl.obj &
 	$(OBJS)\monolib_choiccmn.obj &
 	$(OBJS)\monolib_clipcmn.obj &
-	$(OBJS)\monolib_clntdata.obj &
 	$(OBJS)\monolib_cmdproc.obj &
 	$(OBJS)\monolib_cmndata.obj &
 	$(OBJS)\monolib_containr.obj &
@@ -880,7 +877,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_bookctrl.obj &
 	$(OBJS)\monolib_choiccmn.obj &
 	$(OBJS)\monolib_clipcmn.obj &
-	$(OBJS)\monolib_clntdata.obj &
 	$(OBJS)\monolib_cmdproc.obj &
 	$(OBJS)\monolib_cmndata.obj &
 	$(OBJS)\monolib_containr.obj &
@@ -1114,7 +1110,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_bookctrl.obj &
 	$(OBJS)\coredll_choiccmn.obj &
 	$(OBJS)\coredll_clipcmn.obj &
-	$(OBJS)\coredll_clntdata.obj &
 	$(OBJS)\coredll_cmdproc.obj &
 	$(OBJS)\coredll_cmndata.obj &
 	$(OBJS)\coredll_containr.obj &
@@ -1310,7 +1305,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_bookctrl.obj &
 	$(OBJS)\coredll_choiccmn.obj &
 	$(OBJS)\coredll_clipcmn.obj &
-	$(OBJS)\coredll_clntdata.obj &
 	$(OBJS)\coredll_cmdproc.obj &
 	$(OBJS)\coredll_cmndata.obj &
 	$(OBJS)\coredll_containr.obj &
@@ -1516,7 +1510,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_bookctrl.obj &
 	$(OBJS)\corelib_choiccmn.obj &
 	$(OBJS)\corelib_clipcmn.obj &
-	$(OBJS)\corelib_clntdata.obj &
 	$(OBJS)\corelib_cmdproc.obj &
 	$(OBJS)\corelib_cmndata.obj &
 	$(OBJS)\corelib_containr.obj &
@@ -1712,7 +1705,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_bookctrl.obj &
 	$(OBJS)\corelib_choiccmn.obj &
 	$(OBJS)\corelib_clipcmn.obj &
-	$(OBJS)\corelib_clntdata.obj &
 	$(OBJS)\corelib_cmdproc.obj &
 	$(OBJS)\corelib_cmndata.obj &
 	$(OBJS)\corelib_containr.obj &
@@ -2184,6 +2176,7 @@ MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_dummy.obj &
 	$(OBJS)\monodll_appbase.obj &
+	$(OBJS)\monodll_clntdata.obj &
 	$(OBJS)\monodll_cmdline.obj &
 	$(OBJS)\monodll_config.obj &
 	$(OBJS)\monodll_datetime.obj &
@@ -2281,6 +2274,7 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_dummy.obj &
 	$(OBJS)\monolib_appbase.obj &
+	$(OBJS)\monolib_clntdata.obj &
 	$(OBJS)\monolib_cmdline.obj &
 	$(OBJS)\monolib_config.obj &
 	$(OBJS)\monolib_datetime.obj &
@@ -2379,6 +2373,7 @@ BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_dummy.obj &
 	$(OBJS)\basedll_appbase.obj &
+	$(OBJS)\basedll_clntdata.obj &
 	$(OBJS)\basedll_cmdline.obj &
 	$(OBJS)\basedll_config.obj &
 	$(OBJS)\basedll_datetime.obj &
@@ -2461,6 +2456,7 @@ BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_dummy.obj &
 	$(OBJS)\baselib_appbase.obj &
+	$(OBJS)\baselib_clntdata.obj &
 	$(OBJS)\baselib_cmdline.obj &
 	$(OBJS)\baselib_config.obj &
 	$(OBJS)\baselib_datetime.obj &
@@ -3586,6 +3582,9 @@ $(OBJS)\monodll_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\monodll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

+$(OBJS)\monodll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

@@ -4717,11 +4716,6 @@ $(OBJS)\monodll_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif

-!ifeq USE_GUI 1
-$(OBJS)\monodll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monodll_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5158,6 +5152,9 @@ $(OBJS)\monolib_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\monolib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

+$(OBJS)\monolib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

@@ -6289,11 +6286,6 @@ $(OBJS)\monolib_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif

-!ifeq USE_GUI 1
-$(OBJS)\monolib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monolib_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -6730,6 +6722,9 @@ $(OBJS)\basedll_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\basedll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
 	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<

+$(OBJS)\basedll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
 	$(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<

@@ -6940,6 +6935,9 @@ $(OBJS)\baselib_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\baselib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
 	$(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

+$(OBJS)\baselib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
+	$(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_cmdline.obj :  .AUTODEPEND ..\..\src\common\cmdline.cpp
 	$(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<

@@ -8014,11 +8012,6 @@ $(OBJS)\coredll_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif

-!ifeq USE_GUI 1
-$(OBJS)\coredll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9241,11 +9234,6 @@ $(OBJS)\corelib_clipcmn.obj :  .AUTODEPEND ..\..\src\common\clipcmn.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif

-!ifeq USE_GUI 1
-$(OBJS)\corelib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
-	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_cmdproc.obj :  .AUTODEPEND ..\..\src\common\cmdproc.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -456,6 +456,10 @@ SOURCE=..\..\src\common\appbase.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\src\common\clntdata.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\cmdline.cpp
 # End Source File
 # Begin Source File
@@ -991,6 +995,10 @@ SOURCE=..\..\include\wx\chkconf.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\include\wx\clntdata.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\cmdline.h
 # End Source File
 # Begin Source File
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -484,10 +484,6 @@ SOURCE=..\..\src\common\clipcmn.cpp
 # End Source File
 # Begin Source File

-SOURCE=..\..\src\common\clntdata.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\common\cmdproc.cpp
 # End Source File
 # Begin Source File
@@ -8118,10 +8114,6 @@ SOURCE=..\..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\wx\clntdata.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\cmdproc.h
 # End Source File
 # Begin Source File
--- a/1725
+++ b/1725
--- a/configure.in
+++ b/configure.in
@@ -476,6 +476,7 @@ if test $DEBUG_CONFIGURE = 1; then
  DEFAULT_wxUSE_MENUS=no
  DEFAULT_wxUSE_MINIFRAME=no
  DEFAULT_wxUSE_HTML=no
+  DEFAULT_wxUSE_WEBKIT=no
  DEFAULT_wxUSE_FILESYSTEM=no
  DEFAULT_wxUSE_FS_INET=no
  DEFAULT_wxUSE_FS_ZIP=no
@@ -659,6 +660,7 @@ else
  DEFAULT_wxUSE_MENUS=yes
  DEFAULT_wxUSE_MINIFRAME=yes
  DEFAULT_wxUSE_HTML=yes
+  DEFAULT_wxUSE_WEBKIT=yes
  DEFAULT_wxUSE_FILESYSTEM=yes
  DEFAULT_wxUSE_FS_INET=yes
  DEFAULT_wxUSE_FS_ZIP=yes
@@ -723,6 +725,9 @@ else
  DEFAULT_wxUSE_MONOLITHIC=no
  DEFAULT_wxUSE_PLUGINS=no
  DEFAULT_wxUSE_OFFICIAL_BUILD=no
+
+  dnl Appliable only when --with-gtk was used:
+  DEFAULT_wxUSE_GTK2=yes
 fi

 dnl WX_ARG_WITH should be used to select whether an external package will be
@@ -771,7 +776,7 @@ AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_
 AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
 WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)

-WX_ARG_ENABLE(gtk2,        [  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)], wxUSE_GTK2)
+WX_ARG_ENABLE(gtk2,        [  --disable-gtk2          use GTK+ 1.2 instead of 2.0], wxUSE_GTK2)
 WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)

 WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
@@ -915,6 +920,7 @@ WX_ARG_ENABLE(mdidoc,      [  --enable-mdidoc         use docview architecture w
 WX_ARG_ENABLE(loggui,      [  --enable-loggui         use standard GUI logger], wxUSE_LOGGUI)
 WX_ARG_ENABLE(logwin,      [  --enable-logwin         use wxLogWindow], wxUSE_LOGWINDOW)
 WX_ARG_ENABLE(logdialog,   [  --enable-logdialog      use wxLogDialog], wxUSE_LOGDIALOG)
+WX_ARG_ENABLE(webkit,      [  --enable-webkit         use wxWebKitCtrl (Mac)], wxUSE_WEBKIT)

 dnl ---------------------------------------------------------------------------
 dnl PostScript options
@@ -1033,9 +1039,6 @@ fi
 if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
  wxUSE_PRINTING_ARCHITECTURE=no
  wxUSE_DRAG_AND_DROP=no
-  # Generic notebook requires tab dialog
-  DEFAULT_wxUSE_TABDIALOG=yes
-  DEFAULT_wxUSE_SCROLLBAR=no
  DEFAULT_wxUSE_TOOLTIPS=no
  DEFAULT_wxUSE_DRAGIMAGE=no
 fi
@@ -1350,18 +1353,6 @@ AC_PROG_CXX

 AC_LANG_RESTORE

-dnl check if compiler includes /usr/local/include in
-dnl default include files search path.
-AC_MSG_CHECKING([for /usr/local/include in default include path])
-GCC_SEARCHES_USR_LOCAL_INCLUDE="no"
-if test "$GCC" = "yes" ; then
-  echo | gcc -v -x c++ -E - 2>&1 | sed -n '/^#include </,$p' | \
-  	sed -n '1,/End of search list\./p' | \
-        grep '^ */usr/local/include$' 2>&1 /dev/null \
-  && GCC_SEARCHES_USR_LOCAL_INCLUDE="yes"
-fi
-AC_MSG_RESULT([$GCC_SEARCHES_USR_LOCAL_INCLUDE])
-
 dnl ranlib command
 dnl   defines RANLIB with the appropriate command
 AC_PROG_RANLIB
@@ -2475,6 +2466,14 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                    ]
                )
            fi
+                
+            save_CFLAGS="$CFLAGS"
+            save_LIBS="$LIBS"
+            CFLAGS="$CFLAGS $GTK_CFLAGS"
+            LIBS="$LIBS $GTK_LIBS"
+            AC_CHECK_FUNCS([pango_font_family_is_monospace])
+            CFLAGS="$save_CFLAGS"
+            LIBS="$save_LIBS"
        else
            if test "$wxUSE_UNICODE" = "yes"; then
                AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x])
@@ -2621,20 +2620,28 @@ equivalent variable and GTK+ is version 1.2.3 or above.
        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMSW__ -D__WIN95__ -D__WIN32__ -DMWIN -DMICROWIN_NOCONTROLS -DMICROWIN_TODO=1"
    fi

-    if test "$wxUSE_X11" = 1; then
-        dnl use standard macros to check for X headers/libs, this brings support
-        dnl for the standard configure options --x-includes and --x-libraries
+    dnl common part of X11 and Motif port checks
+    if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
+        dnl use standard macros to check for X headers/libs, this brings
+        dnl support for the standard configure options --x-includes,
+        dnl --x-libraries and --no-x
        AC_PATH_XTRA

        if test "$no_x" = "yes"; then
          AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
        fi

-        GUI_TK_LIBRARY="$X_LIBS"
-        TOOLKIT_INCLUDE="$X_CFLAGS"
+        dnl for some reason AC_PATH_XTRA seems to add -INONE and -LNONE (and
+        dnl also sometimes -RNONE) to X_CFLAGS and X_LIBS respectively, filter
+        dnl this junk out
+        GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
+        TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
        AFMINSTALL=afminstall
        COMPILED_X_PROGRAM=0

+    fi
+
+    if test "$wxUSE_X11" = 1; then
        if test "$wxUSE_NANOX" = "yes"; then
            AC_MSG_CHECKING(for MicroWindows/NanoX distribution)
            if test "x$MICROWIN" = x ; then
@@ -2675,6 +2682,13 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                        AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
                    ]
                )
+                save_CFLAGS="$CFLAGS"
+                save_LIBS="$LIBS"
+                CFLAGS="$CFLAGS $PANGOX_CFLAGS"
+                LIBS="$LIBS $PANGOX_LIBS"
+                AC_CHECK_FUNCS([pango_font_family_is_monospace])
+                CFLAGS="$save_CFLAGS"
+                LIBS="$save_LIBS"
        fi

        wxUSE_UNIVERSAL="yes"
@@ -2693,21 +2707,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
    fi

    if test "$wxUSE_MOTIF" = 1; then
-        dnl use standard macros to check for X headers/libs, this brings support
-        dnl for the standard configure options --x-includes and --x-libraries
-        AC_PATH_XTRA
-
-        if test "$no_x" = "yes"; then
-          AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
-        fi
-
-        dnl for some reason AC_PATH_XTRA seems to add -INONE and -LNONE to
-        dnl X_LIBS and X_CFLAGS respectively -- what for??
-        GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
-        TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
-        AFMINSTALL=afminstall
-        COMPILED_X_PROGRAM=0
-
        AC_MSG_CHECKING(for Motif/Lesstif headers)
        WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
        if test "$ac_find_includes" != "" ; then
@@ -2843,6 +2842,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
        GUIDIST=MOTIF_DIST
    fi

+    dnl more tests common to X11 and Motif:
    if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
        dnl test for external libxpm if we're configured to use it
        if test "$wxUSE_LIBXPM" = "sys"; then
@@ -3127,7 +3127,7 @@ if test "$wxUSE_DISPLAY" = "yes"; then
 dnl ---------------------------------------------------------------------------
 dnl Xinerama (for unix ) - Brian Victor
 dnl ---------------------------------------------------------------------------
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
        AC_MSG_CHECKING([for Xinerama])
        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
        if test "$ac_find_libraries" != "" ; then
@@ -3265,15 +3265,19 @@ fi

 UNICODE=0
 lib_unicode_suffix=
+wxconfig_filename_unicode="ansi"
 if test "$wxUSE_UNICODE" = "yes"; then
    lib_unicode_suffix=u
+    wxconfig_filename_unicode="unicode"
    UNICODE=1
 fi

 lib_debug_suffix=
+wxconfig_filename_debug="release"
 DEBUG_FLAG=0
 if test "$wxUSE_DEBUG_FLAG" = "yes"; then
    lib_debug_suffix=d
+    wxconfig_filename_debug="debug"
    DEBUG_FLAG=1
 fi

@@ -3287,9 +3291,12 @@ WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} |
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
 TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"

+WXCONFIG_DATA_FILE="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${wxconfig_filename_unicode}-${wxconfig_filename_debug}-${WX_RELEASE}"
+
 if test "$cross_compiling" = "yes"; then
    TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
    TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"
+    WXCONFIG_DATA_FILE="${WXCONFIG_DATA_FILE}-${host_alias}"
    HOST_SUFFIX="-${host_alias}"
 fi

@@ -3691,7 +3698,7 @@ fi

 if test "$wxUSE_UNICODE" = yes; then
    dnl also look if we have wide char IO functions
-    AC_CHECK_FUNCS(fputwc wprintf vswprintf)
+    AC_CHECK_FUNCS(wputc wputchar putws fputws wprintf vswprintf)

    dnl MinGW has a vswprintf with a different prototype, and
    dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS
@@ -5602,7 +5609,12 @@ if test "$wxUSE_DRAGIMAGE" = "yes"; then
 fi

 if test "$wxUSE_EXCEPTIONS" = "yes"; then
-    AC_DEFINE(wxUSE_EXCEPTIONS)
+    if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
+        AC_MSG_WARN([--enable-exceptions can't be used with --enable-no_exceptions])
+    else
+        AC_DEFINE(wxUSE_EXCEPTIONS)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS except"
+    fi
 fi

 USE_HTML=0
@@ -5614,6 +5626,28 @@ if test "$wxUSE_HTML" = "yes"; then
        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
    fi
 fi
+if test "$wxUSE_WEBKIT" = "yes"; then
+    if test "$wxUSE_MAC" = 1; then
+        old_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS -x objective-c++"
+        AC_CHECK_HEADER([WebKit/HIWebView.h],
+                        [
+                           AC_DEFINE(wxUSE_WEBKIT)
+                           WEBKIT_LINK="-framework WebKit"
+                        ],
+                        [
+                           AC_MSG_WARN([WebKit headers not found; disabling wxWebKit])
+                           wxUSE_WEBKIT=no
+                        ],
+                        [#include <Carbon/Carbon.h>])
+        CPPFLAGS="$old_CPPFLAGS"
+    elif test "$wxUSE_COCOA" = 1; then
+        AC_DEFINE(wxUSE_WEBKIT)
+    else
+        wxUSE_WEBKIT=no
+    fi
+fi
+

 if test "$wxUSE_MENUS" = "yes"; then
    AC_DEFINE(wxUSE_MENUS)
@@ -5824,7 +5858,10 @@ dnl note that we always link with -lm except for Mac OS X
 dnl extended.c uses floor() and is always linked in

 if test "$wxUSE_MAC" = 1 ; then
-    LDFLAGS="$LDFLAGS -framework Carbon -framework Cocoa -framework WebKit -framework System"
+    if test "$wxUSE_SOUND" = "yes"; then
+       LDFLAGS="$LDFLAGS -framework QuickTime"
+    fi
+    LDFLAGS="$LDFLAGS -framework Carbon -framework Cocoa -framework System"
 fi
 if test "$wxUSE_COCOA" = 1 ; then
    LDFLAGS="$LDFLAGS -framework Cocoa -framework System"
@@ -5927,7 +5964,7 @@ EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
 EXTRALIBS_ODBC="$ODBC_LINK"
 if test "$wxUSE_GUI" = "yes"; then
-    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'`
+    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK | sed 's/ \+/ /g'`
 fi
 if test "$wxUSE_OPENGL" = "yes"; then
    EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
@@ -6045,38 +6082,41 @@ AC_SUBST(CPPUNIT_LIBS)
 AC_BAKEFILE


+GCC_PRAGMA_FLAGS=""
 dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
 if test $GCC_PCH = 1 ; then
-    CODE_GEN_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
-    CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
+    GCC_PRAGMA_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA"
 else
    case "${host}" in
        powerpc-*-darwin* )
            dnl Some Apple's GCC version are broken and can't handle the
            dnl pragmas:
-            CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
-            CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
+            GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
            ;;
        *-*-mingw32* )
            dnl MinGW GCC versions >= 3.2 have problems with
            dnl static member of classes derived from templates
-            dnl in combination with #pragme interface/implementation
+            dnl in combination with #pragma interface/implementation
            dnl (the test case uses 4 files)
-            if test "$wxUSE_STL" = "yes"; then
-               AC_MSG_CHECKING([If this MinGW version needs -DNO_GCC_PRAGMA])
+            dnl ... and with exceptions handling (undefined symbols needed
+            dnl to correctly calls dtors when unwinding) as well
+            if test "$wxUSE_STL" = "yes" -o \
+                    "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
+                    "$wxUSE_NO_RTTI" != "yes"; then
+               AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA])
               AC_TRY_COMPILE([],
-                              [#if !(__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
+                              [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
                               #error "Not GCC 3.2 or greater"
                               #endif
                               ],
-                              [CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
-                               CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
+                              [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
                               AC_MSG_RESULT([yes])],
                              [AC_MSG_RESULT([no])])
            fi
            ;;
    esac
 fi
+CPPFLAGS="$GCC_PRAGMA_FLAGS $CPPFLAGS"


 dnl for convenience, sort the samples in alphabetical order
@@ -6150,7 +6190,9 @@ AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
 AC_SUBST(WXCONFIG_INCLUDE)
 AC_SUBST(WXCONFIG_RPATH)
 AC_SUBST(WXCONFIG_LDFLAGS_GUI)
+AC_SUBST(WXCONFIG_DATA_FILE)
 AC_SUBST(WX_LARGEFILE_FLAGS)
+AC_SUBST(GCC_PRAGMA_FLAGS)
 AC_SUBST(CODE_GEN_FLAGS)
 AC_SUBST(CODE_GEN_FLAGS_CXX)

@@ -6192,7 +6234,6 @@ AC_SUBST(MACRESWXCONFIG)

 dnl other tools
 AC_SUBST(GCC)
-AC_SUBST(GCC_SEARCHES_USR_LOCAL_INCLUDE)
 AC_SUBST(DLLTOOL)
 AC_SUBST(AS)
 AC_SUBST(NM)
@@ -6219,31 +6260,22 @@ dnl (the original file name may be overriden by appending another name after a
 dnl colon)
 AC_CONFIG_FILES([
            wx-config
+            wx-config-wrapper
            version-script
            Makefile
          ])

 AC_CONFIG_COMMANDS([default],
          [
-            dnl This test is required to make the following idempotent.
-            dnl Otherwise running config.status or rerunning configure
-            dnl would stomp the wx-config link or try to move it onto
-            dnl itself.
-            dnl Use -h instead of -L to test for link (GD)
-            dnl   -h is documented as obsolete under Mac OS X but works
-            dnl   -L is obsolete under Solaris8
-            if test ! -h wx-config; then
-                chmod +x wx-config
-                mv wx-config wx${TOOLCHAIN_NAME}-config
-                ${LN_S} wx${TOOLCHAIN_NAME}-config wx-config
-            fi
-
            if test ! -d lib; then
              mkdir lib
            fi
            if test ! -d lib/wx; then
              mkdir lib/wx
            fi
+            if test ! -d lib/wx/config; then
+              mkdir lib/wx/config
+            fi
            if test ! -d lib/wx/include; then
              mkdir lib/wx/include
            fi
@@ -6256,9 +6288,24 @@ AC_CONFIG_COMMANDS([default],
            if test -f setup.h; then
              mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h
            fi
+            
+            if test -f wx-config; then
+                chmod +x wx-config
+                mv -f wx-config lib/wx/config/${WXCONFIG_DATA_FILE}
+                ( cd lib/wx/config ; 
+                  rm -f ${TOOLCHAIN_NAME}
+                  ${LN_S} ${WXCONFIG_DATA_FILE} ${TOOLCHAIN_NAME} )
+            fi
+            if test -f wx-config-wrapper; then
+                chmod +x wx-config-wrapper
+                mv -f wx-config-wrapper wx-config
+                rm -f wx${TOOLCHAIN_NAME}-config
+                ${LN_S} wx-config wx${TOOLCHAIN_NAME}-config
+            fi
          ],
          [
            TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
+            WXCONFIG_DATA_FILE="${WXCONFIG_DATA_FILE}"
            LN_S="${LN_S}"
          ]
         )
--- a/contrib/include/wx/deprecated/treelay.h
+++ b/contrib/include/wx/deprecated/treelay.h
@@ -83,7 +83,7 @@ protected:
    long          m_ySpacing;
    long          m_topMargin;
    long          m_leftMargin;
-    bool          m_orientation; // TRUE for top-to-bottom, FALSE for left-to-right
+    bool          m_orientation; // true for top-to-bottom, false for left-to-right
    
 private:
    DECLARE_ABSTRACT_CLASS(wxTreeLayout)
--- a/contrib/include/wx/fl/controlbar.h
+++ b/contrib/include/wx/fl/controlbar.h
@@ -7,7 +7,7 @@
 // Created:     06/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __CONTROLBAR_G__
@@ -142,7 +142,7 @@ public:

    wxFrameLayout( wxWindow* pParentFrame,
                   wxWindow* pFrameClient = NULL,
-                   bool      activateNow  = TRUE );
+                   bool      activateNow  = true );

        // Destructor. It does not destroy the bar windows.

@@ -150,7 +150,7 @@ public:

        // Enables floating behaviour. By default floating of control bars is on.

-    virtual void EnableFloating( bool enable = TRUE );
+    virtual void EnableFloating( bool enable = true );

        // Activate can be called after some other layout has been deactivated,
        // and this one must take over the current contents of the frame window.
@@ -223,10 +223,10 @@ public:

        // name is a name by which the bar can be referred in layout customization dialogs.

-        // If spyEvents is TRUE, input events for the bar should be "spyed" in order
+        // If spyEvents is true, input events for the bar should be "spyed" in order
        // to forward unhandled mouse clicks to the frame layout, for example to enable
        // easy draggablity of toolbars just by clicking on their interior regions.
-        // For widgets like text/tree control this value should be FALSE,
+        // For widgets like text/tree control this value should be false,
        // since there's no certain way to detect  whether the event was actually handled.

        // state is the initial state, such as wxCBAR_DOCKED_HORIZONTALLY,
@@ -240,7 +240,7 @@ public:
                         int rowNo        = 0,
                         int columnPos    = 0,
                         const wxString& name = wxT("bar"),
-                         bool spyEvents    = FALSE,
+                         bool spyEvents    = false,
                         int state        = wxCBAR_DOCKED_HORIZONTALLY
                       );

@@ -250,7 +250,7 @@ public:
        // To dock a bar which is floating, use the wxFrameLayout::DockBar method.

    virtual bool RedockBar( cbBarInfo* pBar, const wxRect& shapeInParent,
-                            cbDockPane* pToPane = NULL, bool updateNow = TRUE );
+                            cbDockPane* pToPane = NULL, bool updateNow = true );

        // Finds the bar in the framelayout, by name.

@@ -284,7 +284,7 @@ public:

        // Recalculates the layout of panes, and all bars/rows in each pane.

-    virtual void RecalcLayout( bool repositionBarsNow = FALSE );
+    virtual void RecalcLayout( bool repositionBarsNow = false );

        // Returns the client height.

@@ -331,7 +331,7 @@ public:

        // Recalculates layout and performs on-screen update of all panes.

-    void RefreshNow( bool recalcLayout = TRUE );
+    void RefreshNow( bool recalcLayout = true );

        // Event handler for a size event.

@@ -565,7 +565,7 @@ public: /* protected really (accessed only by plugins) */
                    cbDockPane** ppPane );


-        // Returns TRUE if the position is within the given pane.
+        // Returns true if the position is within the given pane.

    bool HitTestPane( cbDockPane* pPane, int x, int y );

@@ -600,7 +600,7 @@ public: /* protected really (accessed only by plugins) */

    void HookUpToFrame();

-        // Returns TRUE if the platform allows reparenting. This may not return TRUE
+        // Returns true if the platform allows reparenting. This may not return true
        // for all platforms. Reparenting allows control bars to be floated.

    bool CanReparent();
@@ -659,7 +659,7 @@ public:

    wxObject*  mpCustomData; // any custom data stored by specific updates mgr.

-        // Default constructor. Is-dirty flag is set TRUE initially.
+        // Default constructor. Is-dirty flag is set true initially.

    cbUpdateMgrData();

@@ -669,7 +669,7 @@ public:

        // Set the dirty flag.

-    void SetDirty( bool isDirty = TRUE );
+    void SetDirty( bool isDirty = true );

        // Set custom data.

@@ -751,8 +751,8 @@ public:

    int    mHorizGap;    // NOTE:: gaps are given in frame's coord. orientation

-    // TRUE, if vertical/horizontal dimensions cannot be mannualy adjusted
-    //       by user using resizing handles. If FALSE, the frame-layout
+    // true, if vertical/horizontal dimensions cannot be mannualy adjusted
+    //       by user using resizing handles. If false, the frame-layout
    //       *automatically* places resizing handles among not-fixed bars

    bool   mIsFixed;
@@ -766,8 +766,8 @@ public:
    cbDimInfo(void);

        // Constructor.
-        // isFixed is TRUE if vertical/horizontal dimensions cannot be manually adjusted
-        // by the user using resizing handles. If FALSE, the frame-layout
+        // isFixed is true if vertical/horizontal dimensions cannot be manually adjusted
+        // by the user using resizing handles. If false, the frame-layout
        // automatically places resizing handles among bars that do are not fixed.

    cbDimInfo( cbBarDimHandlerBase* pDimHandler,
@@ -796,7 +796,7 @@ public:
               int dv_x, int dv_y,
               int f_x,  int f_y,

-               bool isFixed  = TRUE,
+               bool isFixed  = true,
               int  horizGap = 6,
               int  vertGap  = 6,

@@ -806,7 +806,7 @@ public:
        // Constructor.

    cbDimInfo( int x, int y,
-               bool isFixed  = TRUE,
+               bool isFixed  = true,
               int  gap = 6,
               cbBarDimHandlerBase* pDimHandler = NULL
             );
@@ -943,11 +943,11 @@ public:

    ~cbBarInfo();

-        // Returns TRUE if this bar is fixed.
+        // Returns true if this bar is fixed.

    inline bool IsFixed() const { return mDimInfo.mIsFixed; }

-        // Returns TRUE if this bar is expanded.
+        // Returns true if this bar is expanded.

    inline bool IsExpanded() const { return this == mpRow->mpExpandedBar; }
 };
@@ -983,7 +983,7 @@ public:

    void Reset();

-        // Advances the iterator and returns TRUE if a bar is available.
+        // Advances the iterator and returns true if a bar is available.

    bool Next();

@@ -1118,7 +1118,7 @@ public: /* protected really (accessed only by plugins) */

    void SyncRowFlags( cbRowInfo* pRow );

-        // Returns TRUE if the bar's dimension information indicates a fixed size.
+        // Returns true if the bar's dimension information indicates a fixed size.
        // Internal function called by plugins.

    bool IsFixedSize( cbBarInfo* pInfo );
@@ -1133,22 +1133,22 @@ public: /* protected really (accessed only by plugins) */

    int GetRowY( cbRowInfo* pRow );

-        // Returns TRUE if there are any variable-sized rows above this one.
+        // Returns true if there are any variable-sized rows above this one.
        // Internal function called by plugins.

    bool HasNotFixedRowsAbove( cbRowInfo* pRow );

-        // Returns TRUE if there are any variable-sized rows below this one.
+        // Returns true if there are any variable-sized rows below this one.
        // Internal function called by plugins.

    bool HasNotFixedRowsBelow( cbRowInfo* pRow );

-        // Returns TRUE if there are any variable-sized rows to the left of this one.
+        // Returns true if there are any variable-sized rows to the left of this one.
        // Internal function called by plugins.

    bool HasNotFixedBarsLeft ( cbBarInfo* pBar );

-        // Returns TRUE if there are any variable-sized rows to the right of this one.
+        // Returns true if there are any variable-sized rows to the right of this one.
        // Internal function called by plugins.

    bool HasNotFixedBarsRight( cbBarInfo* pBar );
@@ -1203,7 +1203,7 @@ public: /* protected really (accessed only by plugins) */

    void PaneToFrame( wxRect* pRect );

-        // Returns TRUE if pos is within the given rectangle.
+        // Returns true if pos is within the given rectangle.
        // Internal function called by plugins.

    inline bool HasPoint( const wxPoint& pos, int x, int y, int width, int height );
@@ -1368,7 +1368,7 @@ public: /* public members */

        { return mRows.GetCount() ? mRows[0] : NULL; }

-        // Returns TRUE if the given bar is present in this pane.
+        // Returns true if the given bar is present in this pane.

    bool BarPresent( cbBarInfo* pBar );

@@ -1381,11 +1381,11 @@ public: /* public members */

    int GetAlignment();

-        // Returns TRUE if the given mask matches the pane's mask.
+        // Returns true if the given mask matches the pane's mask.

    bool MatchesMask( int paneMask );

-        // Returns TRUE if the pane is aligned to the top or bottom.
+        // Returns true if the pane is aligned to the top or bottom.

    inline bool IsHorizontal()
    {
@@ -1660,31 +1660,31 @@ typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&)

 // Macros for creating event table entries for plugin-events.

-#define EVT_PL_LEFT_DOWN(func)             wxEventTableEntry( cbEVT_PL_LEFT_DOWN,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDownHandler        ) & func, (wxObject *) NULL ),
-#define EVT_PL_LEFT_UP(func)             wxEventTableEntry( cbEVT_PL_LEFT_UP,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftUpHandler          ) & func, (wxObject *) NULL ),
-#define EVT_PL_RIGHT_DOWN(func)             wxEventTableEntry( cbEVT_PL_RIGHT_DOWN,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightDownHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_RIGHT_UP(func)             wxEventTableEntry( cbEVT_PL_RIGHT_UP,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightUpHandler         ) & func, (wxObject *) NULL ),
-#define EVT_PL_MOTION(func)                 wxEventTableEntry( cbEVT_PL_MOTION,                 -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbMotionHandler          ) & func, (wxObject *) NULL ),
-#define EVT_PL_LEFT_DCLICK(func)         wxEventTableEntry( cbEVT_PL_LEFT_DCLICK,         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDClickHandler      ) & func, (wxObject *) NULL ),
+#define EVT_PL_LEFT_DOWN(func)   wxEventTableEntry( cbEVT_PL_LEFT_DOWN,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDownHandler   ) & func, (wxObject *) NULL ),
+#define EVT_PL_LEFT_UP(func)     wxEventTableEntry( cbEVT_PL_LEFT_UP,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftUpHandler     ) & func, (wxObject *) NULL ),
+#define EVT_PL_RIGHT_DOWN(func)  wxEventTableEntry( cbEVT_PL_RIGHT_DOWN,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightDownHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_RIGHT_UP(func)    wxEventTableEntry( cbEVT_PL_RIGHT_UP,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightUpHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_MOTION(func)      wxEventTableEntry( cbEVT_PL_MOTION,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbMotionHandler     ) & func, (wxObject *) NULL ),
+#define EVT_PL_LEFT_DCLICK(func) wxEventTableEntry( cbEVT_PL_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDClickHandler ) & func, (wxObject *) NULL ),

-#define EVT_PL_LAYOUT_ROW(func)             wxEventTableEntry( cbEVT_PL_LAYOUT_ROW,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_RESIZE_ROW(func)             wxEventTableEntry( cbEVT_PL_RESIZE_ROW,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeRowHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_LAYOUT_ROWS(func)         wxEventTableEntry( cbEVT_PL_LAYOUT_ROWS,         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowsHandler      ) & func, (wxObject *) NULL ),
-#define EVT_PL_INSERT_BAR(func)             wxEventTableEntry( cbEVT_PL_INSERT_BAR,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbInsertBarHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_RESIZE_BAR(func)             wxEventTableEntry( cbEVT_PL_RESIZE_BAR,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeBarHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_REMOVE_BAR(func)             wxEventTableEntry( cbEVT_PL_REMOVE_BAR,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRemoveBarHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_SIZE_BAR_WND(func)         wxEventTableEntry( cbEVT_PL_SIZE_BAR_WND,         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbSizeBarWndHandler      ) & func, (wxObject *) NULL ),
+#define EVT_PL_LAYOUT_ROW(func)   wxEventTableEntry( cbEVT_PL_LAYOUT_ROW,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_RESIZE_ROW(func)   wxEventTableEntry( cbEVT_PL_RESIZE_ROW,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeRowHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_LAYOUT_ROWS(func)  wxEventTableEntry( cbEVT_PL_LAYOUT_ROWS,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowsHandler ) & func, (wxObject *) NULL ),
+#define EVT_PL_INSERT_BAR(func)   wxEventTableEntry( cbEVT_PL_INSERT_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbInsertBarHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_RESIZE_BAR(func)   wxEventTableEntry( cbEVT_PL_RESIZE_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeBarHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_REMOVE_BAR(func)   wxEventTableEntry( cbEVT_PL_REMOVE_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRemoveBarHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_SIZE_BAR_WND(func) wxEventTableEntry( cbEVT_PL_SIZE_BAR_WND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbSizeBarWndHandler ) & func, (wxObject *) NULL ),

-#define EVT_PL_DRAW_BAR_DECOR(func)      wxEventTableEntry( cbEVT_PL_DRAW_BAR_DECOR,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarDecorHandler    ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_DECOR(func)      wxEventTableEntry( cbEVT_PL_DRAW_ROW_DECOR,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowDecorHandler    ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_PANE_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_PANE_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneDecorHandler   ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_BAR_HANDLES(func)    wxEventTableEntry( cbEVT_PL_DRAW_BAR_HANDLES,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarHandlesHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_HANDLES(func)    wxEventTableEntry( cbEVT_PL_DRAW_ROW_HANDLES,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowHandlesHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_BKGROUND(func)   wxEventTableEntry( cbEVT_PL_DRAW_ROW_BKGROUND,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowBkGroundHandler ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_PANE_BKGROUND(func)  wxEventTableEntry( cbEVT_PL_DRAW_PANE_BKGROUND,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneBkGroundHandler) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_BAR_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_BAR_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarDecorHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_ROW_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_ROW_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowDecorHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_PANE_DECOR(func)    wxEventTableEntry( cbEVT_PL_DRAW_PANE_DECOR,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneDecorHandler   ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_BAR_HANDLES(func)   wxEventTableEntry( cbEVT_PL_DRAW_BAR_HANDLES,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarHandlesHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_ROW_HANDLES(func)   wxEventTableEntry( cbEVT_PL_DRAW_ROW_HANDLES,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowHandlesHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_ROW_BKGROUND(func)  wxEventTableEntry( cbEVT_PL_DRAW_ROW_BKGROUND,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowBkGroundHandler ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_PANE_BKGROUND(func) wxEventTableEntry( cbEVT_PL_DRAW_PANE_BKGROUND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneBkGroundHandler) & func, (wxObject *) NULL ),

-#define EVT_PL_START_BAR_DRAGGING(func)  wxEventTableEntry( cbEVT_PL_START_BAR_DRAGGING,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartBarDraggingHandler) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_HINT_RECT(func)      wxEventTableEntry( cbEVT_PL_DRAW_HINT_RECT,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawHintRectHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_START_BAR_DRAGGING(func) wxEventTableEntry( cbEVT_PL_START_BAR_DRAGGING, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartBarDraggingHandler) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_HINT_RECT(func)     wxEventTableEntry( cbEVT_PL_DRAW_HINT_RECT,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawHintRectHandler    ) & func, (wxObject *) NULL ),


 #define EVT_PL_START_DRAW_IN_AREA(func)  wxEventTableEntry( cbEVT_PL_START_DRAW_IN_AREA,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartDrawInAreaHandler)  & func, (wxObject *) NULL ),
@@ -1713,7 +1713,7 @@ public:

    int            mPaneMask;

-        // Is TRUE when plugin is ready to handle events.
+        // Is true when plugin is ready to handle events.

    bool           mIsReady;

@@ -1724,7 +1724,7 @@ public:

        : mpLayout  ( 0 ),
          mPaneMask( wxALL_PANES ),
-          mIsReady ( FALSE )
+          mIsReady ( false )
    {}

        // Constructor taking layout panel and a mask.
@@ -1733,7 +1733,7 @@ public:

        : mpLayout  ( pPanel ),
          mPaneMask( paneMask ),
-          mIsReady ( FALSE )
+          mIsReady ( false )
    {}

        // Returns the pane mask.
@@ -1748,9 +1748,9 @@ public:
        // At this point plugin is already attached to the frame layout,
        // and pane masks are set.

-    virtual void OnInitPlugin() { mIsReady = TRUE; }
+    virtual void OnInitPlugin() { mIsReady = true; }

-        // Returns TRUE if the plugin is ready to receive events.
+        // Returns true if the plugin is ready to receive events.

    bool IsReady() { return mIsReady; }

--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -148,13 +148,13 @@ public:
    virtual void AddTool( int toolIndex,
                              const wxString& imageFileName,
                              wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
-                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
-                              bool isFlat = TRUE );
+                              const wxString& labelText = wxT(""), bool alignTextRight = false,
+                              bool isFlat = true );
        // Adds a tool. See the documentation for wxToolBar for details.

    virtual void AddTool( int toolIndex, wxBitmap labelBmp,
-                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
-                              bool isFlat = TRUE );
+                              const wxString& labelText = wxT(""), bool alignTextRight = false,
+                              bool isFlat = true );

        // Unhide method from parent.

@@ -166,7 +166,7 @@ public:
    // See the documentation for wxToolBar for details.

    virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
-               const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
+               const bool toggle = false, const long xPos = wxDefaultCoord, const long yPos = wxDefaultCoord, wxObject *clientData = NULL,
               const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));

        // Adds a separator. See the documentation for wxToolBar for details.
@@ -209,7 +209,7 @@ public:

        // Enables or disables the given tool.

-    virtual void EnableTool(int toolIndex, bool enable = TRUE);
+    virtual void EnableTool(int toolIndex, bool enable = true);

        // Responds to size events, calling Layout.

--- a/contrib/include/wx/fl/frmview.h
+++ b/contrib/include/wx/fl/frmview.h
@@ -63,7 +63,7 @@ public:
    void CreateLayout();
    wxFrameLayout* GetLayout();
    void SetLayout( wxFrameLayout* pLayout );
-    void SetToolUpdates( bool doToolUpdates = TRUE );
+    void SetToolUpdates( bool doToolUpdates = true );


    // hooks for specific frame-views
@@ -123,7 +123,7 @@ public:

    int GetActiveViewNo();
    wxFrameView* GetActiveView();
-    wxNode* GetActiveViewNode();
+    wxObjectList::compatibility_iterator GetActiveViewNode();

    wxFrameView* GetView( int viewNo );

--- a/contrib/include/wx/fl/garbagec.h
+++ b/contrib/include/wx/fl/garbagec.h
@@ -25,7 +25,7 @@ struct GCItem
    wxList    mRefs;   // references to other nodes
 };

-inline void* gc_node_to_obj( wxNode* pGCNode )
+inline void* gc_node_to_obj( wxObjectList::compatibility_iterator pGCNode )
 {
    return ( (GCItem*) (pGCNode->GetData()) )->mpObj;
 }
--- a/contrib/include/wx/fl/hintanimpl.h
+++ b/contrib/include/wx/fl/hintanimpl.h
@@ -55,8 +55,8 @@ public:

    int    mInClientHintBorder; // default: 4 pixels

-    bool   mAccelerationOn;     // TRUE, if morph accelerates, otherwise morph
-                                // speed is constant. Default: TRUE
+    bool   mAccelerationOn;     // true, if morph accelerates, otherwise morph
+                                // speed is constant. Default: true

    // TBD:: get/set methods for above members

--- a/contrib/include/wx/fl/newbmpbtn.h
+++ b/contrib/include/wx/fl/newbmpbtn.h
@@ -63,7 +63,7 @@ protected:
                            // labels for particular state

    wxBitmap mFocusedBmp;   // may not be always present -
-                            // only if mHasFocusedBmp is TRUE
+                            // only if mHasFocusedBmp is true

    wxBitmap* mpDepressedImg;
    wxBitmap* mpPressedImg;
@@ -104,7 +104,7 @@ protected:
                            wxPen& upperLeftSidePen,
                            wxPen& lowerRightSidePen );

-        // Returns TRUE if the given point is in the window.
+        // Returns true if the given point is in the window.
    bool IsInWindow( int x, int y );

    virtual void OnIdle(wxIdleEvent& event);
@@ -117,13 +117,13 @@ public:
    wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,
                       const wxString& labelText   = wxT(""),
                       int   alignText             = NB_ALIGN_TEXT_BOTTOM,
-                       bool  isFlat                = TRUE,
+                       bool  isFlat                = true,
                       // this is the default type of fired events
                       int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
                       int marginX        = NB_DEFAULT_MARGIN,
                       int marginY        = NB_DEFAULT_MARGIN,
                       int textToLabelGap = 2,
-                       bool isSticky      = FALSE
+                       bool isSticky      = false
                     );

        // Use this constructor if buttons have to be persistant
@@ -131,13 +131,13 @@ public:
                           const wxBitmapType     bitmapFileType = wxBITMAP_TYPE_BMP,
                           const wxString& labelText      = wxT(""),
                           int alignText                  = NB_ALIGN_TEXT_BOTTOM,
-                           bool  isFlat                   = TRUE,
+                           bool  isFlat                   = true,
                           // this is the default type of fired events
                           int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
                           int marginX        = NB_DEFAULT_MARGIN,
                           int marginY        = NB_DEFAULT_MARGIN,
                           int textToLabelGap = 2,
-                           bool isSticky      = FALSE
+                           bool isSticky      = false
                             );

        // Destructor.
@@ -169,8 +169,8 @@ public:

        // Renders the label image.
    virtual void RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, 
-                                   bool isEnabled = TRUE,
-                                   bool isPressed = FALSE);
+                                   bool isEnabled = true,
+                                   bool isPressed = false);

        // Renders label images.
    virtual void RenderLabelImages();
--- a/contrib/include/wx/fl/rowlayoutpl.h
+++ b/contrib/include/wx/fl/rowlayoutpl.h
@@ -6,7 +6,7 @@
 // Created:     02/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __ROWLAYOUTPL_G__
--- a/contrib/include/wx/fl/toolwnd.h
+++ b/contrib/include/wx/fl/toolwnd.h
@@ -186,7 +186,7 @@ public:
        // Set the position of the button.
    void SetPos( const wxPoint& pos );

-        // Returns TRUE if the given position was over the button.
+        // Returns true if the given position was over the button.
    bool HitTest( const wxPoint& pos );

        // Responds to a left down event.
@@ -205,7 +205,7 @@ public:
        // the desired appearance.
    virtual void Draw( wxDC& dc );

-        // Returns TRUE if the button was clicked.
+        // Returns true if the button was clicked.
    bool WasClicked();

        // Reset the button.
@@ -214,7 +214,7 @@ public:
        // Enable or disable the button.
    void Enable( bool enable ) { mEnabled = enable; }

-        // Returns TRUE if this button is pressed.
+        // Returns true if this button is pressed.
    bool IsPressed() { return mPressed; }
 };

--- a/contrib/include/wx/fl/updatesmgr.h
+++ b/contrib/include/wx/fl/updatesmgr.h
@@ -6,7 +6,7 @@
 // Created:     19/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __UPDATESMGR_G__
--- a/contrib/include/wx/gizmos/editlbox.h
+++ b/contrib/include/wx/gizmos/editlbox.h
@@ -12,7 +12,7 @@
 #define __WX_EDITLBOX_H__

 #if defined(__GNUG__) && !defined(__APPLE__)
-	#pragma interface "editlbox.h"
+    #pragma interface "editlbox.h"
 #endif

 #include "wx/panel.h"
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxListEvent;

 class WXDLLIMPEXP_GIZMOS wxEditableListBox : public wxPanel
 {
-	DECLARE_CLASS(wxEditableListBox);
+    DECLARE_CLASS(wxEditableListBox);

 public:
    wxEditableListBox(wxWindow *parent, wxWindowID id,
--- a/contrib/include/wx/gizmos/ledctrl.h
+++ b/contrib/include/wx/gizmos/ledctrl.h
@@ -33,18 +33,18 @@ enum wxLEDValueAlign
 // wxLEDNumberCtrl
 // ----------------------------------------------------------------------------

-class WXDLLIMPEXP_GIZMOS wxLEDNumberCtrl :	public wxControl
+class WXDLLIMPEXP_GIZMOS wxLEDNumberCtrl : public wxControl
 {
 public:
    // Constructors.
    wxLEDNumberCtrl();
-    wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = -1,
+    wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);

    // Create functions.
-    bool Create(wxWindow *parent, wxWindowID id = -1,
+    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0);
@@ -53,9 +53,9 @@ public:
    bool GetDrawFaded() const { return m_DrawFaded; }
    const wxString &GetValue() const { return m_Value; }

-    void SetAlignment(wxLEDValueAlign Alignment, bool Redraw = TRUE);
-    void SetDrawFaded(bool DrawFaded, bool Redraw = TRUE);
-    void SetValue(const wxString &Value, bool Redraw = TRUE);
+    void SetAlignment(wxLEDValueAlign Alignment, bool Redraw = true);
+    void SetDrawFaded(bool DrawFaded, bool Redraw = true);
+    void SetValue(const wxString &Value, bool Redraw = true);

 private:
    // Members.
--- a/contrib/include/wx/gizmos/multicell.h
+++ b/contrib/include/wx/gizmos/multicell.h
@@ -16,7 +16,7 @@
 #define __WX_MULTICELL_H__

 #if defined(__GNUG__) && !defined(__APPLE__)
-	#pragma interface "multicell.h"
+    #pragma interface "multicell.h"
 #endif

 #include "wx/gizmos/gizmos.h"
@@ -33,10 +33,10 @@
 // ----------------------------------------------------------------------------
 enum wxResizable
 {
-	wxNOT_RESIZABLE =           0x00,
-	wxHORIZONTAL_RESIZABLE =    0x01,
-	wxVERTICAL_RESIZABLE =      0x10,
-	wxRESIZABLE =               0x11
+    wxNOT_RESIZABLE =           0x00,
+    wxHORIZONTAL_RESIZABLE =    0x01,
+    wxVERTICAL_RESIZABLE =      0x10,
+    wxRESIZABLE =               0x11
 };

 //---------------------------------------------------------------------------
@@ -49,33 +49,33 @@ enum wxResizable

 class WXDLLIMPEXP_GIZMOS wxMultiCellItemHandle: public wxObject
 {
-	DECLARE_CLASS(wxMultiCellItemHandle);
+    DECLARE_CLASS(wxMultiCellItemHandle);
 protected:
-	int             m_column;
-	int             m_row;
-	int             m_width;
-	int             m_height;
-	wxResizable     m_style;
-	wxSize          m_fixedSize;
-	int             m_alignment;
-	wxSize          m_weight;
+    int             m_column;
+    int             m_row;
+    int             m_width;
+    int             m_height;
+    wxResizable     m_style;
+    wxSize          m_fixedSize;
+    int             m_alignment;
+    wxSize          m_weight;

 public:
-	wxMultiCellItemHandle( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-	wxMultiCellItemHandle( int row, int column, wxSize size, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-	wxMultiCellItemHandle( int row, int column, wxResizable style, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-	wxMultiCellItemHandle( int row, int column, int align);
-	int             GetColumn();
-	int             GetRow();
-	int             GetWidth();
-	int             GetHeight();
-	wxResizable     GetStyle();
-	wxSize          GetLocalSize();
-	int             GetAlignment();
-	wxSize          GetWeight();
+    wxMultiCellItemHandle( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
+    wxMultiCellItemHandle( int row, int column, wxSize size, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
+    wxMultiCellItemHandle( int row, int column, wxResizable style, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
+    wxMultiCellItemHandle( int row, int column, int align);
+    int             GetColumn();
+    int             GetRow();
+    int             GetWidth();
+    int             GetHeight();
+    wxResizable     GetStyle();
+    wxSize          GetLocalSize();
+    int             GetAlignment();
+    wxSize          GetWeight();

 private:
-	void Initialize( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
+    void Initialize( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);

 };

@@ -85,43 +85,43 @@ private:

 class WXDLLIMPEXP_GIZMOS wxMultiCellSizer : virtual public wxSizer
 {
-	DECLARE_CLASS(wxMultiCellSizer);
+    DECLARE_CLASS(wxMultiCellSizer);

 protected:
-	wxSize m_cell_count;
+    wxSize m_cell_count;

 public:
-	wxMultiCellSizer(wxSize & size);
-	wxMultiCellSizer(int rows, int cols);
-	~wxMultiCellSizer();
+    wxMultiCellSizer(wxSize & size);
+    wxMultiCellSizer(int rows, int cols);
+    ~wxMultiCellSizer();

-	virtual void 	RecalcSizes();
-	virtual wxSize 	CalcMin();
-	bool 			SetDefaultCellSize(wxSize size);
-	bool 			SetColumnWidth(int column, int colSize = 5, bool expandable = FALSE);
-	bool 			SetRowHeight(int row, int rowSize = 5, bool expandable = FALSE);
-	bool			EnableGridLines(wxWindow *win);
-	bool			SetGridPen(wxPen *pen);
-	void 			OnPaint(wxDC& dc);
+    virtual void RecalcSizes();
+    virtual wxSize CalcMin();
+    bool SetDefaultCellSize(wxSize size);
+    bool SetColumnWidth(int column, int colSize = 5, bool expandable = false);
+    bool SetRowHeight(int row, int rowSize = 5, bool expandable = false);
+    bool EnableGridLines(wxWindow *win);
+    bool SetGridPen(wxPen *pen);
+    void OnPaint(wxDC& dc);

 private:
-	void 			GetMinimums();
-	int 			Sum(int *array, int x);
+    void GetMinimums();
+    int Sum(int *array, int x);

 private:
-	int 			*m_maxHeight;
-	int 			*m_maxWidth;
-	int 			*m_rowStretch;
-	int 			*m_colStretch;
-	wxSize 			**m_weights;
-	wxSize			**m_minSizes;
-	int				m_maxWeights;
-	wxSize			m_defaultCellSize;
-	wxWindow		*m_win; // usually used for debugging
-	wxPen			*m_pen;
+    int *m_maxHeight;
+    int *m_maxWidth;
+    int *m_rowStretch;
+    int *m_colStretch;
+    wxSize **m_weights;
+    wxSize **m_minSizes;
+    int m_maxWeights;
+    wxSize m_defaultCellSize;
+    wxWindow *m_win; // usually used for debugging
+    wxPen *m_pen;

-	void			DrawGridLines(wxDC& dc);
-	void			Initialize(wxSize size);
+    void DrawGridLines(wxDC& dc);
+    void Initialize(wxSize size);
 };


@@ -136,23 +136,23 @@ class wxCell;
 class WXDLLIMPEXP_GIZMOS wxMultiCellCanvas : public wxFlexGridSizer
 {
 public:
-	wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);
-	void Add(wxWindow *win, unsigned int row, unsigned int col);
+    wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);
+    void Add(wxWindow *win, unsigned int row, unsigned int col);

-	void Resize(int numRows, int numCols);
-	int MaxRows()
-	{
-		return m_maxRows;
-	};
-	int MaxCols()
-	{
-		return m_maxCols;
-	};
-	void CalculateConstraints();
-	void SetMinCellSize(const wxSize size)
-	{
-		m_minCellSize = size;
-	};
+    void Resize(int numRows, int numCols);
+    int MaxRows()
+    {
+        return m_maxRows;
+    };
+    int MaxCols()
+    {
+        return m_maxCols;
+    };
+    void CalculateConstraints();
+    void SetMinCellSize(const wxSize size)
+    {
+        m_minCellSize = size;
+    };

  /* These are to hide Add() method of parents and to avoid Borland warning about hiding virtual functions */
  void Add( wxWindow *window, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL )
@@ -165,11 +165,11 @@ public:
       { wxFlexGridSizer::Add( item); }

 private:
-	wxWindow            *m_parent;
-	unsigned int         m_maxRows, m_maxCols;
+    wxWindow            *m_parent;
+    unsigned int         m_maxRows, m_maxCols;

-	wxSize              m_minCellSize;
-	wxCell              **m_cells;
+    wxSize              m_minCellSize;
+    wxCell              **m_cells;
 };

 #endif
--- a/contrib/include/wx/gizmos/splittree.h
+++ b/contrib/include/wx/gizmos/splittree.h
@@ -72,7 +72,7 @@ public:
    virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
                             int noUnitsX, int noUnitsY,
                             int xPos = 0, int yPos = 0,
-                             bool noRefresh = FALSE );
+                             bool noRefresh = false );

    // In case we're using the generic tree control.
    // Get the view start
@@ -127,7 +127,7 @@ class WXDLLIMPEXP_GIZMOS wxTreeCompanionWindow: public wxWindow
 public:
    DECLARE_CLASS(wxTreeCompanionWindow)

-    wxTreeCompanionWindow(wxWindow* parent, wxWindowID id = -1,
+    wxTreeCompanionWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
      const wxPoint& pos = wxDefaultPosition,
      const wxSize& sz = wxDefaultSize,
      long style = 0);
@@ -166,7 +166,7 @@ class WXDLLIMPEXP_GIZMOS wxThinSplitterWindow: public wxSplitterWindow
 public:
    DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)

-    wxThinSplitterWindow(wxWindow* parent, wxWindowID id = -1,
+    wxThinSplitterWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
      const wxPoint& pos = wxDefaultPosition,
      const wxSize& sz = wxDefaultSize,
      long style = wxSP_3D | wxCLIP_CHILDREN);
@@ -210,7 +210,7 @@ class WXDLLIMPEXP_GIZMOS wxSplitterScrolledWindow: public wxScrolledWindow
 public:
    DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)

-    wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = -1,
+    wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
      const wxPoint& pos = wxDefaultPosition,
      const wxSize& sz = wxDefaultSize,
      long style = 0);
--- a/contrib/include/wx/mmedia/sndbase.h
+++ b/contrib/include/wx/mmedia/sndbase.h
@@ -125,7 +125,7 @@ class WXDLLIMPEXP_MMEDIA wxSoundStream {
  // Returns the best size for IO calls
  virtual wxUint32 GetBestSize() const { return 1024; }

-  // SetSoundFormat returns TRUE when the format can be handled.
+  // SetSoundFormat returns true when the format can be handled.
  virtual bool SetSoundFormat(const wxSoundFormatBase& format);

  // GetSoundFormat returns the current sound format.
@@ -146,7 +146,7 @@ class WXDLLIMPEXP_MMEDIA wxSoundStream {
  wxUint32 GetLastAccess() const { return m_lastcount; }

  // This is only useful for device (I think).
-  virtual bool QueueFilled() const { return TRUE; }
+  virtual bool QueueFilled() const { return true; }

 protected:
  // Current sound format
--- a/contrib/include/wx/mmedia/sndfile.h
+++ b/contrib/include/wx/mmedia/sndfile.h
@@ -98,7 +98,7 @@ public:
    
    // You should use this function to test whether this file codec can read
    // the stream you passed to it.
-    virtual bool CanRead() { return FALSE; }
+    virtual bool CanRead() { return false; }
    
 protected:
    wxSoundRouterStream m_codec; 
--- a/contrib/include/wx/mmedia/sndpcm.h
+++ b/contrib/include/wx/mmedia/sndpcm.h
@@ -23,7 +23,7 @@
 class wxSoundFormatPcm : public wxSoundFormatBase {
 public:
  wxSoundFormatPcm(wxUint32 srate = 22500, wxUint8 bps = 8,
-                   wxUint16 channels = 2, bool sign = TRUE,
+                   wxUint16 channels = 2, bool sign = true,
                   int order = wxLITTLE_ENDIAN); 
  ~wxSoundFormatPcm();

--- a/contrib/include/wx/mmedia/vidbase.h
+++ b/contrib/include/wx/mmedia/vidbase.h
@@ -5,7 +5,7 @@
 // Created:    1997
 // Updated:    1998
 // Copyright:  (C) 1997, 1998, Guilhem Lavaux
-// CVS:	       $Id$
+// CVS:        $Id$
 // License:    wxWindows license
 // /////////////////////////////////////////////////////////////////////////////
 /* Real -*- C++ -*- */
@@ -68,7 +68,7 @@ public:
    // Dtor
    virtual ~wxVideoBaseDriver();
    
-    // Usual functions ... They all return FALSE in case of errors.
+    // Usual functions ... They all return false in case of errors.
    virtual bool Play() = 0;
    virtual bool Stop() = 0;
    virtual bool Pause() = 0;
@@ -79,7 +79,7 @@ public:
    virtual bool GetSize(wxSize& size) const = 0;
    
    // Test the capability of the driver to handle the specified type
-    virtual bool IsCapable(wxVideoType WXUNUSED(v_type)) const { return FALSE; }
+    virtual bool IsCapable(wxVideoType WXUNUSED(v_type)) const { return false; }

    // Return the video codec name
    virtual wxString GetMovieCodec() const = 0;
--- a/contrib/include/wx/net/msg.h
+++ b/contrib/include/wx/net/msg.h
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "msg.h"
-#endif
-
 #ifndef _WX_MSG_H_
 #define _WX_MSG_H_

--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_BASIC_H_
@@ -145,7 +145,7 @@ class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataCon
  virtual void OnDelete();
  virtual void OnDraw(wxDC& dc);
  virtual void OnDrawContents(wxDC& dc);
-  virtual void OnDrawBranches(wxDC& dc, bool erase = FALSE);
+  virtual void OnDrawBranches(wxDC& dc, bool erase = false);
  virtual void OnMoveLinks(wxDC& dc);
  virtual void OnErase(wxDC& dc);
  virtual void OnEraseContents(wxDC& dc);
@@ -154,8 +154,8 @@ class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataCon
  virtual void OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
  virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
  virtual void OnSize(double x, double y);
-  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
-  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
+  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);

  virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
  virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
@@ -166,7 +166,7 @@ class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataCon
  virtual void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
  virtual void OnDrawControlPoints(wxDC& dc);
  virtual void OnEraseControlPoints(wxDC& dc);
-  virtual void OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+  virtual void OnMoveLink(wxDC& dc, bool moveControlPoints = true);

  // Control points ('handles') redirect control to the actual shape, to make it easier
  // to override sizing behaviour.
@@ -234,8 +234,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  virtual void OnLeftDoubleClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys) = 0, int WXUNUSED(attachment) = 0) {}
  virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
  virtual void OnSize(double x, double y);
-  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
-  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
+  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);

  virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
  virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
@@ -268,24 +268,24 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  virtual void MakeMandatoryControlPoints();
  virtual void ResetMandatoryControlPoints();

-  inline virtual bool Recompute() { return TRUE; };
+  inline virtual bool Recompute() { return true; };
  // Calculate size recursively, if size changes. Size might depend on children.
  inline virtual void CalculateSize() { };
-  virtual void Select(bool select = TRUE, wxDC* dc = NULL);
-  virtual void SetHighlight(bool hi = TRUE, bool recurse = FALSE);
+  virtual void Select(bool select = true, wxDC* dc = NULL);
+  virtual void SetHighlight(bool hi = true, bool recurse = false);
  inline virtual bool IsHighlighted() const { return m_highlighted; };
  virtual bool Selected() const;
  virtual bool AncestorSelected() const;
-  void SetSensitivityFilter(int sens = OP_ALL, bool recursive = FALSE);
+  void SetSensitivityFilter(int sens = OP_ALL, bool recursive = false);
  int GetSensitivityFilter() const { return m_sensitivity; }
-  void SetDraggable(bool drag, bool recursive = FALSE);
+  void SetDraggable(bool drag, bool recursive = false);
  inline  void SetFixedSize(bool x, bool y) { m_fixedWidth = x; m_fixedHeight = y; };
  inline  void GetFixedSize(bool *x, bool *y) const { *x = m_fixedWidth; *y = m_fixedHeight; };
  inline  bool GetFixedWidth() const { return m_fixedWidth; }
  inline  bool GetFixedHeight() const { return m_fixedHeight; }
  inline  void SetSpaceAttachments(bool sp) { m_spaceAttachments = sp; };
  inline  bool GetSpaceAttachments() const { return m_spaceAttachments; };
-  void SetShadowMode(int mode, bool redraw = FALSE);
+  void SetShadowMode(int mode, bool redraw = false);
  inline int GetShadowMode() const { return m_shadowMode; }
  virtual bool HitTest(double x, double y, int *attachment, double *distance);
  inline void SetCentreResize(bool cr) { m_centreResize = cr; }
@@ -305,19 +305,19 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler

  virtual void Show(bool show);
  virtual bool IsShown() const { return m_visible; }
-  virtual void Move(wxDC& dc, double x1, double y1, bool display = TRUE);
+  virtual void Move(wxDC& dc, double x1, double y1, bool display = true);
  virtual void Erase(wxDC& dc);
  virtual void EraseContents(wxDC& dc);
  virtual void Draw(wxDC& dc);
  virtual void Flash();
  virtual void MoveLinks(wxDC& dc);
  virtual void DrawContents(wxDC& dc);  // E.g. for drawing text label
-  virtual void SetSize(double x, double y, bool recursive = TRUE);
+  virtual void SetSize(double x, double y, bool recursive = true);
  virtual void SetAttachmentSize(double x, double y);
  void Attach(wxShapeCanvas *can);
  void Detach();

-  inline virtual bool Constrain() { return FALSE; } ;
+  inline virtual bool Constrain() { return false; } ;

  void AddLine(wxLineShape *line, wxShape *other,
               int attachFrom = 0, int attachTo = 0,
@@ -413,13 +413,13 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  virtual wxRealPoint CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2,
    int nth, int noArcs, wxLineShape* line);

-  // Returns TRUE if pt1 <= pt2 in the sense that one point comes before another on an
+  // Returns true if pt1 <= pt2 in the sense that one point comes before another on an
  // edge of the shape.
  // attachmentPoint is the attachment point (= side) in question.
  virtual bool AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2);

-  virtual void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE);
-  virtual void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE);
+  virtual void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = false);
+  virtual void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = false);

  virtual bool MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
                                       double x, double y);
@@ -462,8 +462,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  virtual int GetAttachmentLineCount(int attachment) const;

  // Draw the branches (not the actual arcs though)
-  virtual void OnDrawBranches(wxDC& dc, int attachment, bool erase = FALSE);
-  virtual void OnDrawBranches(wxDC& dc, bool erase = FALSE);
+  virtual void OnDrawBranches(wxDC& dc, int attachment, bool erase = false);
+  virtual void OnDrawBranches(wxDC& dc, bool erase = false);

  // Branching attachment settings
  inline void SetBranchNeckLength(int len) { m_branchNeckLength = len; }
@@ -490,13 +490,13 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  // This is really to distinguish between lines and other images.
  // For lines, want to pass drag to canvas, since lines tend to prevent
  // dragging on a canvas (they get in the way.)
-  virtual bool Draggable() const { return TRUE; }
+  virtual bool Draggable() const { return true; }

-  // Returns TRUE if image is a descendant of this image
+  // Returns true if image is a descendant of this image
  bool HasDescendant(wxShape *image);

  // Creates a copy of this shape.
-  wxShape *CreateNewCopy(bool resetMapping = TRUE, bool recompute = TRUE);
+  wxShape *CreateNewCopy(bool resetMapping = true, bool recompute = true);

  // Does the copying for this object
  virtual void Copy(wxShape& copy);
@@ -549,11 +549,11 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
  bool                  m_draggable;
  int                   m_attachmentMode;   // 0 for no attachments, 1 if using normal attachments,
                                            // 2 for branching attachments
-  bool                  m_spaceAttachments; // TRUE if lines at one side should be spaced
+  bool                  m_spaceAttachments; // true if lines at one side should be spaced
  bool                  m_fixedWidth;
  bool                  m_fixedHeight;
-  bool                  m_centreResize;    // Default is to resize keeping the centre constant (TRUE)
-  bool                  m_drawHandles;     // Don't draw handles if FALSE, usually TRUE
+  bool                  m_centreResize;    // Default is to resize keeping the centre constant (true)
+  bool                  m_drawHandles;     // Don't draw handles if false, usually true
  wxList                m_children;      // In case it's composite
  wxShape*              m_parent;      // In case it's a child
  int                   m_formatMode;
@@ -589,7 +589,7 @@ class WXDLLIMPEXP_OGL wxPolygonShape: public wxShape
                                 double x2, double y2,
                                 double *x3, double *y3);
  bool HitTest(double x, double y, int *attachment, double *distance);
-  void SetSize(double x, double y, bool recursive = TRUE);
+  void SetSize(double x, double y, bool recursive = true);
  void OnDraw(wxDC& dc);
  void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);

@@ -661,7 +661,7 @@ class WXDLLIMPEXP_OGL wxRectangleShape: public wxShape
                                 double x2, double y2,
                                 double *x3, double *y3);
  void OnDraw(wxDC& dc);
-  void SetSize(double x, double y, bool recursive = TRUE);
+  void SetSize(double x, double y, bool recursive = true);
  void SetCornerRadius(double rad); // If > 0, rounded corners
  double GetCornerRadius() const { return m_cornerRadius; }

@@ -715,7 +715,7 @@ class WXDLLIMPEXP_OGL wxEllipseShape: public wxShape
                                 double *x3, double *y3);

  void OnDraw(wxDC& dc);
-  void SetSize(double x, double y, bool recursive = TRUE);
+  void SetSize(double x, double y, bool recursive = true);

 #if wxUSE_PROLOGIO
  void WriteAttributes(wxExpr *clause);
--- a/contrib/include/wx/ogl/basicp.h
+++ b/contrib/include/wx/ogl/basicp.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_BASICP_H_
@@ -73,7 +73,7 @@ public:
  double         m_yoffset;
  wxShape*      m_shape;
  wxCursor*     m_oldCursor;
-  bool          m_eraseObject; // If TRUE, erases object before dragging handle.
+  bool          m_eraseObject; // If true, erases object before dragging handle.

 /*
 * Store original top-left, bottom-right coordinates
--- a/contrib/include/wx/ogl/bmpshape.h
+++ b/contrib/include/wx/ogl/bmpshape.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_BITMAP_H_
@@ -35,7 +35,7 @@ class WXDLLIMPEXP_OGL wxBitmapShape: public wxRectangleShape
  // Does the copying for this object
  void Copy(wxShape& copy);

-  void SetSize(double w, double h, bool recursive = TRUE);
+  void SetSize(double w, double h, bool recursive = true);
  inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
  void SetBitmap(const wxBitmap& bm);
  inline void SetFilename(const wxString& f) { m_filename = f; };
--- a/contrib/include/wx/ogl/canvas.h
+++ b/contrib/include/wx/ogl/canvas.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_CANVAS_H_
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_OGL wxShapeCanvas: public wxScrolledWindow
 {
 DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
 public:
-  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = -1,
+  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxBORDER | wxRETAINED,
--- a/contrib/include/wx/ogl/composit.h
+++ b/contrib/include/wx/ogl/composit.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_COMPOSIT_H_
@@ -36,16 +36,16 @@ public:
  void OnDraw(wxDC& dc);
  void OnDrawContents(wxDC& dc);
  void OnErase(wxDC& dc);
-  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = TRUE);
+  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = true);
  void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0);
  void OnBeginDragLeft(double x, double y, int keys, int attachment = 0);
  void OnEndDragLeft(double x, double y, int keys, int attachment = 0);

  void OnRightClick(double x, double y, int keys, int attachment = 0);

-  void SetSize(double w, double h, bool recursive = TRUE);
+  void SetSize(double w, double h, bool recursive = true);

-  // Returns TRUE if it settled down
+  // Returns true if it settled down
  bool Recompute();

  // New members
@@ -69,7 +69,7 @@ public:
  // in case it had to find it recursively.
  wxOGLConstraint *FindConstraint(long id, wxCompositeShape **actualComposite = NULL);

-  // Returns TRUE if something changed
+  // Returns true if something changed
  bool Constrain();

  // Make this composite into a container by creating one wxDivisionShape
@@ -93,7 +93,7 @@ public:
  // of the composite that is not in the divisions list.
  wxShape *FindContainerImage();

-  // Returns TRUE if division is a descendant of this container
+  // Returns true if division is a descendant of this container
  bool ContainsDivision(wxDivisionShape *division);

  inline wxList& GetDivisions() const { return (wxList&) m_divisions; }
@@ -133,7 +133,7 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape

  void OnDraw(wxDC& dc);
  void OnDrawContents(wxDC& dc);
-  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = TRUE);
+  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = true);
  void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0);
  void OnBeginDragLeft(double x, double y, int keys, int attachment = 0);
  void OnEndDragLeft(double x, double y, int keys, int attachment = 0);
@@ -142,7 +142,7 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape

  // Don't want this kind of composite to resize its subdiagrams, so
  // override composite's SetSize.
-  void SetSize(double w, double h, bool recursive = TRUE);
+  void SetSize(double w, double h, bool recursive = true);

  // Similarly for calculating size: it's fixed at whatever SetSize
  // set it to, not in terms of children.
@@ -163,12 +163,12 @@ class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
  // Divide horizontally (wxHORIZONTAL) or vertically (wxVERTICAL)
  bool Divide(int direction);

-  // Resize adjoining divisions at the given side. If test is TRUE,
+  // Resize adjoining divisions at the given side. If test is true,
  // just see whether it's possible for each adjoining region,
-  // returning FALSE if it's not.
+  // returning false if it's not.
  bool ResizeAdjoining(int side, double newPos, bool test);

-  // Adjust a side, returning FALSE if it's not physically possible.
+  // Adjust a side, returning false if it's not physically possible.
  bool AdjustLeft(double left, bool test);
  bool AdjustTop(double top, bool test);
  bool AdjustRight(double right, bool test);
--- a/contrib/include/wx/ogl/constrnt.h
+++ b/contrib/include/wx/ogl/constrnt.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_CONSTRNT_H_
@@ -69,7 +69,7 @@ class WXDLLIMPEXP_OGL wxOGLConstraint: public wxObject
  wxOGLConstraint(int type, wxShape *constraining, wxList& constrained);
  ~wxOGLConstraint();

-  // Returns TRUE if anything changed
+  // Returns true if anything changed
  bool Evaluate();
  inline void SetSpacing(double x, double y) { m_xSpacing = x; m_ySpacing = y; };
  bool Equals(double a, double b);
--- a/contrib/include/wx/ogl/divided.h
+++ b/contrib/include/wx/ogl/divided.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_DIVIDED_H_
@@ -39,7 +39,7 @@ class WXDLLIMPEXP_OGL wxDividedShape: public wxRectangleShape
  void OnDraw(wxDC& dc);
  void OnDrawContents(wxDC& dc);

-  void SetSize(double w, double h, bool recursive = TRUE);
+  void SetSize(double w, double h, bool recursive = true);

  void MakeControlPoints();
  void ResetControlPoints();
--- a/contrib/include/wx/ogl/drawn.h
+++ b/contrib/include/wx/ogl/drawn.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_DRAWN_H_
@@ -100,8 +100,8 @@ public:
  virtual void SetClippingRect(const wxRect& rect);
  virtual void DestroyClippingRect();

-  virtual void SetPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
-  virtual void SetBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
+  virtual void SetPen(wxPen* pen, bool isOutline = false);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetBrush(wxBrush* brush, bool isFill = false);  // pens/brushes etc.
  virtual void SetFont(wxFont* font);
  virtual void SetTextColour(const wxColour& colour);
  virtual void SetBackgroundColour(const wxColour& colour);
@@ -155,7 +155,7 @@ class WXDLLIMPEXP_OGL wxDrawnShape: public wxRectangleShape
  // Get current rotation
  inline double GetRotation() const { return m_rotation; }

-  void SetSize(double w, double h, bool recursive = TRUE);
+  void SetSize(double w, double h, bool recursive = true);
  bool LoadFromMetaFile(const wxString& filename);

  inline void SetSaveToFile(bool save) { m_saveToFile = save; }
@@ -188,8 +188,8 @@ class WXDLLIMPEXP_OGL wxDrawnShape: public wxRectangleShape
  virtual void SetClippingRect(const wxRect& rect);
  virtual void DestroyClippingRect();

-  virtual void SetDrawnPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
-  virtual void SetDrawnBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
+  virtual void SetDrawnPen(wxPen* pen, bool isOutline = false);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetDrawnBrush(wxBrush* brush, bool isFill = false);  // pens/brushes etc.
  virtual void SetDrawnFont(wxFont* font);
  virtual void SetDrawnTextColour(const wxColour& colour);
  virtual void SetDrawnBackgroundColour(const wxColour& colour);
--- a/contrib/include/wx/ogl/drawnp.h
+++ b/contrib/include/wx/ogl/drawnp.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_DRAWNP_H_
@@ -70,9 +70,9 @@ public:
 #endif
  inline int GetOp() const { return m_op; }

-  // Draw an outline using the current operation. By default, return FALSE (not drawn)
+  // Draw an outline using the current operation. By default, return false (not drawn)
  virtual bool OnDrawOutline(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(w), double WXUNUSED(h),
-    double WXUNUSED(oldW), double WXUNUSED(oldH)) { return FALSE; }
+    double WXUNUSED(oldW), double WXUNUSED(oldH)) { return false; }

  // Get the perimeter point using this data
  virtual bool GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
@@ -80,7 +80,7 @@ public:
                                     double *WXUNUSED(x3), double *WXUNUSED(y3),
                                     double WXUNUSED(xOffset), double WXUNUSED(yOffset),
                                     int WXUNUSED(attachmentMode))
-  { return FALSE; }
+  { return false; }

 protected:
  int           m_op;
--- a/contrib/include/wx/ogl/lines.h
+++ b/contrib/include/wx/ogl/lines.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_LINES_H_
@@ -83,7 +83,7 @@ class WXDLLIMPEXP_OGL wxArrowHead: public wxObject
  double             m_spacing;          // Spacing from the last arrowhead
  double             m_arrowSize;        // Length of arrowhead
  wxString          m_arrowName;        // Name of arrow
-  bool              m_saveToFile;       // TRUE if we want to save custom arrowheads to file.
+  bool              m_saveToFile;       // true if we want to save custom arrowheads to file.
  wxPseudoMetaFile* m_metaFile;         // Pseudo metafile if this is a custom arrowhead
  long              m_id;               // identifier
 };
@@ -102,14 +102,14 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
  // correct position
  // moveControlPoints must be disabled when a control point is being
  // dragged.
-  void OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+  void OnMoveLink(wxDC& dc, bool moveControlPoints = true);
+  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
  void OnDraw(wxDC& dc);
  void OnDrawContents(wxDC& dc);
  void OnDrawControlPoints(wxDC& dc);
  void OnEraseControlPoints(wxDC& dc);
  void OnErase(wxDC& dc);
-  virtual bool OnMoveControlPoint(int WXUNUSED(which), double WXUNUSED(x), double WXUNUSED(y)) { return FALSE; }
+  virtual bool OnMoveControlPoint(int WXUNUSED(which), double WXUNUSED(x), double WXUNUSED(y)) { return false; }
  virtual bool OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, const wxRealPoint& pt);
  virtual bool OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double old_x, double old_y, bool display);
  void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
@@ -176,9 +176,9 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
  virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);

  // Override select, to create/delete temporary label-moving objects
-  void Select(bool select = TRUE, wxDC* dc = NULL);
+  void Select(bool select = true, wxDC* dc = NULL);

-  // Set to spline (TRUE) or line (FALSE)
+  // Set to spline (true) or line (false)
  inline void SetSpline(bool spl) { m_isSpline = spl; }
  inline bool IsSpline() const { return m_isSpline; }

@@ -204,7 +204,7 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
  // This is really to distinguish between lines and other images.
  // For lines, want to pass drag to canvas, since lines tend to prevent
  // dragging on a canvas (they get in the way.)
-  virtual bool Draggable() const { return FALSE; }
+  virtual bool Draggable() const { return false; }

  // Does the copying for this object
  void Copy(wxShape& copy);
@@ -221,7 +221,7 @@ class WXDLLIMPEXP_OGL wxLineShape: public wxShape
  // E.g. reference list:      a b c d e
  //      Current line list:   a d
  // Add c, then line list is: a c d
-  // If no legal arrowhead position, return FALSE.
+  // If no legal arrowhead position, return false.
  // Assume reference list is for one end only, since it potentially defines
  // the ordering for any one of the 3 positions. So we don't check
  // the reference list for arrowhead position.
--- a/contrib/include/wx/ogl/linesp.h
+++ b/contrib/include/wx/ogl/linesp.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_LINESP_H_
@@ -68,7 +68,7 @@ class WXDLLIMPEXP_OGL wxLabelShape: public wxRectangleShape
  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);

 public:
  wxLineShape*      m_lineShape;
--- a/contrib/include/wx/ogl/mfutils.h
+++ b/contrib/include/wx/ogl/mfutils.h
@@ -7,7 +7,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _MFUTILS_H_
@@ -21,253 +21,253 @@
 #include <wx/metafile.h>

 #ifndef GetRValue
-#define GetRValue(rgb)	    ((unsigned char)(rgb))
-#define GetGValue(rgb)      ((unsigned char)(((int)(rgb)) >> 8))
-#define GetBValue(rgb)	    ((unsigned char)((rgb)>>16))
+#define GetRValue(rgb) ((unsigned char)(rgb))
+#define GetGValue(rgb) ((unsigned char)(((int)(rgb)) >> 8))
+#define GetBValue(rgb) ((unsigned char)((rgb)>>16))
 #endif

 /* Metafile Functions */
 // some compilers have them in their include files

 #ifndef META_SETBKCOLOR
-  #define META_SETBKCOLOR		     0x0201
+  #define META_SETBKCOLOR            0x0201
 #endif
 #ifndef META_SETBKMODE
-  #define META_SETBKMODE		     0x0102
+  #define META_SETBKMODE             0x0102
 #endif
 #ifndef META_SETMAPMODE
-  #define META_SETMAPMODE		     0x0103
+  #define META_SETMAPMODE            0x0103
 #endif
 #ifndef META_SETROP2
-  #define META_SETROP2		     0x0104
+  #define META_SETROP2               0x0104
 #endif
 #ifndef META_SETRELABS
-  #define META_SETRELABS		     0x0105
+  #define META_SETRELABS             0x0105
 #endif
 #ifndef META_SETPOLYFILLMODE
-  #define META_SETPOLYFILLMODE	     0x0106
+  #define META_SETPOLYFILLMODE       0x0106
 #endif
 #ifndef META_SETSTRETCHBLTMODE
-  #define META_SETSTRETCHBLTMODE	     0x0107
+  #define META_SETSTRETCHBLTMODE     0x0107
 #endif
 #ifndef META_SETTEXTCHAREXTRA
-  #define META_SETTEXTCHAREXTRA	     0x0108
+  #define META_SETTEXTCHAREXTRA      0x0108
 #endif
 #ifndef META_SETTEXTCOLOR
-  #define META_SETTEXTCOLOR	     0x0209
+  #define META_SETTEXTCOLOR          0x0209
 #endif
 #ifndef META_SETTEXTJUSTIFICATION
-  #define META_SETTEXTJUSTIFICATION    0x020A
+  #define META_SETTEXTJUSTIFICATION  0x020A
 #endif
 #ifndef META_SETWINDOWORG
-  #define META_SETWINDOWORG	     0x020B
+  #define META_SETWINDOWORG          0x020B
 #endif
 #ifndef META_SETWINDOWEXT
-  #define META_SETWINDOWEXT	     0x020C
+  #define META_SETWINDOWEXT          0x020C
 #endif
 #ifndef META_SETVIEWPORTORG
-  #define META_SETVIEWPORTORG	     0x020D
+  #define META_SETVIEWPORTORG        0x020D
 #endif
 #ifndef META_SETVIEWPORTEXT
-  #define META_SETVIEWPORTEXT	     0x020E
+  #define META_SETVIEWPORTEXT        0x020E
 #endif
 #ifndef META_OFFSETWINDOWORG
-  #define META_OFFSETWINDOWORG	     0x020F
+  #define META_OFFSETWINDOWORG       0x020F
 #endif
 #ifndef META_SCALEWINDOWEXT
-  #define META_SCALEWINDOWEXT	     0x0410
+  #define META_SCALEWINDOWEXT        0x0410
 #endif
 #ifndef META_OFFSETVIEWPORTORG
-  #define META_OFFSETVIEWPORTORG	     0x0211
+  #define META_OFFSETVIEWPORTORG     0x0211
 #endif
 #ifndef META_SCALEVIEWPORTEXT
-  #define META_SCALEVIEWPORTEXT	     0x0412
+  #define META_SCALEVIEWPORTEXT      0x0412
 #endif
 #ifndef META_LINETO
-  #define META_LINETO		     0x0213
+  #define META_LINETO                0x0213
 #endif
 #ifndef META_MOVETO
-  #define META_MOVETO		     0x0214
+  #define META_MOVETO                0x0214
 #endif
 #ifndef META_EXCLUDECLIPRECT
-  #define META_EXCLUDECLIPRECT	     0x0415
+  #define META_EXCLUDECLIPRECT       0x0415
 #endif
 #ifndef META_INTERSECTCLIPRECT
-  #define META_INTERSECTCLIPRECT	     0x0416
+  #define META_INTERSECTCLIPRECT     0x0416
 #endif
 #ifndef META_ARC
-  #define META_ARC		     0x0817
+  #define META_ARC                   0x0817
 #endif
 #ifndef META_ELLIPSE
-  #define META_ELLIPSE		     0x0418
+  #define META_ELLIPSE               0x0418
 #endif
 #ifndef META_FLOODFILL
-  #define META_FLOODFILL		     0x0419
+  #define META_FLOODFILL             0x0419
 #endif
 #ifndef META_PIE
-  #define META_PIE		     0x081A
+  #define META_PIE                   0x081A
 #endif
 #ifndef META_RECTANGLE
-  #define META_RECTANGLE		     0x041B
+  #define META_RECTANGLE             0x041B
 #endif
 #ifndef META_ROUNDRECT
-  #define META_ROUNDRECT		     0x061C
+  #define META_ROUNDRECT             0x061C
 #endif
 #ifndef META_PATBLT
-  #define META_PATBLT		     0x061D
+  #define META_PATBLT                0x061D
 #endif
 #ifndef META_SAVEDC
-  #define META_SAVEDC		     0x001E
+  #define META_SAVEDC                0x001E
 #endif
 #ifndef META_SETPIXEL
-  #define META_SETPIXEL		     0x041F
+  #define META_SETPIXEL              0x041F
 #endif
 #ifndef META_OFFSETCLIPRGN
-  #define META_OFFSETCLIPRGN	     0x0220
+  #define META_OFFSETCLIPRGN         0x0220
 #endif
 #ifndef META_TEXTOUT
-  #define META_TEXTOUT		     0x0521
+  #define META_TEXTOUT               0x0521
 #endif
 #ifndef META_BITBLT
-  #define META_BITBLT		     0x0922
+  #define META_BITBLT                0x0922
 #endif
 #ifndef META_STRETCHBLT
-  #define META_STRETCHBLT		     0x0B23
+  #define META_STRETCHBLT            0x0B23
 #endif
 #ifndef META_POLYGON
-  #define META_POLYGON		     0x0324
+  #define META_POLYGON               0x0324
 #endif
 #ifndef META_POLYLINE
-  #define META_POLYLINE		     0x0325
+  #define META_POLYLINE              0x0325
 #endif
 #ifndef META_ESCAPE
-  #define META_ESCAPE		     0x0626
+  #define META_ESCAPE                0x0626
 #endif
 #ifndef META_RESTOREDC
-  #define META_RESTOREDC		     0x0127
+  #define META_RESTOREDC             0x0127
 #endif
 #ifndef META_FILLREGION
-  #define META_FILLREGION		     0x0228
+  #define META_FILLREGION            0x0228
 #endif
 #ifndef META_FRAMEREGION
-  #define META_FRAMEREGION	     0x0429
+  #define META_FRAMEREGION           0x0429
 #endif
 #ifndef META_INVERTREGION
-  #define META_INVERTREGION	     0x012A
+  #define META_INVERTREGION          0x012A
 #endif
 #ifndef META_PAINTREGION
-  #define META_PAINTREGION	     0x012B
+  #define META_PAINTREGION           0x012B
 #endif
 #ifndef META_SELECTCLIPREGION
-  #define META_SELECTCLIPREGION	     0x012C
+  #define META_SELECTCLIPREGION      0x012C
 #endif
 #ifndef META_SELECTOBJECT
-  #define META_SELECTOBJECT	     0x012D
+  #define META_SELECTOBJECT          0x012D
 #endif
 #ifndef META_SETTEXTALIGN
-  #define META_SETTEXTALIGN	     0x012E
+  #define META_SETTEXTALIGN          0x012E
 #endif
 #ifndef META_DRAWTEXT
-  #define META_DRAWTEXT		     0x062F
+  #define META_DRAWTEXT              0x062F
 #endif

 #ifndef META_CHORD
-  #define	META_CHORD		     0x0830
+  #define META_CHORD                 0x0830
 #endif
 #ifndef META_SETMAPPERFLAGS
-  #define	META_SETMAPPERFLAGS	     0x0231
+  #define META_SETMAPPERFLAGS        0x0231
 #endif
 #ifndef META_EXTTEXTOUT
-  #define	META_EXTTEXTOUT		     0x0a32
+  #define META_EXTTEXTOUT            0x0a32
 #endif
 #ifndef META_SETDIBTODEV
-  #define	META_SETDIBTODEV	     0x0d33
+  #define META_SETDIBTODEV           0x0d33
 #endif
 #ifndef META_SELECTPALETTE
-  #define	META_SELECTPALETTE	     0x0234
+  #define META_SELECTPALETTE         0x0234
 #endif
 #ifndef META_REALIZEPALETTE
-  #define	META_REALIZEPALETTE	     0x0035
+  #define META_REALIZEPALETTE        0x0035
 #endif
 #ifndef META_ANIMATEPALETTE
-  #define	META_ANIMATEPALETTE	     0x0436
+  #define META_ANIMATEPALETTE        0x0436
 #endif
 #ifndef META_SETPALENTRIES
-  #define	META_SETPALENTRIES	     0x0037
+  #define META_SETPALENTRIES         0x0037
 #endif
 #ifndef META_POLYPOLYGON
-  #define	META_POLYPOLYGON	     0x0538
+  #define META_POLYPOLYGON           0x0538
 #endif
 #ifndef META_RESIZEPALETTE
-  #define	META_RESIZEPALETTE	     0x0139
+  #define META_RESIZEPALETTE         0x0139
 #endif

 #ifndef META_DIBBITBLT
-  #define	META_DIBBITBLT		     0x0940
+  #define META_DIBBITBLT             0x0940
 #endif
 #ifndef META_DIBSTRETCHBLT
-  #define	META_DIBSTRETCHBLT	     0x0b41
+  #define META_DIBSTRETCHBLT         0x0b41
 #endif
 #ifndef META_DIBCREATEPATTERNBRUSH
-  #define	META_DIBCREATEPATTERNBRUSH   0x0142
+  #define META_DIBCREATEPATTERNBRUSH 0x0142
 #endif
 #ifndef META_STRETCHDIB
-  #define	META_STRETCHDIB		     0x0f43
+  #define META_STRETCHDIB            0x0f43
 #endif

 #ifndef META_EXTFLOODFILL
-  #define META_EXTFLOODFILL	     0x0548
+  #define META_EXTFLOODFILL          0x0548
 #endif

 #ifndef META_RESETDC
-  #define META_RESETDC		     0x014C
+  #define META_RESETDC               0x014C
 #endif
 #ifndef META_STARTDOC
-  #define META_STARTDOC		     0x014D
+  #define META_STARTDOC              0x014D
 #endif
 #ifndef META_STARTPAGE
-  #define META_STARTPAGE		     0x004F
+  #define META_STARTPAGE             0x004F
 #endif
 #ifndef META_ENDPAGE
-  #define META_ENDPAGE		     0x0050
+  #define META_ENDPAGE               0x0050
 #endif
 #ifndef META_ABORTDOC
-  #define META_ABORTDOC		     0x0052
+  #define META_ABORTDOC              0x0052
 #endif
 #ifndef META_ENDDOC
-  #define META_ENDDOC		     0x005E
+  #define META_ENDDOC                0x005E
 #endif

 #ifndef META_DELETEOBJECT
-  #define	META_DELETEOBJECT	     0x01f0
+  #define META_DELETEOBJECT          0x01f0
 #endif

 #ifndef META_CREATEPALETTE
-  #define	META_CREATEPALETTE	     0x00f7
+  #define META_CREATEPALETTE         0x00f7
 #endif
 #ifndef META_CREATEBRUSH
-  #define META_CREATEBRUSH	     0x00F8
+  #define META_CREATEBRUSH           0x00F8
 #endif
 #ifndef META_CREATEPATTERNBRUSH
-  #define META_CREATEPATTERNBRUSH	     0x01F9
+  #define META_CREATEPATTERNBRUSH    0x01F9
 #endif
 #ifndef META_CREATEPENINDIRECT
-  #define META_CREATEPENINDIRECT	     0x02FA
+  #define META_CREATEPENINDIRECT     0x02FA
 #endif
 #ifndef META_CREATEFONTINDIRECT
-  #define META_CREATEFONTINDIRECT	     0x02FB
+  #define META_CREATEFONTINDIRECT    0x02FB
 #endif
 #ifndef META_CREATEBRUSHINDIRECT
-  #define META_CREATEBRUSHINDIRECT     0x02FC
+  #define META_CREATEBRUSHINDIRECT   0x02FC
 #endif
 #ifndef META_CREATEBITMAPINDIRECT
-  #define META_CREATEBITMAPINDIRECT    0x02FD
+  #define META_CREATEBITMAPINDIRECT  0x02FD
 #endif
 #ifndef META_CREATEBITMAP
-  #define META_CREATEBITMAP	     0x06FE
+  #define META_CREATEBITMAP          0x06FE
 #endif
 #ifndef META_CREATEREGION
-  #define META_CREATEREGION	     0x06FF
+  #define META_CREATEREGION          0x06FF
 #endif

 /* Background Modes */
@@ -280,25 +280,25 @@

 /* Pen Styles */
 #ifndef PS_SOLID
-  #define PS_SOLID	    0
+  #define PS_SOLID        0
 #endif
 #ifndef PS_DASH
-  #define PS_DASH             1
+  #define PS_DASH         1
 #endif
 #ifndef PS_DOT
-  #define PS_DOT              2
+  #define PS_DOT          2
 #endif
 #ifndef PS_DASHDOT
-  #define PS_DASHDOT          3
+  #define PS_DASHDOT      3
 #endif
 #ifndef PS_DASHDOTDOT
-  #define PS_DASHDOTDOT       4
+  #define PS_DASHDOTDOT   4
 #endif
 #ifndef PS_NULL
-  #define PS_NULL 	    5
+  #define PS_NULL         5
 #endif
 #ifndef PS_INSIDEFRAME
-  #define PS_INSIDEFRAME 	    6
+  #define PS_INSIDEFRAME  6
 #endif

 /* PitchAndFamily family values (high 4 bits) */
@@ -323,25 +323,25 @@

 /* Brush Styles */
 #ifndef BS_SOLID
-  #define BS_SOLID	    0
+  #define BS_SOLID        0
 #endif
 #ifndef BS_NULL
-  #define BS_NULL		    1
+  #define BS_NULL         1
 #endif
 #ifndef BS_HOLLOW
-  #define BS_HOLLOW	    BS_NULL
+  #define BS_HOLLOW       BS_NULL
 #endif
 #ifndef BS_HATCHED
-  #define BS_HATCHED	    2
+  #define BS_HATCHED      2
 #endif
 #ifndef BS_PATTERN
-  #define BS_PATTERN	    3
+  #define BS_PATTERN      3
 #endif
 #ifndef BS_INDEXED
-  #define BS_INDEXED	    4
+  #define BS_INDEXED      4
 #endif
 #ifndef BS_DIBPATTERN
-  #define	BS_DIBPATTERN	    5
+  #define BS_DIBPATTERN   5
 #endif

 /* Hatch Styles */
--- a/contrib/include/wx/ogl/misc.h
+++ b/contrib/include/wx/ogl/misc.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_MISC_H_
--- a/contrib/include/wx/ogl/ogl.h
+++ b/contrib/include/wx/ogl/ogl.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_OGL_H_
--- a/contrib/include/wx/ogl/ogldiag.h
+++ b/contrib/include/wx/ogl/ogldiag.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGL_OGLDIAG_H_
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -1311,14 +1311,14 @@ public:
    %pythonAppend wxStyledTextCtrl   "self._setOORInfo(self)"
    %pythonAppend wxStyledTextCtrl() ""

-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
+    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxString& name = wxPySTCNameStr);
    %name(PreStyledTextCtrl) wxStyledTextCtrl();
    
 #else
-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
+    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxString& name = wxSTCNameStr);
@@ -1327,7 +1327,7 @@ public:
    
 #endif

-    void Create(wxWindow *parent, wxWindowID id,
+    void Create(wxWindow *parent, wxWindowID id=wxID_ANY,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxString& name = wxSTCNameStr);
@@ -2866,7 +2866,6 @@ BEGIN_DECLARE_EVENT_TYPES()
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MACRORECORD,        1660)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MARGINCLICK,        1661)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_NEEDSHOWN,          1662)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_POSCHANGED,         1663)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_PAINTED,            1664)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_USERLISTSELECTION,  1665)
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_URIDROPPED,         1666)
@@ -2895,7 +2894,6 @@ END_DECLARE_EVENT_TYPES()
        wxEVT_STC_MACRORECORD,
        wxEVT_STC_MARGINCLICK,
        wxEVT_STC_NEEDSHOWN,
-        wxEVT_STC_POSCHANGED,
        wxEVT_STC_PAINTED,
        wxEVT_STC_USERLISTSELECTION,
        wxEVT_STC_URIDROPPED,
@@ -2929,7 +2927,6 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_MACRORECORD(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD,           id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #define EVT_STC_MARGINCLICK(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK,           id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #define EVT_STC_NEEDSHOWN(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN,             id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_POSCHANGED(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_POSCHANGED,            id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #define EVT_STC_PAINTED(id, fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_PAINTED,               id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #define EVT_STC_USERLISTSELECTION(id, fn)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_USERLISTSELECTION,     id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #define EVT_STC_URIDROPPED(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED,            id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
--- a/contrib/include/wx/xrc/xh_gauge.h
+++ b/contrib/include/wx/xrc/xh_gauge.h
@@ -24,7 +24,7 @@

 class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
 {
-	DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
    enum
    {
        wxGAUGE_DEFAULT_RANGE = 100
--- a/contrib/include/wx/xrc/xh_menu.h
+++ b/contrib/include/wx/xrc/xh_menu.h
@@ -31,7 +31,7 @@ private:

 class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
 {
-	DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
    public:
        wxMenuBarXmlHandler();
        virtual wxObject *DoCreateResource();
--- a/contrib/include/wx/xrc/xh_scrol.h
+++ b/contrib/include/wx/xrc/xh_scrol.h
@@ -22,7 +22,7 @@

 class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
 {
-	DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
    enum
    {
        wxSL_DEFAULT_VALUE = 0,
--- a/contrib/include/wx/xrc/xh_sizer.h
+++ b/contrib/include/wx/xrc/xh_sizer.h
@@ -33,7 +33,7 @@ public:
 private:
    bool m_isInside;
    bool m_isGBS;
-    
+
    wxSizer *m_parentSizer;

    bool IsSizerNode(wxXmlNode *node);
@@ -52,7 +52,7 @@ private:
    wxGBSpan GetGBSpan(const wxString& param);
    wxSizerItem* MakeSizerItem();
    void SetSizerItemAttributes(wxSizerItem* sitem);
-    void AddSizerItem(wxSizerItem* sitem);    
+    void AddSizerItem(wxSizerItem* sitem);
 };


--- a/contrib/include/wx/xrc/xh_slidr.h
+++ b/contrib/include/wx/xrc/xh_slidr.h
@@ -22,7 +22,7 @@

 class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
 {
-	DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
    enum
    {
        wxSL_DEFAULT_VALUE = 0,
--- a/contrib/include/wx/xrc/xh_spin.h
+++ b/contrib/include/wx/xrc/xh_spin.h
@@ -21,7 +21,7 @@
 #if wxUSE_SPINBTN
 class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler
 {
-	DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
    enum
    {
        wxSP_DEFAULT_VALUE = 0,
@@ -39,7 +39,7 @@ public:
 #if wxUSE_SPINCTRL
 class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler
 {
-	DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
    enum
    {
        wxSP_DEFAULT_VALUE = 0,
--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -93,7 +93,8 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord,
 enum wxXmlResourceFlags
 {
    wxXRC_USE_LOCALE     = 1,
-    wxXRC_NO_SUBCLASSING = 2
+    wxXRC_NO_SUBCLASSING = 2,
+    wxXRC_NO_RELOADING   = 4
 };

 // This class holds XML resources from one or more .xml files
@@ -240,7 +241,7 @@ protected:
    bool UpdateResources();

    // Finds a resource (calls UpdateResources) and returns a node containing it.
-    wxXmlNode *FindResource(const wxString& name, const wxString& classname, bool recursive = FALSE);
+    wxXmlNode *FindResource(const wxString& name, const wxString& classname, bool recursive = false);

    // Helper function: finds a resource (calls UpdateResources) and returns a node containing it.
    wxXmlNode *DoFindResource(wxXmlNode *parent, const wxString& name, const wxString& classname, bool recursive);
@@ -329,8 +330,8 @@ public:
    // were filled.
    virtual wxObject *DoCreateResource() = 0;

-    // Returns TRUE if it understands this node and can create
-    // a resource from it, FALSE otherwise.
+    // Returns true if it understands this node and can create
+    // a resource from it, false otherwise.
    virtual bool CanHandle(wxXmlNode *node) = 0;

    // Sets the parent resource.
@@ -385,7 +386,7 @@ protected:
    // - replaces \n, \r, \t by respective chars (according to C syntax)
    // - replaces _ by & and __ by _ (needed for _File => &File because of XML)
    // - calls wxGetTranslations (unless disabled in wxXmlResource)
-    wxString GetText(const wxString& param, bool translate = TRUE);
+    wxString GetText(const wxString& param, bool translate = true);

    // Returns the XRCID.
    int GetID();
@@ -393,8 +394,8 @@ protected:
    // Returns the resource name.
    wxString GetName();

-    // Gets a bool flag (1, t, yes, on, true are TRUE, everything else is FALSE).
-    bool GetBool(const wxString& param, bool defaultv = FALSE);
+    // Gets a bool flag (1, t, yes, on, true are true, everything else is false).
+    bool GetBool(const wxString& param, bool defaultv = false);

    // Gets the integer value from the parameter.
    long GetLong( const wxString& param, long defaultv = 0 );
@@ -428,7 +429,7 @@ protected:
    void SetupWindow(wxWindow *wnd);

    // Creates children.
-    void CreateChildren(wxObject *parent, bool this_hnd_only = FALSE);
+    void CreateChildren(wxObject *parent, bool this_hnd_only = false);

    // Helper function.
    void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL);
--- a/contrib/samples/animate/anitest.cpp
+++ b/contrib/samples/animate/anitest.cpp
@@ -93,7 +93,9 @@ bool MyApp::OnInit()
    // Associate the menu bar with the frame
    frame->SetMenuBar(menu_bar);

+#if wxUSE_STATUSBAR
    frame->CreateStatusBar();
+#endif // wxUSE_STATUSBAR

    frame->Show(TRUE);

--- a/contrib/samples/deprecated/proplist/proplist.cpp
+++ b/contrib/samples/deprecated/proplist/proplist.cpp
@@ -75,7 +75,7 @@ bool MyApp::OnInit(void)
  m_mainFrame->Show(true);

  SetTopWindow(m_mainFrame);
-    
+
  return true;
 }

@@ -266,7 +266,7 @@ void MyApp::PropertyFormTest(bool useDialog)
        panel->SetConstraints(c);
    }
 #endif
- 
+
    // Add items to the panel
    wxButton *okButton = new wxButton(panel, wxID_OK, _T("OK"), wxDefaultPosition,
        wxSize(80, 26), 0, wxDefaultValidator, _T("ok"));
@@ -306,8 +306,8 @@ void MyApp::PropertyFormTest(bool useDialog)
    okButton->SetConstraints(c);

    // The name of this text item matches the "fred" property
-    wxTextCtrl *text = new wxTextCtrl(panel, wxID_ANY, _T("Fred"), wxDefaultPosition, 
-        wxSize( 200, wxDefaultSize.y), 0, wxDefaultValidator, _T("fred"));
+    wxTextCtrl *text = new wxTextCtrl(panel, wxID_ANY, _T("Fred"), wxDefaultPosition,
+        wxSize( 200, wxDefaultCoord), 0, wxDefaultValidator, _T("fred"));

    c = new wxLayoutConstraints;
    c->left.SameAs(panel, wxLeft, 4);
--- a/contrib/samples/deprecated/resource/resource.cpp
+++ b/contrib/samples/deprecated/resource/resource.cpp
@@ -103,12 +103,14 @@ bool MyApp::OnInit(void)
 #endif

    // Create the main frame window
-    frame = new MyFrame( (wxFrame *) NULL, -1,
+    frame = new MyFrame( (wxFrame *) NULL, wxID_ANY,
                         wxT("wxWidgets Resource Sample"),
-                         wxPoint(-1, -1), wxSize(300, 250) );
+                         wxDefaultPosition, wxSize(300, 250) );

+#if wxUSE_STATUSBAR
    // Give it a status line
    frame->CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR

    wxMenuBar *menu_bar = wxResourceCreateMenuBar(wxT("menu1"));

@@ -116,13 +118,13 @@ bool MyApp::OnInit(void)
    frame->SetMenuBar(menu_bar);

    // Make a panel
-    frame->panel = new MyPanel( frame, -1, wxPoint(0, 0), wxSize(400, 400),
+    frame->panel = new MyPanel( frame, wxID_ANY, wxPoint(0, 0), wxSize(400, 400),
                                0, wxT("MyMainFrame") );
-    frame->Show(TRUE);
+    frame->Show(true);

    SetTopWindow(frame);

-    return TRUE;
+    return true;
 }

 MyApp::~MyApp()
@@ -179,7 +181,7 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )

 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
-    Close(TRUE);
+    Close(true);
 }

 void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
@@ -197,7 +199,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
        dialog->ShowModal();
    }

-    dialog->Close(TRUE);
+    dialog->Close(true);
 }

 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
--- a/contrib/samples/deprecated/treelay/treelay.cpp
+++ b/contrib/samples/deprecated/treelay/treelay.cpp
@@ -41,10 +41,12 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
  // Create the main frame window
-  MyFrame* frame = new MyFrame(NULL, _T("Tree Test"), wxPoint(-1, -1), wxSize(400, 550));
+  MyFrame* frame = new MyFrame(NULL, _T("Tree Test"), wxDefaultPosition, wxSize(400, 550));

+#if wxUSE_STATUSBAR
  // Give it a status line
  frame->CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR

  // Give it an icon
 #ifdef __WINDOWS__
@@ -83,12 +85,14 @@ bool MyApp::OnInit()
  dc.SetFont(font);
  TreeTest(*myTree, dc);

-  frame->Show(TRUE);
+  frame->Show(true);

+#if wxUSE_STATUSBAR
  frame->SetStatusText(_T("Hello, tree!"));
+#endif // wxUSE_STATUSBAR

  // Return the main frame window
-  return TRUE;
+  return true;
 }

 int MyApp::OnExit()
@@ -148,20 +152,20 @@ END_EVENT_TABLE()

 // Define my frame constructor
 MyFrame::MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size):
-  wxFrame(parent, -1, title, pos, size)
+  wxFrame(parent, wxID_ANY, title, pos, size)
 {
 }

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(TRUE);
+    Close(true);
 }

 void MyFrame::OnLeftRight(wxCommandEvent& WXUNUSED(event))
 {
      if (myTree)
      {
-        myTree->SetOrientation(FALSE);
+        myTree->SetOrientation(false);
        wxClientDC dc(canvas);
        wxFont font(10, wxROMAN, wxNORMAL, wxBOLD);
        dc.SetFont(font);
@@ -174,7 +178,7 @@ void MyFrame::OnTopBottom(wxCommandEvent& WXUNUSED(event))
 {
      if (myTree)
      {
-        myTree->SetOrientation(TRUE);
+        myTree->SetOrientation(true);
        wxClientDC dc(canvas);
        wxFont font(10, wxROMAN, wxNORMAL, wxBOLD);
        dc.SetFont(font);
@@ -199,7 +203,7 @@ END_EVENT_TABLE()

 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent):
- wxScrolledWindow(parent, -1)
+ wxScrolledWindow(parent, wxID_ANY)
 {
    SetBackgroundColour(*wxWHITE);
 }
--- a/contrib/samples/fl/fl_demo1.cpp
+++ b/contrib/samples/fl/fl_demo1.cpp
@@ -49,7 +49,7 @@
 char  wxDummyChar;


-IMPLEMENT_APP	(MyApp)
+IMPLEMENT_APP (MyApp)

 bool MyApp::OnInit(void)
 {
@@ -69,9 +69,11 @@ bool MyApp::OnInit(void)
    
    frame->SetMenuBar(menu_bar);
    
+#if wxUSE_STATUSBAR
    frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
    
-    frame->Show(TRUE);
+    frame->Show(true);
    
    frame->mpClientWnd->Refresh();
    
@@ -83,7 +85,7 @@ The ONLY purpose is to demonstrate self-layouting toolbars,\nflat-bitmapped-butt
 (cbRowDragPlugin & cbBarHintsPlugin)\n\n\
 BTW, disabled images and label-text are rendered at run-time") );
    
-    return TRUE;
+    return true;
 }

 /***** Implementation for class MyFrame *****/
@@ -97,7 +99,7 @@ BEGIN_EVENT_TABLE( MyFrame, wxFrame )
 END_EVENT_TABLE()

 void MyFrame::OnLoad( wxCommandEvent& WXUNUSED(event) )
-{						
+{
    wxMessageBox(_T("Hey - you found a BIG question-mark !!"));
 }

@@ -115,7 +117,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {
    wxTextCtrl* pCtrl = 
        
-        new wxTextCtrl( this, -1, value, 
+        new wxTextCtrl( this, wxID_ANY, value, 
        wxDefaultPosition, wxSize(0,0), wxTE_MULTILINE );
    
    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
@@ -124,7 +126,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 }

 MyFrame::MyFrame(wxFrame *frame)
-    : wxFrame( frame, -1, _("wxWidgets 2.0 wxFrameLayout Test Application"), wxDefaultPosition, 
+    : wxFrame( frame, wxID_ANY, _("wxWidgets 2.0 wxFrameLayout Test Application"), wxDefaultPosition, 
          wxSize( 700, 500 ), 
          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | 
          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION, 
@@ -138,7 +140,7 @@ MyFrame::MyFrame(wxFrame *frame)
    cbCommonPaneProperties props;
    mpLayout->GetPaneProperties( props );
    
-    props.mRealTimeUpdatesOn = FALSE; // real-time OFF!!!
+    props.mRealTimeUpdatesOn = false; // real-time OFF!!!
    
    mpLayout->SetPaneProperties( props, wxALL_PANES );
 #endif
@@ -161,7 +163,7 @@ MyFrame::MyFrame(wxFrame *frame)
    cbDimInfo sizes0( 200,45, // when docked horizontally      
                      200,85, // when docked vertically        
                      175,35, // when floated                  
-                      FALSE,  // the bar is not fixed-size
+                      false,  // the bar is not fixed-size
                      4,      // vertical gap (bar border)
                      4       // horizontal gap (bar border)
                    ); 
@@ -169,7 +171,7 @@ MyFrame::MyFrame(wxFrame *frame)
    cbDimInfo sizes1( 150,35, // when docked horizontally      
                      150,85, // when docked vertically        
                      175,35, // when floated                  
-                      TRUE,   // the bar is not fixed-size
+                      true,   // the bar is not fixed-size
                      4,      // vertical gap (bar border)
                      4       // horizontal gap (bar border)
                    ); 
@@ -177,7 +179,7 @@ MyFrame::MyFrame(wxFrame *frame)
    cbDimInfo sizes2( 195,35, // when docked horizontally      
                      185,37, // when docked vertically        
                      195,35, // when floated                  
-                      TRUE,   // the bar is not fixed-size
+                      true,   // the bar is not fixed-size
                      4,      // vertical gap (bar border)
                      4,      // horizontal gap (bar border)
                      new cbDynToolBarDimHandler()
@@ -188,7 +190,7 @@ MyFrame::MyFrame(wxFrame *frame)
                      0,                        // insert into 0th row (vert. position)
                      0,                        // offset from the start of row (in pixels)
                      _("InfoViewer1"),            // name to refer in customization pop-ups
-                      TRUE
+                      true
                    );
    
    mpLayout->AddBar( CreateTextCtrl(_("Bye")),    // bar window
@@ -196,7 +198,7 @@ MyFrame::MyFrame(wxFrame *frame)
                      1,                        // insert into 0th row (vert. position)
                      0,                        // offset from the start of row (in pixels)
                      _("InfoViewer2"),            // name to refer in customization pop-ups
-                      TRUE
+                      true
                    );
    
    mpLayout->AddBar( CreateTextCtrl(_("Fixed0")), // bar window
@@ -204,12 +206,12 @@ MyFrame::MyFrame(wxFrame *frame)
                      0,                        // insert into 0th row (vert. position)
                      0,                        // offset from the start of row (in pixels)
                      _("ToolBar1"),               // name to refer in customization pop-ups
-                      TRUE
+                      true
                    );
    
    wxDynamicToolBar* pToolBar = new wxDynamicToolBar();
    
-    pToolBar->Create( this, -1 );
+    pToolBar->Create( this, wxID_ANY );
    
    // 1001-1006 ids of command events fired by added tool-buttons

@@ -217,7 +219,9 @@ MyFrame::MyFrame(wxFrame *frame)
    pToolBar->AddSeparator();
    pToolBar->AddTool( 1002, wxString(wxT(BMP_DIR)) + wxT("open.bmp") );
    pToolBar->AddTool( 1003, wxString(wxT(BMP_DIR)) + wxT("save.bmp") );
-    pToolBar->AddSeparator(new wxMySeparatorLine(pToolBar, -1));    
+#if wxUSE_STATLINE
+    pToolBar->AddSeparator(new wxMySeparatorLine(pToolBar, wxID_ANY));    
+#endif // wxUSE_STATLINE
    pToolBar->AddTool( 1004, wxString(wxT(BMP_DIR)) + wxT("cut.bmp") );
    pToolBar->AddTool( 1005, wxString(wxT(BMP_DIR)) + wxT("copy.bmp") );
    pToolBar->AddTool( 1006, wxString(wxT(BMP_DIR)) + wxT("paste.bmp") );
@@ -228,10 +232,10 @@ MyFrame::MyFrame(wxFrame *frame)
                      0,                    // insert into 0th row (vert. position)
                      0,                    // offset from the start of row (in pixels)
                      wxT("ToolBar2"),           // name to refer in customization pop-ups
-                      FALSE
+                      false
                    );
    
-    mpLayout->EnableFloating( TRUE ); // off, thinking about wxGtk...
+    mpLayout->EnableFloating( true ); // off, thinking about wxGtk...
 }

 MyFrame::~MyFrame()
@@ -241,6 +245,7 @@ MyFrame::~MyFrame()
 }

 #define LINE_SIZE 3
+#if wxUSE_STATLINE
 void wxMySeparatorLine::DoSetSize( int x, int y,
                                   int width, int height,
                                   int sizeFlags)
@@ -258,3 +263,4 @@ void wxMySeparatorLine::DoSetSize( int x, int y,
    
    wxStaticLine::DoSetSize(x, y, width, height, sizeFlags);
 }
+#endif // wxUSE_STATLINE
--- a/contrib/samples/fl/fl_demo1.h
+++ b/contrib/samples/fl/fl_demo1.h
@@ -43,7 +43,7 @@ public:
    MyFrame(wxFrame *frame);
    virtual ~MyFrame();
    
-    bool OnClose(void) { Show(FALSE); return TRUE; }
+    bool OnClose(void) { Show(false); return true; }
    
    void OnLoad( wxCommandEvent& event );
    void OnSave( wxCommandEvent& event );
@@ -52,6 +52,7 @@ public:
    DECLARE_EVENT_TABLE()
 };

+#if wxUSE_STATLINE
 /*
 * Quick example of your own Separator class...
 */
@@ -69,6 +70,7 @@ protected:
                           int width, int height,
                           int sizeFlags = wxSIZE_AUTO);
 };
+#endif // wxUSE_STATLINE

 #endif

--- a/contrib/samples/fl/fl_demo2.cpp
+++ b/contrib/samples/fl/fl_demo2.cpp
@@ -96,7 +96,9 @@ bool MyApp::OnInit(void)
    menu_bar->Append(file_menu,   _("&File"));
    menu_bar->Append(active_menu, _("Active &Layout"));

+#if wxUSE_STATUSBAR
    frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR

    frame->SetMenuBar(menu_bar);

@@ -203,7 +205,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h

    // Create all layouts
    for( i = 0; i != MAX_LAYOUTS; ++i )
-    {	
+    {
        CreateLayout( i );
    }
    // hide others
@@ -489,17 +491,17 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl( const wxString& label )
 {
    wxTreeCtrl* pTree = new wxTreeCtrl( mpInternalFrm, wxID_ANY );

-    const wxTreeItemId rootid = pTree->AppendItem( (long)0, label, 0);
+    const wxTreeItemId rootid = pTree->AddRoot(label);

-    if ( label[0] != 'X' )
+    if ( label.StartsWith(_T("X")) )
    {
-        pTree->AppendItem(rootid, _("Leaf1"), 0);
-        pTree->AppendItem(rootid, _("Leaf2"), 0);
+        pTree->AppendItem(rootid, _("Scully"));
+        pTree->AppendItem(rootid, _("Mulder"));
    }
    else
    {
-        pTree->AppendItem(rootid, _("Scully"), 0);
-        pTree->AppendItem(rootid, _("Mulder"), 0);
+        pTree->AppendItem(rootid, _("Leaf1"));
+        pTree->AppendItem(rootid, _("Leaf2"));
    }

    return pTree;
@@ -671,7 +673,7 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
    pClassView->AppendItem( rootId, _("serializer-classes (grabbed at run-time)"),    0 );

    // now create "output" window
-    wxNotebook*	pTabbedArea = new wxNotebook(pParent, wxID_ANY);
+    wxNotebook* pTabbedArea = new wxNotebook(pParent, wxID_ANY);
    // SEB: originally here was a wxpp (wxWorkshop) class used
    //    wxPaggedWindow* pTabbedArea = new wxPaggedWindow();
    //    pTabbedArea->Create( pParent, wxID_ANY );
--- a/contrib/samples/fl/fl_demo2.h
+++ b/contrib/samples/fl/fl_demo2.h
@@ -6,7 +6,7 @@
 // Created:     04/11/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __FLDEMO_G__
@@ -14,7 +14,7 @@

 // ID for the menu commands

-#define MINIMAL_QUIT 	1
+#define MINIMAL_QUIT    1
 #define MINIMAL_ABOUT 102

 #define ID_LOAD      103
@@ -25,7 +25,7 @@
 #define ID_REMOVEALL 108
 #define ID_RECREATE  109
 #define ID_ACTIVATE  110
-#define ID_FIRST	 111
+#define ID_FIRST     111
 #define ID_SECOND    112
 #define ID_THIRD     113

@@ -144,10 +144,10 @@ class StartButton95 : public wxPanel
    wxBitmap m_DBmp;
    
 public:
-    StartButton95(void) : m_bPressed(FALSE) {}
+    StartButton95(void) : m_bPressed(false) {}
    
    StartButton95(wxWindow* parent) 
-        : m_bPressed(FALSE) { wxPanel::Create(parent,-1); }
+        : m_bPressed(false) { wxPanel::Create(parent,wxID_ANY); }
    
    void OnMouseDown( wxMouseEvent& event );
    void OnMouseUp( wxMouseEvent& event );
--- a/contrib/samples/fl/fl_sample1.cpp
+++ b/contrib/samples/fl/fl_sample1.cpp
@@ -56,7 +56,7 @@ public:
    void OnStore( wxCommandEvent& event );
    void OnQuit( wxCommandEvent& event );
    
-    bool OnClose(void) { return TRUE; }
+    bool OnClose(void) { return true; }
    
    DECLARE_EVENT_TABLE()
 };
@@ -83,14 +83,16 @@ bool MyApp::OnInit(void)
    
    menu_bar->Append(file_menu, _("&File"));
    
+#if wxUSE_STATUSBAR
    frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
    frame->SetMenuBar(menu_bar);
    
-    frame->Show(TRUE);
+    frame->Show(true);
    
    SetTopWindow(frame);
    
-    return TRUE;
+    return true;
 }

 /***** Immlementation for class MyFrame *****/
@@ -102,7 +104,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()

 MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
-    : wxFrame( parent, -1, title, wxDefaultPosition,
+    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
          wxSize( 700, 500 ),
          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
@@ -122,7 +124,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
    cbCommonPaneProperties props;
    mpLayout->GetPaneProperties( props );
    
-    props.mRealTimeUpdatesOn = FALSE; // off
+    props.mRealTimeUpdatesOn = false; // off
    
    mpLayout->SetPaneProperties( props, wxALL_PANES );    
 #endif
@@ -134,7 +136,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
    cbDimInfo sizes( 80,65, // when docked horizontally      
                     80,65, // when docked vertically        
                     80,30, // when floated                  
-                     TRUE,  // the bar is fixed-size
+                     true,  // the bar is fixed-size
                     5,     // vertical gap (bar border)
                     5      // horizontal gap (bar border)
                   ); 
@@ -169,7 +171,7 @@ MyFrame::~MyFrame()

 wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {
-    wxTextCtrl* pCtrl = new wxTextCtrl( mpInternalFrm, -1, value, 
+    wxTextCtrl* pCtrl = new wxTextCtrl( mpInternalFrm, wxID_ANY, value, 
                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
    
    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
@@ -189,8 +191,8 @@ void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )

 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
-    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
+    Show( false ); // TRICK:: hide it, to avoid flickered destruction
    
-    Close(TRUE);
+    Close(true);
 }

--- a/contrib/samples/fl/fl_sample2.cpp
+++ b/contrib/samples/fl/fl_sample2.cpp
@@ -57,7 +57,7 @@ public:
    void OnStore( wxCommandEvent& event );
    void OnQuit( wxCommandEvent& event );
    
-    bool OnClose(void) { return TRUE; }
+    bool OnClose(void) { return true; }
    
    DECLARE_EVENT_TABLE()
 };
@@ -84,14 +84,16 @@ bool MyApp::OnInit(void)
    
    menu_bar->Append(file_menu, _("&File"));
    
+#if wxUSE_STATUSBAR
    frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
    frame->SetMenuBar(menu_bar);
    
-    frame->Show(TRUE);
+    frame->Show(true);
    SetTopWindow(frame);
    frame->populateMyFrame();
    
-    return TRUE;
+    return true;
 }

 /***** Immlementation for class MyFrame *****/
@@ -103,7 +105,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()

 MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
-    : wxFrame( parent, -1, title, wxDefaultPosition,
+    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
          wxSize( 700, 500 ),
          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
@@ -124,7 +126,7 @@ void MyFrame::populateMyFrame()
    cbDimInfo sizes( 80,65,     // when docked horizontally      
                     80,165,    // when docked vertically        
                     180,30,    // when floated                  
-                     TRUE,      // the bar is fixed-size
+                     true,      // the bar is fixed-size
                     5,         // vertical gap (bar border)
                     5          // horizontal gap (bar border)
                   ); 
@@ -144,7 +146,7 @@ void MyFrame::populateMyFrame()
        
        if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
        //      mpLayout->AddBar( CreateTextCtrl(name),// bar window
-        mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
+        mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name),// bar window
                          sizes, i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                          0,                   // insert into 0th row (vert. position)
                          0,                   // offset from the start of row (in pixels)
@@ -167,7 +169,7 @@ MyFrame::~MyFrame()

 wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {
-    wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, 
+    wxTextCtrl* pCtrl = new wxTextCtrl( this, wxID_ANY, value, 
                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
    
    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
@@ -187,8 +189,8 @@ void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )

 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
-    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
+    Show( false ); // TRICK:: hide it, to avoid flickered destruction
    
-    Close(TRUE);
+    Close(true);
 }

--- a/contrib/samples/fl/fl_sample3.cpp
+++ b/contrib/samples/fl/fl_sample3.cpp
@@ -61,7 +61,7 @@ public:
    
    void OnButt( wxCommandEvent& event );
    void OnButt2( wxCommandEvent& event );
-    bool OnClose(void) { return TRUE; }
+    bool OnClose(void) { return true; }
    
    DECLARE_EVENT_TABLE()
 };
@@ -88,13 +88,15 @@ bool MyApp::OnInit(void)
    
    menu_bar->Append(file_menu, _("&File"));
    
+#if wxUSE_STATUSBAR
    frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
    frame->SetMenuBar(menu_bar);
    
-    frame->Show(TRUE);
+    frame->Show(true);
    SetTopWindow(frame);
    
-    return TRUE;
+    return true;
 }

 /***** Immlementation for class MyFrame *****/
@@ -108,14 +110,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()

 MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
-    : wxFrame( parent, -1, title, wxDefaultPosition,
+    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
          wxSize( 700, 500 ),
          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
          wxT("freimas") )
 {
    
-    mpClientWnd = new wxWindow(this, -1);    
+    mpClientWnd = new wxWindow(this, wxID_ANY);    
    mpLayout = new wxFrameLayout( this, mpClientWnd );
    
    ///  mpLayout->PushDefaultPlugins();
@@ -125,7 +127,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
    cbDimInfo sizes( 80,65,     // when docked horizontally      
                     80,165,    // when docked vertically        
                     180,30,    // when floated                  
-                     TRUE,      // the bar is fixed-size
+                     true,      // the bar is fixed-size
                     5,         // vertical gap (bar border)
                     5          // horizontal gap (bar border)
                   ); 
@@ -145,7 +147,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
        if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
        //      mpLayout->AddBar( CreateTextCtrl(name),// bar window
        if(i != 4 && i!= 5 && i!=11) {
-            mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
+            mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name),// bar window
                              sizes, 
                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                              0,            // insert into 0th row (vert. position)
@@ -153,8 +155,8 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
                              name          // name to refere in customization pop-ups
                            );
        } else if(i==4){
-            mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
-                              cbDimInfo( 100,100, 100,100, 100,100, TRUE, 5, 5), 
+            mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name),// bar window
+                              cbDimInfo( 100,100, 100,100, 100,100, true, 5, 5), 
                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                              0,            // insert into 0th row (vert. position)
                              0,            // offset from the start of row (in pixels)
@@ -163,7 +165,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
        } else if(i==5) {
            my_butt = new wxButton(this, ID_BUTT, name);
            mpLayout->AddBar( my_butt,// bar window
-                              cbDimInfo( 100,100, 200,200, 400,400, TRUE, 5, 5), 
+                              cbDimInfo( 100,100, 200,200, 400,400, true, 5, 5), 
                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                              0,            // insert into 0th row (vert. position)
                              0,            // offset from the start of row (in pixels)
@@ -171,7 +173,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
                            );
        } else if(i==11) {
            mpLayout->AddBar( new wxButton(this, ID_BUTT2, name+wxT("_2")),
-                              cbDimInfo( 100,100, 200,200, 400,400, TRUE, 5, 5), 
+                              cbDimInfo( 100,100, 200,200, 400,400, true, 5, 5), 
                              i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                              0,            // insert into 0th row (vert. position)
                              0,            // offset from the start of row (in pixels)
@@ -194,7 +196,7 @@ MyFrame::~MyFrame()

 wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {
-    wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, 
+    wxTextCtrl* pCtrl = new wxTextCtrl( this, wxID_ANY, value, 
                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
    
    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
@@ -214,9 +216,9 @@ void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )

 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
-    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
+    Show( false ); // TRICK:: hide it, to avoid flickered destruction
    
-    Close(TRUE);
+    Close(true);
 }

 void MyFrame::OnButt( wxCommandEvent& WXUNUSED(event) )
@@ -242,18 +244,18 @@ void MyFrame::OnButt( wxCommandEvent& WXUNUSED(event) )
            {
                if(i % 4 == 1) 
                {
-                    mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);
+                    mpLayout->SetBarState(x, wxCBAR_FLOATING, true);
                    //mpLayout->RecalcLayout(true);
                    mpLayout->RepositionFloatedBar(x);
                } 
                else 
                {
-                    mpLayout->SetBarState(x, 0, TRUE);
+                    mpLayout->SetBarState(x, 0, true);
                    //mpLayout->RecalcLayout(true);
                    //mpLayout->RepositionFloatedBar(x);
                }
-                //  //  //  		x->mState = wxCBAR_FLOATING;
-                //  //  //  		mpLayout->ApplyBarProperties(x);
+                //  //  //  x->mState = wxCBAR_FLOATING;
+                //  //  //  mpLayout->ApplyBarProperties(x);
            } 
            else 
            {
@@ -284,10 +286,10 @@ void MyFrame::OnButt2( wxCommandEvent& WXUNUSED(event) )
                    x->mDimInfo.mSizes[a].y = 200;
                }
                x->mpBarWnd->SetSize(200,200);
-                mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);  // HACK !!!
-                mpLayout->SetBarState(x, 0, TRUE);	              // HACK !!!
+                mpLayout->SetBarState(x, wxCBAR_FLOATING, true);  // HACK !!!
+                mpLayout->SetBarState(x, 0, true);                // HACK !!!
                wxYield();                                        // HACK !!! needed to resize BEFORE redraw 
-                mpLayout->RefreshNow( TRUE );                     // HACK !!! needed to trigger redraw
+                mpLayout->RefreshNow( true );                     // HACK !!! needed to trigger redraw
            }
            else    
            {
@@ -309,20 +311,20 @@ void MyFrame::OnButt2( wxCommandEvent& WXUNUSED(event) )
                    x->mDimInfo.mSizes[a].y = 10 + 2 + 2*x->mDimInfo.mVertGap;
                }
                x->mpBarWnd->SetSize(10,10);
-                mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);  // HACK !!!
-                mpLayout->SetBarState(x, 0, TRUE);	              // HACK !!!
+                mpLayout->SetBarState(x, wxCBAR_FLOATING, true);  // HACK !!!
+                mpLayout->SetBarState(x, 0, true);                // HACK !!!
                wxYield();                                        // HACK !!! needed to resize BEFORE redraw 
-                mpLayout->RefreshNow( TRUE );                     // HACK !!! needed to trigger redraw
+                mpLayout->RefreshNow( true );                     // HACK !!! needed to trigger redraw
                
-                //  //  		mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE);
-                //  //  		mpLayout->RecalcLayout(true);
-                //  //  		//		mpLayout->RepositionFloatedBar(x);
-                //  //  		mpLayout->RecalcLayout(true);
-                //  //  		mpLayout->RepositionFloatedBar(x);
-                //  //  		  mpLayout->SetBarState(x, 0, TRUE);	
-                //  //  		  wxYield();
-                //  //  		  mpLayout->RefreshNow( TRUE );
-                //  //  		  mpLayout->RecalcLayout(true);
+                //  //  mpLayout->SetBarState(x, wxCBAR_FLOATING, true);
+                //  //  mpLayout->RecalcLayout(true);
+                //  //  mpLayout->RepositionFloatedBar(x);
+                //  //  mpLayout->RecalcLayout(true);
+                //  //  mpLayout->RepositionFloatedBar(x);
+                //  //  mpLayout->SetBarState(x, 0, true);
+                //  //  wxYield();
+                //  //  mpLayout->RefreshNow( true );
+                //  //  mpLayout->RecalcLayout(true);
            }
            else    
            {
--- a/contrib/samples/gizmos/dynsash/dynsash.cpp
+++ b/contrib/samples/gizmos/dynsash/dynsash.cpp
@@ -37,7 +37,7 @@ public:

 class SashHtmlWindow : public wxHtmlWindow {
 public:
-    SashHtmlWindow(wxWindow *parent, wxWindowID id = -1,
+    SashHtmlWindow(wxWindow *parent, wxWindowID id = wxID_ANY,
                   const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
                   long style = wxHW_SCROLLBAR_NEVER, const wxString& name = wxT("sashHtmlWindow"));

@@ -62,23 +62,23 @@ wxT("manages the scrollbars provided by <TT>wxDynamicSashWindow</TT> itself.");
 bool Demo::OnInit() {
    wxInitAllImageHandlers();

-    wxFrame *frame = new wxFrame(NULL, -1, wxT("Dynamic Sash Demo"));
+    wxFrame *frame = new wxFrame(NULL, wxID_ANY, wxT("Dynamic Sash Demo"));
    frame->SetSize(480, 480);

-    wxDynamicSashWindow *sash = new wxDynamicSashWindow(frame, -1);
-    wxHtmlWindow *html = new SashHtmlWindow(sash, -1);
+    wxDynamicSashWindow *sash = new wxDynamicSashWindow(frame, wxID_ANY);
+    wxHtmlWindow *html = new SashHtmlWindow(sash, wxID_ANY);
    html->SetPage(HTML_content);

    frame->Show();

-    return TRUE;
+    return true;
 }


 SashHtmlWindow::SashHtmlWindow(wxWindow *parent, wxWindowID id,
                               const wxPoint& pos, const wxSize& size, long style, const wxString& name) :
                                    wxHtmlWindow(parent, id, pos, size, style, name) {
-    Connect(-1, wxEVT_DYNAMIC_SASH_SPLIT, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_DYNAMIC_SASH_SPLIT, (wxObjectEventFunction)
                                          (wxEventFunction)
                                          (wxDynamicSashSplitEventFunction)&SashHtmlWindow::OnSplit);

@@ -97,6 +97,6 @@ wxSize SashHtmlWindow::DoGetBestSize() const {
 }

 void SashHtmlWindow::OnSplit(wxDynamicSashSplitEvent& WXUNUSED(event)) {
-    wxHtmlWindow *html = new SashHtmlWindow(m_dyn_sash, -1);
+    wxHtmlWindow *html = new SashHtmlWindow(m_dyn_sash, wxID_ANY);
    html->SetPage(HTML_content);
 }
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
+++ b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
@@ -65,14 +65,14 @@ IMPLEMENT_APP(SwitchDemo)


 SwitchView::SwitchView(wxDynamicSashWindow *win) {
-    Create(win, -1);
+    Create(win, wxID_ANY);

    m_dyn_sash = win;

-    m_bar = new wxWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER, wxT("bar"));
-    m_choice = new wxChoice(m_bar, -1);
+    m_bar = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER, wxT("bar"));
+    m_choice = new wxChoice(m_bar, wxID_ANY);
    m_choice->SetEventHandler(this);
-    m_view = new wxWindow(this, -1, wxDefaultPosition, wxDefaultSize, 0, wxT("view"));
+    m_view = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, wxT("view"));
    m_view->SetBackgroundColour(*wxWHITE);
    m_view->SetEventHandler(this);

@@ -119,41 +119,41 @@ SwitchView::SwitchView(wxDynamicSashWindow *win) {
                                          (wxEventFunction)
                                          (wxPaintEventFunction)&SwitchView::OnPaint);

-    Connect(-1, wxEVT_SET_FOCUS, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_SET_FOCUS, (wxObjectEventFunction)
                                 (wxEventFunction)
                                 (wxFocusEventFunction)&SwitchView::OnFocus);
-    Connect(-1, wxEVT_SCROLL_TOP, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_SCROLL_TOP, (wxObjectEventFunction)
                                  (wxEventFunction)
                                  (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_BOTTOM, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_SCROLL_BOTTOM, (wxObjectEventFunction)
                                     (wxEventFunction)
                                     (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_LINEUP, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_SCROLL_LINEUP, (wxObjectEventFunction)
                                     (wxEventFunction)
                                     (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_LINEDOWN, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_SCROLL_LINEDOWN, (wxObjectEventFunction)
                                       (wxEventFunction)
                                       (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_PAGEUP, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_SCROLL_PAGEUP, (wxObjectEventFunction)
                                     (wxEventFunction)
                                     (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_PAGEDOWN, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_SCROLL_PAGEDOWN, (wxObjectEventFunction)
                                       (wxEventFunction)
                                       (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)
                                         (wxEventFunction)
                                         (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_SCROLL_THUMBRELEASE, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_SCROLL_THUMBRELEASE, (wxObjectEventFunction)
                                           (wxEventFunction)
                                           (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(-1, wxEVT_ERASE_BACKGROUND, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_ERASE_BACKGROUND, (wxObjectEventFunction)
                                        (wxEventFunction)
                                        (wxEraseEventFunction)&SwitchView::OnErase);

-    Connect(-1, wxEVT_DYNAMIC_SASH_SPLIT, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_DYNAMIC_SASH_SPLIT, (wxObjectEventFunction)
                                          (wxEventFunction)
                                          (wxDynamicSashSplitEventFunction)&SwitchView::OnSplit);
-    Connect(-1, wxEVT_DYNAMIC_SASH_UNIFY, (wxObjectEventFunction)
+    Connect(wxID_ANY, wxEVT_DYNAMIC_SASH_UNIFY, (wxObjectEventFunction)
                                          (wxEventFunction)
                                          (wxDynamicSashUnifyEventFunction)&SwitchView::OnUnify);
 }
@@ -252,12 +252,12 @@ bool SwitchDemo::OnInit() {
    wxFrame *frame;
    wxDynamicSashWindow *dyn;

-    frame = new wxFrame(NULL, -1, wxT("Dynamic Sash Window Switch Demo"));
-    dyn = new wxDynamicSashWindow(frame, -1, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN);
+    frame = new wxFrame(NULL, wxID_ANY, wxT("Dynamic Sash Window Switch Demo"));
+    dyn = new wxDynamicSashWindow(frame, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN);
    new SwitchView(dyn);

    frame->SetSize(480, 480);
    frame->Show();

-    return TRUE;
+    return true;
 }
--- a/contrib/samples/gizmos/editlbox/test.cpp
+++ b/contrib/samples/gizmos/editlbox/test.cpp
@@ -25,17 +25,17 @@ IMPLEMENT_APP(MyApp)

 bool MyApp::OnInit()
 {
-    wxDialog dlg(NULL, -1, _("Test dialog"), wxDefaultPosition, wxDefaultSize,
+    wxDialog dlg(NULL, wxID_ANY, _("Test dialog"), wxDefaultPosition, wxDefaultSize,
                 wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);

    wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-    sizer->Add(new wxEditableListBox(&dlg, -1, _("Match these wildcards:"), 
+    sizer->Add(new wxEditableListBox(&dlg, wxID_ANY, _("Match these wildcards:"),
                                     wxDefaultPosition,wxSize(300,200)),
               1, wxEXPAND|wxALL, 10);
-               
+
    sizer->Add(5,5);

-    wxEditableListBox *lb = new wxEditableListBox(&dlg, -1, _("Except:"), 
+    wxEditableListBox *lb = new wxEditableListBox(&dlg, wxID_ANY, _("Except:"),
                                     wxDefaultPosition,wxSize(300,200));
    wxArrayString ar;
    ar.Add(_T("*.cpp"));
@@ -46,13 +46,12 @@ bool MyApp::OnInit()
    sizer->Add(lb, 1, wxEXPAND|wxALL, 10);

    sizer->Add(5,5);
-               
+
    sizer->Add(new wxButton(&dlg, wxID_OK, _("OK")), 0, wxALIGN_RIGHT | wxALL, 10);
-    dlg.SetAutoLayout(TRUE);
    dlg.SetSizer(sizer);
    sizer->Fit(&dlg);
-	dlg.Centre();
-  
+    dlg.Centre();
+
    dlg.ShowModal();

    wxString res = _("'Except' contains these strings:\n\n");
@@ -60,6 +59,6 @@ bool MyApp::OnInit()
    for (size_t i = 0; i < ar.GetCount(); i++)
        res << ar[i] << _T("\n");
    wxMessageBox(res);
-    
-    return FALSE;
+
+    return false;
 }
--- a/contrib/samples/gizmos/led/led.cpp
+++ b/contrib/samples/gizmos/led/led.cpp
@@ -165,12 +165,12 @@ bool MyApp::OnInit()

    // and show it (the frames, unlike simple controls, are not shown when
    // created initially)
-    frame->Show(TRUE);
+    frame->Show(true);

    // success: wxApp::OnRun() will be called which will enter the main message
-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the
    // application would exit immediately.
-    return TRUE;
+    return true;
 }

 // ----------------------------------------------------------------------------
@@ -179,7 +179,7 @@ bool MyApp::OnInit()

 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
-       : wxFrame(NULL, -1, title, pos, size, style)
+       : wxFrame(NULL, wxID_ANY, title, pos, size, style)
 {
 #if wxUSE_MENUS
    // create a menu bar
@@ -202,7 +202,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
    editMenu->AppendSeparator();
    editMenu->AppendCheckItem(LED_Edit_DrawFaded, _T("Draw &Faded\tCtrl-F"));

-    editMenu->Check(LED_Edit_DrawFaded, TRUE);
+    editMenu->Check(LED_Edit_DrawFaded, true);

    // now append the freshly created menu to the menu bar...
    wxMenuBar *menuBar = new wxMenuBar();
@@ -222,8 +222,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);
 }

 void MyFrame::OnIncrement(wxCommandEvent& WXUNUSED(event))
--- a/contrib/samples/gizmos/multicell/mtest.cpp
+++ b/contrib/samples/gizmos/multicell/mtest.cpp
@@ -1,194 +1,196 @@
 /*
- * File:	mtest.cpp
- * Purpose:	wxMultiCellSizer and wxMultiCellCanvas test
- * Author:	Alex Andruschak
- * Created:	2000
- * Updated:	
+ * File:    mtest.cpp
+ * Purpose: wxMultiCellSizer and wxMultiCellCanvas test
+ * Author:  Alex Andruschak
+ * Created: 2000
+ * Updated:
 * Copyright:
 */

 static const char sccsid[] = "%W% %G%";

 #if defined(__GNUG__) && !defined(__APPLE__)
-	#pragma implementation
-	#pragma interface
+    #pragma implementation
+    #pragma interface
 #endif

 #include "wx/wxprec.h"

 #ifdef __BORLANDC__
-	#pragma hdrstop
+    #pragma hdrstop
 #endif

 #ifndef WX_PRECOMP
-	#include "wx/wx.h"
+    #include "wx/wx.h"
 #endif

 #include "wx/gizmos/multicell.h"

 class MyApp: public wxApp
 {public:
-	bool OnInit(void);
+    bool OnInit(void);
 };

 class MyFrame: public wxFrame
 {

 public:
-	MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
+    MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);

-	void OnCloseWindow(wxCloseEvent& event);
-	void OnPaint(wxPaintEvent& event);
-	wxMultiCellSizer *sizer;
+    void OnCloseWindow(wxCloseEvent& event);
+    void OnPaint(wxPaintEvent& event);
+    wxMultiCellSizer *sizer;

-	DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };

 IMPLEMENT_APP(MyApp)

 bool MyApp::OnInit(void)
 {
-	MyFrame *frame = new MyFrame(1, (wxFrame *) NULL, wxT("wxMultiCellSizer Sample"), wxPoint(50, 50), wxDefaultSize); //, wxSize(600, 500));
+    MyFrame *frame = new MyFrame(1, (wxFrame *) NULL, wxT("wxMultiCellSizer Sample"), wxPoint(50, 50), wxDefaultSize); //, wxSize(600, 500));

-	frame->Show(TRUE);
+    frame->Show(true);

-	SetTopWindow(frame);
-	frame = new MyFrame(2, (wxFrame *) NULL, wxT("wxMultiCellCanvas Sample"), wxPoint(100, 100), wxSize(600, 500));
+    SetTopWindow(frame);
+    frame = new MyFrame(2, (wxFrame *) NULL, wxT("wxMultiCellCanvas Sample"), wxPoint(100, 100), wxSize(600, 500));

-	frame->Show(TRUE);
+    frame->Show(true);

-	SetTopWindow(frame);
-	return TRUE;
+    SetTopWindow(frame);
+    return true;
 }



 MyFrame::MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
-wxFrame(frame, -1, title, pos, size, wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL)
+wxFrame(frame, wxID_ANY, title, pos, size, wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL)
 {
-	CreateStatusBar(1);
-	sizer = NULL;
-	if (type == 1)
-	{
-		// create sizer 4 columns 5 rows
-		wxSize aa(4,9);
-		sizer = new wxMultiCellSizer(aa);
-		sizer->SetDefaultCellSize(wxSize(15,15));
-		sizer->SetRowHeight(7,5,TRUE);
-		sizer->SetRowHeight(8,5,FALSE);
-		// add first row
-		sizer->Add(
-				  new wxButton( this, -1,wxT( "B1 - 0,0, horizontal resizable")),
-				  0, 0, 0, new wxMultiCellItemHandle(0,0,1,1, wxDefaultSize, wxHORIZONTAL_RESIZABLE, wxSize(2,2)));
-		sizer->Add(
-				  new wxButton( this, -1, wxT("B2 - 0,1, vertical resizable")),
-				  0, 0, 0, new wxMultiCellItemHandle(0,1,1,1, wxDefaultSize, wxVERTICAL_RESIZABLE, wxSize(2, 2)));
-		sizer->Add(
-				  new wxButton( this, -1, wxT("B3 - 0,2")),
-				  0, 0, 0, new wxMultiCellItemHandle(0,2,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_CENTER_HORIZONTAL)); //, wxALIGN_CENTER));
-		sizer->Add(
-				  new wxStaticText(this, -1, wxT("jbb 0,3, lower-right")),
-				  0, 0, 0, new wxMultiCellItemHandle(0,3,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_BOTTOM | wxALIGN_RIGHT));
+#if wxUSE_STATUSBAR
+    CreateStatusBar(1);
+#endif // wxUSE_STATUSBAR
+    sizer = NULL;
+    if (type == 1)
+    {
+        // create sizer 4 columns 5 rows
+        wxSize aa(4,9);
+        sizer = new wxMultiCellSizer(aa);
+        sizer->SetDefaultCellSize(wxSize(15,15));
+        sizer->SetRowHeight(7,5,true);
+        sizer->SetRowHeight(8,5,false);
+        // add first row
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT( "B1 - 0,0, horizontal resizable")),
+                  0, 0, 0, new wxMultiCellItemHandle(0,0,1,1, wxDefaultSize, wxHORIZONTAL_RESIZABLE, wxSize(2,2)));
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B2 - 0,1, vertical resizable")),
+                  0, 0, 0, new wxMultiCellItemHandle(0,1,1,1, wxDefaultSize, wxVERTICAL_RESIZABLE, wxSize(2, 2)));
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B3 - 0,2")),
+                  0, 0, 0, new wxMultiCellItemHandle(0,2,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_CENTER_HORIZONTAL)); //, wxALIGN_CENTER));
+        sizer->Add(
+                  new wxStaticText(this, wxID_ANY, wxT("jbb 0,3, lower-right")),
+                  0, 0, 0, new wxMultiCellItemHandle(0,3,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_BOTTOM | wxALIGN_RIGHT));

-		// add button for secord row
-		sizer->Add(
-				  new wxTextCtrl(this, -1, wxT("Text control - 1,0, 4 cols wide")),
-				  0, 0, 0, new wxMultiCellItemHandle(1,0,1,4));
+        // add button for secord row
+        sizer->Add(
+                  new wxTextCtrl(this, wxID_ANY, wxT("Text control - 1,0, 4 cols wide")),
+                  0, 0, 0, new wxMultiCellItemHandle(1,0,1,4));

-		// add buttons for next row
-		sizer->Add(
-				  new wxButton( this, -1, wxT("B6 - 2,0, 2 cols wide")),
-				  0, 0, 0, new wxMultiCellItemHandle(2,0,1,2));
-		sizer->Add(
-				  new wxButton( this, -1, wxT("B7 - 2,3")),
-				  0, 0, 0, new wxMultiCellItemHandle(2,3,1,1));
+        // add buttons for next row
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B6 - 2,0, 2 cols wide")),
+                  0, 0, 0, new wxMultiCellItemHandle(2,0,1,2));
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B7 - 2,3")),
+                  0, 0, 0, new wxMultiCellItemHandle(2,3,1,1));

-		// and last additions
-		sizer->Add(
-				  new wxButton( this, -1, wxT("B8 - 3,0, 4 rows high, vert resizable")),
-				  0, 0, 0, new wxMultiCellItemHandle(3,0,4,1,wxDefaultSize, wxVERTICAL_RESIZABLE));
-		sizer->Add(
-				  new wxButton( this, -1, wxT("B9 - 3,2, 2 cols wide, vert resizable")),
-				  0, 0, 0, new wxMultiCellItemHandle(3,2,1,2,wxDefaultSize, wxVERTICAL_RESIZABLE));
-		sizer->Add(
-				  new wxButton( this, -1, wxT("B10 - 4,1, 3 cols wide, vert resizable")),
-				  0, 0, 0, new wxMultiCellItemHandle(4,1,1,3,wxDefaultSize, wxVERTICAL_RESIZABLE));
+        // and last additions
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B8 - 3,0, 4 rows high, vert resizable")),
+                  0, 0, 0, new wxMultiCellItemHandle(3,0,4,1,wxDefaultSize, wxVERTICAL_RESIZABLE));
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B9 - 3,2, 2 cols wide, vert resizable")),
+                  0, 0, 0, new wxMultiCellItemHandle(3,2,1,2,wxDefaultSize, wxVERTICAL_RESIZABLE));
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B10 - 4,1, 3 cols wide, vert resizable")),
+                  0, 0, 0, new wxMultiCellItemHandle(4,1,1,3,wxDefaultSize, wxVERTICAL_RESIZABLE));

-		sizer->Add(
-				  new wxButton( this, -1, wxT("B11 - 5,1, 3 cols wide")),
-				  0, 0, 0, new wxMultiCellItemHandle(5,1,1,3));
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B11 - 5,1, 3 cols wide")),
+                  0, 0, 0, new wxMultiCellItemHandle(5,1,1,3));

-		sizer->Add(
-				  new wxButton( this, -1, wxT("B12 - 6,1, 3 cols wide")),
-				  0, 0, 0, new wxMultiCellItemHandle(6,1,1,3));
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B12 - 6,1, 3 cols wide")),
+                  0, 0, 0, new wxMultiCellItemHandle(6,1,1,3));

-		sizer->Add(
-				  new wxButton( this, -1, wxT("B13 - 7,1, 2 cols wide")),
-				  0, 0, 0, new wxMultiCellItemHandle(7,1,1,2));
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B13 - 7,1, 2 cols wide")),
+                  0, 0, 0, new wxMultiCellItemHandle(7,1,1,2));

-		sizer->Add(
-				  new wxButton( this, -1, wxT("B14 - 8,1, 3 cols wide")),
-				  0, 0, 0, new wxMultiCellItemHandle(8,1,1,3));
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("B14 - 8,1, 3 cols wide")),
+                  0, 0, 0, new wxMultiCellItemHandle(8,1,1,3));

-		SetAutoLayout( TRUE );
-//	sizer->SetMinSize(sizer->CalcMin());
-		SetSizer( sizer );
-		wxSize s = sizer->CalcMin();
-		wxSize c = GetSize() - GetClientSize();
-		SetSizeHints(s.GetWidth() + c.GetWidth() , s.GetHeight() + c.GetHeight());
-		sizer->EnableGridLines(this);
-	}
-	else
-	{
-		// create sizer 4 columns 5 rows
-		wxMultiCellCanvas *sizer = new wxMultiCellCanvas(this, 5,5);
+        SetAutoLayout( true );
+//    sizer->SetMinSize(sizer->CalcMin());
+        SetSizer( sizer );
+        wxSize s = sizer->CalcMin();
+        wxSize c = GetSize() - GetClientSize();
+        SetSizeHints(s.GetWidth() + c.GetWidth() , s.GetHeight() + c.GetHeight());
+        sizer->EnableGridLines(this);
+    }
+    else
+    {
+        // create sizer 4 columns 5 rows
+        wxMultiCellCanvas *sizer = new wxMultiCellCanvas(this, 5,5);

-		// add first row
-		sizer->Add(
-				  new wxButton( this, -1, wxT("Button 1")),
-				  0, 0);
-		sizer->Add(
-				  new wxButton( this, -1, wxT("Button 2")),
-				  0, 1);
-		sizer->Add(
-				  new wxButton( this, -1, wxT("Button 3")),
-				  0, 2);
-		sizer->Add(
-				  new wxStaticText(this, -1, wxT("jbb test")),
-				  0, 3);
+        // add first row
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("Button 1")),
+                  0, 0);
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("Button 2")),
+                  0, 1);
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("Button 3")),
+                  0, 2);
+        sizer->Add(
+                  new wxStaticText(this, wxID_ANY, wxT("jbb test")),
+                  0, 3);

-		sizer->Add(
-				  new wxStaticText(this, -1, wxT("jbb test 2")),
-				  0, 4);
+        sizer->Add(
+                  new wxStaticText(this, wxID_ANY, wxT("jbb test 2")),
+                  0, 4);

-		// add button for secord row
-		sizer->Add(
-				  new wxTextCtrl(this, -1, wxT("Text control")),
-				  1, 0);
+        // add button for secord row
+        sizer->Add(
+                  new wxTextCtrl(this, wxID_ANY, wxT("Text control")),
+                  1, 0);

-		// add buttons for next row
-		sizer->Add(
-				  new wxButton( this, -1, wxT("Button 6")),
-				  2, 0);
-		sizer->Add(
-				  new wxButton( this, -1, wxT("Button 7")),
-				  2, 3);
+        // add buttons for next row
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("Button 6")),
+                  2, 0);
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("Button 7")),
+                  2, 3);

-		// and last additions
-		sizer->Add(
-				  new wxButton( this, -1, wxT("Button 8")),
-				  3, 0);
-		sizer->Add(
-				  new wxButton( this, -1, wxT("Button 9")),
-				  3, 1);
-		sizer->Add(
-				  new wxButton( this, -1, wxT("Button 10")),
-				  4, 1);
+        // and last additions
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("Button 8")),
+                  3, 0);
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("Button 9")),
+                  3, 1);
+        sizer->Add(
+                  new wxButton( this, wxID_ANY, wxT("Button 10")),
+                  4, 1);

-		sizer->CalculateConstraints();
-		SetSizer( sizer );
-		SetAutoLayout( TRUE );
-	}
+        sizer->CalculateConstraints();
+        SetSizer( sizer );
+        SetAutoLayout( true );
+    }
 }
 // Define the repainting behaviour

@@ -200,16 +202,16 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)

 void MyFrame::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
-	wxPaintDC dc(this);
+    wxPaintDC dc(this);

-	if (sizer)
-	{
-		sizer->OnPaint(dc);
-	}
+    if (sizer)
+    {
+        sizer->OnPaint(dc);
+    }
 }

 void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
-	Destroy();
+    Destroy();
 }

--- a/contrib/samples/gizmos/splittree/tree.cpp
+++ b/contrib/samples/gizmos/splittree/tree.cpp
@@ -138,12 +138,12 @@ bool MyApp::OnInit()

    // and show it (the frames, unlike simple controls, are not shown when
    // created initially)
-    frame->Show(TRUE);
+    frame->Show(true);

    // success: wxApp::OnRun() will be called which will enter the main message
-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the
    // application would exit immediately.
-    return TRUE;
+    return true;
 }

 // ----------------------------------------------------------------------------
@@ -155,7 +155,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
       : wxFrame((wxFrame *)NULL, idMAIN_FRAME, title, pos, size)
 {
    m_splitter = NULL;
-	m_scrolledWindow = NULL;
+    m_scrolledWindow = NULL;
    m_tree = NULL;
    m_valueWindow = NULL;
 #ifdef __WXMAC__
@@ -165,26 +165,26 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #endif

    m_scrolledWindow = new wxSplitterScrolledWindow(this, idSCROLLED_WINDOW, wxDefaultPosition,
-		wxSize(300, 400), wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL);
+        wxSize(300, 400), wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL);
    m_splitter = new wxThinSplitterWindow(m_scrolledWindow, idSPLITTER_WINDOW, wxDefaultPosition,
-		wxDefaultSize, wxSP_3DBORDER | wxCLIP_CHILDREN /* | wxSP_LIVE_UPDATE */);
-	m_splitter->SetSashSize(2);
+        wxDefaultSize, wxSP_3DBORDER | wxCLIP_CHILDREN /* | wxSP_LIVE_UPDATE */);
+    m_splitter->SetSashSize(2);

-	/* Note the wxTR_ROW_LINES style: draws horizontal lines between items */
+    /* Note the wxTR_ROW_LINES style: draws horizontal lines between items */
    m_tree = new TestTree(m_splitter , idTREE_CTRL, wxDefaultPosition,
-		wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER | wxTR_ROW_LINES );
+        wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER | wxTR_ROW_LINES );
    m_valueWindow = new TestValueWindow(m_splitter, idVALUE_WINDOW, wxDefaultPosition,
-		wxDefaultSize, wxNO_BORDER);
+        wxDefaultSize, wxNO_BORDER);
    m_splitter->SplitVertically(m_tree, m_valueWindow);
-	//m_splitter->AdjustScrollbars();
-	m_splitter->SetSashPosition(200);
-	m_scrolledWindow->SetTargetWindow(m_tree);
+    //m_splitter->AdjustScrollbars();
+    m_splitter->SetSashPosition(200);
+    m_scrolledWindow->SetTargetWindow(m_tree);

-	m_scrolledWindow->EnableScrolling(FALSE, FALSE);
+    m_scrolledWindow->EnableScrolling(false, false);

-	// Let the two controls know about each other
-	m_valueWindow->SetTreeCtrl(m_tree);
-	m_tree->SetCompanionWindow(m_valueWindow);
+    // Let the two controls know about each other
+    m_valueWindow->SetTreeCtrl(m_tree);
+    m_tree->SetCompanionWindow(m_valueWindow);

    // set the frame icon
    SetIcon(wxICON(mondrian));
@@ -212,8 +212,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);
 }

 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -238,7 +238,7 @@ TestTree::TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt,
        const wxSize& sz, long style):
        wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style)
 {
-    m_imageList = new wxImageList(16, 16, TRUE);
+    m_imageList = new wxImageList(16, 16, true);
 #if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW
    m_imageList->Add(wxIcon(icon1_xpm));
    m_imageList->Add(wxIcon(icon2_xpm));
@@ -250,28 +250,28 @@ TestTree::TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt,
 #endif
    SetImageList(m_imageList);

-		
-	// Add some dummy items
-	wxTreeItemId rootId = AddRoot(_("Root"), -1, -1);
-	int i;
-	for (i = 1; i <= 20; i++)
-	{
-		wxString label;
-		label.Printf(wxT("Item %d"), i);
-		wxTreeItemId id = AppendItem(rootId, label, 0);
-		//SetItemImage( id, 1, wxTreeItemIcon_Expanded );

-		int j;
-		for (j = 0; j < 10; j++)
-			AppendItem(id, _("Child"), 1);
-	}
-	Expand(rootId);
+    // Add some dummy items
+    wxTreeItemId rootId = AddRoot(_("Root"), -1, -1);
+    int i;
+    for (i = 1; i <= 20; i++)
+    {
+        wxString label;
+        label.Printf(wxT("Item %d"), i);
+        wxTreeItemId id = AppendItem(rootId, label, 0);
+        //SetItemImage( id, 1, wxTreeItemIcon_Expanded );
+
+        int j;
+        for (j = 0; j < 10; j++)
+            AppendItem(id, _("Child"), 1);
+    }
+    Expand(rootId);
 }

 TestTree::~TestTree()
 {
-	SetImageList(NULL);
-	delete m_imageList;
+    SetImageList(NULL);
+    delete m_imageList;
 }

 /*
@@ -289,5 +289,5 @@ TestValueWindow::TestValueWindow(wxWindow* parent, wxWindowID id,
      long style):
      wxTreeCompanionWindow(parent, id, pos, sz, style)
 {
-	SetBackgroundColour(* wxWHITE);
+    SetBackgroundColour(* wxWHITE);
 }
--- a/contrib/samples/gizmos/splittree/tree.h
+++ b/contrib/samples/gizmos/splittree/tree.h
@@ -87,7 +87,7 @@ protected:
 class TestValueWindow: public wxTreeCompanionWindow
 {
 public:
-    TestValueWindow(wxWindow* parent, wxWindowID id = -1,
+    TestValueWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
      const wxPoint& pos = wxDefaultPosition,
      const wxSize& sz = wxDefaultSize,
      long style = 0);
--- a/contrib/samples/mmedia/mmbman.cpp
+++ b/contrib/samples/mmedia/mmbman.cpp
@@ -245,7 +245,7 @@ void MMBoardSoundFile::SetPosition(MMBoardTime btime)

 bool MMBoardSoundFile::NeedWindow()
 {
-    return FALSE;
+    return false;
 }

 void MMBoardSoundFile::SetWindow(wxWindow *WXUNUSED(window))
@@ -310,17 +310,17 @@ wxString MMBoardSoundFile::GetStringInformation()
    case wxSOUND_PCM: {
        wxSoundFormatPcm *pcm_format = (wxSoundFormatPcm *)format;
      
-	info += wxString::Format(wxT("PCM %s %s\n"),
+    info += wxString::Format(wxT("PCM %s %s\n"),
                                 pcm_format->Signed() ? wxT("signed") : wxT("unsigned"),
                                 pcm_format->GetOrder() == wxLITTLE_ENDIAN ? wxT("little endian") : wxT("big endian"));
-	info += wxString::Format(wxT("Sampling rate: %d\n")
-				 wxT("Bits per sample: %d\n")
-				 wxT("Number of channels: %d\n"),
-				 pcm_format->GetSampleRate(),
-				 pcm_format->GetBPS(),
-				 pcm_format->GetChannels());
-	
-	break;
+    info += wxString::Format(wxT("Sampling rate: %d\n")
+                 wxT("Bits per sample: %d\n")
+                 wxT("Number of channels: %d\n"),
+                 pcm_format->GetSampleRate(),
+                 pcm_format->GetBPS(),
+                 pcm_format->GetChannels());
+
+    break;
    }
    case wxSOUND_MSADPCM: {
        wxSoundFormatMSAdpcm *adpcm_format = (wxSoundFormatMSAdpcm *)format;
@@ -334,13 +334,13 @@ wxString MMBoardSoundFile::GetStringInformation()
    }
    case wxSOUND_ULAW: {
        wxSoundFormatUlaw *ulaw_format = (wxSoundFormatUlaw *)format;
-	info += wxT("ULAW\n");
-	info += wxString::Format(wxT("Sampling rate: %d\n"), ulaw_format->GetSampleRate());
-	break;
+        info += wxT("ULAW\n");
+        info += wxString::Format(wxT("Sampling rate: %d\n"), ulaw_format->GetSampleRate());
+        break;
    }
    default:
        info += wxT("Unknown");
-	break;
+        break;
    }
    return info;
 }
@@ -375,7 +375,7 @@ MMBoardVideoFile::~MMBoardVideoFile()

 bool MMBoardVideoFile::NeedWindow()
 {
-    return TRUE;
+    return true;
 }

 void MMBoardVideoFile::SetWindow(wxWindow *window)
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -75,7 +75,7 @@ public:
    MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
    // dtor
    ~MMBoardFrame();
-    
+
    // event handlers
    void OnQuit(wxCommandEvent& event);
    void OnAbout(wxCommandEvent& event);
@@ -86,28 +86,28 @@ public:
    void OnEject(wxCommandEvent& event);
    void OnRefreshInfo(wxEvent& event);
    void OnSetPosition(wxCommandEvent& event);
-    
+
    void OpenVideoWindow();
    void CloseVideoWindow();
-    
+
 private:
    // any class wishing to process wxWidgets events must use this macro
    DECLARE_EVENT_TABLE()

 private:
-    void UpdateMMedInfo(); 
+    void UpdateMMedInfo();
    void UpdateInfoText();
-    
+
    MMBoardFile *m_opened_file;
-    
+
    wxSlider *m_positionSlider;
    wxBitmapButton *m_playButton, *m_pauseButton, *m_stopButton, *m_ejectButton;
    wxStaticText *m_fileType, *m_infoText;
    wxWindow *m_video_window;
-    
+
    wxPanel *m_panel;
    wxSizer *m_sizer;
-    
+
    wxTimer *m_refreshTimer;
 };

@@ -142,7 +142,7 @@ BEGIN_EVENT_TABLE(MMBoardFrame, wxFrame)
  EVT_BUTTON(MMBoard_PlayButton, MMBoardFrame::OnPlay)
  EVT_BUTTON(MMBoard_StopButton, MMBoardFrame::OnStop)
  EVT_BUTTON(MMBoard_PauseButton, MMBoardFrame::OnPause)
-  EVT_BUTTON(MMBoard_EjectButton, MMBoardFrame::OnEject)  
+  EVT_BUTTON(MMBoard_EjectButton, MMBoardFrame::OnEject)
  EVT_SLIDER(MMBoard_PositionSlider, MMBoardFrame::OnSetPosition)
  EVT_CUSTOM(wxEVT_TIMER, MMBoard_RefreshInfo, MMBoardFrame::OnRefreshInfo)
 END_EVENT_TABLE()
@@ -169,43 +169,43 @@ bool MMBoardApp::OnInit()

    // and show it (the frames, unlike simple controls, are not shown when
    // created initially)
-    frame->Show(TRUE);
+    frame->Show();

    m_caps = TestMultimediaCaps();

    if (!m_caps) {
      wxMessageBox(_T("Your system has no multimedia capabilities. We are exiting now."), _T("Major error !"), wxOK | wxICON_ERROR, NULL);
-      return FALSE;
+      return false;
    }

    wxString msg;
    msg.Printf(_T("Detected : %s%s%s"), (m_caps & MM_SOUND_OSS) ? _T("OSS ") : _T(""),
-	                            (m_caps & MM_SOUND_ESD) ? _T("ESD ") : _T(""),
-	                            (m_caps & MM_SOUND_WIN) ? _T("WIN") : _T(""));
+                                (m_caps & MM_SOUND_ESD) ? _T("ESD ") : _T(""),
+                                (m_caps & MM_SOUND_WIN) ? _T("WIN") : _T(""));

    wxMessageBox(msg, _T("Good !"), wxOK | wxICON_INFORMATION, NULL);

    // success: wxApp::OnRun() will be called which will enter the main message
-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the
    // application would exit immediately.
-    return TRUE;
+    return true;
 }

 wxUint8 MMBoardApp::TestMultimediaCaps()
 {
    wxSoundStream *dev;
    wxUint8 caps;
-    
+
    caps = 0;
-    
+
 #ifdef __UNIX__
    // We now test the ESD support
-    
+
    dev = new wxSoundStreamESD();
-    if (dev->GetError() == wxSOUND_NOERROR) 
+    if (dev->GetError() == wxSOUND_NOERROR)
        caps |= MM_SOUND_ESD;
    delete dev;
-    
+
    // We test the OSS (Open Sound System) support.
    // WARNING: There is a conflict between ESD and ALSA. We may be interrested
    // in disabling the auto detection of OSS is ESD has been detected.
@@ -222,7 +222,7 @@ wxUint8 MMBoardApp::TestMultimediaCaps()
 #endif

 #endif
-    
+
 #ifdef __WIN32__
    // We test the Windows sound support.

@@ -231,7 +231,7 @@ wxUint8 MMBoardApp::TestMultimediaCaps()
        caps |= MM_SOUND_WIN;
    delete dev;
 #endif
-    
+
    return caps;
 }

@@ -241,7 +241,7 @@ wxUint8 MMBoardApp::TestMultimediaCaps()

 // frame constructor
 MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+       : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
 {
 #ifdef __WXMAC__
    // we need this in order to allow the about menu relocation, since ABOUT is
@@ -253,7 +253,7 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
    SetIcon(wxICON(mondrian));

    // create a menu bar
-    wxMenu *menuFile = new wxMenu(wxT(""), wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);

    // the "About" item should be in the help menu
    wxMenu *helpMenu = new wxMenu;
@@ -280,68 +280,76 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
    // Misc variables
    m_opened_file = NULL;

-    m_panel = new wxPanel(this, -1);
+    m_panel = new wxPanel(this, wxID_ANY);

    // Initialize main slider
    m_positionSlider = new wxSlider( m_panel, MMBoard_PositionSlider, 0, 0, 60,
-				     wxDefaultPosition, wxSize(300, -1),
-				     wxSL_HORIZONTAL | wxSL_AUTOTICKS);
+                     wxDefaultPosition, wxSize(300, wxDefaultCoord),
+                     wxSL_HORIZONTAL | wxSL_AUTOTICKS);
    m_positionSlider->SetPageSize(60);  // 60 secs
-    m_positionSlider->Enable(FALSE);
-    
+    m_positionSlider->Disable();
+
    // Initialize info panel
-    wxPanel *infoPanel = new wxPanel( m_panel, -1);
+    wxPanel *infoPanel = new wxPanel( m_panel, wxID_ANY);
    infoPanel->SetBackgroundColour(*wxBLACK);
    infoPanel->SetForegroundColour(*wxWHITE);

    wxBoxSizer *infoSizer = new wxBoxSizer(wxVERTICAL);

-    m_fileType = new wxStaticText(infoPanel, -1, wxT(""));
-    wxStaticLine *line = new wxStaticLine(infoPanel, -1);
-    m_infoText = new wxStaticText(infoPanel, -1, _T(""));
+    m_fileType = new wxStaticText(infoPanel, wxID_ANY, wxEmptyString);
+#if wxUSE_STATLINE
+    wxStaticLine *line = new wxStaticLine(infoPanel, wxID_ANY);
+#endif // wxUSE_STATLINE
+    m_infoText = new wxStaticText(infoPanel, wxID_ANY, wxEmptyString);

    UpdateInfoText();

    infoSizer->Add(m_fileType, 0, wxGROW | wxALL, 1);
+#if wxUSE_STATLINE
    infoSizer->Add(line, 0, wxGROW | wxCENTRE, 20);
+#endif // wxUSE_STATLINE
    infoSizer->Add(m_infoText, 0, wxGROW | wxALL, 1);
- 
+
    infoPanel->SetSizer(infoSizer);
-    infoPanel->SetAutoLayout(TRUE);

    // Bitmap button panel
    wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
-    
+
    wxBitmap play_bmp(play_back_xpm);
    wxBitmap stop_bmp(stop_back_xpm);
    wxBitmap eject_bmp(eject_xpm);
    wxBitmap pause_bmp(pause_xpm);

    m_playButton = new wxBitmapButton(m_panel, MMBoard_PlayButton, play_bmp);
-    m_playButton->Enable(FALSE);
+    m_playButton->Disable();
    m_pauseButton = new wxBitmapButton(m_panel, MMBoard_PauseButton, pause_bmp);
-    m_pauseButton->Enable(FALSE);
+    m_pauseButton->Disable();
    m_stopButton = new wxBitmapButton(m_panel, MMBoard_StopButton, stop_bmp);
-    m_stopButton->Enable(FALSE);
+    m_stopButton->Disable();
    m_ejectButton = new wxBitmapButton(m_panel, MMBoard_EjectButton, eject_bmp);
-    m_ejectButton->Enable(FALSE);
-    
+    m_ejectButton->Disable();
+
    buttonSizer->Add(m_playButton, 0, wxALL, 2);
-    buttonSizer->Add(m_pauseButton, 0, wxALL, 2);  
+    buttonSizer->Add(m_pauseButton, 0, wxALL, 2);
    buttonSizer->Add(m_stopButton, 0, wxALL, 2);
    buttonSizer->Add(m_ejectButton, 0, wxALL, 2);

    // Top sizer
    m_sizer = new wxBoxSizer(wxVERTICAL);
-    m_sizer->Add(new wxStaticLine(m_panel, -1), 0, wxGROW | wxCENTRE, 0);
+#if wxUSE_STATLINE
+    m_sizer->Add(new wxStaticLine(m_panel, wxID_ANY), 0, wxGROW | wxCENTRE, 0);
+#endif // wxUSE_STATLINE
    m_sizer->Add(m_positionSlider, 0, wxCENTRE | wxGROW | wxALL, 2);
-    m_sizer->Add(new wxStaticLine(m_panel, -1), 0, wxGROW | wxCENTRE, 0);
+#if wxUSE_STATLINE
+    m_sizer->Add(new wxStaticLine(m_panel, wxID_ANY), 0, wxGROW | wxCENTRE, 0);
+#endif // wxUSE_STATLINE
    m_sizer->Add(buttonSizer, 0, wxALL, 0);
-    m_sizer->Add(new wxStaticLine(m_panel, -1), 0, wxGROW | wxCENTRE, 0);
+#if wxUSE_STATLINE
+    m_sizer->Add(new wxStaticLine(m_panel, wxID_ANY), 0, wxGROW | wxCENTRE, 0);
+#endif // wxUSE_STATLINE
    m_sizer->Add(infoPanel, 1, wxCENTRE | wxGROW, 0);
-    
+
    m_panel->SetSizer(m_sizer);
-    m_panel->SetAutoLayout(TRUE);
    m_sizer->Fit(this);
    m_sizer->SetSizeHints(this);

@@ -359,7 +367,7 @@ MMBoardFrame::~MMBoardFrame()
 {
    if (m_opened_file)
        delete m_opened_file;
-    
+
    delete m_refreshTimer;
 }

@@ -368,7 +376,7 @@ void MMBoardFrame::OpenVideoWindow()
  if (m_video_window)
    return;

-  m_video_window = new wxWindow(m_panel, -1, wxDefaultPosition, wxSize(200, 200));
+  m_video_window = new wxWindow(m_panel, wxID_ANY, wxDefaultPosition, wxSize(200, 200));
  m_video_window->SetBackgroundColour(*wxBLACK);
  m_sizer->Prepend(m_video_window, 2, wxGROW | wxSHRINK | wxCENTRE, 1);

@@ -391,8 +399,8 @@ void MMBoardFrame::CloseVideoWindow()

 void MMBoardFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);
 }

 void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -400,15 +408,15 @@ void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
    wxString msg;
    msg.Printf( wxT("wxWidgets Multimedia board v1.0a, wxMMedia v2.0a:\n")
                wxT("an example of the capabilities of the wxWidgets multimedia classes.\n")
-		wxT("Copyright 1999, 2000, Guilhem Lavaux.\n"));
- 
+        wxT("Copyright 1999, 2000, Guilhem Lavaux.\n"));
+
    wxMessageBox(msg, _T("About MMBoard"), wxOK | wxICON_INFORMATION, this);
 }

 void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
 {
    wxString selected_file;
-    
+
    if (m_opened_file) {
        if (!m_opened_file->IsStopped()) {
            wxCommandEvent event2;
@@ -416,33 +424,35 @@ void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
        }
        delete m_opened_file;
    }
-    
+
    // select a file to be opened
    selected_file = wxLoadFileSelector(_T("multimedia"), _T("*"), NULL, this);
    if (selected_file.IsNull())
        return;
-    
+
    m_opened_file = MMBoardManager::Open(selected_file);
-    
+
    // Change the range values of the slider.
    MMBoardTime length;
-    
+
    length = m_opened_file->GetLength();
    m_positionSlider->SetRange(0, length.hours * 3600 + length.minutes * 60 + length.seconds);
-    
+
    // Update misc info
    UpdateMMedInfo();
-    
+
+#if wxUSE_STATUSBAR
    SetStatusText(selected_file, 2);
-  
+#endif // wxUSE_STATUSBAR
+
    // Update info text
    UpdateInfoText();
-    
+
    // Enable a few buttons
-    m_playButton->Enable(TRUE);
-    m_ejectButton->Enable(TRUE);
-    m_positionSlider->Enable(TRUE);
-    
+    m_playButton->Enable();
+    m_ejectButton->Enable();
+    m_positionSlider->Enable();
+
    if (m_opened_file->NeedWindow()) {
        OpenVideoWindow();
        m_opened_file->SetWindow(m_video_window);
@@ -453,27 +463,26 @@ void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
 void MMBoardFrame::UpdateInfoText()
 {
    wxString infotext1, infotext2;
-    
+
    if (m_opened_file) {
        infotext1 = wxT("File type:\n\t");
        infotext1 += m_opened_file->GetStringType() + wxT("\n");
-        
+
        infotext2 = wxT("File informations:\n\n");
        infotext2 += m_opened_file->GetStringInformation();
    } else {
        infotext1 = wxT("File type: \n\tNo file opened");
        infotext2 = wxT("File informations:\nNo information\n\n\n\n\n");
    }
-    
+
    m_fileType->SetLabel(infotext1);
    m_infoText->SetLabel(infotext2);
 }

 void MMBoardFrame::UpdateMMedInfo()
 {
-    wxString temp_string;
    MMBoardTime current, length;
-    
+
    if (m_opened_file) {
        current = m_opened_file->GetPosition();
        length  = m_opened_file->GetLength();
@@ -482,11 +491,16 @@ void MMBoardFrame::UpdateMMedInfo()
        length = current;
    }

+#if wxUSE_STATUSBAR
    // We refresh the status bar
+    wxString temp_string;
    temp_string.Printf(wxT("%02d:%02d / %02d:%02d"), current.hours * 60 + current.minutes,
                       current.seconds, length.hours * 60 + length.minutes, length.seconds);
    SetStatusText(temp_string, 1);
-    
+#else
+    wxUnusedVar(length);
+#endif // wxUSE_STATUSBAR
+
    // We set the slider position
    m_positionSlider->SetValue(current.hours * 3600 + current.minutes * 60 + current.seconds);
 }
@@ -497,33 +511,35 @@ void MMBoardFrame::UpdateMMedInfo()
 void MMBoardFrame::OnRefreshInfo(wxEvent& WXUNUSED(event))
 {
    UpdateMMedInfo();
-    
-    if (m_opened_file->IsStopped()) {
+
+    if (m_opened_file->IsStopped())
+    {
        m_refreshTimer->Stop();
-        m_playButton->Enable(TRUE);
-        m_stopButton->Enable(FALSE);
-        m_pauseButton->Enable(FALSE);
+        m_playButton->Enable();
+        m_stopButton->Disable();
+        m_pauseButton->Disable();
    }
 }

 void MMBoardFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
 {
-    m_stopButton->Enable(TRUE);
-    m_pauseButton->Enable(TRUE);
-    m_playButton->Enable(FALSE);
-    
-    if (m_opened_file->IsPaused()) {
+    m_stopButton->Enable();
+    m_pauseButton->Enable();
+    m_playButton->Disable();
+
+    if (m_opened_file->IsPaused())
+    {
        m_opened_file->Resume();
        return;
    }
-    
-    m_refreshTimer->Start(1000, FALSE);
-    
+
+    m_refreshTimer->Start(1000, false);
+
    m_opened_file->Play();
-    
-    m_stopButton->Enable(TRUE);
-    m_pauseButton->Enable(TRUE);
-    m_playButton->Enable(FALSE);
+
+    m_stopButton->Enable();
+    m_pauseButton->Enable();
+    m_playButton->Disable();
 }

 void MMBoardFrame::OnStop(wxCommandEvent& WXUNUSED(event))
@@ -531,18 +547,18 @@ void MMBoardFrame::OnStop(wxCommandEvent& WXUNUSED(event))
    m_opened_file->Stop();
    m_refreshTimer->Stop();

-    m_stopButton->Enable(FALSE);
-    m_playButton->Enable(TRUE);
-    
+    m_stopButton->Disable();
+    m_playButton->Enable();
+
    UpdateMMedInfo();
 }

 void MMBoardFrame::OnPause(wxCommandEvent& WXUNUSED(event))
 {
    m_opened_file->Pause();
-    
-    m_playButton->Enable(TRUE);
-    m_pauseButton->Enable(FALSE);
+
+    m_playButton->Enable();
+    m_pauseButton->Disable();
 }

 void MMBoardFrame::OnEject(wxCommandEvent& WXUNUSED(event))
@@ -551,12 +567,12 @@ void MMBoardFrame::OnEject(wxCommandEvent& WXUNUSED(event))

    delete m_opened_file;
    m_opened_file = NULL;
-    
-    m_playButton->Enable(FALSE);
-    m_pauseButton->Enable(FALSE);
-    m_stopButton->Enable(FALSE);
-    m_ejectButton->Enable(FALSE);
-    m_positionSlider->Enable(FALSE);
+
+    m_playButton->Disable();
+    m_pauseButton->Disable();
+    m_stopButton->Disable();
+    m_ejectButton->Disable();
+    m_positionSlider->Disable();

    UpdateInfoText();
    UpdateMMedInfo();
@@ -566,7 +582,7 @@ void MMBoardFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event))
 {
    wxUint32 itime;
    MMBoardTime btime;
-    
+
    itime = m_positionSlider->GetValue();
    btime.seconds = itime % 60;
    btime.minutes = (itime / 60) % 60;
--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ b/contrib/samples/ogl/ogledit/doc.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
@@ -49,7 +49,7 @@ DiagramDocument::~DiagramDocument(void)
 bool DiagramDocument::OnCloseDocument(void)
 {
  diagram.DeleteAllShapes();
-  return TRUE;
+  return true;
 }

 #if wxUSE_STD_IOSTREAM
@@ -130,7 +130,7 @@ wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)

 DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxClassInfo *info, double xx, double yy,
  bool sel, wxShape *theShape, wxShape *fs, wxShape *ts):
-  wxCommand(TRUE, name)
+  wxCommand(true, name)
 {
  doc = ddoc;
  cmd = command;
@@ -143,11 +143,11 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
  x = xx;
  y = yy;
  selected = sel;
-  deleteShape = FALSE;
+  deleteShape = false;
 }

 DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape):
-  wxCommand(TRUE, name)
+  wxCommand(true, name)
 {
  doc = ddoc;
  cmd = command;
@@ -157,14 +157,14 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
  shapeInfo = NULL;
  x = 0.0;
  y = 0.0;
-  selected = FALSE;
-  deleteShape = FALSE;
+  selected = false;
+  deleteShape = false;
  shapeBrush = backgroundColour;
  shapePen = NULL;
 }

 DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape):
-  wxCommand(TRUE, name)
+  wxCommand(true, name)
 {
  doc = ddoc;
  cmd = command;
@@ -174,8 +174,8 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
  shapeInfo = NULL;
  x = 0.0;
  y = 0.0;
-  selected = FALSE;
-  deleteShape = FALSE;
+  selected = false;
+  deleteShape = false;
  shapeBrush = NULL;
  shapePen = NULL;
  shapeLabel = lab;
@@ -198,9 +198,9 @@ bool DiagramCommand::Do(void)
    {
      if (shape)
      {
-        deleteShape = TRUE;
+        deleteShape = true;
        
-        shape->Select(FALSE);
+        shape->Select(false);
        
        // Generate commands to explicitly remove each connected line.
        RemoveLines(shape);
@@ -214,7 +214,7 @@ bool DiagramCommand::Do(void)
        }
        shape->Unlink();
        
-        doc->Modify(TRUE);
+        doc->Modify(true);
        doc->UpdateAllViews();
      }

@@ -230,14 +230,14 @@ bool DiagramCommand::Do(void)
        theShape = (wxShape *)shapeInfo->CreateObject();
        theShape->AssignNewIds();
        theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString));
-        theShape->SetCentreResize(FALSE);
+        theShape->SetCentreResize(false);
        theShape->SetPen(wxBLACK_PEN);
        theShape->SetBrush(wxCYAN_BRUSH);
      
        theShape->SetSize(60, 60);
      }
      doc->GetDiagram()->AddShape(theShape);
-      theShape->Show(TRUE);
+      theShape->Show(true);

      wxClientDC dc(theShape->GetCanvas());
      theShape->GetCanvas()->PrepareDC(dc);
@@ -245,9 +245,9 @@ bool DiagramCommand::Do(void)
      theShape->Move(dc, x, y);
      
      shape = theShape;
-      deleteShape = FALSE;
+      deleteShape = false;

-      doc->Modify(TRUE);
+      doc->Modify(true);
      doc->UpdateAllViews();
      break;
    }
@@ -276,7 +276,7 @@ bool DiagramCommand::Do(void)
      
      fromShape->AddLine((wxLineShape *)theShape, toShape);
      
-      theShape->Show(TRUE);
+      theShape->Show(true);

      wxClientDC dc(theShape->GetCanvas());
      theShape->GetCanvas()->PrepareDC(dc);
@@ -287,9 +287,9 @@ bool DiagramCommand::Do(void)
      toShape->Move(dc, toShape->GetX(), toShape->GetY());
      
      shape = theShape;
-      deleteShape = FALSE;
+      deleteShape = false;

-      doc->Modify(TRUE);
+      doc->Modify(true);
      doc->UpdateAllViews();
      break;
    }
@@ -305,7 +305,7 @@ bool DiagramCommand::Do(void)
        shapeBrush = oldBrush;
        shape->Draw(dc);
        
-        doc->Modify(TRUE);
+        doc->Modify(true);
        doc->UpdateAllViews();
      }

@@ -326,14 +326,14 @@ bool DiagramCommand::Do(void)
        shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
        shape->Draw(dc);
        
-        doc->Modify(TRUE);
+        doc->Modify(true);
        doc->UpdateAllViews();
      }

      break;
    }
  }
-  return TRUE;
+  return true;
 }

 bool DiagramCommand::Undo(void)
@@ -345,7 +345,7 @@ bool DiagramCommand::Undo(void)
      if (shape)
      {
        doc->GetDiagram()->AddShape(shape);
-        shape->Show(TRUE);
+        shape->Show(true);

        if (shape->IsKindOf(CLASSINFO(wxLineShape)))
        {
@@ -354,11 +354,11 @@ bool DiagramCommand::Undo(void)
          fromShape->AddLine(lineShape, toShape);
        }
        if (selected)
-          shape->Select(TRUE);
+          shape->Select(true);

-        deleteShape = FALSE;
+        deleteShape = false;
      }
-      doc->Modify(TRUE);
+      doc->Modify(true);
      doc->UpdateAllViews();
      break;
    }
@@ -370,12 +370,12 @@ bool DiagramCommand::Undo(void)
        wxClientDC dc(shape->GetCanvas());
        shape->GetCanvas()->PrepareDC(dc);

-        shape->Select(FALSE, &dc);
+        shape->Select(false, &dc);
        doc->GetDiagram()->RemoveShape(shape);
        shape->Unlink();
-        deleteShape = TRUE;
+        deleteShape = true;
      }
-      doc->Modify(TRUE);
+      doc->Modify(true);
      doc->UpdateAllViews();
      break;
    }
@@ -391,7 +391,7 @@ bool DiagramCommand::Undo(void)
        shapeBrush = oldBrush;
        shape->Draw(dc);
        
-        doc->Modify(TRUE);
+        doc->Modify(true);
        doc->UpdateAllViews();
      }
      break;
@@ -411,20 +411,20 @@ bool DiagramCommand::Undo(void)
        shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
        shape->Draw(dc);
        
-        doc->Modify(TRUE);
+        doc->Modify(true);
        doc->UpdateAllViews();
      }

      break;
    }
  }
-  return TRUE;
+  return true;
 }

 // Remove each individual line connected to a shape by sending a command.
 void DiagramCommand::RemoveLines(wxShape *shape)
 {
-  wxNode *node = shape->GetLines().GetFirst();
+  wxObjectList::compatibility_iterator node = shape->GetLines().GetFirst();
  while (node)
  {
    wxLineShape *line = (wxLineShape *)node->GetData();
@@ -448,14 +448,14 @@ void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
    // Selection is a concept the library knows about
    if (GetShape()->Selected())
    {
-      GetShape()->Select(FALSE, &dc);
+      GetShape()->Select(false, &dc);
      GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be are missing
    }
    else
    {
      // Ensure no other shape is selected, to simplify Undo/Redo code
-      bool redraw = FALSE;
-      wxNode *node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
+      bool redraw = false;
+      wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
      while (node)
      {
        wxShape *eachShape = (wxShape *)node->GetData();
@@ -463,13 +463,13 @@ void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
        {
          if (eachShape->Selected())
          {
-            eachShape->Select(FALSE, &dc);
-            redraw = TRUE;
+            eachShape->Select(false, &dc);
+            redraw = true;
          }
        }
        node = node->GetNext();
      }
-      GetShape()->Select(TRUE, &dc);
+      GetShape()->Select(true, &dc);
      if (redraw)
        GetShape()->GetCanvas()->Redraw(dc);
    }
@@ -480,7 +480,9 @@ void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
  }
  else
  {
+#if wxUSE_STATUSBAR
    wxGetApp().frame->SetStatusText(label);
+#endif // wxUSE_STATUSBAR
  }
 }

@@ -535,7 +537,7 @@ void MyEvtHandler::OnEndDragRight(double x, double y, int WXUNUSED(keys), int WX
  {
    canvas->view->GetDocument()->GetCommandProcessor()->Submit(
      new DiagramCommand(_T("wxLineShape"), OGLEDIT_ADD_LINE, (DiagramDocument *)canvas->view->GetDocument(), CLASSINFO(wxLineShape),
-      0.0, 0.0, FALSE, NULL, GetShape(), otherShape));
+      0.0, 0.0, false, NULL, GetShape(), otherShape));
  }
 }

@@ -558,7 +560,7 @@ bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
  wxDiagram::OnShapeSave(db, shape, expr);
  MyEvtHandler *handler = (MyEvtHandler *)shape.GetEventHandler();
  expr.AddAttributeValueString(_T("label"), handler->label);
-  return TRUE;
+  return true;
 }

 bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
@@ -571,7 +573,7 @@ bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
  
  if (label)
    delete[] label;
-  return TRUE;
+  return true;
 }

 #endif
--- a/contrib/samples/ogl/ogledit/doc.h
+++ b/contrib/samples/ogl/ogledit/doc.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGLSAMPLE_DOC_H_
@@ -164,7 +164,7 @@ class DiagramCommand: public wxCommand
 public:
  // Multi-purpose constructor for creating, deleting shapes
  DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxClassInfo *shapeInfo = NULL,
-     double x = 0.0, double y = 0.0, bool sel = FALSE, wxShape *theShape = NULL, wxShape *fs = NULL, wxShape *ts = NULL);
+     double x = 0.0, double y = 0.0, bool sel = false, wxShape *theShape = NULL, wxShape *fs = NULL, wxShape *ts = NULL);

  // Property-changing command constructors
  DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape);
--- a/contrib/samples/ogl/ogledit/ogledit.cpp
+++ b/contrib/samples/ogl/ogledit/ogledit.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
@@ -118,12 +118,14 @@ bool MyApp::OnInit(void)
  //// Associate the menu bar with the frame
  frame->SetMenuBar(menu_bar);

+#if wxUSE_STATUSBAR
  frame->CreateStatusBar(1);
+#endif // wxUSE_STATUSBAR

  frame->Centre(wxBOTH);
-  frame->Show(TRUE);
+  frame->Show(true);

-  return TRUE;
+  return true;
 }

 int MyApp::OnExit(void)
@@ -147,7 +149,7 @@ END_EVENT_TABLE()

 MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
    const wxPoint& pos, const wxSize& size, long type):
-  wxDocParentFrame(manager, frame, -1, title, pos, size, type)
+  wxDocParentFrame(manager, frame, wxID_ANY, title, pos, size, type)
 {
  canvas = NULL;
  palette = NULL;
@@ -197,7 +199,7 @@ MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent)
  parent->GetClientSize(&width, &height);

  // Non-retained canvas
-  MyCanvas *canvas = new MyCanvas(view, parent, -1, wxPoint(0, 0), wxSize(width, height), 0);
+  MyCanvas *canvas = new MyCanvas(view, parent, wxID_ANY, wxPoint(0, 0), wxSize(width, height), 0);
  canvas->SetCursor(wxCursor(wxCURSOR_HAND));

  // Give it scrollbars
--- a/contrib/samples/ogl/ogledit/ogledit.h
+++ b/contrib/samples/ogl/ogledit/ogledit.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #if defined(__GNUG__) && !defined(__APPLE__)
--- a/contrib/samples/ogl/ogledit/palette.cpp
+++ b/contrib/samples/ogl/ogledit/palette.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
@@ -49,7 +49,7 @@

 EditorToolPalette::EditorToolPalette(wxWindow* parent, const wxPoint& pos, const wxSize& size,
            long style):
-  TOOLPALETTECLASS(parent, -1, pos, size, style)
+  TOOLPALETTECLASS(parent, wxID_ANY, pos, size, style)
 {
    currentlySelected = -1;
 }
@@ -58,7 +58,7 @@ bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
 {
  // BEGIN mutual exclusivity code
  if (toggled && (currentlySelected != -1) && (toolIndex != currentlySelected))
-    ToggleTool(currentlySelected, FALSE);
+    ToggleTool(currentlySelected, false);

  if (toggled)
    currentlySelected = toolIndex;
@@ -66,7 +66,7 @@ bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
    currentlySelected = -1;
  //  END mutual exclusivity code

-  return TRUE;
+  return true;
 }

 void EditorToolPalette::OnMouseEnter(int WXUNUSED(toolIndex))
@@ -96,21 +96,21 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
  wxBitmap PaletteArrow(arrow_xpm);
 #endif

-  EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxSize(-1, -1),
+  EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxDefaultSize,
      wxTB_VERTICAL);

  palette->SetMargins(2, 2);
  palette->SetToolBitmapSize(wxSize(22, 22));

-  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, _T("Pointer"));
-  palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, TRUE, 0, -1, NULL, _T("Tool 1"));
-  palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, TRUE, 0, -1, NULL, _T("Tool 2"));
-  palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, TRUE, 0, -1, NULL, _T("Tool 3"));
-  palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, TRUE, 0, -1, NULL, _T("Tool 4"));
+  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Pointer"));
+  palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 1"));
+  palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 2"));
+  palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 3"));
+  palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 4"));

  palette->Realize();

-  palette->ToggleTool(PALETTE_ARROW, TRUE);
+  palette->ToggleTool(PALETTE_ARROW, true);
  palette->currentlySelected = PALETTE_ARROW;
  return palette;
 }
--- a/contrib/samples/ogl/ogledit/palette.h
+++ b/contrib/samples/ogl/ogledit/palette.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGLSAMPLE_PALETTE_H_
--- a/contrib/samples/ogl/ogledit/view.cpp
+++ b/contrib/samples/ogl/ogledit/view.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
@@ -52,7 +52,7 @@ bool DiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
  canvas->view = this;

  SetFrame(frame);
-  Activate(TRUE);
+  Activate(true);

  // Initialize the edit menu Undo and Redo items
  doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu);
@@ -63,10 +63,10 @@ bool DiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
  shapeCanvas->SetDiagram(diagramDoc->GetDiagram());
  diagramDoc->GetDiagram()->SetCanvas(shapeCanvas);

-  return TRUE;
+  return true;
 }

-#define CENTER  FALSE // Place the drawing to the center of the page
+#define CENTER  false // Place the drawing to the center of the page


 // Sneakily gets used for default print/preview
@@ -127,7 +127,7 @@ void DiagramView::OnDraw(wxDC *dc)
  if (diagram_p->GetShapeList())
  {
    /* wxCursor *old_cursor = NULL; */
-    wxNode *current = diagram_p->GetShapeList()->GetFirst();
+    wxObjectList::compatibility_iterator current = diagram_p->GetShapeList()->GetFirst();

    while (current) // Loop through the entire list of shapes
    {
@@ -152,7 +152,7 @@ void DiagramView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 bool DiagramView::OnClose(bool WXUNUSED(deleteWindow))
 {
  if (!GetDocument()->Close())
-    return FALSE;
+    return false;

  DiagramDocument *diagramDoc = (DiagramDocument *)GetDocument();
  diagramDoc->GetDiagram()->SetCanvas(NULL);
@@ -168,27 +168,25 @@ bool DiagramView::OnClose(bool WXUNUSED(deleteWindow))

  SetFrame(NULL);

-  Activate(FALSE);
+  Activate(false);

-  return TRUE;
+  return true;
 }

 wxShape *DiagramView::FindSelectedShape(void)
 {
  DiagramDocument *doc = (DiagramDocument *)GetDocument();
-  wxShape *theShape = NULL;
-  wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
  while (node)
  {
    wxShape *eachShape = (wxShape *)node->GetData();
    if ((eachShape->GetParent() == NULL) && eachShape->Selected())
    {
-      theShape = eachShape;
-      node = NULL;
+      return eachShape;
    }
    else node = node->GetNext();
  }
-  return theShape;
+  return NULL;
 }

 void DiagramView::OnCut(wxCommandEvent& WXUNUSED(event))
@@ -197,7 +195,7 @@ void DiagramView::OnCut(wxCommandEvent& WXUNUSED(event))

  wxShape *theShape = FindSelectedShape();
  if (theShape)
-    doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), OGLEDIT_CUT, doc, NULL, 0.0, 0.0, TRUE, theShape));
+    doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), OGLEDIT_CUT, doc, NULL, 0.0, 0.0, true, theShape));
 }

 void DiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
@@ -208,7 +206,7 @@ void DiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
      if (theShape)
      {
        wxColourData data;
-        data.SetChooseFull(TRUE);
+        data.SetChooseFull(true);
        data.SetColour(theShape->GetBrush()->GetColour());

        wxColourDialog *dialog = new wxColourDialog(frame, &data);
--- a/contrib/samples/ogl/ogledit/view.h
+++ b/contrib/samples/ogl/ogledit/view.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _OGLSAMPLE_VIEW_H_
@@ -26,7 +26,7 @@ class MyCanvas: public wxShapeCanvas
 public:
  wxView *view;

-  MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = -1,
+  MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
            long style = wxRETAINED);
  ~MyCanvas(void);
@@ -62,7 +62,7 @@ class DiagramView: public wxView
  bool OnCreate(wxDocument *doc, long flags);
  void OnDraw(wxDC *dc);
  void OnUpdate(wxView *sender, wxObject *hint = NULL);
-  bool OnClose(bool deleteWindow = TRUE);
+  bool OnClose(bool deleteWindow = true);

  wxShape *FindSelectedShape(void);

--- a/contrib/samples/ogl/studio/cspalette.cpp
+++ b/contrib/samples/ogl/studio/cspalette.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
@@ -59,7 +59,7 @@ bool csEditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
 {
  // BEGIN mutual exclusivity code
  if (toggled && (m_currentlySelected != -1) && (toolIndex != m_currentlySelected))
-    ToggleTool(m_currentlySelected, FALSE);
+    ToggleTool(m_currentlySelected, false);

  if (toggled)
    m_currentlySelected = toolIndex;
@@ -67,11 +67,12 @@ bool csEditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
    m_currentlySelected = -1;
  //  END mutual exclusivity code

-  return TRUE;
+  return true;
 }

 void csEditorToolPalette::OnMouseEnter(int toolIndex)
 {
+#if wxUSE_STATUSBAR
    wxString msg = wxEmptyString;
    if (toolIndex == PALETTE_ARROW)
        msg = _T("Pointer");
@@ -82,6 +83,9 @@ void csEditorToolPalette::OnMouseEnter(int toolIndex)
            msg = symbol->GetName();
    }
    ((wxFrame*) wxGetApp().GetTopWindow())->SetStatusText(msg);
+#else
+    wxUnusedVar(toolIndex);
+#endif // wxUSE_STATUSBAR
 }

 void csEditorToolPalette::SetSize(int x, int y, int width, int height, int sizeFlags)
@@ -93,10 +97,10 @@ void csEditorToolPalette::SetSelection(int sel)
 {
    if ((sel != m_currentlySelected) && (m_currentlySelected != -1))
    {
-        ToggleTool(m_currentlySelected, FALSE);
+        ToggleTool(m_currentlySelected, false);
    }
    m_currentlySelected = sel;
-    ToggleTool(m_currentlySelected, TRUE);
+    ToggleTool(m_currentlySelected, true);
 }

 bool csApp::CreatePalette(wxFrame *parent)
@@ -107,11 +111,11 @@ bool csApp::CreatePalette(wxFrame *parent)
    win->SetOrientation(wxLAYOUT_HORIZONTAL);
    win->SetAlignment(wxLAYOUT_TOP);
    win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    win->SetSashVisible(wxSASH_BOTTOM, TRUE);
+    win->SetSashVisible(wxSASH_BOTTOM, true);

    m_diagramPaletteSashWindow = win;

-    m_diagramPaletteSashWindow->Show(FALSE);
+    m_diagramPaletteSashWindow->Show(false);

  // Load palette bitmaps
 #ifdef __WXMSW__
@@ -124,14 +128,14 @@ bool csApp::CreatePalette(wxFrame *parent)
    wxSize toolBitmapSize(22, 22);
 #endif

-  csEditorToolPalette *palette = new csEditorToolPalette(m_diagramPaletteSashWindow, ID_DIAGRAM_PALETTE, wxPoint(0, 0), wxSize(-1, -1), wxTB_HORIZONTAL|wxNO_BORDER);
+  csEditorToolPalette *palette = new csEditorToolPalette(m_diagramPaletteSashWindow, ID_DIAGRAM_PALETTE, wxPoint(0, 0), wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER);

  palette->SetMargins(2, 2);

  palette->SetToolBitmapSize(toolBitmapSize);

-  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, _T("Pointer"));
-  palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, TRUE, 0, -1, NULL, _T("Text"));
+  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Pointer"));
+  palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Text"));

  wxChar** symbols = new wxChar*[20];
  int noSymbols = 0;
@@ -171,7 +175,7 @@ bool csApp::CreatePalette(wxFrame *parent)
      if (symbol)
      {
           wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
-           palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, TRUE, 0, -1, NULL, symbol->GetName());
+           palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultCoord, NULL, symbol->GetName());

           delete bitmap;
      }
@@ -185,7 +189,7 @@ bool csApp::CreatePalette(wxFrame *parent)
    csSymbol* symbol = (csSymbol*) node->Data();

    wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
-    palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, TRUE, 0, -1, NULL, symbol->GetName());
+    palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultCoord, NULL, symbol->GetName());

    delete bitmap;

@@ -198,6 +202,6 @@ bool csApp::CreatePalette(wxFrame *parent)
  palette->SetSelection(PALETTE_ARROW);
  m_diagramPalette = palette;

-  return TRUE;
+  return true;
 }

--- a/contrib/samples/ogl/studio/cspalette.h
+++ b/contrib/samples/ogl/studio/cspalette.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _STUDIO_CSPALETTE_H_
@@ -37,7 +37,7 @@ class csEditorToolPalette: public TOOLPALETTECLASS
 {
 public:

-  csEditorToolPalette(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
+  csEditorToolPalette(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
    const wxSize& size = wxDefaultSize,
    long style = wxTB_VERTICAL);

--- a/contrib/samples/ogl/studio/csprint.cpp
+++ b/contrib/samples/ogl/studio/csprint.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
@@ -45,14 +45,14 @@ bool wxDiagramClipboard::Copy(wxDiagram* diagram)
 {
    DeleteAllShapes();

-    return DoCopy(diagram, this, FALSE, NULL);
+    return DoCopy(diagram, this, false, NULL);
 }

 // Copy contents to the diagram, with new ids.

 bool wxDiagramClipboard::Paste(wxDiagram* diagram, wxDC* dc, int offsetX, int offsetY)
 {
-    return DoCopy(this, diagram, TRUE, dc, offsetX, offsetY);
+    return DoCopy(this, diagram, true, dc, offsetX, offsetY);
 }

 // Universal copy function (to or from clipboard).
@@ -70,7 +70,7 @@ bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bo

    // First copy all node shapes.
    wxList* shapeList = diagramFrom->GetShapeList();
-    wxNode* node = shapeList->GetFirst();
+    wxObjectList::compatibility_iterator node = shapeList->GetFirst();
    while (node)
    {
        wxShape* shape = (wxShape*) node->GetData();
@@ -137,7 +137,7 @@ bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bo
            // Make a list of all the new lines, in the same order as the old lines.
            // Then apply the list of new lines to the shape.
            wxList newLines;
-            wxNode* lineNode = shape->GetLines().GetFirst();
+            wxObjectList::compatibility_iterator lineNode = shape->GetLines().GetFirst();
            while (lineNode)
            {
                wxLineShape* lineShape = (wxLineShape*) lineNode->GetData();
@@ -161,7 +161,7 @@ bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bo

    OnEndCopy(diagramTo);

-    return TRUE;
+    return true;
 }

 #ifdef __WXMSW__
@@ -194,7 +194,7 @@ bool wxDiagramClipboard::CopyToClipboard(double scale)
      wxChar buf[200];
      wxSprintf(buf, _T("Sorry, could not allocate clipboard bitmap (%dx%d)"), (maxX+10), (maxY+10));
      wxMessageBox(buf, _T("Clipboard copy problem"));
-      return FALSE;
+      return false;
    }

    wxMemoryDC memDC;
@@ -248,10 +248,10 @@ bool wxDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxD

    if (dc && (diagramTo != this))
    {
-        newShape->Select(TRUE, dc);
+        newShape->Select(true, dc);
    }

-    return TRUE;
+    return true;
 }

 /*
@@ -265,24 +265,24 @@ bool csDiagramClipboard::OnStartCopy(wxDiagram* diagramTo)
 {
    // Do nothing if copying to the clipboard
    if (diagramTo == this)
-        return TRUE;
+        return true;

    // Deselect all objects initially.

    csDiagram* diagram = (csDiagram*) diagramTo;
    csDiagramDocument* doc = diagram->GetDocument();
-    ((csDiagramView*)doc->GetFirstView())->SelectAll(FALSE);
+    ((csDiagramView*)doc->GetFirstView())->SelectAll(false);

    m_currentCmd = new csDiagramCommand(_T("Paste"), doc);

-    return TRUE;
+    return true;
 }

 bool csDiagramClipboard::OnEndCopy(wxDiagram* diagramTo)
 {
    // Do nothing if copying to the clipboard
    if (diagramTo == this)
-        return TRUE;
+        return true;

    csDiagram* diagram = (csDiagram*) diagramTo;
    csDiagramDocument* doc = diagram->GetDocument();
@@ -299,7 +299,7 @@ bool csDiagramClipboard::OnEndCopy(wxDiagram* diagramTo)
            m_currentCmd = NULL;
        }
    }
-    return TRUE;
+    return true;
 }

 // Use the command framework to add the shapes, if we're copying to a diagram and
@@ -321,7 +321,7 @@ bool csDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxD
            m_currentCmd->AddState(new csCommandState(ID_CS_ADD_SHAPE_SELECT, newShape, NULL));
    }

-    return TRUE;
+    return true;
 }


--- a/contrib/samples/ogl/studio/dialogs.cpp
+++ b/contrib/samples/ogl/studio/dialogs.cpp
@@ -90,7 +90,7 @@ END_EVENT_TABLE()
 // For 400x400 settings dialog, size your panels to about 375x325 in dialog editor

 csSettingsDialog::csSettingsDialog(wxWindow* parent):
-    wxDialog(parent, -1, _T("Settings"), wxPoint(0, 0), wxSize(PROPERTY_DIALOG_WIDTH, PROPERTY_DIALOG_HEIGHT))
+    wxDialog(parent, wxID_ANY, _T("Settings"), wxPoint(0, 0), wxSize(PROPERTY_DIALOG_WIDTH, PROPERTY_DIALOG_HEIGHT))
 {
    m_generalSettings = NULL;
    m_diagramSettings = NULL;
@@ -105,7 +105,7 @@ csSettingsDialog::csSettingsDialog(wxWindow* parent):
    #endif
                   wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog"));
    wxASSERT_MSG( (success), _T("Could not load general settings panel."));
-    m_notebook->AddPage(m_generalSettings, _T("General"), TRUE);
+    m_notebook->AddPage(m_generalSettings, _T("General"), true);

    m_diagramSettings = new wxPanel;

@@ -181,7 +181,7 @@ bool csSettingsDialog::TransferDataToWindow()
    str.Printf(_T("%d"), wxGetApp().GetGridSpacing());
    gridSpacing->SetValue(str);

-    return TRUE;
+    return true;
 }

 bool csSettingsDialog::TransferDataFromWindow()
@@ -201,11 +201,11 @@ bool csSettingsDialog::TransferDataFromWindow()
    if (wxGetApp().GetGridStyle() == csGRID_STYLE_DOTTED)
    {
        wxMessageBox(_T("Dotted grid style not yet implemented."), _T("Studio"), wxICON_EXCLAMATION);
-        return FALSE;
+        return false;
    }

    // Apply settings to all open diagram documents
-    wxNode* node = wxGetApp().GetDocManager()->GetDocuments().GetFirst();
+    wxObjectList::compatibility_iterator node = wxGetApp().GetDocManager()->GetDocuments().GetFirst();
    while (node)
    {
        wxDocument* doc = (wxDocument*) node->GetData();
@@ -219,12 +219,12 @@ bool csSettingsDialog::TransferDataFromWindow()
            {
                case csGRID_STYLE_NONE:
                {
-                    diagram->SetSnapToGrid(FALSE);
+                    diagram->SetSnapToGrid(false);
                    break;
                }
                case csGRID_STYLE_INVISIBLE:
                {
-                    diagram->SetSnapToGrid(TRUE);
+                    diagram->SetSnapToGrid(true);
                    break;
                }
                case csGRID_STYLE_DOTTED:
@@ -237,7 +237,7 @@ bool csSettingsDialog::TransferDataFromWindow()
        node = node->GetNext();
    }

-    return TRUE;
+    return true;
 }

 /*
@@ -258,7 +258,7 @@ END_EVENT_TABLE()

 csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxString& title,
  wxPanel* attributeDialog, const wxString& attributeDialogName):
-    wxDialog(parent, -1, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT))
+    wxDialog(parent, wxID_ANY, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT))
 {
    m_attributeDialog = attributeDialog;
    m_alternativeAttributeDialog = NULL;
@@ -365,7 +365,7 @@ void csShapePropertiesDialog::SetDefaults()
    if (!m_attributeDialog)
        return;

-    wxWindowListNode* node = m_attributeDialog->GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = m_attributeDialog->GetChildren().GetFirst();
    while (node)
    {
        wxWindow* child = (wxWindow*) node->GetData();
--- a/contrib/samples/ogl/studio/doc.cpp
+++ b/contrib/samples/ogl/studio/doc.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
@@ -50,13 +50,13 @@ csDiagramDocument::~csDiagramDocument()
 bool csDiagramDocument::OnCloseDocument()
 {
  m_diagram.DeleteAllShapes();
-  return TRUE;
+  return true;
 }

 bool csDiagramDocument::OnSaveDocument(const wxString& file)
 {
  if (file == wxEmptyString)
-    return FALSE;
+    return false;

  if (!m_diagram.SaveFile(file))
  {
@@ -68,18 +68,18 @@ bool csDiagramDocument::OnSaveDocument(const wxString& file)

    (void)wxMessageBox(_T("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
      GetDocumentWindow());
-    return FALSE;
+    return false;
  }

-  Modify(FALSE);
+  Modify(false);
  SetFilename(file);
-  return TRUE;
+  return true;
 }
-	
+
 bool csDiagramDocument::OnOpenDocument(const wxString& file)
 {
  if (!OnSaveModified())
-    return FALSE;
+    return false;

  wxString msgTitle;
  if (wxTheApp->GetAppName() != wxEmptyString)
@@ -92,15 +92,15 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)
  {
    (void)wxMessageBox(_T("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
     GetDocumentWindow());
-    return FALSE;
+    return false;
  }
-  SetFilename(file, TRUE);
-  Modify(FALSE);
+  SetFilename(file, true);
+  Modify(false);
  UpdateAllViews();
  
-  return TRUE;
+  return true;
 }
-	
+

 /*
 * Implementation of drawing command
@@ -108,7 +108,7 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)

 csDiagramCommand::csDiagramCommand(const wxString& name, csDiagramDocument *doc,
    csCommandState* onlyState):
-  wxCommand(TRUE, name)
+  wxCommand(true, name)
 {
  m_doc = doc;

@@ -120,7 +120,7 @@ csDiagramCommand::csDiagramCommand(const wxString& name, csDiagramDocument *doc,

 csDiagramCommand::~csDiagramCommand()
 {
-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();
    while (node)
    {
        csCommandState* state = (csCommandState*) node->GetData();
@@ -147,14 +147,14 @@ void csDiagramCommand::InsertState(csCommandState* state)
 // Schedule all lines connected to the states to be cut.
 void csDiagramCommand::RemoveLines()
 {
-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();
    while (node)
    {
        csCommandState* state = (csCommandState*) node->GetData();
        wxShape* shape = state->GetShapeOnCanvas();
        wxASSERT( (shape != NULL) );

-        wxNode *node1 = shape->GetLines().GetFirst();
+        wxObjectList::compatibility_iterator node1 = shape->GetLines().GetFirst();
        while (node1)
        {
            wxLineShape *line = (wxLineShape *)node1->GetData();
@@ -172,7 +172,7 @@ void csDiagramCommand::RemoveLines()

 csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
 {
-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();
    while (node)
    {
        csCommandState* state = (csCommandState*) node->GetData();
@@ -185,30 +185,30 @@ csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)

 bool csDiagramCommand::Do()
 {
-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();
    while (node)
    {
        csCommandState* state = (csCommandState*) node->GetData();
        if (!state->Do())
-            return FALSE;
+            return false;
        node = node->GetNext();
    }
-    return TRUE;
+    return true;
 }

 bool csDiagramCommand::Undo()
 {
    // Undo in reverse order, so e.g. shapes get added
    // back before the lines do.
-    wxNode* node = m_states.GetLast();
+    wxObjectList::compatibility_iterator node = m_states.GetLast();
    while (node)
    {
        csCommandState* state = (csCommandState*) node->GetData();
        if (!state->Undo())
-            return FALSE;
+            return false;
        node = node->GetPrevious();
    }
-    return TRUE;
+    return true;
 }

 csCommandState::csCommandState(int cmd, wxShape* savedState, wxShape* shapeOnCanvas)
@@ -264,8 +264,8 @@ bool csCommandState::Do()
            m_linePositionTo = lineTo->GetLinePosition(lineShape);
        }

-        m_shapeOnCanvas->Select(FALSE);
-        ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, FALSE);
+        m_shapeOnCanvas->Select(false);
+        ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);

        m_shapeOnCanvas->Unlink();
        
@@ -288,7 +288,7 @@ bool csCommandState::Do()
            lineTo->MoveLinks(dc);
        }

-        m_doc->Modify(TRUE);
+        m_doc->Modify(true);
        m_doc->UpdateAllViews();
        break;
    }
@@ -309,7 +309,7 @@ bool csCommandState::Do()
        m_savedState = NULL;

        m_doc->GetDiagram()->AddShape(m_shapeOnCanvas);
-        m_shapeOnCanvas->Show(TRUE);
+        m_shapeOnCanvas->Show(true);

        wxClientDC dc(m_shapeOnCanvas->GetCanvas());
        m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
@@ -321,11 +321,11 @@ bool csCommandState::Do()

        if (m_cmd == ID_CS_ADD_SHAPE_SELECT)
        {
-            m_shapeOnCanvas->Select(TRUE, &dc);
-            ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, TRUE);
+            m_shapeOnCanvas->Select(true, &dc);
+            ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, true);
        }

-        m_doc->Modify(TRUE);
+        m_doc->Modify(true);
        m_doc->UpdateAllViews();
        break;
    }
@@ -348,7 +348,7 @@ bool csCommandState::Do()
        lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(),
            lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo());
      
-        lineShape->Show(TRUE);
+        lineShape->Show(true);

        wxClientDC dc(lineShape->GetCanvas());
        lineShape->GetCanvas()->PrepareDC(dc);
@@ -360,11 +360,11 @@ bool csCommandState::Do()

        if (m_cmd == ID_CS_ADD_LINE_SELECT)
        {
-            lineShape->Select(TRUE, &dc);
-            ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, TRUE);
+            lineShape->Select(true, &dc);
+            ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, true);
        }

-        m_doc->Modify(TRUE);
+        m_doc->Modify(true);
        m_doc->UpdateAllViews();
        break;
    }
@@ -401,7 +401,7 @@ bool csCommandState::Do()

        bool isSelected = m_shapeOnCanvas->Selected();
        if (isSelected)
-            m_shapeOnCanvas->Select(FALSE, & dc);
+            m_shapeOnCanvas->Select(false, & dc);

        if (m_cmd == ID_CS_SIZE || m_cmd == ID_CS_ROTATE_CLOCKWISE || m_cmd == ID_CS_ROTATE_ANTICLOCKWISE ||
            m_cmd == ID_CS_CHANGE_LINE_ORDERING || m_cmd == ID_CS_CHANGE_LINE_ATTACHMENT)
@@ -454,11 +454,11 @@ bool csCommandState::Do()
            m_shapeOnCanvas->SetSize(width, height);
            m_shapeOnCanvas->Move(dc, m_shapeOnCanvas->GetX(), m_shapeOnCanvas->GetY());

-            m_shapeOnCanvas->Show(TRUE);
+            m_shapeOnCanvas->Show(true);

            // Recursively redraw links if we have a composite.
            if (m_shapeOnCanvas->GetChildren().GetCount() > 0)
-                m_shapeOnCanvas->DrawLinks(dc, -1, TRUE);
+                m_shapeOnCanvas->DrawLinks(dc, -1, true);

            m_shapeOnCanvas->GetEventHandler()->OnEndSize(width, height);
        }
@@ -474,15 +474,15 @@ bool csCommandState::Do()
        }

        if (isSelected)
-            m_shapeOnCanvas->Select(TRUE, & dc);
+            m_shapeOnCanvas->Select(true, & dc);
        
-        m_doc->Modify(TRUE);
+        m_doc->Modify(true);
        m_doc->UpdateAllViews();

        break;
    }
  }
-  return TRUE;
+  return true;
 }

 bool csCommandState::Undo()
@@ -514,9 +514,9 @@ bool csCommandState::Undo()
            lineShape->GetTo()->MoveLinks(dc);

        }
-        m_shapeOnCanvas->Show(TRUE);
+        m_shapeOnCanvas->Show(true);

-        m_doc->Modify(TRUE);
+        m_doc->Modify(true);
        m_doc->UpdateAllViews();
        break;
    }
@@ -547,8 +547,8 @@ bool csCommandState::Undo()
        wxClientDC dc(m_shapeOnCanvas->GetCanvas());
        m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);

-        m_shapeOnCanvas->Select(FALSE, &dc);
-        ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, FALSE);
+        m_shapeOnCanvas->Select(false, &dc);
+        ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
        m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas);
        m_shapeOnCanvas->Unlink(); // Unlinks the line, if it is a line

@@ -564,7 +564,7 @@ bool csCommandState::Undo()
        m_savedState = m_shapeOnCanvas;
        m_shapeOnCanvas = NULL;

-        m_doc->Modify(TRUE);
+        m_doc->Modify(true);
        m_doc->UpdateAllViews();
        break;
    }
@@ -591,6 +591,6 @@ bool csCommandState::Undo()
    }
  }

-    return TRUE;
+    return true;
 }

--- a/contrib/samples/ogl/studio/doc.h
+++ b/contrib/samples/ogl/studio/doc.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _STUDIO_DOC_H_
--- a/contrib/samples/ogl/studio/mainfrm.cpp
+++ b/contrib/samples/ogl/studio/mainfrm.cpp
@@ -52,8 +52,7 @@ BEGIN_EVENT_TABLE(csFrame, wxDocMDIParentFrame)
 END_EVENT_TABLE()

 // Define my frame constructor
-csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
-	long style):
+csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
  wxDocMDIParentFrame(manager, parent, id, title, pos, size, style, _T("frame"))
 {
    CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
@@ -73,7 +72,10 @@ csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wx

 void csFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
 {
-    wxGetApp().GetHelpController().DisplayContents();
+    wxHelpControllerBase* help;
+    help = wxGetApp().GetHelpController();
+    if (help)
+        help->DisplayContents();
 }

 void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
@@ -85,7 +87,7 @@ void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))

 void csFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-      Close(TRUE);
+      Close(true);
 }

 void csFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -155,24 +157,24 @@ void csFrame::OnIdle(wxIdleEvent& event)
    wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow();
    if (!paletteWin || !diagramToolBarWin)
        return;
-    bool doLayout = FALSE;
+    bool doLayout = false;
    if (GetActiveChild())
    {
        if (!paletteWin->IsShown() || !diagramToolBarWin->IsShown())
        {
-            paletteWin->Show(TRUE);
-            diagramToolBarWin->Show(TRUE);
+            paletteWin->Show(true);
+            diagramToolBarWin->Show(true);

-            doLayout = TRUE;
+            doLayout = true;
        }
    }
    else
    {
        if (paletteWin->IsShown() || diagramToolBarWin->IsShown())
        {
-            paletteWin->Show(FALSE);
-            diagramToolBarWin->Show(FALSE);
-            doLayout = TRUE;
+            paletteWin->Show(false);
+            diagramToolBarWin->Show(false);
+            doLayout = true;
        }
    }
    if (doLayout)
@@ -206,7 +208,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
 // General handler for disabling items
 void csFrame::OnUpdateDisable(wxUpdateUIEvent& event)
 {
-    event.Enable(FALSE);
+    event.Enable(false);
 }

 void csFrame::OnSaveUpdate(wxUpdateUIEvent& event)
--- a/contrib/samples/ogl/studio/project.cpp
+++ b/contrib/samples/ogl/studio/project.cpp
@@ -31,8 +31,7 @@ BEGIN_EVENT_TABLE(csProjectTreeCtrl, wxTreeCtrl)
 END_EVENT_TABLE()

 // Define my frame constructor
-csProjectTreeCtrl::csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
-	long style):
+csProjectTreeCtrl::csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style):

  wxTreeCtrl(parent, id, pos, size, style),
  m_imageList(16, 16)
@@ -58,7 +57,7 @@ bool csApp::CreateProjectWindow(wxFrame *WXUNUSED(parent))
    win->SetOrientation(wxLAYOUT_VERTICAL);
    win->SetAlignment(wxLAYOUT_LEFT);
    win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    win->SetSashVisible(wxSASH_RIGHT, TRUE);
+    win->SetSashVisible(wxSASH_RIGHT, true);
    win->SetExtraBorderSize(5);

    m_projectSashWindow = win;
@@ -67,10 +66,10 @@ bool csApp::CreateProjectWindow(wxFrame *WXUNUSED(parent))
        wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxDOUBLE_BORDER);

    // For now, hide the window
-    m_projectSashWindow->Show(FALSE);
+    m_projectSashWindow->Show(false);
 #endif

-    return TRUE;
+    return true;
 }

 // Fill out the project tree control
--- a/contrib/samples/ogl/studio/shapes.cpp
+++ b/contrib/samples/ogl/studio/shapes.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
@@ -130,7 +130,7 @@ void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
    // If the shape was selected, deselect it and vice versa.
    bool selected = GetShape()->Selected();

-    view->SelectAll(FALSE);
+    view->SelectAll(false);

    selected = !selected;

@@ -143,13 +143,13 @@ void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
  {
    if (GetShape()->Selected())
    {
-        GetShape()->Select(FALSE, &dc);
-        view->SelectShape(GetShape(), FALSE);
+        GetShape()->Select(false, &dc);
+        view->SelectShape(GetShape(), false);
    }
    else
    {
-        GetShape()->Select(TRUE, &dc);
-        view->SelectShape(GetShape(), TRUE);
+        GetShape()->Select(true, &dc);
+        view->SelectShape(GetShape(), true);
    }
    GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be missing
  }
@@ -159,7 +159,9 @@ void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
  }
  else
  {
+#if wxUSE_STATUSBAR
    ((wxFrame*)wxGetApp().GetTopWindow())->SetStatusText(m_label);
+#endif // wxUSE_STATUSBAR
  }
 }

@@ -299,7 +301,7 @@ void csEvtHandler::OnDragLeft(bool draw, double x, double y, int keys, int attac
  GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);

  // Draw bounding box for other selected shapes
-  wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
  while (node)
  {
     wxShape* shape = (wxShape*) node->GetData();
@@ -358,7 +360,7 @@ void csEvtHandler::OnBeginDragLeft(double x, double y, int keys, int attachment)
  GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);

  // Draw bounding box for other selected shapes
-  wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
  while (node)
  {
     wxShape* shape = (wxShape*) node->GetData();
@@ -413,7 +415,7 @@ void csEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
                new csCommandState(ID_CS_MOVE, newShape, GetShape()));

  // Move line points
-  wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
  while (node)
  {
     wxShape* shape = (wxShape*) node->GetData();
@@ -427,7 +429,7 @@ void csEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
        {
            wxLineShape* newLineShape = (wxLineShape*) lineShape->CreateNewCopy();

-            wxNode *node1 = newLineShape->GetLineControlPoints()->GetFirst();
+            wxObjectList::compatibility_iterator node1 = newLineShape->GetLineControlPoints()->GetFirst();
            while (node1)
            {
                wxRealPoint *point = (wxRealPoint *)node1->GetData();
@@ -477,7 +479,7 @@ void csEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, i
        wxClientDC dc(canvas);
        canvas->PrepareDC(dc);

-        shape->SetDisableLabel(FALSE);
+        shape->SetDisableLabel(false);

        if (lpt->m_type == CONTROL_POINT_LINE)
        {
@@ -529,7 +531,7 @@ void csEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, i
  shape->Recompute();
  shape->ResetControlPoints();
  if (!pt->m_eraseObject)
-    shape->Show(FALSE);
+    shape->Show(false);
 */

  wxShape* newShape = shape->CreateNewCopy();
@@ -612,7 +614,7 @@ bool csEvtHandler::EditProperties()

    // For now, no line property editing
    if (shape->IsKindOf(CLASSINFO(wxLineShape)))
-        return FALSE;
+        return false;

    csDiagramView* view = ((csCanvas*)shape->GetCanvas())->GetView();

@@ -677,7 +679,7 @@ bool csEvtHandler::EditProperties()
    else
    {
        wxMessageBox(_T("Unrecognised shape."), _T("Studio"), wxICON_EXCLAMATION);
-        return FALSE;
+        return false;
    }

    csShapePropertiesDialog* dialog = new csShapePropertiesDialog(shape->GetCanvas()->GetParent(), title, attributeDialog, attributeDialogName);
@@ -685,7 +687,7 @@ bool csEvtHandler::EditProperties()
    if (dialog->ShowModal() == wxID_CANCEL)
    {
        dialog->Destroy();
-        return FALSE;
+        return false;
    }

    wxString newLabel = dialog->GetGeneralPropertiesDialog()->GetShapeLabel();
@@ -699,7 +701,7 @@ bool csEvtHandler::EditProperties()
    view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Edit properties"), (csDiagramDocument*) view->GetDocument(),
                new csCommandState(ID_CS_EDIT_PROPERTIES, newShape, shape)));

-    return TRUE;
+    return true;
 }

 /*
@@ -711,7 +713,7 @@ bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
  wxDiagram::OnShapeSave(db, shape, expr);
  csEvtHandler *handler = (csEvtHandler *)shape.GetEventHandler();
  expr.AddAttributeValueString(_T("label"), handler->m_label);
-  return TRUE;
+  return true;
 }

 bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
@@ -722,7 +724,7 @@ bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
  csEvtHandler *handler = new csEvtHandler(&shape, &shape, label);
  shape.SetEventHandler(handler);
  
-  return TRUE;
+  return true;
 }

 IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape)
@@ -741,7 +743,7 @@ csThinRectangleShape::csThinRectangleShape()

    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(FALSE);
+    SetCentreResize(false);
 }

 IMPLEMENT_DYNAMIC_CLASS(csWideRectangleShape, wxDrawnShape)
@@ -760,7 +762,7 @@ csWideRectangleShape::csWideRectangleShape()

    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(FALSE);
+    SetCentreResize(false);
 }

 IMPLEMENT_DYNAMIC_CLASS(csTriangleShape, wxDrawnShape)
@@ -814,7 +816,7 @@ csTriangleShape::csTriangleShape()

    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(FALSE);
+    SetCentreResize(false);
 }

 IMPLEMENT_DYNAMIC_CLASS(csSemiCircleShape, wxDrawnShape)
@@ -911,7 +913,7 @@ csSemiCircleShape::csSemiCircleShape()

    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(FALSE);
+    SetCentreResize(false);
 }

 IMPLEMENT_DYNAMIC_CLASS(csCircleShape, wxCircleShape)
@@ -926,7 +928,7 @@ csCircleShape::csCircleShape()

    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(FALSE);
+    SetCentreResize(false);
 }

 IMPLEMENT_DYNAMIC_CLASS(csCircleShadowShape, wxCircleShape)
@@ -941,7 +943,7 @@ csCircleShadowShape::csCircleShadowShape()

    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(FALSE);
+    SetCentreResize(false);
    SetShadowMode(SHADOW_RIGHT);
 }

@@ -971,7 +973,7 @@ csOctagonShape::csOctagonShape()

    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(FALSE);
+    SetCentreResize(false);
 }

 // This is a transparent shape for drawing around other shapes.
@@ -983,7 +985,7 @@ csGroupShape::csGroupShape()
    SetBrush(wxTRANSPARENT_BRUSH);

    SetSize(csSTANDARD_SHAPE_WIDTH, csSTANDARD_SHAPE_WIDTH);
-    SetCentreResize(FALSE);
+    SetCentreResize(false);
 }

 void csGroupShape::OnDraw(wxDC& dc)
@@ -1013,20 +1015,20 @@ bool csGroupShape::HitTest(double x, double y, int* attachment, double* distance
    if (x >= x1 && x <= x2)
    {
        if ((y >= y1 - edgeTolerance) && (y <= y1 + edgeTolerance))
-            return TRUE;
+            return true;
        if ((y <= y2 + edgeTolerance) && (y >= y2 - edgeTolerance))
-            return TRUE;
+            return true;
    }
    // Left/right edges
    if (y >= y1 && y <= y2)
    {
        if ((x >= x1 - edgeTolerance) && (x <= x1 + edgeTolerance))
-            return TRUE;
+            return true;
        if ((x <= x2 + edgeTolerance) && (x >= x2 - edgeTolerance))
-            return TRUE;
+            return true;
    }

-    return FALSE;
+    return false;
 }

 IMPLEMENT_DYNAMIC_CLASS(csTextBoxShape, wxRectangleShape)
@@ -1040,7 +1042,7 @@ csTextBoxShape::csTextBoxShape()

    SetAttachmentMode(ATTACHMENT_MODE_NONE);
    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(FALSE);
+    SetCentreResize(false);
 }

 IMPLEMENT_DYNAMIC_CLASS(csLineShape, wxLineShape)
@@ -1066,7 +1068,7 @@ bool csLineShape::OnMoveMiddleControlPoint(wxDC& WXUNUSED(dc), wxLineControlPoin
    view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Move line point"), (csDiagramDocument*) view->GetDocument(),
                new csCommandState(ID_CS_MOVE_LINE_POINT, newShape, this)));

-    return TRUE;
+    return true;
 }

 wxLabelShape* csLineShape::OnCreateLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h)
@@ -1085,7 +1087,7 @@ bool csLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, d

    view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Move label", (csDiagramDocument*) view->GetDocument(),
                new csCommandState(ID_CS_MOVE_LABEL, newShape, this)));
-  return TRUE;
+  return true;
 }
 #endif

--- a/contrib/samples/ogl/studio/shapes.h
+++ b/contrib/samples/ogl/studio/shapes.h
@@ -73,8 +73,8 @@ public:

 // Overridables
    // Start/end copying
-    virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };
-    virtual bool OnEndCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };
+    virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return true; };
+    virtual bool OnEndCopy(wxDiagram* WXUNUSED(diagramTo)) { return true; };

    // Override this to e.g. have the shape added through a Do/Undo command system.
    // By default, we'll just add it directly to the destination diagram, and
--- a/Show More
+++ b/Show More