[csw-devel] SF.net SVN: gar:[6065] csw/mgar/pkg/wxwidgets/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Fri Aug 21 10:35:03 CEST 2009
Revision: 6065
http://gar.svn.sourceforge.net/gar/?rev=6065&view=rev
Author: wahwah
Date: 2009-08-21 08:35:02 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
wxwidgets: Got the configuration phase to complete
Modified Paths:
--------------
csw/mgar/pkg/wxwidgets/trunk/Makefile
csw/mgar/pkg/wxwidgets/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/wxwidgets/trunk/files/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
csw/mgar/pkg/wxwidgets/trunk/files/0002-Fixing-retarded-checks-for-libGL.patch
Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-08-20 20:42:46 UTC (rev 6064)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-08-21 08:35:02 UTC (rev 6065)
@@ -2,6 +2,13 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# It's a work in progress!
+#
+# Done: configuration phase completes now.
+# TODO:
+# - Make sure the compilation phase completes
+# - Split the installed files into separate packages
+
## This file contains comments to guide you through various GAR settings.
## Please remove unnecessary comments before committing your code to the code
## repository. The comments to remove are marked with double hashes.
@@ -30,16 +37,16 @@
## A longer description of the package. This is only for descriptive purposes
## inside the Makefile and is not used elsewhere.
define BLURB
- <please fill in>
endef
##
## Upstream URL that should show up in the VENDOR field as well as on
## http://opencsw.org/packages/<packagename>.
-SPKG_SOURCEURL =
+SPKG_SOURCEURL = http://www.wxwidgets.org/
##
## Whitespace-separated list of URLs to download the source package from.
## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR).
-MASTER_SITES = $(SF_MIRRORS)
+MASTER_SITES = $(SF_MIRRORS)
+MASTER_SITES += http://trac.wxwidgets.org/raw-attachment/ticket/10660/
##
## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge
@@ -49,12 +56,14 @@
## A list of space separated patch filenames from files/ that are to be applied
## to the extracted software before the ./configure stage. Patches need to be
## included in the DISTFILES variable as well.
-## PATCHFILES =
+PATCHFILES = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
+PATCHFILES += 0002-Fixing-retarded-checks-for-libGL.patch
##
## Whitespace-separated list of files which comprise this build. mGAR will look
## for the files in the $(FILEDIR) (trunk/files) directory and on the
## $(MASTER_SITES).
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += $(PATCHFILES)
##
## We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -166,8 +175,8 @@
EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt
## -L/opt/csw/lib -R/opt/csw/lib
## EXTRA_LDFLAGS =
-## EXTRA_INC = /opt/csw/include/gtk-2.0
-## EXTRA_LIB =
+EXTRA_INC = /opt/csw/X11/include
+EXTRA_LIB = /opt/csw/X11/lib
## GARFLAVOR =
## INSTALL_ARGS =
## OPT_FLAGS_SOS = -xO3
@@ -177,4 +186,5 @@
## GARCOMPILER = SOS11
##
PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig
+
include gar/category.mk
Modified: csw/mgar/pkg/wxwidgets/trunk/checksums
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-08-20 20:42:46 UTC (rev 6064)
+++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-08-21 08:35:02 UTC (rev 6065)
@@ -1 +1,3 @@
+7830ab8006ade9b14567341b5481eadd download/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
+45df2933ed2fa53f229feda01467db81 download/0002-Fixing-retarded-checks-for-libGL.patch
05b32ca051651f4b1885a90f62969faf download/wxWidgets-2.8.10.tar.gz
Added: csw/mgar/pkg/wxwidgets/trunk/files/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/files/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch (rev 0)
+++ csw/mgar/pkg/wxwidgets/trunk/files/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 2009-08-21 08:35:02 UTC (rev 6065)
@@ -0,0 +1,3566 @@
+From 3f9876856278a83d9f15e3d3be8ac1b037356a15 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at build8s.(none)>
+Date: Fri, 21 Aug 2009 08:49:59 +0200
+Subject: [PATCH] Patches from http://trac.wxwidgets.org/ticket/10660
+
+---
+ Makefile.in | 128 +++++++-------
+ build/bakefiles/common.bkl | 2 +
+ include/wx/afterstd.h | 11 +
+ include/wx/arrstr.h | 4 +-
+ include/wx/artprov.h | 6 +-
+ include/wx/beforestd.h | 10 +
+ include/wx/buffer.h | 2 +-
+ include/wx/cocoa/dirdlg.h | 2 +-
+ include/wx/confbase.h | 4 +-
+ include/wx/cppunit.h | 2 +-
+ include/wx/cshelp.h | 2 +-
+ include/wx/datectrl.h | 2 +-
+ include/wx/datetime.h | 42 ++--
+ include/wx/dbgrid.h | 6 +-
+ include/wx/dbtable.h | 2 +-
+ include/wx/dcbuffer.h | 6 +-
+ include/wx/dcmirror.h | 6 +-
+ include/wx/debug.h | 6 +-
+ include/wx/debugrpt.h | 2 +-
+ include/wx/defs.h | 18 +-
+ include/wx/dynlib.h | 2 +-
+ include/wx/dynload.h | 2 +-
+ include/wx/event.h | 4 +-
+ include/wx/ffile.h | 4 +-
+ include/wx/filefn.h | 2 +-
+ include/wx/filename.h | 4 +-
+ include/wx/generic/calctrl.h | 6 +-
+ include/wx/generic/combo.h | 4 +-
+ include/wx/generic/grid.h | 14 +-
+ include/wx/generic/gridctrl.h | 4 +-
+ include/wx/generic/spinctlg.h | 8 +-
+ include/wx/generic/splitter.h | 2 +-
+ include/wx/glcanvas.h | 2 +-
+ include/wx/gtk/checklst.h | 6 +-
+ include/wx/gtk/spinctrl.h | 4 +-
+ include/wx/gtk1/checklst.h | 6 +-
+ include/wx/gtk1/spinctrl.h | 4 +-
+ include/wx/imagbmp.h | 26 ++--
+ include/wx/image.h | 12 +-
+ include/wx/imagtiff.h | 8 +-
+ include/wx/intl.h | 16 +-
+ include/wx/list.h | 2 +-
+ include/wx/longlong.h | 8 +-
+ include/wx/mimetype.h | 6 +-
+ include/wx/module.h | 2 +-
+ include/wx/msgdlg.h | 4 +-
+ include/wx/object.h | 2 +-
+ include/wx/palette.h | 2 +-
+ include/wx/private/fileback.h | 2 +-
+ include/wx/protocol/ftp.h | 2 +-
+ include/wx/recguard.h | 2 +-
+ include/wx/selstore.h | 2 +-
+ include/wx/sound.h | 2 +-
+ include/wx/spinbutt.h | 2 +-
+ include/wx/stopwatch.h | 2 +-
+ include/wx/string.h | 30 ++--
+ include/wx/tbarbase.h | 4 +-
+ include/wx/thrimpl.cpp | 22 +-
+ include/wx/tokenzr.h | 2 +-
+ include/wx/univ/button.h | 8 +-
+ include/wx/univ/checkbox.h | 6 +-
+ include/wx/univ/checklst.h | 2 +-
+ include/wx/univ/combobox.h | 6 +-
+ include/wx/univ/control.h | 4 +-
+ include/wx/univ/inpcons.h | 2 +-
+ include/wx/univ/inphand.h | 30 ++--
+ include/wx/univ/listbox.h | 36 ++--
+ include/wx/univ/menuitem.h | 4 +-
+ include/wx/univ/notebook.h | 6 +-
+ include/wx/univ/scrolbar.h | 18 +-
+ include/wx/univ/slider.h | 20 +-
+ include/wx/univ/spinbutt.h | 4 +-
+ include/wx/univ/textctrl.h | 52 +++---
+ include/wx/univ/toolbar.h | 4 +-
+ include/wx/univ/toplevel.h | 12 +-
+ include/wx/valtext.h | 4 +-
+ include/wx/vector.h | 2 +-
+ include/wx/version.h | 4 +-
+ include/wx/vlbox.h | 4 +-
+ include/wx/wfstream.h | 4 +-
+ include/wx/wxchar.h | 32 ++--
+ include/wx/x11/textctrl.h | 50 +++---
+ include/wx/xrc/xmlres.h | 2 +-
+ utils/wxrc/wxrc.cpp | 414 ++++++++++++++++++++--------------------
+ 84 files changed, 631 insertions(+), 600 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8c1a03e..175a0fb 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -75,7 +75,7 @@ WX_RELEASE = 2.8
+ WX_RELEASE_NODOT = 28
+ WX_VERSION = $(WX_RELEASE).10
+ LIBDIRNAME = $(wx_top_builddir)/lib
+-WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
++WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ -DWXBUILDING $(__WXUNIV_DEFINE_p) $(____SHARED) \
+ $(CPPFLAGS) $(CFLAGS)
+ WXREGEX_OBJECTS = \
+ wxregex_regcomp.o \
+@@ -676,17 +676,17 @@ ALL_BASE_SOURCES = \
+ src/common/dbtable.cpp
+ MONODLL_CFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 \
+ -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
+ MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ MONODLL_OBJCXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
+ MONODLL_OBJECTS = \
+@@ -781,17 +781,17 @@ MONODLL_OBJECTS = \
+ MONODLL_ODEP = $(_____pch_wxprec_monodll_wx_wxprec_h_gch___depname)
+ MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CPPFLAGS) \
+ $(CFLAGS)
+ MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
+ MONOLIB_OBJCXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DwxUSE_BASE=1 $(CPPFLAGS) $(OBJCXXFLAGS)
+ MONOLIB_OBJECTS = \
+@@ -885,12 +885,12 @@ MONOLIB_OBJECTS = \
+ MONOLIB_ODEP = $(_____pch_wxprec_monolib_wx_wxprec_h_gch___depname)
+ BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 \
+ -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
+ BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) \
+ $(CXXFLAGS)
+@@ -971,12 +971,12 @@ BASEDLL_OBJECTS = \
+ BASEDLL_ODEP = $(_____pch_wxprec_basedll_wx_wxprec_h_gch___depname)
+ BASELIB_CFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 \
+ -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+ BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
+ BASELIB_OBJECTS = \
+@@ -1055,7 +1055,7 @@ BASELIB_OBJECTS = \
+ BASELIB_ODEP = $(_____pch_wxprec_baselib_wx_wxprec_h_gch___depname)
+ NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \
+ -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ NETDLL_OBJECTS = \
+@@ -1074,7 +1074,7 @@ NETDLL_OBJECTS = \
+ NETDLL_ODEP = $(_____pch_wxprec_netdll_wx_wxprec_h_gch___depname)
+ NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \
+ $(CXXFLAGS)
+ NETLIB_OBJECTS = \
+@@ -1092,18 +1092,18 @@ NETLIB_OBJECTS = \
+ NETLIB_ODEP = $(_____pch_wxprec_netlib_wx_wxprec_h_gch___depname)
+ COREDLL_CFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \
+ -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
+ COREDLL_CXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) \
+ $(CXXFLAGS)
+ COREDLL_OBJCXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) \
+ $(OBJCXXFLAGS)
+@@ -1119,17 +1119,17 @@ COREDLL_OBJECTS = \
+ COREDLL_ODEP = $(_____pch_wxprec_coredll_wx_wxprec_h_gch___depname)
+ CORELIB_CFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CPPFLAGS) \
+ $(CFLAGS)
+ CORELIB_CXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DwxUSE_BASE=0 $(CPPFLAGS) $(CXXFLAGS)
+ CORELIB_OBJCXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DwxUSE_BASE=0 $(CPPFLAGS) $(OBJCXXFLAGS)
+ CORELIB_OBJECTS = \
+@@ -1143,17 +1143,17 @@ CORELIB_OBJECTS = \
+ CORELIB_ODEP = $(_____pch_wxprec_corelib_wx_wxprec_h_gch___depname)
+ ADVDLL_CFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__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) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__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) $(CXXFLAGS)
+ ADVDLL_OBJCXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__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) $(OBJCXXFLAGS)
+ ADVDLL_OBJECTS = \
+@@ -1163,15 +1163,15 @@ ADVDLL_OBJECTS = \
+ ADVDLL_ODEP = $(_____pch_wxprec_advdll_wx_wxprec_h_gch___depname)
+ ADVLIB_CFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__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) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
+ ADVLIB_OBJCXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ $(CPPFLAGS) $(OBJCXXFLAGS)
+ ADVLIB_OBJECTS = \
+@@ -1180,12 +1180,12 @@ ADVLIB_OBJECTS = \
+ ADVLIB_ODEP = $(_____pch_wxprec_advlib_wx_wxprec_h_gch___depname)
+ MEDIADLL_CXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DWXUSINGDLL -DWXMAKINGDLL_MEDIA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ MEDIADLL_OBJCXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DWXUSINGDLL -DWXMAKINGDLL_MEDIA $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
+ MEDIADLL_OBJECTS = \
+@@ -1195,12 +1195,12 @@ MEDIADLL_OBJECTS = \
+ MEDIADLL_ODEP = $(_____pch_wxprec_mediadll_wx_wxprec_h_gch___depname)
+ MEDIALIB_CXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ $(CPPFLAGS) $(CXXFLAGS)
+ MEDIALIB_OBJCXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ $(CPPFLAGS) $(OBJCXXFLAGS)
+ MEDIALIB_OBJECTS = \
+@@ -1209,7 +1209,7 @@ MEDIALIB_OBJECTS = \
+ MEDIALIB_ODEP = $(_____pch_wxprec_medialib_wx_wxprec_h_gch___depname)
+ ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) \
+ $(CXXFLAGS)
+@@ -1220,7 +1220,7 @@ ODBCDLL_OBJECTS = \
+ ODBCDLL_ODEP = $(_____pch_wxprec_odbcdll_wx_wxprec_h_gch___depname)
+ ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+ ODBCLIB_OBJECTS = \
+@@ -1229,7 +1229,7 @@ ODBCLIB_OBJECTS = \
+ ODBCLIB_ODEP = $(_____pch_wxprec_odbclib_wx_wxprec_h_gch___depname)
+ DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ DBGRIDDLL_OBJECTS = \
+@@ -1238,7 +1238,7 @@ DBGRIDDLL_OBJECTS = \
+ DBGRIDDLL_ODEP = $(_____pch_wxprec_dbgriddll_wx_wxprec_h_gch___depname)
+ DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ $(CPPFLAGS) $(CXXFLAGS)
+ DBGRIDLIB_OBJECTS = \
+@@ -1246,7 +1246,7 @@ DBGRIDLIB_OBJECTS = \
+ DBGRIDLIB_ODEP = $(_____pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname)
+ HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DWXUSINGDLL -DWXMAKINGDLL_HTML $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ HTMLDLL_OBJECTS = \
+@@ -1278,7 +1278,7 @@ HTMLDLL_OBJECTS = \
+ HTMLDLL_ODEP = $(_____pch_wxprec_htmldll_wx_wxprec_h_gch___depname)
+ HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ $(CPPFLAGS) $(CXXFLAGS)
+ HTMLLIB_OBJECTS = \
+@@ -1309,7 +1309,7 @@ HTMLLIB_OBJECTS = \
+ HTMLLIB_ODEP = $(_____pch_wxprec_htmllib_wx_wxprec_h_gch___depname)
+ QADLL_CXXFLAGS = $(__qadll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \
+ -DWXMAKINGDLL_QA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ QADLL_OBJECTS = \
+@@ -1319,7 +1319,7 @@ QADLL_OBJECTS = \
+ QADLL_ODEP = $(_____pch_wxprec_qadll_wx_wxprec_h_gch___depname)
+ QALIB_CXXFLAGS = $(__qalib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
+ QALIB_OBJECTS = \
+ qalib_debugrpt.o \
+@@ -1327,7 +1327,7 @@ QALIB_OBJECTS = \
+ QALIB_ODEP = $(_____pch_wxprec_qalib_wx_wxprec_h_gch___depname)
+ XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \
+ -DWXMAKINGDLL_XML $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ XMLDLL_OBJECTS = \
+@@ -1337,7 +1337,7 @@ XMLDLL_OBJECTS = \
+ XMLDLL_ODEP = $(_____pch_wxprec_xmldll_wx_wxprec_h_gch___depname)
+ XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \
+ $(CXXFLAGS)
+ XMLLIB_OBJECTS = \
+@@ -1346,7 +1346,7 @@ XMLLIB_OBJECTS = \
+ XMLLIB_ODEP = $(_____pch_wxprec_xmllib_wx_wxprec_h_gch___depname)
+ XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \
+ -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ XRCDLL_OBJECTS = \
+@@ -1410,7 +1410,7 @@ XRCDLL_OBJECTS = \
+ XRCDLL_ODEP = $(_____pch_wxprec_xrcdll_wx_wxprec_h_gch___depname)
+ XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
+ XRCLIB_OBJECTS = \
+ xrclib_xh_animatctrl.o \
+@@ -1472,7 +1472,7 @@ XRCLIB_OBJECTS = \
+ XRCLIB_ODEP = $(_____pch_wxprec_xrclib_wx_wxprec_h_gch___depname)
+ AUIDLL_CXXFLAGS = $(__auidll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \
+ -DWXMAKINGDLL_AUI $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ AUIDLL_OBJECTS = \
+@@ -1486,7 +1486,7 @@ AUIDLL_OBJECTS = \
+ AUIDLL_ODEP = $(_____pch_wxprec_auidll_wx_wxprec_h_gch___depname)
+ AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
+ AUILIB_OBJECTS = \
+ auilib_framemanager.o \
+@@ -1498,7 +1498,7 @@ AUILIB_OBJECTS = \
+ AUILIB_ODEP = $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname)
+ RICHTEXTDLL_CXXFLAGS = $(__richtextdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ RICHTEXTDLL_OBJECTS = \
+@@ -1515,7 +1515,7 @@ RICHTEXTDLL_OBJECTS = \
+ RICHTEXTDLL_ODEP = $(_____pch_wxprec_richtextdll_wx_wxprec_h_gch___depname)
+ RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
++ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+ $(CPPFLAGS) $(CXXFLAGS)
+ RICHTEXTLIB_OBJECTS = \
+@@ -1531,12 +1531,12 @@ RICHTEXTLIB_OBJECTS = \
+ RICHTEXTLIB_ODEP = $(_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
+ GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \
+ -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ GLDLL_OBJCXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \
+ -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
+ GLDLL_OBJECTS = \
+@@ -1545,11 +1545,11 @@ GLDLL_OBJECTS = \
+ GLDLL_ODEP = $(_____pch_wxprec_gldll_wx_wxprec_h_gch___depname)
+ GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
+ GLLIB_OBJCXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
++ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(OBJCXXFLAGS)
+ GLLIB_OBJECTS = \
+ $(__OPENGL_SRC_OBJECTS_1)
+@@ -12660,7 +12660,7 @@ wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c
+ $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmltok.c
+
+ monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL
+
+ monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
+@@ -20937,7 +20937,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
+ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
+
+ basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
+
+ basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
+ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
+@@ -22122,7 +22122,7 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
+ @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
+
+ netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
+
+ netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP)
+ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
+@@ -22227,7 +22227,7 @@ netlib_carbon_gsocket.o: $(srcdir)/src/mac/carbon/gsocket.cpp $(NETLIB_ODEP)
+ @COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+
+ coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
+
+ coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
+@@ -28158,7 +28158,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
+
+ advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV
+
+ advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
+ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
+@@ -28581,7 +28581,7 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
+ @COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
+
+ mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA
+
+ mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
+ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
+@@ -28668,7 +28668,7 @@ medialib_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
+ @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
+
+ odbcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ODBCDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC
+
+ odbcdll_db.o: $(srcdir)/src/common/db.cpp $(ODBCDLL_ODEP)
+ $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $(srcdir)/src/common/db.cpp
+@@ -28683,7 +28683,7 @@ odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(ODBCLIB_ODEP)
+ $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp
+
+ dbgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(DBGRIDDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_DBGRID
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_DBGRID
+
+ dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDDLL_ODEP)
+ $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp
+@@ -28692,7 +28692,7 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDLIB_ODEP)
+ $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp
+
+ htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_HTML
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_HTML
+
+ htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP)
+ $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
+@@ -28851,7 +28851,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP)
+ @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
+
+ qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_QA
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_QA
+
+ qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP)
+ $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
+@@ -28866,7 +28866,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP)
+ $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
+
+ xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML
+
+ xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP)
+ $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
+@@ -28881,7 +28881,7 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP)
+ $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
+
+ xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_XRC
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_XRC
+
+ xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP)
+ $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
+@@ -29220,7 +29220,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP)
+ $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
+
+ auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_AUI
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_AUI
+
+ auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP)
+ $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
+@@ -29259,7 +29259,7 @@ auilib_auibar.o: $(srcdir)/src/aui/auibar.cpp $(AUILIB_ODEP)
+ $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
+
+ richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
+
+ richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP)
+ $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
+@@ -29316,7 +29316,7 @@ richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXT
+ $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
+
+ gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
+- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_GL
++ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_GL
+
+ gldll_carbon_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLDLL_ODEP)
+ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/glcanvas.cpp
+diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
+index 25cc25f..338fdad 100644
+--- a/build/bakefiles/common.bkl
++++ b/build/bakefiles/common.bkl
+@@ -592,6 +592,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
+ <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
+ <libname>$(WXLIBNAME)</libname>
+
++ <define>WXBUILDING</define>
++
+ <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
+ <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
+ <sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
+diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
+index 4c1d4a5..a1ad8d1 100644
+--- a/include/wx/afterstd.h
++++ b/include/wx/afterstd.h
+@@ -46,3 +46,14 @@
+ #endif
+ #endif
+
++#if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
++#ifndef _T
++#if !wxUSE_UNICODE
++#define _T(x) x
++#else /* Unicode */
++/* use wxCONCAT_HELPER so that x could be expanded if it's a macro */
++#define _T(x) wxCONCAT_HELPER(L, x)
++#endif /* ASCII/Unicode */
++#endif /* !defined(_T) */
++
++#endif /* defined(__SUNPRO_CC) || defined(__SUNPRO_C) */
+diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
+index 0f1b908..d669dc6 100644
+--- a/include/wx/arrstr.h
++++ b/include/wx/arrstr.h
+@@ -152,7 +152,7 @@ public:
+ wxString& Item(size_t nIndex) const
+ {
+ wxASSERT_MSG( nIndex < m_nCount,
+- _T("wxArrayString: index out of bounds") );
++ wxT("wxArrayString: index out of bounds") );
+
+ return *(wxString *)&(m_pItems[nIndex]);
+ }
+@@ -163,7 +163,7 @@ public:
+ wxString& Last() const
+ {
+ wxASSERT_MSG( !IsEmpty(),
+- _T("wxArrayString: index out of bounds") );
++ wxT("wxArrayString: index out of bounds") );
+ return Item(Count() - 1);
+ }
+
+diff --git a/include/wx/artprov.h b/include/wx/artprov.h
+index 1d026a7..e6df4f3 100644
+--- a/include/wx/artprov.h
++++ b/include/wx/artprov.h
+@@ -27,10 +27,10 @@ class wxArtProviderModule;
+ typedef wxString wxArtClient;
+ typedef wxString wxArtID;
+
+-#define wxART_MAKE_CLIENT_ID_FROM_STR(id) (id + _T("_C"))
+-#define wxART_MAKE_CLIENT_ID(id) _T(#id) _T("_C")
++#define wxART_MAKE_CLIENT_ID_FROM_STR(id) (id + wxT("_C"))
++#define wxART_MAKE_CLIENT_ID(id) wxT(#id) wxT("_C")
+ #define wxART_MAKE_ART_ID_FROM_STR(id) (id)
+-#define wxART_MAKE_ART_ID(id) _T(#id)
++#define wxART_MAKE_ART_ID(id) wxT(#id)
+
+ // ----------------------------------------------------------------------------
+ // Art clients
+diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
+index aacfc7c..609073c 100644
+--- a/include/wx/beforestd.h
++++ b/include/wx/beforestd.h
+@@ -63,3 +63,13 @@
+ #pragma warning(disable:4786)
+ #endif // VC++ < 7
+
++#if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
++#undef _T
++#endif // SUNCC
++
++#if defined (WXBUILDING)
++#if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
++#undef _T
++#endif /* SUNCC */
++#endif /* WXBUILDING */
++
+diff --git a/include/wx/buffer.h b/include/wx/buffer.h
+index 605f4f1..f169f22 100644
+--- a/include/wx/buffer.h
++++ b/include/wx/buffer.h
+@@ -286,7 +286,7 @@ public:
+ // Other ways to append to the buffer
+ void AppendByte(char data)
+ {
+- wxCHECK_RET( m_bufdata->m_data, _T("invalid wxMemoryBuffer") );
++ wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
+
+ m_bufdata->ResizeIfNeeded(m_bufdata->m_len + 1);
+ *(((char*)m_bufdata->m_data) + m_bufdata->m_len) = data;
+diff --git a/include/wx/cocoa/dirdlg.h b/include/wx/cocoa/dirdlg.h
+index 3c5b8dc..084d561 100644
+--- a/include/wx/cocoa/dirdlg.h
++++ b/include/wx/cocoa/dirdlg.h
+@@ -26,7 +26,7 @@ class WXDLLEXPORT wxDirDialog: public wxDirDialogBase
+ public:
+ wxDirDialog(wxWindow *parent,
+ const wxString& message = wxDirSelectorPromptStr,
+- const wxString& defaultPath = _T(""),
++ const wxString& defaultPath = wxT(""),
+ long style = wxDD_DEFAULT_STYLE,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+diff --git a/include/wx/confbase.h b/include/wx/confbase.h
+index 9e0cf54..2941b8a 100644
+--- a/include/wx/confbase.h
++++ b/include/wx/confbase.h
+@@ -30,13 +30,13 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
+
+ /// separates group and entry names (probably shouldn't be changed)
+ #ifndef wxCONFIG_PATH_SEPARATOR
+- #define wxCONFIG_PATH_SEPARATOR _T('/')
++ #define wxCONFIG_PATH_SEPARATOR wxT('/')
+ #endif
+
+ /// introduces immutable entries
+ // (i.e. the ones which can't be changed from the local config file)
+ #ifndef wxCONFIG_IMMUTABLE_PREFIX
+- #define wxCONFIG_IMMUTABLE_PREFIX _T('!')
++ #define wxCONFIG_IMMUTABLE_PREFIX wxT('!')
+ #endif
+
+ #if wxUSE_CONFIG
+diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
+index c70cfbd..18266f8 100644
+--- a/include/wx/cppunit.h
++++ b/include/wx/cppunit.h
+@@ -69,7 +69,7 @@
+ if (Condition) \
+ { anyTest; } \
+ else \
+- wxLogInfo(wxString::Format(_T("skipping: %s.%s\n reason: %s equals false\n"), \
++ wxLogInfo(wxString::Format(wxT("skipping: %s.%s\n reason: %s equals false\n"), \
+ wxString(suiteName, wxConvUTF8).c_str(), \
+ wxString(#testMethod, wxConvUTF8).c_str(), \
+ wxString(#Condition, wxConvUTF8).c_str()))
+diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
+index f77ac4f..4cee508 100644
+--- a/include/wx/cshelp.h
++++ b/include/wx/cshelp.h
+@@ -134,7 +134,7 @@ public:
+ const wxPoint& pt,
+ wxHelpEvent::Origin origin)
+ {
+- wxCHECK_MSG( window, false, _T("window must not be NULL") );
++ wxCHECK_MSG( window, false, wxT("window must not be NULL") );
+
+ m_helptextAtPoint = pt;
+ m_helptextOrigin = origin;
+diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
+index 0da1277..085a8d1 100644
+--- a/include/wx/datectrl.h
++++ b/include/wx/datectrl.h
+@@ -19,7 +19,7 @@
+ #include "wx/control.h" // the base class
+ #include "wx/datetime.h"
+
+-#define wxDatePickerCtrlNameStr _T("datectrl")
++#define wxDatePickerCtrlNameStr wxT("datectrl")
+
+ // wxDatePickerCtrl styles
+ enum
+diff --git a/include/wx/datetime.h b/include/wx/datetime.h
+index e74dde1..cf6c024 100644
+--- a/include/wx/datetime.h
++++ b/include/wx/datetime.h
+@@ -951,37 +951,37 @@ public:
+
+ inline bool operator<(const wxDateTime& dt) const
+ {
+- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") );
++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") );
+ return GetValue() < dt.GetValue();
+ }
+
+ inline bool operator<=(const wxDateTime& dt) const
+ {
+- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") );
++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") );
+ return GetValue() <= dt.GetValue();
+ }
+
+ inline bool operator>(const wxDateTime& dt) const
+ {
+- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") );
++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") );
+ return GetValue() > dt.GetValue();
+ }
+
+ inline bool operator>=(const wxDateTime& dt) const
+ {
+- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") );
++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") );
+ return GetValue() >= dt.GetValue();
+ }
+
+ inline bool operator==(const wxDateTime& dt) const
+ {
+- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") );
++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") );
+ return GetValue() == dt.GetValue();
+ }
+
+ inline bool operator!=(const wxDateTime& dt) const
+ {
+- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") );
++ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") );
+ return GetValue() != dt.GetValue();
+ }
+
+@@ -1075,15 +1075,15 @@ public:
+ wxString Format(const wxChar *format = wxDefaultDateTimeFormat,
+ const TimeZone& tz = Local) const;
+ // preferred date representation for the current locale
+- wxString FormatDate() const { return Format(_T("%x")); }
++ wxString FormatDate() const { return Format(wxT("%x")); }
+ // preferred time representation for the current locale
+- wxString FormatTime() const { return Format(_T("%X")); }
++ wxString FormatTime() const { return Format(wxT("%X")); }
+ // returns the string representing the date in ISO 8601 format
+ // (YYYY-MM-DD)
+- wxString FormatISODate() const { return Format(_T("%Y-%m-%d")); }
++ wxString FormatISODate() const { return Format(wxT("%Y-%m-%d")); }
+ // returns the string representing the time in ISO 8601 format
+ // (HH:MM:SS)
+- wxString FormatISOTime() const { return Format(_T("%H:%M:%S")); }
++ wxString FormatISOTime() const { return Format(wxT("%H:%M:%S")); }
+
+ // implementation
+ // ------------------------------------------------------------------------
+@@ -1647,7 +1647,7 @@ inline wxDateTime::wxDateTime(double jdn)
+
+ inline wxDateTime& wxDateTime::Set(const Tm& tm)
+ {
+- wxASSERT_MSG( tm.IsValid(), _T("invalid broken down date/time") );
++ wxASSERT_MSG( tm.IsValid(), wxT("invalid broken down date/time") );
+
+ return Set(tm.mday, (Month)tm.mon, tm.year,
+ tm.hour, tm.min, tm.sec, tm.msec);
+@@ -1678,14 +1678,14 @@ inline wxDateTime::wxDateTime(wxDateTime_t day,
+
+ inline wxLongLong wxDateTime::GetValue() const
+ {
+- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));
++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime"));
+
+ return m_time;
+ }
+
+ inline time_t wxDateTime::GetTicks() const
+ {
+- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));
++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime"));
+ if ( !IsInStdRange() )
+ {
+ return (time_t)-1;
+@@ -1753,21 +1753,21 @@ inline wxDateTime wxDateTime::GetYearDay(wxDateTime_t yday) const
+
+ inline bool wxDateTime::IsEqualTo(const wxDateTime& datetime) const
+ {
+- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime"));
++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime"));
+
+ return m_time == datetime.m_time;
+ }
+
+ inline bool wxDateTime::IsEarlierThan(const wxDateTime& datetime) const
+ {
+- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime"));
++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime"));
+
+ return m_time < datetime.m_time;
+ }
+
+ inline bool wxDateTime::IsLaterThan(const wxDateTime& datetime) const
+ {
+- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime"));
++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime"));
+
+ return m_time > datetime.m_time;
+ }
+@@ -1824,14 +1824,14 @@ inline bool wxDateTime::IsEqualUpTo(const wxDateTime& dt,
+
+ inline wxDateTime wxDateTime::Add(const wxTimeSpan& diff) const
+ {
+- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));
++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime"));
+
+ return wxDateTime(m_time + diff.GetValue());
+ }
+
+ inline wxDateTime& wxDateTime::Add(const wxTimeSpan& diff)
+ {
+- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));
++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime"));
+
+ m_time += diff.GetValue();
+
+@@ -1845,14 +1845,14 @@ inline wxDateTime& wxDateTime::operator+=(const wxTimeSpan& diff)
+
+ inline wxDateTime wxDateTime::Subtract(const wxTimeSpan& diff) const
+ {
+- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));
++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime"));
+
+ return wxDateTime(m_time - diff.GetValue());
+ }
+
+ inline wxDateTime& wxDateTime::Subtract(const wxTimeSpan& diff)
+ {
+- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));
++ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime"));
+
+ m_time -= diff.GetValue();
+
+@@ -1866,7 +1866,7 @@ inline wxDateTime& wxDateTime::operator-=(const wxTimeSpan& diff)
+
+ inline wxTimeSpan wxDateTime::Subtract(const wxDateTime& datetime) const
+ {
+- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime"));
++ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime"));
+
+ return wxTimeSpan(GetValue() - datetime.GetValue());
+ }
+diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
+index 4e8655c..7e3b513 100644
+--- a/include/wx/dbgrid.h
++++ b/include/wx/dbgrid.h
+@@ -23,7 +23,7 @@
+ #include "wx/grid.h"
+ #include "wx/dbkeyg.h"
+
+-#define wxGRID_VALUE_DBAUTO _T("dbauto")
++#define wxGRID_VALUE_DBAUTO wxT("dbauto")
+
+ WX_DECLARE_USER_EXPORTED_OBJARRAY(GenericKey,keyarray,WXDLLIMPEXP_DBGRID);
+
+@@ -119,12 +119,12 @@ public:
+
+ virtual int GetNumberRows()
+ {
+- wxLogDebug(_T(" GetNumberRows() = %i"),m_rowtotal);
++ wxLogDebug(wxT(" GetNumberRows() = %i"),m_rowtotal);
+ return m_rowtotal;
+ }
+ virtual int GetNumberCols()
+ {
+- wxLogDebug(_T(" GetNumberCols() = %i"),m_nocols);
++ wxLogDebug(wxT(" GetNumberCols() = %i"),m_nocols);
+ return m_nocols;
+ }
+ virtual bool IsEmptyCell(int row, int col) ;
+diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
+index 1bbef54..9fb6260 100644
+--- a/include/wx/dbtable.h
++++ b/include/wx/dbtable.h
+@@ -305,7 +305,7 @@ public:
+ HSTMT *NewCursor(bool setCursor = false, bool bindColumns = true) { return GetNewCursor(setCursor,bindColumns); }
+ #endif
+
+- ULONG Count(const wxString &args=_T("*"));
++ ULONG Count(const wxString &args=wxT("*"));
+ int DB_STATUS(void) { return(pDb->DB_STATUS); }
+
+ bool IsColNull(UWORD colNumber) const;
+diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
+index 46c28ba..7249235 100644
+--- a/include/wx/dcbuffer.h
++++ b/include/wx/dcbuffer.h
+@@ -100,8 +100,8 @@ public:
+ // blitting to) is destroyed.
+ void UnMask()
+ {
+- wxCHECK_RET( m_dc, _T("no underlying wxDC?") );
+- wxASSERT_MSG( m_buffer && m_buffer->IsOk(), _T("invalid backing store") );
++ wxCHECK_RET( m_dc, wxT("no underlying wxDC?") );
++ wxASSERT_MSG( m_buffer && m_buffer->IsOk(), wxT("invalid backing store") );
+
+ wxCoord x = 0,
+ y = 0;
+@@ -122,7 +122,7 @@ private:
+ // common part of Init()s
+ void InitCommon(wxDC *dc, int style)
+ {
+- wxASSERT_MSG( !m_dc, _T("wxBufferedDC already initialised") );
++ wxASSERT_MSG( !m_dc, wxT("wxBufferedDC already initialised") );
+
+ m_dc = dc;
+ m_style = style;
+diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h
+index bc15a39..3b9dcb9 100644
+--- a/include/wx/dcmirror.h
++++ b/include/wx/dcmirror.h
+@@ -135,7 +135,7 @@ protected:
+ wxCoord x2, wxCoord y2,
+ wxCoord xc, wxCoord yc)
+ {
+- wxFAIL_MSG( _T("this is probably wrong") );
++ wxFAIL_MSG( wxT("this is probably wrong") );
+
+ m_dc.DoDrawArc(GetX(x1, y1), GetY(x1, y1),
+ GetX(x2, y2), GetY(x2, y2),
+@@ -152,7 +152,7 @@ protected:
+ virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+ double sa, double ea)
+ {
+- wxFAIL_MSG( _T("this is probably wrong") );
++ wxFAIL_MSG( wxT("this is probably wrong") );
+
+ m_dc.DoDrawEllipticArc(GetX(x, y), GetY(x, y),
+ GetX(w, h), GetY(w, h),
+@@ -256,7 +256,7 @@ protected:
+
+ virtual void DoSetClippingRegionAsRegion(const wxRegion& WXUNUSED(region))
+ {
+- wxFAIL_MSG( _T("not implemented") );
++ wxFAIL_MSG( wxT("not implemented") );
+ }
+
+ virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
+diff --git a/include/wx/debug.h b/include/wx/debug.h
+index fd389d5..7e07377 100644
+--- a/include/wx/debug.h
++++ b/include/wx/debug.h
+@@ -123,13 +123,13 @@
+ if ( cond ) \
+ {} \
+ else \
+- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg)
++ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg)
+ #else
+ #define wxASSERT_MSG(cond, msg) \
+ if ( cond ) \
+ ; \
+ else \
+- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg)
++ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg)
+ #endif
+
+ /* special form of assert: always triggers it (in debug mode) */
+@@ -140,7 +140,7 @@
+
+ /* FAIL with some message and a condition */
+ #define wxFAIL_COND_MSG(cond, msg) \
+- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(cond), msg)
++ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(cond), msg)
+
+ /* An assert helper used to avoid warning when testing constant expressions, */
+ /* i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about */
+diff --git a/include/wx/debugrpt.h b/include/wx/debugrpt.h
+index a50f1cb..d2b57d5 100644
+--- a/include/wx/debugrpt.h
++++ b/include/wx/debugrpt.h
+@@ -161,7 +161,7 @@ public:
+ wxDebugReportUpload(const wxString& url,
+ const wxString& input,
+ const wxString& action,
+- const wxString& curl = _T("curl"));
++ const wxString& curl = wxT("curl"));
+
+ protected:
+ virtual bool DoProcess();
+diff --git a/include/wx/defs.h b/include/wx/defs.h
+index 0e2ca0c..5e1ae54 100644
+--- a/include/wx/defs.h
++++ b/include/wx/defs.h
+@@ -915,28 +915,28 @@ inline void *wxUIntToPtr(wxUIntPtr p)
+ #if (defined(__VISUALC__) && defined(__WIN32__))
+ #define wxLongLong_t __int64
+ #define wxLongLongSuffix i64
+- #define wxLongLongFmtSpec _T("I64")
++ #define wxLongLongFmtSpec wxT("I64")
+ #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
+ #define wxLongLong_t __int64
+ #define wxLongLongSuffix i64
+- #define wxLongLongFmtSpec _T("L")
++ #define wxLongLongFmtSpec wxT("L")
+ #elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__)))
+ #define wxLongLong_t __int64
+ #define wxLongLongSuffix i64
+- #define wxLongLongFmtSpec _T("L")
++ #define wxLongLongFmtSpec wxT("L")
+ #elif defined(__DIGITALMARS__)
+ #define wxLongLong_t __int64
+ #define wxLongLongSuffix LL
+- #define wxLongLongFmtSpec _T("ll")
++ #define wxLongLongFmtSpec wxT("ll")
+ #elif defined(__MINGW32__)
+ #define wxLongLong_t long long
+ #define wxLongLongSuffix ll
+- #define wxLongLongFmtSpec _T("I64")
++ #define wxLongLongFmtSpec wxT("I64")
+ #elif defined(__MWERKS__)
+ #if __option(longlong)
+ #define wxLongLong_t long long
+ #define wxLongLongSuffix ll
+- #define wxLongLongFmtSpec _T("ll")
++ #define wxLongLongFmtSpec wxT("ll")
+ #else
+ #error "The 64 bit integer support in CodeWarrior has been disabled."
+ #error "See the documentation on the 'longlong' pragma."
+@@ -944,7 +944,7 @@ inline void *wxUIntToPtr(wxUIntPtr p)
+ #elif defined(__WXPALMOS__)
+ #define wxLongLong_t int64_t
+ #define wxLongLongSuffix ll
+- #define wxLongLongFmtSpec _T("ll")
++ #define wxLongLongFmtSpec wxT("ll")
+ #elif defined(__VISAGECPP__) && __IBMCPP__ >= 400
+ #define wxLongLong_t long long
+ #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \
+@@ -954,11 +954,11 @@ inline void *wxUIntToPtr(wxUIntPtr p)
+ (defined(__DJGPP__) && __DJGPP__ >= 2)
+ #define wxLongLong_t long long
+ #define wxLongLongSuffix ll
+- #define wxLongLongFmtSpec _T("ll")
++ #define wxLongLongFmtSpec wxT("ll")
+ #elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
+ #define wxLongLong_t long
+ #define wxLongLongSuffix l
+- #define wxLongLongFmtSpec _T("l")
++ #define wxLongLongFmtSpec wxT("l")
+ #define wxLongLongIsLong
+ #endif
+
+diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
+index 3552bdc..eefd49f 100644
+--- a/include/wx/dynlib.h
++++ b/include/wx/dynlib.h
+@@ -116,7 +116,7 @@ enum wxPluginCategory
+ // type only once, as the first parameter, and creating a variable of this type
+ // called "pfn<name>" initialized with the "name" from the "dynlib"
+ #define wxDYNLIB_FUNCTION(type, name, dynlib) \
+- type pfn ## name = (type)(dynlib).GetSymbol(_T(#name))
++ type pfn ## name = (type)(dynlib).GetSymbol(wxT(#name))
+
+ // ----------------------------------------------------------------------------
+ // wxDynamicLibraryDetails: contains details about a loaded wxDynamicLibrary
+diff --git a/include/wx/dynload.h b/include/wx/dynload.h
+index 68c63c1..3c40113 100644
+--- a/include/wx/dynload.h
++++ b/include/wx/dynload.h
+@@ -71,7 +71,7 @@ public:
+ void RefObj() { ++m_objcount; }
+ void UnrefObj()
+ {
+- wxASSERT_MSG( m_objcount > 0, _T("Too many objects deleted??") );
++ wxASSERT_MSG( m_objcount > 0, wxT("Too many objects deleted??") );
+ --m_objcount;
+ }
+
+diff --git a/include/wx/event.h b/include/wx/event.h
+index 26fab62..351d04f 100644
+--- a/include/wx/event.h
++++ b/include/wx/event.h
+@@ -451,7 +451,7 @@ public:
+ wxPropagateOnce(wxEvent& event) : m_event(event)
+ {
+ wxASSERT_MSG( m_event.m_propagationLevel > 0,
+- _T("shouldn't be used unless ShouldPropagate()!") );
++ wxT("shouldn't be used unless ShouldPropagate()!") );
+
+ m_event.m_propagationLevel--;
+ }
+@@ -1398,7 +1398,7 @@ public:
+ // m_loggingOff flag is only used by wxEVT_[QUERY_]END_SESSION, it
+ // doesn't make sense for wxEVT_CLOSE_WINDOW
+ wxASSERT_MSG( m_eventType != wxEVT_CLOSE_WINDOW,
+- _T("this flag is for end session events only") );
++ wxT("this flag is for end session events only") );
+
+ return m_loggingOff;
+ }
+diff --git a/include/wx/ffile.h b/include/wx/ffile.h
+index c3dda75..5577484 100644
+--- a/include/wx/ffile.h
++++ b/include/wx/ffile.h
+@@ -37,13 +37,13 @@ public:
+ // def ctor
+ wxFFile() { m_fp = NULL; }
+ // open specified file (may fail, use IsOpened())
+- wxFFile(const wxChar *filename, const wxChar *mode = _T("r"));
++ wxFFile(const wxChar *filename, const wxChar *mode = wxT("r"));
+ // attach to (already opened) file
+ wxFFile(FILE *lfp) { m_fp = lfp; }
+
+ // open/close
+ // open a file (existing or not - the mode controls what happens)
+- bool Open(const wxChar *filename, const wxChar *mode = _T("r"));
++ bool Open(const wxChar *filename, const wxChar *mode = wxT("r"));
+ // closes the opened file (this is a NOP if not opened)
+ bool Close();
+
+diff --git a/include/wx/filefn.h b/include/wx/filefn.h
+index 56c01c7..0e35b39 100644
+--- a/include/wx/filefn.h
++++ b/include/wx/filefn.h
+@@ -406,7 +406,7 @@ enum wxFileKind
+ #define wxHAS_LARGE_FFILES
+ #endif
+ #else
+- #define wxFileOffsetFmtSpec _T("")
++ #define wxFileOffsetFmtSpec wxT("")
+ #endif
+ // functions
+ #define wxClose close
+diff --git a/include/wx/filename.h b/include/wx/filename.h
+index 0a3abb5..c156e73 100644
+--- a/include/wx/filename.h
++++ b/include/wx/filename.h
+@@ -488,10 +488,10 @@ public:
+ static wxULongLong GetSize(const wxString &file);
+
+ // returns the size in a human readable form
+- wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(_T("Not available")),
++ wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(wxT("Not available")),
+ int precision = 1) const;
+ static wxString GetHumanReadableSize(const wxULongLong &sz,
+- const wxString &nullsize = wxGetTranslation(_T("Not available")),
++ const wxString &nullsize = wxGetTranslation(wxT("Not available")),
+ int precision = 1);
+
+
+diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h
+index 43b854c..a525a4b 100644
+--- a/include/wx/generic/calctrl.h
++++ b/include/wx/generic/calctrl.h
+@@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxComboBox;
+ class WXDLLIMPEXP_FWD_CORE wxStaticText;
+ class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
+
+-#define wxCalendarNameStr _T("CalendarCtrl")
++#define wxCalendarNameStr wxT("CalendarCtrl")
+
+ // ----------------------------------------------------------------------------
+ // wxCalendarCtrl: a control allowing the user to pick a date interactively
+@@ -124,14 +124,14 @@ public:
+
+ wxCalendarDateAttr *GetAttr(size_t day) const
+ {
+- wxCHECK_MSG( day > 0 && day < 32, NULL, _T("invalid day") );
++ wxCHECK_MSG( day > 0 && day < 32, NULL, wxT("invalid day") );
+
+ return m_attrs[day - 1];
+ }
+
+ void SetAttr(size_t day, wxCalendarDateAttr *attr)
+ {
+- wxCHECK_RET( day > 0 && day < 32, _T("invalid day") );
++ wxCHECK_RET( day > 0 && day < 32, wxT("invalid day") );
+
+ delete m_attrs[day - 1];
+ m_attrs[day - 1] = attr;
+diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
+index 1b25185..06814aa 100644
+--- a/include/wx/generic/combo.h
++++ b/include/wx/generic/combo.h
+@@ -26,8 +26,8 @@
+ // all actions of single line text controls are supported
+
+ // popup/dismiss the choice window
+-#define wxACTION_COMBOBOX_POPUP _T("popup")
+-#define wxACTION_COMBOBOX_DISMISS _T("dismiss")
++#define wxACTION_COMBOBOX_POPUP wxT("popup")
++#define wxACTION_COMBOBOX_DISMISS wxT("dismiss")
+
+ #endif
+
+diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
+index e84bb7d..fb308ed 100644
+--- a/include/wx/generic/grid.h
++++ b/include/wx/generic/grid.h
+@@ -42,11 +42,11 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[];
+ #define WXGRID_DEFAULT_SCROLLBAR_WIDTH 16
+
+ // type names for grid table values
+-#define wxGRID_VALUE_STRING _T("string")
+-#define wxGRID_VALUE_BOOL _T("bool")
+-#define wxGRID_VALUE_NUMBER _T("long")
+-#define wxGRID_VALUE_FLOAT _T("double")
+-#define wxGRID_VALUE_CHOICE _T("choice")
++#define wxGRID_VALUE_STRING wxT("string")
++#define wxGRID_VALUE_BOOL wxT("bool")
++#define wxGRID_VALUE_NUMBER wxT("long")
++#define wxGRID_VALUE_FLOAT wxT("double")
++#define wxGRID_VALUE_CHOICE wxT("choice")
+
+ #define wxGRID_VALUE_TEXT wxGRID_VALUE_STRING
+ #define wxGRID_VALUE_LONG wxGRID_VALUE_NUMBER
+@@ -472,7 +472,7 @@ protected:
+
+ // string representation of m_valueOld
+ wxString GetString() const
+- { return wxString::Format(_T("%ld"), m_valueOld); }
++ { return wxString::Format(wxT("%ld"), m_valueOld); }
+
+ private:
+ int m_min,
+@@ -552,7 +552,7 @@ public:
+
+ // set the string values returned by GetValue() for the true and false
+ // states, respectively
+- static void UseStringValues(const wxString& valueTrue = _T("1"),
++ static void UseStringValues(const wxString& valueTrue = wxT("1"),
+ const wxString& valueFalse = wxEmptyString);
+
+ // return true if the given string is equal to the string representation of
+diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
+index 2581fd2..477e0f1 100644
+--- a/include/wx/generic/gridctrl.h
++++ b/include/wx/generic/gridctrl.h
+@@ -16,8 +16,8 @@
+
+ #if wxUSE_GRID
+
+-#define wxGRID_VALUE_CHOICEINT _T("choiceint")
+-#define wxGRID_VALUE_DATETIME _T("datetime")
++#define wxGRID_VALUE_CHOICEINT wxT("choiceint")
++#define wxGRID_VALUE_DATETIME wxT("datetime")
+
+ #if wxUSE_DATETIME
+
+diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
+index 7874e44..9719432 100644
+--- a/include/wx/generic/spinctlg.h
++++ b/include/wx/generic/spinctlg.h
+@@ -41,7 +41,7 @@ public:
+ const wxSize& size = wxDefaultSize,
+ long style = wxSP_ARROW_KEYS,
+ int min = 0, int max = 100, int initial = 0,
+- const wxString& name = _T("wxSpinCtrl"))
++ const wxString& name = wxT("wxSpinCtrl"))
+ {
+ Init();
+ Create(parent, id, value, pos, size, style, min, max, initial, name);
+@@ -54,7 +54,7 @@ public:
+ const wxSize& size = wxDefaultSize,
+ long style = wxSP_ARROW_KEYS,
+ int min = 0, int max = 100, int initial = 0,
+- const wxString& name = _T("wxSpinCtrl"));
++ const wxString& name = wxT("wxSpinCtrl"));
+
+ virtual ~wxSpinCtrl();
+
+@@ -125,7 +125,7 @@ public:
+ const wxSize& size = wxDefaultSize,
+ long style = wxSP_ARROW_KEYS,
+ int min = 0, int max = 100, int initial = 0,
+- const wxString& name = _T("wxSpinCtrl"))
++ const wxString& name = wxT("wxSpinCtrl"))
+ {
+ Create(parent, id, value, pos, size, style, min, max, initial, name);
+ }
+@@ -137,7 +137,7 @@ public:
+ const wxSize& size = wxDefaultSize,
+ long style = wxSP_ARROW_KEYS,
+ int min = 0, int max = 100, int initial = 0,
+- const wxString& name = _T("wxSpinCtrl"))
++ const wxString& name = wxT("wxSpinCtrl"))
+ {
+ SetRange(min, max);
+
+diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
+index ac651f2..d5927a6 100644
+--- a/include/wx/generic/splitter.h
++++ b/include/wx/generic/splitter.h
+@@ -91,7 +91,7 @@ public:
+ void SetSplitMode(int mode)
+ {
+ wxASSERT_MSG( mode == wxSPLIT_VERTICAL || mode == wxSPLIT_HORIZONTAL,
+- _T("invalid split mode") );
++ wxT("invalid split mode") );
+
+ m_splitMode = (wxSplitMode)mode;
+ }
+diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
+index 25e2eac..c6ed1c8 100644
+--- a/include/wx/glcanvas.h
++++ b/include/wx/glcanvas.h
+@@ -44,7 +44,7 @@ enum
+ WX_GL_MIN_ACCUM_ALPHA /* use alpha buffer with most bits (> MIN_ACCUM_ALPHA bits) */
+ };
+
+-#define wxGLCanvasName _T("GLCanvas")
++#define wxGLCanvasName wxT("GLCanvas")
+
+ #if defined(__WXMSW__)
+ #include "wx/msw/glcanvas.h"
+diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
+index fa89477..2c1ff65 100644
+--- a/include/wx/gtk/checklst.h
++++ b/include/wx/gtk/checklst.h
+@@ -18,10 +18,10 @@
+ // there is no "right" choice of the checkbox indicators, so allow the user to
+ // define them himself if he wants
+ #ifndef wxCHECKLBOX_CHECKED
+- #define wxCHECKLBOX_CHECKED _T('x')
+- #define wxCHECKLBOX_UNCHECKED _T(' ')
++ #define wxCHECKLBOX_CHECKED wxT('x')
++ #define wxCHECKLBOX_UNCHECKED wxT(' ')
+
+- #define wxCHECKLBOX_STRING _T("[ ] ")
++ #define wxCHECKLBOX_STRING wxT("[ ] ")
+ #endif
+
+ //-----------------------------------------------------------------------------
+diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
+index 2929f7f..8fc1dc9 100644
+--- a/include/wx/gtk/spinctrl.h
++++ b/include/wx/gtk/spinctrl.h
+@@ -26,7 +26,7 @@ public:
+ const wxSize& size = wxDefaultSize,
+ long style = wxSP_ARROW_KEYS,
+ int min = 0, int max = 100, int initial = 0,
+- const wxString& name = _T("wxSpinCtrl"))
++ const wxString& name = wxT("wxSpinCtrl"))
+ {
+ Create(parent, id, value, pos, size, style, min, max, initial, name);
+ }
+@@ -38,7 +38,7 @@ public:
+ const wxSize& size = wxDefaultSize,
+ long style = wxSP_ARROW_KEYS,
+ int min = 0, int max = 100, int initial = 0,
+- const wxString& name = _T("wxSpinCtrl"));
++ const wxString& name = wxT("wxSpinCtrl"));
+
+ void SetValue(const wxString& text);
+ void SetSelection(long from, long to);
+diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
+index 5a9b8cb..de75b1f 100644
+--- a/include/wx/gtk1/checklst.h
++++ b/include/wx/gtk1/checklst.h
+@@ -18,10 +18,10 @@
+ // there is no "right" choice of the checkbox indicators, so allow the user to
+ // define them himself if he wants
+ #ifndef wxCHECKLBOX_CHECKED
+- #define wxCHECKLBOX_CHECKED _T('x')
+- #define wxCHECKLBOX_UNCHECKED _T(' ')
++ #define wxCHECKLBOX_CHECKED wxT('x')
++ #define wxCHECKLBOX_UNCHECKED wxT(' ')
+
+- #define wxCHECKLBOX_STRING _T("[ ] ")
++ #define wxCHECKLBOX_STRING wxT("[ ] ")
+ #endif
+
+ //-----------------------------------------------------------------------------
+diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
+index 7c94538..2c60b77 100644
+--- a/include/wx/gtk1/spinctrl.h
++++ b/include/wx/gtk1/spinctrl.h
+@@ -32,7 +32,7 @@ public:
+ const wxSize& size = wxDefaultSize,
+ long style = wxSP_ARROW_KEYS,
+ int min = 0, int max = 100, int initial = 0,
+- const wxString& name = _T("wxSpinCtrl"))
++ const wxString& name = wxT("wxSpinCtrl"))
+ {
+ Create(parent, id, value, pos, size, style, min, max, initial, name);
+ }
+@@ -44,7 +44,7 @@ public:
+ const wxSize& size = wxDefaultSize,
+ long style = wxSP_ARROW_KEYS,
+ int min = 0, int max = 100, int initial = 0,
+- const wxString& name = _T("wxSpinCtrl"));
++ const wxString& name = wxT("wxSpinCtrl"));
+
+ void SetValue(const wxString& text);
+ void SetSelection(long from, long to);
+diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h
+index b7a5222..780736b 100644
+--- a/include/wx/imagbmp.h
++++ b/include/wx/imagbmp.h
+@@ -14,7 +14,7 @@
+
+ // defines for saving the BMP file in different formats, Bits Per Pixel
+ // USE: wximage.SetOption( wxIMAGE_OPTION_BMP_FORMAT, wxBMP_xBPP );
+-#define wxIMAGE_OPTION_BMP_FORMAT wxString(_T("wxBMP_FORMAT"))
++#define wxIMAGE_OPTION_BMP_FORMAT wxString(wxT("wxBMP_FORMAT"))
+
+ // These two options are filled in upon reading CUR file and can (should) be
+ // specified when saving a CUR file - they define the hotspot of the cursor:
+@@ -52,10 +52,10 @@ class WXDLLEXPORT wxBMPHandler : public wxImageHandler
+ public:
+ wxBMPHandler()
+ {
+- m_name = _T("Windows bitmap file");
+- m_extension = _T("bmp");
++ m_name = wxT("Windows bitmap file");
++ m_extension = wxT("bmp");
+ m_type = wxBITMAP_TYPE_BMP;
+- m_mime = _T("image/x-bmp");
++ m_mime = wxT("image/x-bmp");
+ }
+
+ #if wxUSE_STREAMS
+@@ -86,10 +86,10 @@ class WXDLLEXPORT wxICOHandler : public wxBMPHandler
+ public:
+ wxICOHandler()
+ {
+- m_name = _T("Windows icon file");
+- m_extension = _T("ico");
++ m_name = wxT("Windows icon file");
++ m_extension = wxT("ico");
+ m_type = wxBITMAP_TYPE_ICO;
+- m_mime = _T("image/x-ico");
++ m_mime = wxT("image/x-ico");
+ }
+
+ #if wxUSE_STREAMS
+@@ -115,10 +115,10 @@ class WXDLLEXPORT wxCURHandler : public wxICOHandler
+ public:
+ wxCURHandler()
+ {
+- m_name = _T("Windows cursor file");
+- m_extension = _T("cur");
++ m_name = wxT("Windows cursor file");
++ m_extension = wxT("cur");
+ m_type = wxBITMAP_TYPE_CUR;
+- m_mime = _T("image/x-cur");
++ m_mime = wxT("image/x-cur");
+ }
+
+ // VS: This handler's meat is implemented inside wxICOHandler (the two
+@@ -142,10 +142,10 @@ class WXDLLEXPORT wxANIHandler : public wxCURHandler
+ public:
+ wxANIHandler()
+ {
+- m_name = _T("Windows animated cursor file");
+- m_extension = _T("ani");
++ m_name = wxT("Windows animated cursor file");
++ m_extension = wxT("ani");
+ m_type = wxBITMAP_TYPE_ANI;
+- m_mime = _T("image/x-ani");
++ m_mime = wxT("image/x-ani");
+ }
+
+
+diff --git a/include/wx/image.h b/include/wx/image.h
+index 8048da4..f7f58a4 100644
+--- a/include/wx/image.h
++++ b/include/wx/image.h
+@@ -27,14 +27,14 @@
+ // which breaks the compilation below
+ #undef index
+
+-#define wxIMAGE_OPTION_QUALITY wxString(_T("quality"))
+-#define wxIMAGE_OPTION_FILENAME wxString(_T("FileName"))
++#define wxIMAGE_OPTION_QUALITY wxString(wxT("quality"))
++#define wxIMAGE_OPTION_FILENAME wxString(wxT("FileName"))
+
+-#define wxIMAGE_OPTION_RESOLUTION wxString(_T("Resolution"))
+-#define wxIMAGE_OPTION_RESOLUTIONX wxString(_T("ResolutionX"))
+-#define wxIMAGE_OPTION_RESOLUTIONY wxString(_T("ResolutionY"))
++#define wxIMAGE_OPTION_RESOLUTION wxString(wxT("Resolution"))
++#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxT("ResolutionX"))
++#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxT("ResolutionY"))
+
+-#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(_T("ResolutionUnit"))
++#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxT("ResolutionUnit"))
+
+ // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT
+ enum
+diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
+index d236b75..d807ae7 100644
+--- a/include/wx/imagtiff.h
++++ b/include/wx/imagtiff.h
+@@ -21,10 +21,10 @@
+ #include "wx/image.h"
+
+ // defines for wxImage::SetOption
+-#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(_T("BitsPerSample"))
+-#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(_T("SamplesPerPixel"))
+-#define wxIMAGE_OPTION_COMPRESSION wxString(_T("Compression"))
+-#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(_T("ImageDescriptor"))
++#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(wxT("BitsPerSample"))
++#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel"))
++#define wxIMAGE_OPTION_COMPRESSION wxString(wxT("Compression"))
++#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor"))
+
+ class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
+ {
+diff --git a/include/wx/intl.h b/include/wx/intl.h
+index 02bef05..311281a 100644
+--- a/include/wx/intl.h
++++ b/include/wx/intl.h
+@@ -45,13 +45,13 @@ enum wxLayoutDirection
+ // --keyword="_" --keyword="wxPLURAL:1,2" options
+ // to extract the strings from the sources)
+ #ifndef WXINTL_NO_GETTEXT_MACRO
+- #define _(s) wxGetTranslation(_T(s))
+- #define wxPLURAL(sing, plur, n) wxGetTranslation(_T(sing), _T(plur), n)
++ #define _(s) wxGetTranslation(wxT(s))
++ #define wxPLURAL(sing, plur, n) wxGetTranslation(wxT(sing), wxT(plur), n)
+ #endif
+
+ // another one which just marks the strings for extraction, but doesn't
+ // perform the translation (use -kwxTRANSLATE with xgettext!)
+-#define wxTRANSLATE(str) _T(str)
++#define wxTRANSLATE(str) wxT(str)
+
+ // ----------------------------------------------------------------------------
+ // forward decls
+@@ -603,12 +603,12 @@ wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
+
+ #if !defined(WXINTL_NO_GETTEXT_MACRO)
+ #if !defined(_)
+- #define _(s) (_T(s))
++ #define _(s) (wxT(s))
+ #endif
+- #define wxPLURAL(sing, plur, n) ((n) == 1 ? _T(sing) : _T(plur))
++ #define wxPLURAL(sing, plur, n) ((n) == 1 ? wxT(sing) : wxT(plur))
+ #endif
+
+-#define wxTRANSLATE(str) _T(str)
++#define wxTRANSLATE(str) wxT(str)
+
+ inline const wxChar *
+ wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL)
+@@ -622,10 +622,10 @@ wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL)
+ // wxTRANSLATE) too
+ #if !defined(WXINTL_NO_GETTEXT_MACRO)
+ #if !defined(gettext_noop)
+- #define gettext_noop(str) _T(str)
++ #define gettext_noop(str) wxT(str)
+ #endif
+ #if !defined(N_)
+- #define N_(s) _T(s)
++ #define N_(s) wxT(s)
+ #endif
+ #endif
+
+diff --git a/include/wx/list.h b/include/wx/list.h
+index 4b5ae06..b0c2e18 100644
+--- a/include/wx/list.h
++++ b/include/wx/list.h
+@@ -207,7 +207,7 @@ private:
+ bool operator==(const compatibility_iterator& i) const \
+ { \
+ wxASSERT_MSG( m_list && i.m_list, \
+- _T("comparing invalid iterators is illegal") ); \
++ wxT("comparing invalid iterators is illegal") ); \
+ return (m_list == i.m_list) && (m_iter == i.m_iter); \
+ } \
+ bool operator!=(const compatibility_iterator& i) const \
+diff --git a/include/wx/longlong.h b/include/wx/longlong.h
+index 0bead47..9210228 100644
+--- a/include/wx/longlong.h
++++ b/include/wx/longlong.h
+@@ -177,7 +177,7 @@ public:
+ long ToLong() const
+ {
+ wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX),
+- _T("wxLongLong to long conversion loss of precision") );
++ wxT("wxLongLong to long conversion loss of precision") );
+
+ return wx_truncate_cast(long, m_ll);
+ }
+@@ -405,7 +405,7 @@ public:
+ unsigned long ToULong() const
+ {
+ wxASSERT_MSG( m_ll <= LONG_MAX,
+- _T("wxULongLong to long conversion loss of precision") );
++ wxT("wxULongLong to long conversion loss of precision") );
+
+ return wx_truncate_cast(unsigned long, m_ll);
+ }
+@@ -683,7 +683,7 @@ public:
+ long ToLong() const
+ {
+ wxASSERT_MSG( (m_hi == 0l) || (m_hi == -1l),
+- _T("wxLongLong to long conversion loss of precision") );
++ wxT("wxLongLong to long conversion loss of precision") );
+
+ return (long)m_lo;
+ }
+@@ -908,7 +908,7 @@ public:
+ unsigned long ToULong() const
+ {
+ wxASSERT_MSG( m_hi == 0ul,
+- _T("wxULongLong to long conversion loss of precision") );
++ wxT("wxULongLong to long conversion loss of precision") );
+
+ return (unsigned long)m_lo;
+ }
+diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
+index 2ebf996..8eee00d 100644
+--- a/include/wx/mimetype.h
++++ b/include/wx/mimetype.h
+@@ -51,12 +51,12 @@ class WXDLLIMPEXP_BASE wxMimeType : public wxString
+ public:
+ // all string ctors here
+
+- wxString GetType() const { return BeforeFirst(_T('/')); }
+- wxString GetSubType() const { return AfterFirst(_T('/')); }
++ wxString GetType() const { return BeforeFirst(wxT('/')); }
++ wxString GetSubType() const { return AfterFirst(wxT('/')); }
+
+ void SetSubType(const wxString& subtype)
+ {
+- *this = GetType() + _T('/') + subtype;
++ *this = GetType() + wxT('/') + subtype;
+ }
+
+ bool Matches(const wxMimeType& wildcard)
+diff --git a/include/wx/module.h b/include/wx/module.h
+index 7394f4e..b4d0abc 100644
+--- a/include/wx/module.h
++++ b/include/wx/module.h
+@@ -68,7 +68,7 @@ protected:
+ // after that
+ void AddDependency(wxClassInfo *dep)
+ {
+- wxCHECK_RET( dep, _T("NULL module dependency") );
++ wxCHECK_RET( dep, wxT("NULL module dependency") );
+
+ m_dependencies.Add(dep);
+ }
+diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
+index d225726..a2ce2a8 100644
+--- a/include/wx/msgdlg.h
++++ b/include/wx/msgdlg.h
+@@ -23,10 +23,10 @@ protected:
+ void SetMessageDialogStyle(long style)
+ {
+ wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || ((style & wxYES_NO) == 0),
+- _T("wxYES and wxNO may only be used together in wxMessageDialog") );
++ wxT("wxYES and wxNO may only be used together in wxMessageDialog") );
+
+ wxASSERT_MSG( (style & wxID_OK) != wxID_OK,
+- _T("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") );
++ wxT("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") );
+
+ m_dialogStyle = style;
+ }
+diff --git a/include/wx/object.h b/include/wx/object.h
+index d46efcf..b7fda24 100644
+--- a/include/wx/object.h
++++ b/include/wx/object.h
+@@ -311,7 +311,7 @@ name##PluginSentinel m_pluginsentinel;
+ #ifdef __WXDEBUG__
+ inline void* wxCheckCast(void *ptr)
+ {
+- wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
++ wxASSERT_MSG( ptr, wxT("wxStaticCast() used incorrectly") );
+ return ptr;
+ }
+ #define wxStaticCast(obj, className) \
+diff --git a/include/wx/palette.h b/include/wx/palette.h
+index 9a09456..43757ab 100644
+--- a/include/wx/palette.h
++++ b/include/wx/palette.h
+@@ -27,7 +27,7 @@ public:
+
+ virtual bool Ok() const { return IsOk(); }
+ virtual bool IsOk() const = 0;
+- virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; }
++ virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; }
+ };
+
+ #if defined(__WXPALMOS__)
+diff --git a/include/wx/private/fileback.h b/include/wx/private/fileback.h
+index 534a0f3..7f5e722 100644
+--- a/include/wx/private/fileback.h
++++ b/include/wx/private/fileback.h
+@@ -33,7 +33,7 @@ public:
+ // backing file is never created and the backing is done with memory.
+ wxBackingFile(wxInputStream *stream,
+ size_t bufsize = DefaultBufSize,
+- const wxString& prefix = _T("wxbf"));
++ const wxString& prefix = wxT("wxbf"));
+
+ wxBackingFile() : m_impl(NULL) { }
+ ~wxBackingFile();
+diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
+index b074e15..0c5cfbc 100644
+--- a/include/wx/protocol/ftp.h
++++ b/include/wx/protocol/ftp.h
+@@ -175,7 +175,7 @@ protected:
+
+ // the trace mask used by assorted wxLogTrace() in ftp code, do
+ // wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output
+-#define FTP_TRACE_MASK _T("ftp")
++#define FTP_TRACE_MASK wxT("ftp")
+
+ #endif // wxUSE_PROTOCOL_FTP
+
+diff --git a/include/wx/recguard.h b/include/wx/recguard.h
+index f2c6ffe..8133a12 100644
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list