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")