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

44
samples/oleauto/oleauto.cpp
View File

@@ -129,7 +129,7 @@ bool MyApp::OnInit()
return false;
// Create the main application window
MyFrame *frame = new MyFrame(_T("OleAuto wxWidgets App"),
MyFrame *frame = new MyFrame(wxT("OleAuto wxWidgets App"),
wxPoint(50, 50), wxSize(450, 340));
// Show it and tell the application that it's our main window
@@ -157,14 +157,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a menu bar
wxMenu *menuFile = new wxMenu;
menuFile->Append(OleAuto_Test, _T("&Test Excel Automation..."));
menuFile->Append(OleAuto_About, _T("&About..."));
menuFile->Append(OleAuto_Test, wxT("&Test Excel Automation..."));
menuFile->Append(OleAuto_About, wxT("&About..."));
menuFile->AppendSeparator();
menuFile->Append(OleAuto_Quit, _T("E&xit"));
menuFile->Append(OleAuto_Quit, wxT("E&xit"));
// 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);
@@ -172,7 +172,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
}
@@ -187,8 +187,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxMessageBox(_T("This is an OLE Automation sample"),
_T("About OleAuto"), wxOK | wxICON_INFORMATION, this);
wxMessageBox(wxT("This is an OLE Automation sample"),
wxT("About OleAuto"), wxOK | wxICON_INFORMATION, this);
}
/* Tests OLE automation by making the active Excel cell bold,
@@ -196,49 +196,49 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
*/
void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))
{
wxMessageBox(_T("Please ensure Excel is running, then press OK.\nThe active cell should then say 'wxWidgets automation test!' in bold."));
wxMessageBox(wxT("Please ensure Excel is running, then press OK.\nThe active cell should then say 'wxWidgets automation test!' in bold."));
wxAutomationObject excelObject, rangeObject;
if (!excelObject.GetInstance(_T("Excel.Application")))
if (!excelObject.GetInstance(wxT("Excel.Application")))
{
// Start Excel if it is not running
if (!excelObject.CreateInstance(_T("Excel.Application")))
if (!excelObject.CreateInstance(wxT("Excel.Application")))
{
wxMessageBox(_T("Could not create Excel object."));
wxMessageBox(wxT("Could not create Excel object."));
return;
}
}
// Ensure that Excel is visible
if (!excelObject.PutProperty(_T("Visible"), true))
if (!excelObject.PutProperty(wxT("Visible"), true))
{
wxMessageBox(_T("Could not make Excel object visible"));
wxMessageBox(wxT("Could not make Excel object visible"));
}
const wxVariant workbooksCountVariant = excelObject.GetProperty(_T("Workbooks.Count"));
const wxVariant workbooksCountVariant = excelObject.GetProperty(wxT("Workbooks.Count"));
if (workbooksCountVariant.IsNull())
{
wxMessageBox(_T("Could not get workbooks count"));
wxMessageBox(wxT("Could not get workbooks count"));
return;
}
const long workbooksCount = workbooksCountVariant;
if (workbooksCount == 0)
{
const wxVariant workbook = excelObject.CallMethod(_T("Workbooks.Add"));
const wxVariant workbook = excelObject.CallMethod(wxT("Workbooks.Add"));
if (workbook.IsNull())
{
wxMessageBox(_T("Could not create new Workbook"));
wxMessageBox(wxT("Could not create new Workbook"));
return;
}
}
if (!excelObject.PutProperty(_T("ActiveCell.Value"), _T("wxWidgets automation test!")))
if (!excelObject.PutProperty(wxT("ActiveCell.Value"), wxT("wxWidgets automation test!")))
{
wxMessageBox(_T("Could not set active cell value."));
wxMessageBox(wxT("Could not set active cell value."));
return;
}
if (!excelObject.PutProperty(_T("ActiveCell.Font.Bold"), wxVariant(true)) )
if (!excelObject.PutProperty(wxT("ActiveCell.Font.Bold"), wxVariant(true)) )
{
wxMessageBox(_T("Could not put Bold property to active cell."));
wxMessageBox(wxT("Could not put Bold property to active cell."));
return;
}
}