Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Globally replace _T() with wxT().

Browse Source 
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:
Vadim Zeitlin
2009-07-23 20:30:22 +00:00
parent 32cdc45397
commit 9a83f86094
798 changed files with 10370 additions and 10349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
samples/caret/caret.cpp
View File

@@ -186,7 +186,7 @@ bool MyApp::OnInit()
return false;
// create and show the main application window
MyFrame *frame = new MyFrame(_T("Caret wxWidgets sample"),
MyFrame *frame = new MyFrame(wxT("Caret wxWidgets sample"),
wxPoint(50, 50), wxSize(450, 340));
frame->Show(true);
@@ -211,17 +211,17 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a menu bar
wxMenu *menuFile = new wxMenu;
menuFile->Append(Caret_SetBlinkTime, _T("&Blink time...\tCtrl-B"));
menuFile->Append(Caret_SetFontSize, _T("&Font size...\tCtrl-S"));
menuFile->Append(Caret_Move, _T("&Move caret\tCtrl-C"));
menuFile->Append(Caret_SetBlinkTime, wxT("&Blink time...\tCtrl-B"));
menuFile->Append(Caret_SetFontSize, wxT("&Font size...\tCtrl-S"));
menuFile->Append(Caret_Move, wxT("&Move caret\tCtrl-C"));
menuFile->AppendSeparator();
menuFile->Append(Caret_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
menuFile->Append(Caret_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
menuFile->AppendSeparator();
menuFile->Append(Caret_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
menuFile->Append(Caret_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar;
menuBar->Append(menuFile, _T("&File"));
menuBar->Append(menuFile, wxT("&File"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
@@ -231,7 +231,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
#if wxUSE_STATUSBAR
// create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2);
SetStatusText(_T("Welcome to wxWidgets!"));
SetStatusText(wxT("Welcome to wxWidgets!"));
#endif // wxUSE_STATUSBAR
}
@@ -246,8 +246,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxMessageBox(_T("The caret wxWidgets sample.\n(c) 1999 Vadim Zeitlin"),
_T("About Caret"), wxOK | wxICON_INFORMATION, this);
wxMessageBox(wxT("The caret wxWidgets sample.\n(c) 1999 Vadim Zeitlin"),
wxT("About Caret"), wxOK | wxICON_INFORMATION, this);
}
void MyFrame::OnCaretMove(wxCommandEvent& WXUNUSED(event))
@@ -259,9 +259,9 @@ void MyFrame::OnSetBlinkTime(wxCommandEvent& WXUNUSED(event))
{
long blinkTime = wxGetNumberFromUser
(
_T("The caret blink time is the time between two blinks"),
_T("Time in milliseconds:"),
_T("wxCaret sample"),
wxT("The caret blink time is the time between two blinks"),
wxT("Time in milliseconds:"),
wxT("wxCaret sample"),
wxCaret::GetBlinkTime(), 0, 10000,
this
);
@@ -269,7 +269,7 @@ void MyFrame::OnSetBlinkTime(wxCommandEvent& WXUNUSED(event))
{
wxCaret::SetBlinkTime((int)blinkTime);
m_canvas->CreateCaret();
wxLogStatus(this, _T("Blink time set to %ld milliseconds."), blinkTime);
wxLogStatus(this, wxT("Blink time set to %ld milliseconds."), blinkTime);
}
}
@@ -277,9 +277,9 @@ void MyFrame::OnSetFontSize(wxCommandEvent& WXUNUSED(event))
{
long fontSize = wxGetNumberFromUser
(
_T("The font size also determines the caret size so\nthis demonstrates resizing the caret."),
_T("Font size (in points):"),
_T("wxCaret sample"),
wxT("The font size also determines the caret size so\nthis demonstrates resizing the caret."),
wxT("Font size (in points):"),
wxT("wxCaret sample"),
12, 1, 100,
this
);
@@ -364,7 +364,7 @@ void MyCanvas::MoveCaret(int x, int y)
void MyCanvas::DoMoveCaret()
{
wxLogStatus(_T("Caret is at (%d, %d)"), m_xCaret, m_yCaret);
wxLogStatus(wxT("Caret is at (%d, %d)"), m_xCaret, m_yCaret);
GetCaret()->Move(m_xMargin + m_xCaret * m_widthChar,
m_yMargin + m_yCaret * m_heightChar);
@@ -396,7 +396,7 @@ void MyCanvas::ChangeSize()
if ( frame && frame->GetStatusBar() )
{
wxString msg;
msg.Printf(_T("Panel size is (%d, %d)"), m_xChars, m_yChars);
msg.Printf(wxT("Panel size is (%d, %d)"), m_xChars, m_yChars);
frame->SetStatusText(msg, 1);
}
#endif // wxUSE_STATUSBAR
@@ -423,7 +423,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
wxChar ch = CharAt(x, y);
if ( !ch )
ch = _T(' ');
ch = wxT(' ');
line += ch;
}