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:
@@ -335,7 +335,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;
|
||||
|
@@ -180,7 +180,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;
|
||||
}
|
||||
|
@@ -37,7 +37,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);
|
||||
}
|
||||
@@ -49,7 +49,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"));
|
||||
|
||||
// a wxTextCtrl-like method (but we can't have GetValue returning wxString
|
||||
// because the base class already has one returning int!)
|
||||
|
@@ -54,14 +54,14 @@ public:
|
||||
// vice versa
|
||||
wxIcon GetIcon() const
|
||||
{
|
||||
wxASSERT_MSG( m_isIcon, _T("no icon in this wxStaticBitmap") );
|
||||
wxASSERT_MSG( m_isIcon, wxT("no icon in this wxStaticBitmap") );
|
||||
|
||||
return *(wxIcon *)m_image;
|
||||
}
|
||||
|
||||
wxBitmap GetBitmap() const
|
||||
{
|
||||
wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") );
|
||||
wxASSERT_MSG( !m_isIcon, wxT("no bitmap in this wxStaticBitmap") );
|
||||
|
||||
return *(wxBitmap *)m_image;
|
||||
}
|
||||
|
Reference in New Issue
Block a user