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:
@@ -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:
|
||||
@@ -45,10 +45,10 @@ class WXDLLIMPEXP_CORE 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
|
||||
@@ -79,10 +79,10 @@ class WXDLLIMPEXP_CORE 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
|
||||
@@ -109,10 +109,10 @@ class WXDLLIMPEXP_CORE 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
|
||||
@@ -136,10 +136,10 @@ class WXDLLIMPEXP_CORE 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");
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user