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:
@@ -57,20 +57,20 @@ static void CheckGLError()
|
||||
// so check that we get a different error than the last time
|
||||
if ( err == errLast )
|
||||
{
|
||||
wxLogError(_T("OpenGL error state couldn't be reset."));
|
||||
wxLogError(wxT("OpenGL error state couldn't be reset."));
|
||||
return;
|
||||
}
|
||||
|
||||
errLast = err;
|
||||
|
||||
wxLogError(_T("OpenGL error %d"), err);
|
||||
wxLogError(wxT("OpenGL error %d"), err);
|
||||
}
|
||||
}
|
||||
|
||||
// function to draw the texture for cube faces
|
||||
static wxImage DrawDice(int size, unsigned num)
|
||||
{
|
||||
wxASSERT_MSG( num >= 1 && num <= 6, _T("invalid dice index") );
|
||||
wxASSERT_MSG( num >= 1 && num <= 6, wxT("invalid dice index") );
|
||||
|
||||
const int dot = size/16; // radius of a single dot
|
||||
const int gap = 5*size/32; // gap between dots
|
||||
@@ -369,7 +369,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
MyFrame::MyFrame()
|
||||
: wxFrame(NULL, wxID_ANY, _T("wxWidgets OpenGL Cube Sample"))
|
||||
: wxFrame(NULL, wxID_ANY, wxT("wxWidgets OpenGL Cube Sample"))
|
||||
{
|
||||
new TestGLCanvas(this);
|
||||
|
||||
@@ -381,7 +381,7 @@ MyFrame::MyFrame()
|
||||
menu->AppendSeparator();
|
||||
menu->Append(wxID_CLOSE);
|
||||
wxMenuBar *menuBar = new wxMenuBar;
|
||||
menuBar->Append(menu, _T("&Cube"));
|
||||
menuBar->Append(menu, wxT("&Cube"));
|
||||
|
||||
SetMenuBar(menuBar);
|
||||
|
||||
|
@@ -103,9 +103,9 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
|
||||
// Make a menubar
|
||||
wxMenu *fileMenu = new wxMenu;
|
||||
|
||||
fileMenu->Append(wxID_EXIT, _T("E&xit"));
|
||||
fileMenu->Append(wxID_EXIT, wxT("E&xit"));
|
||||
wxMenuBar *menuBar = new wxMenuBar;
|
||||
menuBar->Append(fileMenu, _T("&File"));
|
||||
menuBar->Append(fileMenu, wxT("&File"));
|
||||
SetMenuBar(menuBar);
|
||||
|
||||
|
||||
@@ -230,7 +230,7 @@ void TestGLCanvas::LoadSurface(const wxString& filename)
|
||||
|
||||
delete stream;
|
||||
|
||||
wxLogMessage(_T("Loaded %d vertices, %d triangles from '%s'"),
|
||||
wxLogMessage(wxT("Loaded %d vertices, %d triangles from '%s'"),
|
||||
m_numverts, m_numverts-2, filename.c_str());
|
||||
|
||||
// NOTE: for some reason under wxGTK the following is required to avoid that
|
||||
|
Reference in New Issue
Block a user