Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -59,7 +59,7 @@ public:
|
||||
|
||||
#define wxGetFormatName(format) wxDataObject::GetFormatName(format)
|
||||
#else // !Debug
|
||||
#define wxGetFormatName(format) _T("")
|
||||
#define wxGetFormatName(format) wxT("")
|
||||
#endif // Debug/!Debug
|
||||
// they need to be accessed from wxIDataObject, so made them public,
|
||||
// or wxIDataObject friend
|
||||
|
@@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
// the cursor 'name' from the resources under MSW, but will expand to
|
||||
// something else under GTK. If you don't use it, you will have to use #ifdef
|
||||
// in the application code.
|
||||
#define wxDROP_ICON(name) wxCursor(_T(#name))
|
||||
#define wxDROP_ICON(name) wxCursor(wxT(#name))
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxDropSource is used to start the drag-&-drop operation on associated
|
||||
|
@@ -143,7 +143,7 @@ private:
|
||||
#define IMPLEMENT_IUNKNOWN_METHODS(classname) \
|
||||
STDMETHODIMP classname::QueryInterface(REFIID riid, void **ppv) \
|
||||
{ \
|
||||
wxLogQueryInterface(_T(#classname), riid); \
|
||||
wxLogQueryInterface(wxT(#classname), riid); \
|
||||
\
|
||||
if ( IsIidFromList(riid, ms_aIids, WXSIZEOF(ms_aIids)) ) { \
|
||||
*ppv = this; \
|
||||
@@ -160,14 +160,14 @@ private:
|
||||
\
|
||||
STDMETHODIMP_(ULONG) classname::AddRef() \
|
||||
{ \
|
||||
wxLogAddRef(_T(#classname), m_cRef); \
|
||||
wxLogAddRef(wxT(#classname), m_cRef); \
|
||||
\
|
||||
return ++m_cRef; \
|
||||
} \
|
||||
\
|
||||
STDMETHODIMP_(ULONG) classname::Release() \
|
||||
{ \
|
||||
wxLogRelease(_T(#classname), m_cRef); \
|
||||
wxLogRelease(wxT(#classname), m_cRef); \
|
||||
\
|
||||
if ( --m_cRef == wxAutoULong(0) ) { \
|
||||
delete this; \
|
||||
|
Reference in New Issue
Block a user