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:
@@ -133,7 +133,7 @@ bool MyApp::OnInit()
|
||||
return false;
|
||||
|
||||
// create the main application window
|
||||
MyFrame *frame = new MyFrame(_T("wxWebKit Sample"));
|
||||
MyFrame *frame = new MyFrame(wxT("wxWebKit Sample"));
|
||||
|
||||
// and show it (the frames, unlike simple controls, are not shown when
|
||||
// created initially)
|
||||
@@ -184,7 +184,7 @@ MyFrame::MyFrame(const wxString& title)
|
||||
wxButton* btnReload = new wxButton(myToolbar, ID_RELOAD, _("Reload"));
|
||||
myToolbar->AddControl(btnReload);
|
||||
myToolbar->AddSeparator();
|
||||
urlText = new wxTextCtrl(myToolbar, ID_URLLIST, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(220, -1), wxTE_PROCESS_ENTER);
|
||||
urlText = new wxTextCtrl(myToolbar, ID_URLLIST, wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(220, -1), wxTE_PROCESS_ENTER);
|
||||
myToolbar->AddControl(urlText);
|
||||
myToolbar->AddSeparator();
|
||||
myToolbar->Realize();
|
||||
@@ -196,7 +196,7 @@ MyFrame::MyFrame(const wxString& title)
|
||||
wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);
|
||||
panel->SetSizer(boxSizer);
|
||||
|
||||
mySafari = new wxWebKitCtrl(panel, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
|
||||
mySafari = new wxWebKitCtrl(panel, ID_WEBKIT, wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
|
||||
|
||||
boxSizer->Add(mySafari, 1, wxEXPAND);
|
||||
|
||||
@@ -204,7 +204,7 @@ MyFrame::MyFrame(const wxString& title)
|
||||
SetSizer(frameSizer);
|
||||
frameSizer->Add(panel, 1, wxEXPAND);
|
||||
#else
|
||||
mySafari = new wxWebKitCtrl(this, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
|
||||
mySafari = new wxWebKitCtrl(this, ID_WEBKIT, wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
|
||||
#endif
|
||||
|
||||
#if wxUSE_STATUSBAR
|
||||
|
Reference in New Issue
Block a user