| author | Vladimir Marek <Vladimir.Marek@oracle.com> |
| Fri, 03 Jun 2011 05:25:28 -0700 | |
| changeset 287 | 4679ead72494 |
| parent 286 | 54ecf1775bd5 |
| child 288 | 2a474229e9a1 |
| components/wxwidgets/Makefile | file | annotate | diff | comparison | revisions | |
| components/wxwidgets/patches/wxwidgets-02-Tmacro.patch | file | annotate | diff | comparison | revisions | |
| components/wxwidgets/patches/wxwidgets-03-Tmacro.patch | file | annotate | diff | comparison | revisions | |
| components/wxwidgets/patches/wxwidgets-04-Tmacro.patch | file | annotate | diff | comparison | revisions | |
| components/wxwidgets/patches/wxwidgets-05-Tmacro.patch | file | annotate | diff | comparison | revisions | |
| components/wxwidgets/patches/wxwidgets-06-Tmacro.patch | file | annotate | diff | comparison | revisions | |
| components/wxwidgets/patches/wxwidgets-07-gsocket.patch | file | annotate | diff | comparison | revisions | |
| components/wxwidgets/patches/wxwidgets-08-Tmacro.patch | file | annotate | diff | comparison | revisions | |
| components/wxwidgets/wxwidgets.p5m | file | annotate | diff | comparison | revisions |
--- a/components/wxwidgets/Makefile Tue Jun 07 13:38:21 2011 -0700 +++ b/components/wxwidgets/Makefile Fri Jun 03 05:25:28 2011 -0700 @@ -23,13 +23,11 @@ include ../../make-rules/shared-macros.mk -MAKEFILE = - COMPONENT_NAME= wxGTK -COMPONENT_VERSION= 2.8.10 +COMPONENT_VERSION= 2.8.12 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha1:b90a1010851a1f4a3bc2ea5da5412ac66143d768 +COMPONENT_ARCHIVE_HASH= sha1:56cc7f6622dd6f2fecd43fc210dc1c6cb155b37f COMPONENT_ARCHIVE_URL= http://prdownloads.sourceforge.net/wxwindows/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL= http://www.wxwidgets.org
--- a/components/wxwidgets/patches/wxwidgets-02-Tmacro.patch Tue Jun 07 13:38:21 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -From edb725ec268bed5a940c29d0ee51e0d72eb51715 Mon Sep 17 00:00:00 2001 -From: Vadim Zeitlin <[email protected]> -Date: Sat, 5 Sep 2009 15:53:32 +0200 -Subject: [PATCH 1/5] Work around conflict between _T() and Sun CC standard headers. - -This change fixes the build of wxWidgets itself by undefining _T() before -including any standard headers and redefining it after including them. - -See #10660. ---- - include/wx/afterstd.h | 18 ++++++++++++++++++ - include/wx/beforestd.h | 10 ++++++++++ - 2 files changed, 28 insertions(+), 0 deletions(-) - -diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h -index 6fdbb31..3de6507 100644 ---- a/include/wx/afterstd.h -+++ b/include/wx/afterstd.h -@@ -46,3 +46,23 @@ - #endif - #endif - -+/* -+ See comment about Sun C++ compiler in wx/beforestd.h. -+ */ -+#if defined(WXBUILDING) || defined(wxNEEDS_T) -+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) -+ /* -+ Undefine _T in case it was defined in the standard header. -+ */ -+ #undef _T -+ -+ /* -+ And define it again in the same way as it's done in wx/wxchar.h. -+ */ -+ #if wxUSE_UNICODE -+ #define _T(x) wxCONCAT_HELPER(L, x) -+ #else /* !Unicode */ -+ #define _T(x) x -+ #endif /* Unicode/!Unicode */ -+#endif /* defined(__SUNPRO_CC) || defined(__SUNPRO_C) */ -+#endif /* defined(WXBUILDING) */ -diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h -index 684b842..f75f392 100644 ---- a/include/wx/beforestd.h -+++ b/include/wx/beforestd.h -@@ -63,3 +63,13 @@ - #pragma warning(disable:4786) - #endif // VC++ < 7 - -+/* -+ Recent versions of Sun C++ compiler use _T in their standard headers and -+ our definition of it in wx/wxchar.h conflicts with them and breaks -+ compilation, so undefine _T before including them and redefine it back in -+ wx/afterstd.h. -+ */ -+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) -+ #undef _T -+#endif /* SUNCC */ -+ --- -1.6.3.3 -
--- a/components/wxwidgets/patches/wxwidgets-03-Tmacro.patch Tue Jun 07 13:38:21 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,555 +0,0 @@ -From fe65f0d40ff5f1e504e4ab2f2875299209a5e18f Mon Sep 17 00:00:00 2001 -From: Vadim Zeitlin <[email protected]> -Date: Wed, 9 Sep 2009 15:55:54 +0200 -Subject: [PATCH 2/5] Define WXBUILDING when building wxWidgets itself. - -This is needed by the upcoming _T-related patches (see #10660). - -Notice that only Makefile.in was regenerated using the old 0.2.5 bakefile -version to keep changes to the minimum. The other makefiles will have more -changes when they are regenerated with bakefile 0.2.6 after we update to it. ---- - Makefile.in | 128 ++++++++++++++++++++++---------------------- - build/bakefiles/common.bkl | 2 + - 2 files changed, 66 insertions(+), 64 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index be5bb34..6b12dff 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 ada6c31..c19bbbf 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> --- -1.6.3.3 -
--- a/components/wxwidgets/patches/wxwidgets-04-Tmacro.patch Tue Jun 07 13:38:21 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ -From 497270fcc17db1f0cb12d8aa2c49b74805c7195a Mon Sep 17 00:00:00 2001 -From: Vadim Zeitlin <[email protected]> -Date: Wed, 9 Sep 2009 15:39:27 +0200 -Subject: [PATCH 3/5] Don't define _T() when using Sun compiler if possible. - -Avoid defining _T() if possible as it conflicts with the use of this -identifier in standard headers. Do still define it when building wx itself or -when the special symbol wxNEEDS__T is explicitly predefined. - -See #10660. ---- - include/wx/wxchar.h | 50 +++++++++++++++++++++++++++++++------------------- - 1 files changed, 31 insertions(+), 19 deletions(-) - -diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h -index 2620fba..0850ef4 100644 ---- a/include/wx/wxchar.h -+++ b/include/wx/wxchar.h -@@ -227,29 +227,41 @@ - #endif /* ASCII/Unicode */ - - /* ---------------------------------------------------------------------------- */ --/* define _T() and related macros */ -+/* define wxT() and related macros */ - /* ---------------------------------------------------------------------------- */ - --/* BSD systems define _T() to be something different in ctype.h, override it */ --#if defined(__FreeBSD__) || defined(__DARWIN__) -- #include <ctype.h> -- #undef _T -+#if wxUSE_UNICODE -+ /* use wxCONCAT_HELPER so that x could be expanded if it's a macro */ -+ #define wxT(x) wxCONCAT_HELPER(L, x) -+#else /* !Unicode */ -+ #define wxT(x) x -+#endif /* Unicode/!Unicode */ -+ -+/* -+ We define _T() as a synonym of wxT() for backwards compatibility and also -+ for the benefit of Windows programmers used to it. But this identifier is a -+ reserved one and this does create problems in practice, notably with Sun CC -+ which uses it in the recent versions of its standard headers. So avoid -+ defining it for this compiler at all, unless it was explicitly requested by -+ predefining wxNEEDS__T macro before including this header or if we're -+ building wx itself which does need and compiles fine thanks to the special -+ workarounds for Sun CC in wx/{before,after}std.h. -+ */ -+#ifndef wxNEEDS__T -+ #if defined(WXBUILDING) || !(defined (__SUNPRO_C) || defined(__SUNPRO_CC)) -+ #define wxNEEDS__T -+ #endif - #endif - --/* could already be defined by tchar.h (it's quasi standard) */ --#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) */ -- --/* although global macros with such names are normally bad, we want to have */ --/* another name for _T() which should be used to avoid confusion between _T() */ --/* and _() in wxWidgets sources */ --#define wxT(x) _T(x) -+#ifdef wxNEEDS__T -+ /* BSDs define _T() to be something different in ctype.h, override it */ -+ #if defined(__FreeBSD__) || defined(__DARWIN__) -+ #include <ctype.h> -+ #endif -+ #undef _T -+ -+ #define _T(x) wxT(x) -+#endif /* wxNEEDS__T */ - - /* this macro exists only for forward compatibility with wx 3.0 */ - #define wxS(x) _T(x) --- -1.6.3.3 -
--- a/components/wxwidgets/patches/wxwidgets-05-Tmacro.patch Tue Jun 07 13:38:21 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1675 +0,0 @@ -From 8c62f99535aa8bfa13dd705166d0f3afbc918674 Mon Sep 17 00:00:00 2001 -From: Vadim Zeitlin <[email protected]> -Date: Sat, 5 Sep 2009 15:55:13 +0200 -Subject: [PATCH 4/5] Don't use _T() in public headers used under Unix. - -Avoid conflict with the Sun CC standard headers (see #10660). ---- - include/wx/arrstr.h | 4 +- - include/wx/artprov.h | 6 ++-- - 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 | 6 ++-- - include/wx/x11/textctrl.h | 50 +++++++++++++++++++------------------- - include/wx/xrc/xmlres.h | 2 +- - 79 files changed, 320 insertions(+), 320 deletions(-) - -diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h -index 9ad3b4a..e6e6e8f 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 c45ad59..42ee28d 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/buffer.h b/include/wx/buffer.h -index a47a3e2..1a26ead 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/confbase.h b/include/wx/confbase.h -index 2d20b52..ae0b053 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 c4a0954..d21a271 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 e80c2d0..066c9fd 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 81f6c0d..822902f 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 8fd9bd4..cedc452 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 b08f2c6..2d9db9a 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 5e7ff17..f29754c 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 0f4e896..41b536f 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 0bcc54f..f1c95ce 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 84f101d..1ef9a17 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 86ecdb5..02c895c 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 35afe0d..0139d64 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 3bf267f..35e9b36 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 2b08fe2..dba1a21 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 e9ee49a..db8fe4b 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 58aca44..a159aff 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 19e682b..f65cdac 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 c2f51c4..ffd3f9f 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 08acaca..2971a40 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 8ed30e4..0a0e9e3 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 6389ca6..e6b2aae 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 2ee1c10..79939f8 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 3d63773..8bd374d 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 0e7c694..3ce17f0 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 4e3e432..27e79ef 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 cc8accd..c3aa5e6 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 898f1dc..6f73236 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 ba0368b..e96e56a 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 3237b1e..e748a60 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 c70dd6c..4785a5a 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 df7b056..85d0baf 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 536cf39..dc14258 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 fe003dd..ec17ef3 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 5d04a36..83019bc 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 f8f8e16..2cb8a69 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 cca3c4f..9ad9e0c 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 e255fe8..874557f 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 2b779a7..3c36dbc 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 0acba7a..2bf5eaa 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 b04f513..1577d63 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 8567852..fe07138 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 0133637..d541a28 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 010637e..3b7fe8e 100644 ---- a/include/wx/recguard.h -+++ b/include/wx/recguard.h -@@ -35,7 +35,7 @@ public: - - ~wxRecursionGuard() - { -- wxASSERT_MSG( m_flag > 0, _T("unbalanced wxRecursionGuards!?") ); -+ wxASSERT_MSG( m_flag > 0, wxT("unbalanced wxRecursionGuards!?") ); - - m_flag--; - } -diff --git a/include/wx/selstore.h b/include/wx/selstore.h -index b0c0b4e..dfd96d4 100644 ---- a/include/wx/selstore.h -+++ b/include/wx/selstore.h -@@ -51,7 +51,7 @@ public: - void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = false; } - - // must be called when a new item is inserted/added -- void OnItemAdd(size_t WXUNUSED(item)) { wxFAIL_MSG( _T("TODO") ); } -+ void OnItemAdd(size_t WXUNUSED(item)) { wxFAIL_MSG( wxT("TODO") ); } - - // must be called when an item is deleted - void OnItemDelete(size_t item); -diff --git a/include/wx/sound.h b/include/wx/sound.h -index 37315eb..e2d4245 100644 ---- a/include/wx/sound.h -+++ b/include/wx/sound.h -@@ -43,7 +43,7 @@ public: - { - wxASSERT_MSG( (flags & wxSOUND_LOOP) == 0 || - (flags & wxSOUND_ASYNC) != 0, -- _T("sound can only be looped asynchronously") ); -+ wxT("sound can only be looped asynchronously") ); - return DoPlay(flags); - } - #if WXWIN_COMPATIBILITY_2_4 -diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h -index 776868f..3415eee 100644 ---- a/include/wx/spinbutt.h -+++ b/include/wx/spinbutt.h -@@ -23,7 +23,7 @@ - #include "wx/control.h" - #include "wx/event.h" - --#define wxSPIN_BUTTON_NAME _T("wxSpinButton") -+#define wxSPIN_BUTTON_NAME wxT("wxSpinButton") - - // ---------------------------------------------------------------------------- - // The wxSpinButton is like a small scrollbar than is often placed next -diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h -index dec4fa2..84f8ff8 100644 ---- a/include/wx/stopwatch.h -+++ b/include/wx/stopwatch.h -@@ -40,7 +40,7 @@ public: - void Resume() - { - wxASSERT_MSG( m_pauseCount > 0, -- _T("Resuming stop watch which is not paused") ); -+ wxT("Resuming stop watch which is not paused") ); - - if ( --m_pauseCount == 0 ) - Start(m_pause); -diff --git a/include/wx/string.h b/include/wx/string.h -index 67f33ea..8a2d50b 100644 ---- a/include/wx/string.h -+++ b/include/wx/string.h -@@ -70,7 +70,7 @@ class WXDLLIMPEXP_FWD_BASE wxString; - - // implementation only - #define wxASSERT_VALID_INDEX(i) \ -- wxASSERT_MSG( (size_t)(i) <= length(), _T("invalid index in wxString") ) -+ wxASSERT_MSG( (size_t)(i) <= length(), wxT("invalid index in wxString") ) - - // ---------------------------------------------------------------------------- - // constants -@@ -349,7 +349,7 @@ public: - wxStringBase(const wxStringBase& stringSrc) - { - wxASSERT_MSG( stringSrc.GetStringData()->IsValid(), -- _T("did you forget to call UngetWriteBuf()?") ); -+ wxT("did you forget to call UngetWriteBuf()?") ); - - if ( stringSrc.empty() ) { - // nothing to do for an empty string -@@ -376,7 +376,7 @@ public: - wxStringBase(const wxStringBase& str, size_t nPos, size_t nLen) - { - wxASSERT_MSG( str.GetStringData()->IsValid(), -- _T("did you forget to call UngetWriteBuf()?") ); -+ wxT("did you forget to call UngetWriteBuf()?") ); - Init(); - size_t strLen = str.length() - nPos; nLen = strLen < nLen ? strLen : nLen; - InitWith(str.c_str(), nPos, nLen); -@@ -754,7 +754,7 @@ public: - { - Truncate(0); - -- wxASSERT_MSG( empty(), _T("string not empty after call to Empty()?") ); -+ wxASSERT_MSG( empty(), wxT("string not empty after call to Empty()?") ); - } - // empty the string and free memory - void Clear() -@@ -785,7 +785,7 @@ public: - // get last character - wxChar Last() const - { -- wxASSERT_MSG( !empty(), _T("wxString: index out of bounds") ); -+ wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") ); - - return at(length() - 1); - } -@@ -793,7 +793,7 @@ public: - // get writable last character - wxChar& Last() - { -- wxASSERT_MSG( !empty(), _T("wxString: index out of bounds") ); -+ wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") ); - return at(length() - 1); - } - -@@ -993,7 +993,7 @@ public: - { - #if !wxUSE_STL - wxASSERT_MSG( s.GetStringData()->IsValid(), -- _T("did you forget to call UngetWriteBuf()?") ); -+ wxT("did you forget to call UngetWriteBuf()?") ); - #endif - - append(s); -@@ -1058,36 +1058,36 @@ public: - // stream-like functions - // insert an int into string - wxString& operator<<(int i) -- { return (*this) << Format(_T("%d"), i); } -+ { return (*this) << Format(wxT("%d"), i); } - // insert an unsigned int into string - wxString& operator<<(unsigned int ui) -- { return (*this) << Format(_T("%u"), ui); } -+ { return (*this) << Format(wxT("%u"), ui); } - // insert a long into string - wxString& operator<<(long l) -- { return (*this) << Format(_T("%ld"), l); } -+ { return (*this) << Format(wxT("%ld"), l); } - // insert an unsigned long into string - wxString& operator<<(unsigned long ul) -- { return (*this) << Format(_T("%lu"), ul); } -+ { return (*this) << Format(wxT("%lu"), ul); } - #if defined wxLongLong_t && !defined wxLongLongIsLong - // insert a long long if they exist and aren't longs - wxString& operator<<(wxLongLong_t ll) - { -- const wxChar *fmt = _T("%") wxLongLongFmtSpec _T("d"); -+ const wxChar *fmt = wxT("%") wxLongLongFmtSpec wxT("d"); - return (*this) << Format(fmt, ll); - } - // insert an unsigned long long - wxString& operator<<(wxULongLong_t ull) - { -- const wxChar *fmt = _T("%") wxLongLongFmtSpec _T("u"); -+ const wxChar *fmt = wxT("%") wxLongLongFmtSpec wxT("u"); - return (*this) << Format(fmt , ull); - } - #endif - // insert a float into string - wxString& operator<<(float f) -- { return (*this) << Format(_T("%f"), f); } -+ { return (*this) << Format(wxT("%f"), f); } - // insert a double into string - wxString& operator<<(double d) -- { return (*this) << Format(_T("%g"), d); } -+ { return (*this) << Format(wxT("%g"), d); } - - // string comparison - // case-sensitive comparison (returns a value < 0, = 0 or > 0) -diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h -index 1f54ea3..2e10456 100644 ---- a/include/wx/tbarbase.h -+++ b/include/wx/tbarbase.h -@@ -115,7 +115,7 @@ public: - - wxControl *GetControl() const - { -- wxASSERT_MSG( IsControl(), _T("this toolbar tool is not a control") ); -+ wxASSERT_MSG( IsControl(), wxT("this toolbar tool is not a control") ); - - return m_control; - } -@@ -129,7 +129,7 @@ public: - int GetStyle() const { return m_toolStyle; } - wxItemKind GetKind() const - { -- wxASSERT_MSG( IsButton(), _T("only makes sense for buttons") ); -+ wxASSERT_MSG( IsButton(), wxT("only makes sense for buttons") ); - - return m_kind; - } -diff --git a/include/wx/thrimpl.cpp b/include/wx/thrimpl.cpp -index ba4aa31..12f5a87 100644 ---- a/include/wx/thrimpl.cpp -+++ b/include/wx/thrimpl.cpp -@@ -39,7 +39,7 @@ bool wxMutex::IsOk() const - wxMutexError wxMutex::Lock() - { - wxCHECK_MSG( m_internal, wxMUTEX_INVALID, -- _T("wxMutex::Lock(): not initialized") ); -+ wxT("wxMutex::Lock(): not initialized") ); - - return m_internal->Lock(); - } -@@ -47,7 +47,7 @@ wxMutexError wxMutex::Lock() - wxMutexError wxMutex::TryLock() - { - wxCHECK_MSG( m_internal, wxMUTEX_INVALID, -- _T("wxMutex::TryLock(): not initialized") ); -+ wxT("wxMutex::TryLock(): not initialized") ); - - return m_internal->TryLock(); - } -@@ -55,7 +55,7 @@ wxMutexError wxMutex::TryLock() - wxMutexError wxMutex::Unlock() - { - wxCHECK_MSG( m_internal, wxMUTEX_INVALID, -- _T("wxMutex::Unlock(): not initialized") ); -+ wxT("wxMutex::Unlock(): not initialized") ); - - return m_internal->Unlock(); - } -@@ -243,7 +243,7 @@ bool wxCondition::IsOk() const - wxCondError wxCondition::Wait() - { - wxCHECK_MSG( m_internal, wxCOND_INVALID, -- _T("wxCondition::Wait(): not initialized") ); -+ wxT("wxCondition::Wait(): not initialized") ); - - return m_internal->Wait(); - } -@@ -251,7 +251,7 @@ wxCondError wxCondition::Wait() - wxCondError wxCondition::WaitTimeout(unsigned long milliseconds) - { - wxCHECK_MSG( m_internal, wxCOND_INVALID, -- _T("wxCondition::Wait(): not initialized") ); -+ wxT("wxCondition::Wait(): not initialized") ); - - return m_internal->WaitTimeout(milliseconds); - } -@@ -259,7 +259,7 @@ wxCondError wxCondition::WaitTimeout(unsigned long milliseconds) - wxCondError wxCondition::Signal() - { - wxCHECK_MSG( m_internal, wxCOND_INVALID, -- _T("wxCondition::Signal(): not initialized") ); -+ wxT("wxCondition::Signal(): not initialized") ); - - return m_internal->Signal(); - } -@@ -267,7 +267,7 @@ wxCondError wxCondition::Signal() - wxCondError wxCondition::Broadcast() - { - wxCHECK_MSG( m_internal, wxCOND_INVALID, -- _T("wxCondition::Broadcast(): not initialized") ); -+ wxT("wxCondition::Broadcast(): not initialized") ); - - return m_internal->Broadcast(); - } -@@ -299,7 +299,7 @@ bool wxSemaphore::IsOk() const - wxSemaError wxSemaphore::Wait() - { - wxCHECK_MSG( m_internal, wxSEMA_INVALID, -- _T("wxSemaphore::Wait(): not initialized") ); -+ wxT("wxSemaphore::Wait(): not initialized") ); - - return m_internal->Wait(); - } -@@ -307,7 +307,7 @@ wxSemaError wxSemaphore::Wait() - wxSemaError wxSemaphore::TryWait() - { - wxCHECK_MSG( m_internal, wxSEMA_INVALID, -- _T("wxSemaphore::TryWait(): not initialized") ); -+ wxT("wxSemaphore::TryWait(): not initialized") ); - - return m_internal->TryWait(); - } -@@ -315,7 +315,7 @@ wxSemaError wxSemaphore::TryWait() - wxSemaError wxSemaphore::WaitTimeout(unsigned long milliseconds) - { - wxCHECK_MSG( m_internal, wxSEMA_INVALID, -- _T("wxSemaphore::WaitTimeout(): not initialized") ); -+ wxT("wxSemaphore::WaitTimeout(): not initialized") ); - - return m_internal->WaitTimeout(milliseconds); - } -@@ -323,7 +323,7 @@ wxSemaError wxSemaphore::WaitTimeout(unsigned long milliseconds) - wxSemaError wxSemaphore::Post() - { - wxCHECK_MSG( m_internal, wxSEMA_INVALID, -- _T("wxSemaphore::Post(): not initialized") ); -+ wxT("wxSemaphore::Post(): not initialized") ); - - return m_internal->Post(); - } -diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h -index d47d52c..95d3716 100644 ---- a/include/wx/tokenzr.h -+++ b/include/wx/tokenzr.h -@@ -21,7 +21,7 @@ - // ---------------------------------------------------------------------------- - - // default: delimiters are usual white space characters --#define wxDEFAULT_DELIMITERS (_T(" \t\r\n")) -+#define wxDEFAULT_DELIMITERS (wxT(" \t\r\n")) - - // wxStringTokenizer mode flags which determine its behaviour - enum wxStringTokenizerMode -diff --git a/include/wx/valtext.h b/include/wx/valtext.h -index 1bea80e..aeaaa3c 100644 ---- a/include/wx/valtext.h -+++ b/include/wx/valtext.h -@@ -99,9 +99,9 @@ protected: - bool CheckValidator() const - { - wxCHECK_MSG( m_validatorWindow, false, -- _T("No window associated with validator") ); -+ wxT("No window associated with validator") ); - wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), false, -- _T("wxTextValidator is only for wxTextCtrl's") ); -+ wxT("wxTextValidator is only for wxTextCtrl's") ); - - return true; - } -diff --git a/include/wx/vector.h b/include/wx/vector.h -index f8aa562..c724186 100644 ---- a/include/wx/vector.h -+++ b/include/wx/vector.h -@@ -105,7 +105,7 @@ public: - { - if ( !Alloc(n) ) - { -- wxFAIL_MSG( _T("out of memory in wxVector::reserve()") ); -+ wxFAIL_MSG( wxT("out of memory in wxVector::reserve()") ); - } - } - -diff --git a/include/wx/version.h b/include/wx/version.h -index 8af3f27..cd5dda0 100644 ---- a/include/wx/version.h -+++ b/include/wx/version.h -@@ -30,7 +30,7 @@ - #define wxMINOR_VERSION 8 - #define wxRELEASE_NUMBER 10 - #define wxSUBRELEASE_NUMBER 0 --#define wxVERSION_STRING _T("wxWidgets 2.8.10") -+#define wxVERSION_STRING wxT("wxWidgets 2.8.10") - - /* nothing to update below this line when updating the version */ - /* ---------------------------------------------------------------------------- */ -@@ -54,7 +54,7 @@ - #define wxMAKE_VERSION_STRING_T(x, y, z) \ - wxSTRINGIZE_T(x) wxSTRINGIZE_T(y) wxSTRINGIZE_T(z) - #define wxMAKE_VERSION_DOT_STRING_T(x, y, z) \ -- wxSTRINGIZE_T(x) _T(".") wxSTRINGIZE_T(y) _T(".") wxSTRINGIZE_T(z) -+ wxSTRINGIZE_T(x) wxT(".") wxSTRINGIZE_T(y) wxT(".") wxSTRINGIZE_T(z) - - /* these are used by src/msw/version.rc and should always be ASCII, not Unicode */ - #define wxVERSION_NUM_STRING \ -diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h -index f89e876..e774e22 100644 ---- a/include/wx/vlbox.h -+++ b/include/wx/vlbox.h -@@ -17,7 +17,7 @@ - - class WXDLLIMPEXP_FWD_CORE wxSelectionStore; - --#define wxVListBoxNameStr _T("wxVListBox") -+#define wxVListBoxNameStr wxT("wxVListBox") - - // ---------------------------------------------------------------------------- - // wxVListBox -@@ -86,7 +86,7 @@ public: - int GetSelection() const - { - wxASSERT_MSG( !HasMultipleSelection(), -- _T("GetSelection() can't be used with wxLB_MULTIPLE") ); -+ wxT("GetSelection() can't be used with wxLB_MULTIPLE") ); - - return m_current; - } -diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h -index b8b954e..9c2a30b 100644 ---- a/include/wx/wfstream.h -+++ b/include/wx/wfstream.h -@@ -132,7 +132,7 @@ private: - class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream - { - public: -- wxFFileInputStream(const wxString& fileName, const wxChar *mode = _T("rb")); -+ wxFFileInputStream(const wxString& fileName, const wxChar *mode = wxT("rb")); - wxFFileInputStream(wxFFile& file); - wxFFileInputStream(FILE *file); - virtual ~wxFFileInputStream(); -@@ -160,7 +160,7 @@ protected: - class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream - { - public: -- wxFFileOutputStream(const wxString& fileName, const wxChar *mode = _T("w+b")); -+ wxFFileOutputStream(const wxString& fileName, const wxChar *mode = wxT("w+b")); - wxFFileOutputStream(wxFFile& file); - wxFFileOutputStream(FILE *file); - virtual ~wxFFileOutputStream(); -diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h -index 0850ef4..2ebae6b 100644 ---- a/include/wx/wxchar.h -+++ b/include/wx/wxchar.h -@@ -264,10 +264,10 @@ - #endif /* wxNEEDS__T */ - - /* this macro exists only for forward compatibility with wx 3.0 */ --#define wxS(x) _T(x) -+#define wxS(x) wxT(x) - - /* a helper macro allowing to make another macro Unicode-friendly, see below */ --#define wxAPPLY_T(x) _T(x) -+#define wxAPPLY_T(x) wxT(x) - - /* Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs */ - #ifndef __TFILE__ -@@ -1126,7 +1126,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */ - - #ifdef _WIN32_WCE - #if _WIN32_WCE <= 211 -- #define isspace(c) ((c) == _T(' ') || (c) == _T('\t')) -+ #define isspace(c) ((c) == wxT(' ') || (c) == wxT('\t')) - #endif - #endif /* _WIN32_WCE */ - -diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h -index a98f7d4..c96e7cb 100644 ---- a/include/wx/xrc/xmlres.h -+++ b/include/wx/xrc/xmlres.h -@@ -59,7 +59,7 @@ class wxXmlResourceModule; - #define WX_XMLRES_CURRENT_VERSION_MINOR 5 - #define WX_XMLRES_CURRENT_VERSION_RELEASE 3 - #define WX_XMLRES_CURRENT_VERSION_REVISION 0 --#define WX_XMLRES_CURRENT_VERSION_STRING _T("2.5.3.0") -+#define WX_XMLRES_CURRENT_VERSION_STRING wxT("2.5.3.0") - - #define WX_XMLRES_CURRENT_VERSION \ - (WX_XMLRES_CURRENT_VERSION_MAJOR * 256*256*256 + \ --- -1.6.3.3 -
--- a/components/wxwidgets/patches/wxwidgets-06-Tmacro.patch Tue Jun 07 13:38:21 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -From 5e1b0e4ade49f064c19d8b0e8fcdb31dc04c039b Mon Sep 17 00:00:00 2001 -From: Vadim Zeitlin <[email protected]> -Date: Wed, 9 Sep 2009 15:48:05 +0200 -Subject: [PATCH 5/5] Predefine wxNEEDS_T to fix wxrc compilation with Sun CC. - -After the recent changes _T() is not defined any longer when using Sun CC but -this file does need it to be defined and seems to compile fine when it is, so -define wxNEEDS_T before including any wx headers. - -See #10660. ---- - utils/wxrc/wxrc.cpp | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp -index cca4ba1..c255db7 100644 ---- a/utils/wxrc/wxrc.cpp -+++ b/utils/wxrc/wxrc.cpp -@@ -8,6 +8,9 @@ - // Licence: wxWindows licence - ///////////////////////////////////////////////////////////////////////////// - -+// To fix compilation when using Sun CC we must define _T() for this file. -+#define wxNEEDS_T -+ - // For compilers that support precompilation, includes "wx/wx.h". - #include "wx/wxprec.h" - --- -1.6.3.3 -
--- a/components/wxwidgets/patches/wxwidgets-07-gsocket.patch Tue Jun 07 13:38:21 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ ---- wxWidgets-2.8.10/src/gtk/gsockgtk.cpp-orig 2009-09-05 02:22:27.629408064 -0500 -+++ wxWidgets-2.8.10/src/gtk/gsockgtk.cpp 2009-09-05 02:41:11.180272937 -0500 -@@ -15,8 +15,10 @@ - #include <stdlib.h> - #include <stdio.h> - -+#define GSocket GlibGSocket - #include <gdk/gdk.h> - #include <glib.h> -+#undef GSocket - - #include "wx/gsocket.h" - #include "wx/unix/gsockunx.h"
--- a/components/wxwidgets/patches/wxwidgets-08-Tmacro.patch Tue Jun 07 13:38:21 2011 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,238 +0,0 @@ -diff -u -r a/contrib/src//gizmos/editlbox.cpp b/contrib/src//gizmos/editlbox.cpp ---- a/contrib/src//gizmos/editlbox.cpp Wed Sep 16 03:37:52 2009 -+++ b/contrib/src//gizmos/editlbox.cpp Wed Sep 16 03:39:23 2009 -@@ -45,7 +45,7 @@ - - void CreateColumns() - { -- InsertColumn(0, _T("item")); -+ InsertColumn(0, wxT("item")); - SizeColumns(); - } - -diff -u -r a/contrib/src//gizmos/ledctrl.cpp b/contrib/src//gizmos/ledctrl.cpp ---- a/contrib/src//gizmos/ledctrl.cpp Wed Sep 16 03:37:52 2009 -+++ b/contrib/src//gizmos/ledctrl.cpp Wed Sep 16 03:40:26 2009 -@@ -187,51 +187,51 @@ - wxChar c = m_Value.GetChar(offset); - - // Draw faded lines if wanted. -- if (m_DrawFaded && (c != _T('.'))) -+ if (m_DrawFaded && (c != wxT('.'))) - DrawDigit(MemDc, DIGITALL, i); - - // Draw the digits. - switch (c) - { -- case _T('0') : -+ case wxT('0') : - DrawDigit(MemDc, DIGIT0, i); - break; -- case _T('1') : -+ case wxT('1') : - DrawDigit(MemDc, DIGIT1, i); - break; -- case _T('2') : -+ case wxT('2') : - DrawDigit(MemDc, DIGIT2, i); - break; -- case _T('3') : -+ case wxT('3') : - DrawDigit(MemDc, DIGIT3, i); - break; -- case _T('4') : -+ case wxT('4') : - DrawDigit(MemDc, DIGIT4, i); - break; -- case _T('5') : -+ case wxT('5') : - DrawDigit(MemDc, DIGIT5, i); - break; -- case _T('6') : -+ case wxT('6') : - DrawDigit(MemDc, DIGIT6, i); - break; -- case _T('7') : -+ case wxT('7') : - DrawDigit(MemDc, DIGIT7, i); - break; -- case _T('8') : -+ case wxT('8') : - DrawDigit(MemDc, DIGIT8, i); - break; -- case _T('9') : -+ case wxT('9') : - DrawDigit(MemDc, DIGIT9, i); - break; -- case _T('-') : -+ case wxT('-') : - DrawDigit(MemDc, DASH, i); - break; -- case _T('.') : -+ case wxT('.') : - // Display the decimal in the previous segment - i--; - DrawDigit(MemDc, DECIMALSIGN, i); - break; -- case _T(' ') : -+ case wxT(' ') : - // just skip it - break; - default : -diff -u -r a/contrib/src//gizmos/multicell.cpp b/contrib/src//gizmos/multicell.cpp ---- a/contrib/src//gizmos/multicell.cpp Wed Sep 16 03:37:52 2009 -+++ b/contrib/src//gizmos/multicell.cpp Wed Sep 16 03:40:40 2009 -@@ -623,9 +623,9 @@ - { - // thanks to unsigned data row and col are always >= 0 - wxASSERT_MSG( /* row >= 0 && */ row < m_maxRows, -- wxString::Format(_T("Row %d out of bounds (0..%d)"), row, m_maxRows) ); -+ wxString::Format(wxT("Row %d out of bounds (0..%d)"), row, m_maxRows) ); - wxASSERT_MSG( /* col >= 0 && */ col < m_maxCols, -- wxString::Format(_T("Column %d out of bounds (0..%d)"), col, m_maxCols) ); -+ wxString::Format(wxT("Column %d out of bounds (0..%d)"), col, m_maxCols) ); - - wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied")); - -diff -u -r a/contrib/src//plot/plot.cpp b/contrib/src//plot/plot.cpp ---- a/contrib/src//plot/plot.cpp Wed Sep 16 03:37:52 2009 -+++ b/contrib/src//plot/plot.cpp Wed Sep 16 03:42:38 2009 -@@ -134,7 +134,7 @@ - - void wxPlotOnOffCurve::Add( wxInt32 on, wxInt32 off, void *clientData ) - { -- wxASSERT_MSG( on > 0, _T("plot index < 0") ); -+ wxASSERT_MSG( on > 0, wxT("plot index < 0") ); - wxASSERT( on <= off ); - - if (m_minX == -1) -@@ -202,7 +202,7 @@ - END_EVENT_TABLE() - - wxPlotArea::wxPlotArea( wxPlotWindow *parent ) -- : wxWindow( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, _T("plotarea") ) -+ : wxWindow( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, wxT("plotarea") ) - { - m_owner = parent; - -@@ -456,7 +456,7 @@ - END_EVENT_TABLE() - - wxPlotXAxisArea::wxPlotXAxisArea( wxPlotWindow *parent ) -- : wxWindow( parent, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,40), 0, _T("plotxaxisarea") ) -+ : wxWindow( parent, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,40), 0, wxT("plotxaxisarea") ) - { - m_owner = parent; - -@@ -552,14 +552,14 @@ - wxString label; - if (range < 50) - { -- label.Printf( _T("%f"), current ); -- while (label.Last() == _T('0')) -+ label.Printf( wxT("%f"), current ); -+ while (label.Last() == wxT('0')) - label.RemoveLast(); -- if ((label.Last() == _T('.')) || (label.Last() == _T(','))) -- label.Append( _T('0') ); -+ if ((label.Last() == wxT('.')) || (label.Last() == wxT(','))) -+ label.Append( wxT('0') ); - } - else -- label.Printf( _T("%d"), (int)floor(current) ); -+ label.Printf( wxT("%d"), (int)floor(current) ); - dc.DrawText( label, x-4, 20 ); - } - -@@ -583,7 +583,7 @@ - END_EVENT_TABLE() - - wxPlotYAxisArea::wxPlotYAxisArea( wxPlotWindow *parent ) -- : wxWindow( parent, wxID_ANY, wxDefaultPosition, wxSize(60,wxDefaultCoord), 0, _T("plotyaxisarea") ) -+ : wxWindow( parent, wxID_ANY, wxDefaultPosition, wxSize(60,wxDefaultCoord), 0, wxT("plotyaxisarea") ) - { - m_owner = parent; - -@@ -658,14 +658,14 @@ - wxString label; - if (range < 50) - { -- label.Printf( _T("%f"), current ); -- while (label.Last() == _T('0')) -+ label.Printf( wxT("%f"), current ); -+ while (label.Last() == wxT('0')) - label.RemoveLast(); -- if ((label.Last() == _T('.')) || (label.Last() == _T(','))) -- label.Append( _T('0') ); -+ if ((label.Last() == wxT('.')) || (label.Last() == wxT(','))) -+ label.Append( wxT('0') ); - } - else -- label.Printf( _T("%d"), (int)floor(current) ); -+ label.Printf( wxT("%d"), (int)floor(current) ); - dc.DrawText( label, 5, y-7 ); - } - -@@ -707,7 +707,7 @@ - END_EVENT_TABLE() - - wxPlotWindow::wxPlotWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag ) -- : wxScrolledWindow( parent, id, pos, size, flag, _T("plotcanvas") ), -+ : wxScrolledWindow( parent, id, pos, size, flag, wxT("plotcanvas") ), - m_titleStaticText( NULL ) - { - m_xUnitsPerValue = 1.0; -@@ -1088,7 +1088,7 @@ - s_loaded = true; // set it to true anyhow, we won't try again - - #if defined(__WXMSW__) || defined(__WXPM__) -- s_bitmap = new wxBitmap(_T("plot_enl_bmp"), wxBITMAP_TYPE_RESOURCE); -+ s_bitmap = new wxBitmap(wxT("plot_enl_bmp"), wxBITMAP_TYPE_RESOURCE); - #else - s_bitmap = new wxBitmap( plot_enl_xpm ); - #endif -@@ -1107,7 +1107,7 @@ - s_loaded = true; // set it to true anyhow, we won't try again - - #if defined(__WXMSW__) || defined(__WXPM__) -- s_bitmap = new wxBitmap(_T("plot_shr_bmp"), wxBITMAP_TYPE_RESOURCE); -+ s_bitmap = new wxBitmap(wxT("plot_shr_bmp"), wxBITMAP_TYPE_RESOURCE); - #else - s_bitmap = new wxBitmap( plot_shr_xpm ); - #endif -@@ -1126,7 +1126,7 @@ - s_loaded = true; // set it to true anyhow, we won't try again - - #if defined(__WXMSW__) || defined(__WXPM__) -- s_bitmap = new wxBitmap(_T("plot_zin_bmp"), wxBITMAP_TYPE_RESOURCE); -+ s_bitmap = new wxBitmap(wxT("plot_zin_bmp"), wxBITMAP_TYPE_RESOURCE); - #else - s_bitmap = new wxBitmap( plot_zin_xpm ); - #endif -@@ -1145,7 +1145,7 @@ - s_loaded = true; // set it to true anyhow, we won't try again - - #if defined(__WXMSW__) || defined(__WXPM__) -- s_bitmap = new wxBitmap(_T("plot_zot_bmp"), wxBITMAP_TYPE_RESOURCE); -+ s_bitmap = new wxBitmap(wxT("plot_zot_bmp"), wxBITMAP_TYPE_RESOURCE); - #else - s_bitmap = new wxBitmap( plot_zot_xpm ); - #endif -@@ -1164,7 +1164,7 @@ - s_loaded = true; // set it to true anyhow, we won't try again - - #if defined(__WXMSW__) || defined(__WXPM__) -- s_bitmap = new wxBitmap(_T("plot_up_bmp"), wxBITMAP_TYPE_RESOURCE); -+ s_bitmap = new wxBitmap(wxT("plot_up_bmp"), wxBITMAP_TYPE_RESOURCE); - #else - s_bitmap = new wxBitmap( plot_up_xpm ); - #endif -@@ -1183,7 +1183,7 @@ - s_loaded = true; // set it to true anyhow, we won't try again - - #if defined(__WXMSW__) || defined(__WXPM__) -- s_bitmap = new wxBitmap(_T("plot_dwn_bmp"), wxBITMAP_TYPE_RESOURCE); -+ s_bitmap = new wxBitmap(wxT("plot_dwn_bmp"), wxBITMAP_TYPE_RESOURCE); - #else - s_bitmap = new wxBitmap( plot_dwn_xpm ); - #endif
--- a/components/wxwidgets/wxwidgets.p5m Tue Jun 07 13:38:21 2011 -0700 +++ b/components/wxwidgets/wxwidgets.p5m Fri Jun 03 05:25:28 2011 -0700 @@ -29,7 +29,7 @@ set name=info.upstream_url value=$(COMPONENT_PROJECT_URL) set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2008/273/ +set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/LSARC/2008/476/ license wxwidgets.license license='wxWindows Library license' legacy pkg=SUNWwxwidgets desc="wxWidgets - A cross-platform GUI toolkit $(COMPONENT_VERSION)" \ @@ -666,44 +666,44 @@ file path=usr/include/wx-2.8/wx/xtixml.h file path=usr/include/wx-2.8/wx/zipstrm.h file path=usr/include/wx-2.8/wx/zstream.h -file path=usr/lib/$(MACH64)/libwx_baseu_net-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_baseu_xml-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_baseu-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_adv-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_aui-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_core-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_fl-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_gizmos_xrc-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_gizmos-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_gl-2.8.so.0.6.0 pkg.depend.bypass-generate=.* -file path=usr/lib/$(MACH64)/libwx_gtk2u_html-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_ogl-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_plot-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_qa-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_richtext-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_stc-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_svg-2.8.so.0.6.0 -file path=usr/lib/$(MACH64)/libwx_gtk2u_xrc-2.8.so.0.6.0 +file path=usr/lib/$(MACH64)/libwx_baseu_net-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_baseu_xml-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_baseu-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_adv-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_aui-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_core-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_fl-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_gizmos_xrc-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_gizmos-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_gl-2.8.so.0 pkg.depend.bypass-generate=.* +file path=usr/lib/$(MACH64)/libwx_gtk2u_html-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_ogl-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_plot-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_qa-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_richtext-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_stc-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_svg-2.8.so.0 +file path=usr/lib/$(MACH64)/libwx_gtk2u_xrc-2.8.so.0 file path=usr/lib/$(MACH64)/wx/config/gtk2-unicode-release-2.8 file path=usr/lib/$(MACH64)/wx/include/gtk2-unicode-release-2.8/wx/setup.h -file path=usr/lib/libwx_baseu_net-2.8.so.0.6.0 -file path=usr/lib/libwx_baseu_xml-2.8.so.0.6.0 -file path=usr/lib/libwx_baseu-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_adv-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_aui-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_core-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_fl-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_gizmos-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_gl-2.8.so.0.6.0 pkg.depend.bypass-generate=.* -file path=usr/lib/libwx_gtk2u_html-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_ogl-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_plot-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_qa-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_richtext-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_stc-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_svg-2.8.so.0.6.0 -file path=usr/lib/libwx_gtk2u_xrc-2.8.so.0.6.0 +file path=usr/lib/libwx_baseu_net-2.8.so.0 +file path=usr/lib/libwx_baseu_xml-2.8.so.0 +file path=usr/lib/libwx_baseu-2.8.so.0 +file path=usr/lib/libwx_gtk2u_adv-2.8.so.0 +file path=usr/lib/libwx_gtk2u_aui-2.8.so.0 +file path=usr/lib/libwx_gtk2u_core-2.8.so.0 +file path=usr/lib/libwx_gtk2u_fl-2.8.so.0 +file path=usr/lib/libwx_gtk2u_gizmos_xrc-2.8.so.0 +file path=usr/lib/libwx_gtk2u_gizmos-2.8.so.0 +file path=usr/lib/libwx_gtk2u_gl-2.8.so.0 pkg.depend.bypass-generate=.* +file path=usr/lib/libwx_gtk2u_html-2.8.so.0 +file path=usr/lib/libwx_gtk2u_ogl-2.8.so.0 +file path=usr/lib/libwx_gtk2u_plot-2.8.so.0 +file path=usr/lib/libwx_gtk2u_qa-2.8.so.0 +file path=usr/lib/libwx_gtk2u_richtext-2.8.so.0 +file path=usr/lib/libwx_gtk2u_stc-2.8.so.0 +file path=usr/lib/libwx_gtk2u_svg-2.8.so.0 +file path=usr/lib/libwx_gtk2u_xrc-2.8.so.0 file path=usr/lib/wx/config/gtk2-unicode-release-2.8 file path=usr/lib/wx/include/gtk2-unicode-release-2.8/wx/setup.h file path=usr/share/aclocal/wxwin.m4 @@ -712,74 +712,38 @@ link path=usr/bin/$(MACH64)/wx-config target=../../lib/$(MACH64)/wx/config/gtk2-unicode-release-2.8 link path=usr/bin/wx-config target=../lib/wx/config/gtk2-unicode-release-2.8 link path=usr/lib/$(MACH64)/libwx_baseu_net-2.8.so target=libwx_baseu_net-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_baseu_net-2.8.so.0 target=libwx_baseu_net-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_baseu_xml-2.8.so target=libwx_baseu_xml-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_baseu_xml-2.8.so.0 target=libwx_baseu_xml-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_baseu-2.8.so target=libwx_baseu-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_baseu-2.8.so.0 target=libwx_baseu-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_adv-2.8.so target=libwx_gtk2u_adv-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_adv-2.8.so.0 target=libwx_gtk2u_adv-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_aui-2.8.so target=libwx_gtk2u_aui-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_aui-2.8.so.0 target=libwx_gtk2u_aui-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_core-2.8.so target=libwx_gtk2u_core-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_core-2.8.so.0 target=libwx_gtk2u_core-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_fl-2.8.so target=libwx_gtk2u_fl-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_fl-2.8.so.0 target=libwx_gtk2u_fl-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_gizmos_xrc-2.8.so target=libwx_gtk2u_gizmos_xrc-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_gizmos_xrc-2.8.so.0 target=libwx_gtk2u_gizmos_xrc-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_gizmos-2.8.so target=libwx_gtk2u_gizmos-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_gizmos-2.8.so.0 target=libwx_gtk2u_gizmos-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_gl-2.8.so target=libwx_gtk2u_gl-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_gl-2.8.so.0 target=libwx_gtk2u_gl-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_html-2.8.so target=libwx_gtk2u_html-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_html-2.8.so.0 target=libwx_gtk2u_html-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_ogl-2.8.so target=libwx_gtk2u_ogl-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_ogl-2.8.so.0 target=libwx_gtk2u_ogl-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_plot-2.8.so target=libwx_gtk2u_plot-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_plot-2.8.so.0 target=libwx_gtk2u_plot-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_qa-2.8.so target=libwx_gtk2u_qa-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_qa-2.8.so.0 target=libwx_gtk2u_qa-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_richtext-2.8.so target=libwx_gtk2u_richtext-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_richtext-2.8.so.0 target=libwx_gtk2u_richtext-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_stc-2.8.so target=libwx_gtk2u_stc-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_stc-2.8.so.0 target=libwx_gtk2u_stc-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_svg-2.8.so target=libwx_gtk2u_svg-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_svg-2.8.so.0 target=libwx_gtk2u_svg-2.8.so.0.6.0 link path=usr/lib/$(MACH64)/libwx_gtk2u_xrc-2.8.so target=libwx_gtk2u_xrc-2.8.so.0 -link path=usr/lib/$(MACH64)/libwx_gtk2u_xrc-2.8.so.0 target=libwx_gtk2u_xrc-2.8.so.0.6.0 link path=usr/lib/libwx_baseu_net-2.8.so target=libwx_baseu_net-2.8.so.0 -link path=usr/lib/libwx_baseu_net-2.8.so.0 target=libwx_baseu_net-2.8.so.0.6.0 link path=usr/lib/libwx_baseu_xml-2.8.so target=libwx_baseu_xml-2.8.so.0 -link path=usr/lib/libwx_baseu_xml-2.8.so.0 target=libwx_baseu_xml-2.8.so.0.6.0 link path=usr/lib/libwx_baseu-2.8.so target=libwx_baseu-2.8.so.0 -link path=usr/lib/libwx_baseu-2.8.so.0 target=libwx_baseu-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_adv-2.8.so target=libwx_gtk2u_adv-2.8.so.0 -link path=usr/lib/libwx_gtk2u_adv-2.8.so.0 target=libwx_gtk2u_adv-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_aui-2.8.so target=libwx_gtk2u_aui-2.8.so.0 -link path=usr/lib/libwx_gtk2u_aui-2.8.so.0 target=libwx_gtk2u_aui-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_core-2.8.so target=libwx_gtk2u_core-2.8.so.0 -link path=usr/lib/libwx_gtk2u_core-2.8.so.0 target=libwx_gtk2u_core-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_fl-2.8.so target=libwx_gtk2u_fl-2.8.so.0 -link path=usr/lib/libwx_gtk2u_fl-2.8.so.0 target=libwx_gtk2u_fl-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_gizmos_xrc-2.8.so target=libwx_gtk2u_gizmos_xrc-2.8.so.0 -link path=usr/lib/libwx_gtk2u_gizmos_xrc-2.8.so.0 target=libwx_gtk2u_gizmos_xrc-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_gizmos-2.8.so target=libwx_gtk2u_gizmos-2.8.so.0 -link path=usr/lib/libwx_gtk2u_gizmos-2.8.so.0 target=libwx_gtk2u_gizmos-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_gl-2.8.so target=libwx_gtk2u_gl-2.8.so.0 -link path=usr/lib/libwx_gtk2u_gl-2.8.so.0 target=libwx_gtk2u_gl-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_html-2.8.so target=libwx_gtk2u_html-2.8.so.0 -link path=usr/lib/libwx_gtk2u_html-2.8.so.0 target=libwx_gtk2u_html-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_ogl-2.8.so target=libwx_gtk2u_ogl-2.8.so.0 -link path=usr/lib/libwx_gtk2u_ogl-2.8.so.0 target=libwx_gtk2u_ogl-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_plot-2.8.so target=libwx_gtk2u_plot-2.8.so.0 -link path=usr/lib/libwx_gtk2u_plot-2.8.so.0 target=libwx_gtk2u_plot-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_qa-2.8.so target=libwx_gtk2u_qa-2.8.so.0 -link path=usr/lib/libwx_gtk2u_qa-2.8.so.0 target=libwx_gtk2u_qa-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_richtext-2.8.so target=libwx_gtk2u_richtext-2.8.so.0 -link path=usr/lib/libwx_gtk2u_richtext-2.8.so.0 target=libwx_gtk2u_richtext-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_stc-2.8.so target=libwx_gtk2u_stc-2.8.so.0 -link path=usr/lib/libwx_gtk2u_stc-2.8.so.0 target=libwx_gtk2u_stc-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_svg-2.8.so target=libwx_gtk2u_svg-2.8.so.0 -link path=usr/lib/libwx_gtk2u_svg-2.8.so.0 target=libwx_gtk2u_svg-2.8.so.0.6.0 link path=usr/lib/libwx_gtk2u_xrc-2.8.so target=libwx_gtk2u_xrc-2.8.so.0 -link path=usr/lib/libwx_gtk2u_xrc-2.8.so.0 target=libwx_gtk2u_xrc-2.8.so.0.6.0