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

84
samples/help/demo.cpp
View File

@@ -312,7 +312,7 @@ bool MyApp::OnInit()
#endif // wxUSE_HTML
// Create the main application window
MyFrame *frame = new MyFrame(_T("HelpDemo wxWidgets App"),
MyFrame *frame = new MyFrame(wxT("HelpDemo wxWidgets App"),
wxPoint(50, 50), wxSize(450, 340));
#if !USE_SIMPLE_HELP_PROVIDER
@@ -329,7 +329,7 @@ bool MyApp::OnInit()
// initialise the help system: this means that we'll use doc.hlp file under
// Windows and that the HTML docs are in the subdirectory doc for platforms
// using HTML help
if ( !frame->GetHelpController().Initialize(_T("doc")) )
if ( !frame->GetHelpController().Initialize(wxT("doc")) )
{
wxLogError(wxT("Cannot initialize the help system, aborting."));
@@ -337,7 +337,7 @@ bool MyApp::OnInit()
}
#if wxUSE_MS_HTML_HELP && !defined(__WXUNIVERSAL__)
if( !frame->GetMSHtmlHelpController().Initialize(_T("doc")) )
if( !frame->GetMSHtmlHelpController().Initialize(wxT("doc")) )
{
wxLogError(wxT("Cannot initialize the MS HTML Help system."));
}
@@ -345,7 +345,7 @@ bool MyApp::OnInit()
#if wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
// you need to call Initialize in order to use wxBestHelpController
if( !frame->GetBestHelpController().Initialize(_T("doc")) )
if( !frame->GetBestHelpController().Initialize(wxT("doc")) )
{
wxLogError(wxT("Cannot initialize the best help system, aborting."));
}
@@ -354,7 +354,7 @@ bool MyApp::OnInit()
#if USE_HTML_HELP
// initialise the advanced HTML help system: this means that the HTML docs are in .htb
// (zipped) form
if ( !frame->GetAdvancedHtmlHelpController().Initialize(_T("doc")) )
if ( !frame->GetAdvancedHtmlHelpController().Initialize(wxT("doc")) )
{
wxLogError(wxT("Cannot initialize the advanced HTML help system, aborting."));
@@ -365,7 +365,7 @@ bool MyApp::OnInit()
#if 0
// defined(__WXMSW__) && wxUSE_MS_HTML_HELP
wxString path(wxGetCwd());
if ( !frame->GetMSHtmlHelpController().Initialize(path + _T("\\doc.chm")) )
if ( !frame->GetMSHtmlHelpController().Initialize(path + wxT("\\doc.chm")) )
{
wxLogError("Cannot initialize the MS HTML help system, aborting.");
@@ -401,51 +401,51 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a menu bar
wxMenu *menuFile = new wxMenu;
menuFile->Append(HelpDemo_Help_Index, _T("&Help Index..."));
menuFile->Append(HelpDemo_Help_Classes, _T("&Help on Classes..."));
menuFile->Append(HelpDemo_Help_Functions, _T("&Help on Functions..."));
menuFile->Append(HelpDemo_Help_ContextHelp, _T("&Context Help..."));
menuFile->Append(HelpDemo_Help_DialogContextHelp, _T("&Dialog Context Help...\tCtrl-H"));
menuFile->Append(HelpDemo_Help_Help, _T("&About Help Demo..."));
menuFile->Append(HelpDemo_Help_Search, _T("&Search help..."));
menuFile->Append(HelpDemo_Help_Index, wxT("&Help Index..."));
menuFile->Append(HelpDemo_Help_Classes, wxT("&Help on Classes..."));
menuFile->Append(HelpDemo_Help_Functions, wxT("&Help on Functions..."));
menuFile->Append(HelpDemo_Help_ContextHelp, wxT("&Context Help..."));
menuFile->Append(HelpDemo_Help_DialogContextHelp, wxT("&Dialog Context Help...\tCtrl-H"));
menuFile->Append(HelpDemo_Help_Help, wxT("&About Help Demo..."));
menuFile->Append(HelpDemo_Help_Search, wxT("&Search help..."));
#if USE_HTML_HELP
menuFile->AppendSeparator();
menuFile->Append(HelpDemo_Advanced_Html_Help_Index, _T("Advanced HTML &Help Index..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Classes, _T("Advanced HTML &Help on Classes..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Functions, _T("Advanced HTML &Help on Functions..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Help, _T("Advanced HTML &About Help Demo..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Search, _T("Advanced HTML &Search help..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Modal, _T("Advanced HTML Help &Modal Dialog..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Index, wxT("Advanced HTML &Help Index..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Classes, wxT("Advanced HTML &Help on Classes..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Functions, wxT("Advanced HTML &Help on Functions..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Help, wxT("Advanced HTML &About Help Demo..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Search, wxT("Advanced HTML &Search help..."));
menuFile->Append(HelpDemo_Advanced_Html_Help_Modal, wxT("Advanced HTML Help &Modal Dialog..."));
#endif
#if wxUSE_MS_HTML_HELP && !defined(__WXUNIVERSAL__)
menuFile->AppendSeparator();
menuFile->Append(HelpDemo_MS_Html_Help_Index, _T("MS HTML &Help Index..."));
menuFile->Append(HelpDemo_MS_Html_Help_Classes, _T("MS HTML &Help on Classes..."));
menuFile->Append(HelpDemo_MS_Html_Help_Functions, _T("MS HTML &Help on Functions..."));
menuFile->Append(HelpDemo_MS_Html_Help_Help, _T("MS HTML &About Help Demo..."));
menuFile->Append(HelpDemo_MS_Html_Help_Search, _T("MS HTML &Search help..."));
menuFile->Append(HelpDemo_MS_Html_Help_Index, wxT("MS HTML &Help Index..."));
menuFile->Append(HelpDemo_MS_Html_Help_Classes, wxT("MS HTML &Help on Classes..."));
menuFile->Append(HelpDemo_MS_Html_Help_Functions, wxT("MS HTML &Help on Functions..."));
menuFile->Append(HelpDemo_MS_Html_Help_Help, wxT("MS HTML &About Help Demo..."));
menuFile->Append(HelpDemo_MS_Html_Help_Search, wxT("MS HTML &Search help..."));
#endif
#if wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
menuFile->AppendSeparator();
menuFile->Append(HelpDemo_Best_Help_Index, _T("Best &Help Index..."));
menuFile->Append(HelpDemo_Best_Help_Index, wxT("Best &Help Index..."));
#endif
#ifndef __WXMSW__
#if !wxUSE_HTML
menuFile->AppendSeparator();
menuFile->Append(HelpDemo_Help_KDE, _T("Use &KDE"));
menuFile->Append(HelpDemo_Help_GNOME, _T("Use &GNOME"));
menuFile->Append(HelpDemo_Help_Netscape, _T("Use &Netscape"));
menuFile->Append(HelpDemo_Help_KDE, wxT("Use &KDE"));
menuFile->Append(HelpDemo_Help_GNOME, wxT("Use &GNOME"));
menuFile->Append(HelpDemo_Help_Netscape, wxT("Use &Netscape"));
#endif
#endif
menuFile->AppendSeparator();
menuFile->Append(HelpDemo_Quit, _T("E&xit"));
menuFile->Append(HelpDemo_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);
@@ -453,7 +453,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();
SetStatusText(_T("Welcome to wxWidgets!"));
SetStatusText(wxT("Welcome to wxWidgets!"));
#endif // wxUSE_STATUSBAR
#if USE_HTML_HELP
@@ -465,8 +465,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
m_embeddedHelpWindow->Create(this,
wxID_ANY, wxDefaultPosition, GetClientSize(), wxTAB_TRAVERSAL|wxNO_BORDER, wxHF_DEFAULT_STYLE);
m_embeddedHtmlHelp.AddBook(wxFileName(_T("doc.zip")));
m_embeddedHtmlHelp.Display(_T("Introduction"));
m_embeddedHtmlHelp.AddBook(wxFileName(wxT("doc.zip")));
m_embeddedHtmlHelp.Display(wxT("Introduction"));
#else
// now create some controls
@@ -477,7 +477,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
//panel->SetHelpText(wxContextId(300));
// and a static control whose parent is the panel
wxStaticText* staticText = new wxStaticText(panel, 302, _T("Hello, world!"), wxPoint(10, 10));
wxStaticText* staticText = new wxStaticText(panel, 302, wxT("Hello, world!"), wxPoint(10, 10));
staticText->SetHelpText(_("This static text control isn't doing a lot right now."));
#endif
}
@@ -640,8 +640,8 @@ void MyFrame::ShowHelp(int commandId, wxHelpControllerBase& helpController)
case HelpDemo_MS_Html_Help_Search:
case HelpDemo_Best_Help_Search:
{
wxString key = wxGetTextFromUser(_T("Search for?"),
_T("Search help for keyword"),
wxString key = wxGetTextFromUser(wxT("Search for?"),
wxT("Search help for keyword"),
wxEmptyString,
this);
if(! key.IsEmpty())
@@ -660,13 +660,13 @@ void MyFrame::ShowHelp(int commandId, wxHelpControllerBase& helpController)
// These three calls are only used by wxExtHelpController
case HelpDemo_Help_KDE:
helpController.SetViewer(_T("kdehelp"));
helpController.SetViewer(wxT("kdehelp"));
break;
case HelpDemo_Help_GNOME:
helpController.SetViewer(_T("gnome-help-browser"));
helpController.SetViewer(wxT("gnome-help-browser"));
break;
case HelpDemo_Help_Netscape:
helpController.SetViewer(_T("netscape"), wxHELP_NETSCAPE);
helpController.SetViewer(wxT("netscape"), wxHELP_NETSCAPE);
break;
}
}
@@ -680,7 +680,7 @@ BEGIN_EVENT_TABLE(MyModalDialog, wxDialog)
END_EVENT_TABLE()
MyModalDialog::MyModalDialog(wxWindow *parent)
: wxDialog(parent, wxID_ANY, wxString(_T("Modal dialog")))
: wxDialog(parent, wxID_ANY, wxString(wxT("Modal dialog")))
{
// Add the context-sensitive help button on the caption for the platforms
// which support it (currently MSW only)
@@ -690,10 +690,10 @@ MyModalDialog::MyModalDialog(wxWindow *parent)
wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL);
wxButton* btnOK = new wxButton(this, wxID_OK, _T("&OK"));
wxButton* btnOK = new wxButton(this, wxID_OK, wxT("&OK"));
btnOK->SetHelpText(_("The OK button confirms the dialog choices."));
wxButton* btnCancel = new wxButton(this, wxID_CANCEL, _T("&Cancel"));
wxButton* btnCancel = new wxButton(this, wxID_CANCEL, wxT("&Cancel"));
btnCancel->SetHelpText(_("The Cancel button cancels the dialog."));
sizerRow->Add(btnOK, 0, wxALIGN_CENTER | wxALL, 5);