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:
@@ -180,7 +180,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
|
||||
}
|
||||
case SHAPE_DRAG_TEXT:
|
||||
{
|
||||
m_dragImage = new MyDragImage(this, wxString(_T("Dragging some test text")), wxCursor(wxCURSOR_HAND));
|
||||
m_dragImage = new MyDragImage(this, wxString(wxT("Dragging some test text")), wxCursor(wxCURSOR_HAND));
|
||||
break;
|
||||
}
|
||||
case SHAPE_DRAG_ICON:
|
||||
@@ -316,16 +316,16 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
MyFrame::MyFrame()
|
||||
: wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxDragImage sample"),
|
||||
: wxFrame( (wxFrame *)NULL, wxID_ANY, wxT("wxDragImage sample"),
|
||||
wxPoint(20,20), wxSize(470,360) )
|
||||
{
|
||||
wxMenu *file_menu = new wxMenu();
|
||||
file_menu->Append( wxID_ABOUT, _T("&About..."));
|
||||
file_menu->AppendCheckItem( TEST_USE_SCREEN, _T("&Use whole screen for dragging"), _T("Use whole screen"));
|
||||
file_menu->Append( wxID_EXIT, _T("E&xit"));
|
||||
file_menu->Append( wxID_ABOUT, wxT("&About..."));
|
||||
file_menu->AppendCheckItem( TEST_USE_SCREEN, wxT("&Use whole screen for dragging"), wxT("Use whole screen"));
|
||||
file_menu->Append( wxID_EXIT, wxT("E&xit"));
|
||||
|
||||
wxMenuBar *menu_bar = new wxMenuBar();
|
||||
menu_bar->Append(file_menu, _T("&File"));
|
||||
menu_bar->Append(file_menu, wxT("&File"));
|
||||
|
||||
SetIcon(wxICON(mondrian));
|
||||
SetMenuBar( menu_bar );
|
||||
@@ -346,9 +346,9 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
|
||||
|
||||
void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
|
||||
{
|
||||
(void)wxMessageBox( _T("wxDragImage demo\n")
|
||||
_T("Julian Smart (c) 2000"),
|
||||
_T("About wxDragImage Demo"),
|
||||
(void)wxMessageBox( wxT("wxDragImage demo\n")
|
||||
wxT("Julian Smart (c) 2000"),
|
||||
wxT("About wxDragImage Demo"),
|
||||
wxICON_INFORMATION | wxOK );
|
||||
}
|
||||
|
||||
@@ -376,14 +376,14 @@ bool MyApp::OnInit()
|
||||
#endif
|
||||
|
||||
wxImage image;
|
||||
if (image.LoadFile(_T("backgrnd.png"), wxBITMAP_TYPE_PNG))
|
||||
if (image.LoadFile(wxT("backgrnd.png"), wxBITMAP_TYPE_PNG))
|
||||
{
|
||||
m_background = wxBitmap(image);
|
||||
}
|
||||
|
||||
MyFrame *frame = new MyFrame();
|
||||
|
||||
wxString rootName(_T("shape0"));
|
||||
wxString rootName(wxT("shape0"));
|
||||
|
||||
for (int i = 1; i < 4; i++)
|
||||
{
|
||||
|
Reference in New Issue
Block a user