Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Globally replace _T() with wxT().

Browse Source 
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:
Vadim Zeitlin
2009-07-23 20:30:22 +00:00
parent 32cdc45397
commit 9a83f86094
798 changed files with 10370 additions and 10349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/app.h
View File

@@ -52,7 +52,7 @@ public:
// this suffix should be appended to all our Win32 class names to obtain a
// variant registered without CS_[HV]REDRAW styles
static const wxChar *GetNoRedrawClassSuffix() { return _T("NR"); }
static const wxChar *GetNoRedrawClassSuffix() { return wxT("NR"); }
// get the name of the registered Win32 class with the given (unique) base
// name: this function constructs the unique class name using this name as

2
include/wx/msw/dc.h
View File

@@ -338,7 +338,7 @@ public:
virtual void DoGetSize(int *w, int *h) const
{
wxASSERT_MSG( m_size.IsFullySpecified(),
_T("size of this DC hadn't been set and is unknown") );
wxT("size of this DC hadn't been set and is unknown") );
if ( w )
*w = m_size.x;

2
include/wx/msw/gdiimage.h
View File

@@ -145,7 +145,7 @@ protected:
virtual wxGDIRefData *
CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
{
wxFAIL_MSG( _T("must be implemented if used") );
wxFAIL_MSG( wxT("must be implemented if used") );
return NULL;
}

2
include/wx/msw/ole/dataobj.h
View File

@@ -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

2
include/wx/msw/ole/dropsrc.h
View File

@@ -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

6
include/wx/msw/ole/oleutils.h
View File

@@ -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; \

28
include/wx/msw/private.h
View File

@@ -369,7 +369,7 @@ inline RECT wxGetWindowRect(HWND hwnd)
if ( !::GetWindowRect(hwnd, &rect) )
{
wxLogLastError(_T("GetWindowRect"));
wxLogLastError(wxT("GetWindowRect"));
}
return rect;
@@ -381,7 +381,7 @@ inline RECT wxGetClientRect(HWND hwnd)
if ( !::GetClientRect(hwnd, &rect) )
{
wxLogLastError(_T("GetClientRect"));
wxLogLastError(wxT("GetClientRect"));
}
return rect;
@@ -452,7 +452,7 @@ public:
void Init(HDC hdc, HGDIOBJ hgdiobj)
{
wxASSERT_MSG( !m_hdc, _T("initializing twice?") );
wxASSERT_MSG( !m_hdc, wxT("initializing twice?") );
m_hdc = hdc;
@@ -481,7 +481,7 @@ protected:
void InitGdiobj(HGDIOBJ gdiobj)
{
wxASSERT_MSG( !m_gdiobj, _T("initializing twice?") );
wxASSERT_MSG( !m_gdiobj, wxT("initializing twice?") );
m_gdiobj = gdiobj;
}
@@ -575,7 +575,7 @@ public:
{
if ( !::SelectClipRgn(hdc, hrgn) )
{
wxLogLastError(_T("SelectClipRgn"));
wxLogLastError(wxT("SelectClipRgn"));
}
}
@@ -606,7 +606,7 @@ private:
m_modeOld = ::SetMapMode(hdc, mm);
if ( !m_modeOld )
{
wxLogLastError(_T("SelectClipRgn"));
wxLogLastError(wxT("SelectClipRgn"));
}
}
@@ -643,7 +643,7 @@ public:
m_hGlobal = ::GlobalAlloc(flags, size);
if ( !m_hGlobal )
{
wxLogLastError(_T("GlobalAlloc"));
wxLogLastError(wxT("GlobalAlloc"));
}
}
@@ -656,7 +656,7 @@ public:
{
if ( m_hGlobal && ::GlobalFree(m_hGlobal) )
{
wxLogLastError(_T("GlobalFree"));
wxLogLastError(wxT("GlobalFree"));
}
}
@@ -694,7 +694,7 @@ public:
m_ptr = GlobalLock(hGlobal);
if ( !m_ptr )
{
wxLogLastError(_T("GlobalLock"));
wxLogLastError(wxT("GlobalLock"));
}
}
@@ -712,7 +712,7 @@ public:
DWORD dwLastError = ::GetLastError();
if ( dwLastError != NO_ERROR )
{
wxLogApiError(_T("GlobalUnlock"), dwLastError);
wxLogApiError(wxT("GlobalUnlock"), dwLastError);
}
}
}
@@ -745,12 +745,12 @@ public:
{
// we should only be called if we hadn't been initialized yet
wxASSERT_MSG( m_registered == -1,
_T("calling ClassRegistrar::Register() twice?") );
wxT("calling ClassRegistrar::Register() twice?") );
m_registered = ::RegisterClass(&wc) ? 1 : 0;
if ( !IsRegistered() )
{
wxLogLastError(_T("RegisterClassEx()"));
wxLogLastError(wxT("RegisterClassEx()"));
}
else
{
@@ -771,7 +771,7 @@ public:
{
if ( !::UnregisterClass(m_clsname.wx_str(), wxhInstance) )
{
wxLogLastError(_T("UnregisterClass"));
wxLogLastError(wxT("UnregisterClass"));
}
}
}
@@ -857,7 +857,7 @@ inline wxString wxGetFullModuleName(HMODULE hmod)
MAX_PATH
) )
{
wxLogLastError(_T("GetModuleFileName"));
wxLogLastError(wxT("GetModuleFileName"));
}
return fullname;

2
include/wx/msw/private/button.h
View File

@@ -38,7 +38,7 @@ namespace wxMSWButton
// returns BS_MULTILINE if the label contains new lines or 0 otherwise
inline int GetMultilineStyle(const wxString& label)
{
return label.find(_T('\n')) == wxString::npos ? 0 : BS_MULTILINE;
return label.find(wxT('\n')) == wxString::npos ? 0 : BS_MULTILINE;
}
// update the style of the specified HWND to include or exclude BS_MULTILINE

6
include/wx/msw/private/dc.h
View File

@@ -72,7 +72,7 @@ protected:
m_oldColFg = ::SetTextColor(m_hdc, colFg);
if ( m_oldColFg == CLR_INVALID )
{
wxLogLastError(_T("SetTextColor"));
wxLogLastError(wxT("SetTextColor"));
}
}
else
@@ -85,7 +85,7 @@ protected:
m_oldColBg = ::SetBkColor(m_hdc, colBg);
if ( m_oldColBg == CLR_INVALID )
{
wxLogLastError(_T("SetBkColor"));
wxLogLastError(wxT("SetBkColor"));
}
}
else
@@ -131,7 +131,7 @@ protected:
: OPAQUE);
if ( !m_oldMode )
{
wxLogLastError(_T("SetBkMode"));
wxLogLastError(wxT("SetBkMode"));
}
}

2
include/wx/msw/private/metrics.h
View File

@@ -36,7 +36,7 @@ inline const NONCLIENTMETRICS& GetNonClientMetrics()
#endif // WINVER >= 0x0600
{
// maybe we should initialize the struct with some defaults?
wxLogLastError(_T("SystemParametersInfo(SPI_GETNONCLIENTMETRICS)"));
wxLogLastError(wxT("SystemParametersInfo(SPI_GETNONCLIENTMETRICS)"));
}
}

2
include/wx/msw/slider.h
View File

@@ -101,7 +101,7 @@ protected:
void Init();
// format an integer value as string
static wxString Format(int n) { return wxString::Format(_T("%d"), n); }
static wxString Format(int n) { return wxString::Format(wxT("%d"), n); }
// get the boundig box for the slider and possible labels
wxRect GetBoundingBox() const;

4
include/wx/msw/spinctrl.h
View File

@@ -39,7 +39,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
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);
}
@@ -51,7 +51,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
int min = 0, int max = 100, int initial = 0,
const wxString& name = _T("wxSpinCtrl"));
const wxString& name = wxT("wxSpinCtrl"));
// a wxTextCtrl-like method (but we can't have GetValue returning wxString
// because the base class already has one returning int!)

8
include/wx/msw/subwin.h
View File

@@ -28,7 +28,7 @@ public:
// allocate enough space for the given number of windows
void Create(size_t n)
{
wxASSERT_MSG( !m_hwnds, _T("Create() called twice?") );
wxASSERT_MSG( !m_hwnds, wxT("Create() called twice?") );
m_count = n;
m_hwnds = (HWND *)calloc(n, sizeof(HWND));
@@ -54,7 +54,7 @@ public:
// access a given window
HWND& Get(size_t n)
{
wxASSERT_MSG( n < m_count, _T("subwindow index out of range") );
wxASSERT_MSG( n < m_count, wxT("subwindow index out of range") );
return m_hwnds[n];
}
@@ -68,7 +68,7 @@ public:
// that it is not reused while this object exists
void Set(size_t n, HWND hwnd, wxWindowID id)
{
wxASSERT_MSG( n < m_count, _T("subwindow index out of range") );
wxASSERT_MSG( n < m_count, wxT("subwindow index out of range") );
m_hwnds[n] = hwnd;
m_ids[n] = id;
@@ -115,7 +115,7 @@ public:
void SetFont(const wxFont& font)
{
HFONT hfont = GetHfontOf(font);
wxCHECK_RET( hfont, _T("invalid font") );
wxCHECK_RET( hfont, wxT("invalid font") );
for ( size_t n = 0; n < m_count; n++ )
{

2
include/wx/msw/wrapshl.h
View File

@@ -72,7 +72,7 @@ public:
wxString path;
if ( !SHGetPathFromIDList(m_pidl, wxStringBuffer(path, MAX_PATH)) )
{
wxLogLastError(_T("SHGetPathFromIDList"));
wxLogLastError(wxT("SHGetPathFromIDList"));
}
return path;