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

62
samples/vscroll/vstest.cpp
View File

@@ -83,7 +83,7 @@ public:
if ( m_frameStatusBar )
{
wxSize sz = GetClientSize();
SetStatusText(wxString::Format(_T("%dx%d"), sz.x, sz.y), 1);
SetStatusText(wxString::Format(wxT("%dx%d"), sz.x, sz.y), 1);
}
#endif // wxUSE_STATUSBAR
@@ -119,7 +119,7 @@ public:
#if wxUSE_STATUSBAR
m_frame->SetStatusText(wxString::Format
(
_T("Page size = %d, pos = %d, max = %d"),
wxT("Page size = %d, pos = %d, max = %d"),
GetScrollThumb(wxVERTICAL),
GetScrollPos(wxVERTICAL),
GetScrollRange(wxVERTICAL)
@@ -147,7 +147,7 @@ public:
dc.DrawLine(0, y, clientSize.GetWidth(), y);
wxCoord hLine = OnGetRowHeight(line);
dc.DrawText(wxString::Format(_T("Line %lu"), (unsigned long)line),
dc.DrawText(wxString::Format(wxT("Line %lu"), (unsigned long)line),
2, y + (hLine - hText) / 2);
y += hLine;
@@ -216,7 +216,7 @@ public:
#if wxUSE_STATUSBAR
m_frame->SetStatusText(wxString::Format
(
_T("Page size = %d, pos = %d, max = %d"),
wxT("Page size = %d, pos = %d, max = %d"),
GetScrollThumb(wxVERTICAL),
GetScrollPos(wxVERTICAL),
GetScrollRange(wxVERTICAL)
@@ -244,7 +244,7 @@ public:
dc.DrawLine(x, 0, x, clientSize.GetHeight());
wxCoord wLine = OnGetColumnWidth(line);
dc.DrawRotatedText(wxString::Format(_T("Line %lu"), (unsigned long)line),
dc.DrawRotatedText(wxString::Format(wxT("Line %lu"), (unsigned long)line),
x + (wLine - hText) / 2, clientSize.GetHeight() - 5, 90);
x += wLine;
@@ -316,7 +316,7 @@ public:
#if wxUSE_STATUSBAR
m_frame->SetStatusText(wxString::Format
(
_T("Page size = %d rows %d columns; pos = row: %d, column: %d; max = %d rows, %d columns"),
wxT("Page size = %d rows %d columns; pos = row: %d, column: %d; max = %d rows, %d columns"),
GetScrollThumb(wxVERTICAL),
GetScrollThumb(wxHORIZONTAL),
GetScrollPos(wxVERTICAL),
@@ -358,9 +358,9 @@ public:
if ( row == rowFirst )
dc.DrawLine(x, 0, x, clientSize.GetHeight());
dc.DrawText(wxString::Format(_T("Row %lu"), (unsigned long)row),
dc.DrawText(wxString::Format(wxT("Row %lu"), (unsigned long)row),
x + 2, y + rowHeight / 2 - hText);
dc.DrawText(wxString::Format(_T("Col %lu"), (unsigned long)col),
dc.DrawText(wxString::Format(wxT("Col %lu"), (unsigned long)col),
x + 2, y + rowHeight / 2);
x += colWidth;
@@ -497,7 +497,7 @@ bool VarScrollApp::OnInit()
VarScrollFrame::VarScrollFrame()
: wxFrame(NULL,
wxID_ANY,
_T("VScroll wxWidgets Sample"),
wxT("VScroll wxWidgets Sample"),
wxDefaultPosition,
wxSize(400, 350)),
m_scrollWindow(NULL)
@@ -513,33 +513,33 @@ VarScrollFrame::VarScrollFrame()
// the "About" item should be in the help menu
wxMenu *menuHelp = new wxMenu;
menuHelp->Append(VScroll_About, _T("&About...\tF1"), _T("Show about dialog"));
menuHelp->Append(VScroll_About, wxT("&About...\tF1"), wxT("Show about dialog"));
#ifdef wxHAS_RADIO_MENU_ITEMS
menuMode->AppendRadioItem(VScroll_VScrollMode, _T("&Vertical\tAlt-V"),
_T("Vertical scrolling only"));
menuMode->AppendRadioItem(VScroll_HScrollMode, _T("&Horizontal\tAlt-H"),
_T("Horizontal scrolling only"));
menuMode->AppendRadioItem(VScroll_VScrollMode, wxT("&Vertical\tAlt-V"),
wxT("Vertical scrolling only"));
menuMode->AppendRadioItem(VScroll_HScrollMode, wxT("&Horizontal\tAlt-H"),
wxT("Horizontal scrolling only"));
menuMode->AppendRadioItem(VScroll_HVScrollMode,
_T("Hori&zontal/Vertical\tAlt-Z"),
_T("Horizontal and vertical scrolling"));
wxT("Hori&zontal/Vertical\tAlt-Z"),
wxT("Horizontal and vertical scrolling"));
menuMode->Check(VScroll_VScrollMode, true);
#else
menuMode->Append(VScroll_VScrollMode, _T("&Vertical\tAlt-V"),
_T("Vertical scrolling only"));
menuMode->Append(VScroll_HScrollMode, _T("&Horizontal\tAlt-H"),
_T("Horizontal scrolling only"));
menuMode->Append(VScroll_HVScrollMode, _T("Hori&zontal/Vertical\tAlt-Z"),
_T("Horizontal and vertical scrolling"));
menuMode->Append(VScroll_VScrollMode, wxT("&Vertical\tAlt-V"),
wxT("Vertical scrolling only"));
menuMode->Append(VScroll_HScrollMode, wxT("&Horizontal\tAlt-H"),
wxT("Horizontal scrolling only"));
menuMode->Append(VScroll_HVScrollMode, wxT("Hori&zontal/Vertical\tAlt-Z"),
wxT("Horizontal and vertical scrolling"));
#endif
menuFile->Append(VScroll_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
menuFile->Append(VScroll_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(menuMode, _T("&Mode"));
menuBar->Append(menuHelp, _T("&Help"));
menuBar->Append(menuFile, wxT("&File"));
menuBar->Append(menuMode, wxT("&Mode"));
menuBar->Append(menuHelp, wxT("&Help"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
@@ -548,7 +548,7 @@ VarScrollFrame::VarScrollFrame()
#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!"));
int widths[2];
widths[0] = -1;
widths[1] = 100;
@@ -603,10 +603,10 @@ void VarScrollFrame::OnModeHVScroll(wxCommandEvent& WXUNUSED(event))
void VarScrollFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxMessageBox(_T("VScroll shows how to implement scrolling with\n")
_T("variable line widths and heights.\n")
_T("(c) 2003 Vadim Zeitlin"),
_T("About VScroll"),
wxMessageBox(wxT("VScroll shows how to implement scrolling with\n")
wxT("variable line widths and heights.\n")
wxT("(c) 2003 Vadim Zeitlin"),
wxT("About VScroll"),
wxOK | wxICON_INFORMATION,
this);
}