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:
@@ -68,7 +68,7 @@ void ScreenshotFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
||||
info.SetName(_("Automatic Screenshot Generator"));
|
||||
info.SetVersion(_("1.0"));
|
||||
info.SetDescription(_("This utility automatically creates screenshots of wxWidgets controls for use in wxWidgets documentation."));
|
||||
info.SetCopyright(_T("(C) 2008 Utensil Candel"));
|
||||
info.SetCopyright(wxT("(C) 2008 Utensil Candel"));
|
||||
|
||||
wxAboutBox(info);
|
||||
}
|
||||
@@ -85,10 +85,10 @@ void ScreenshotFrame::OnCaptureFullScreen(wxCommandEvent& WXUNUSED(event))
|
||||
wxBitmap fullscreen(1, 1);
|
||||
AutoCaptureMechanism::Capture(&fullscreen, 0, 0, screenWidth, screenHeight);
|
||||
|
||||
AutoCaptureMechanism::Save(&fullscreen, _T("fullscreen"));
|
||||
AutoCaptureMechanism::Save(&fullscreen, wxT("fullscreen"));
|
||||
|
||||
wxMessageBox(_("A screenshot of the entire screen was saved as:\n\n ")
|
||||
+ AutoCaptureMechanism::GetDefaultDirectoryAbsPath() + _T("fullscreen.png"),
|
||||
+ AutoCaptureMechanism::GetDefaultDirectoryAbsPath() + wxT("fullscreen.png"),
|
||||
_("Full screen capture"), wxICON_INFORMATION|wxOK, this);
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ void ScreenshotFrame::OnCaptureAllControls(wxCommandEvent& WXUNUSED(event))
|
||||
case wxYES:
|
||||
{
|
||||
wxArrayString files;
|
||||
wxDir::GetAllFiles(dir, &files, _T("*.png"), wxDIR_FILES);
|
||||
wxDir::GetAllFiles(dir, &files, wxT("*.png"), wxDIR_FILES);
|
||||
|
||||
// remove all PNG files from the screenshots folder
|
||||
int n = files.GetCount();
|
||||
@@ -135,11 +135,11 @@ void ScreenshotFrame::OnCaptureAllControls(wxCommandEvent& WXUNUSED(event))
|
||||
auto_cap.RegisterControl(m_radioBtn2, AJ_UnionEnd);
|
||||
auto_cap.RegisterControl(m_bpButton1);
|
||||
auto_cap.RegisterControl(m_bitmap1);
|
||||
auto_cap.RegisterControl(m_gauge1, _T("wxGauge"));
|
||||
auto_cap.RegisterControl(m_gauge1, wxT("wxGauge"));
|
||||
auto_cap.RegisterControl(m_slider1);
|
||||
auto_cap.RegisterControl(m_toggleBtn1, AJ_Union);
|
||||
auto_cap.RegisterControl(m_toggleBtn2, AJ_UnionEnd);
|
||||
auto_cap.RegisterControl(m_hyperlink1, _T("wxHyperlinkCtrl"));
|
||||
auto_cap.RegisterControl(m_hyperlink1, wxT("wxHyperlinkCtrl"));
|
||||
auto_cap.RegisterControl(m_spinCtrl1, AJ_RegionAdjust);
|
||||
auto_cap.RegisterControl(m_spinBtn1);
|
||||
auto_cap.RegisterControl(m_scrollBar1);
|
||||
@@ -151,10 +151,10 @@ void ScreenshotFrame::OnCaptureAllControls(wxCommandEvent& WXUNUSED(event))
|
||||
auto_cap.RegisterControl(m_radioBox1);
|
||||
auto_cap.RegisterControl(m_staticBox1);
|
||||
auto_cap.RegisterControl(m_treeCtrl1);
|
||||
auto_cap.RegisterControl(m_listCtrl1, _T("wxListCtrl"));
|
||||
auto_cap.RegisterControl(m_listCtrl1, wxT("wxListCtrl"));
|
||||
|
||||
auto_cap.RegisterControl(m_animationCtrl1);
|
||||
auto_cap.RegisterControl(m_collPane1, _T("wxCollapsiblePane"), AJ_Union);
|
||||
auto_cap.RegisterControl(m_collPane1, wxT("wxCollapsiblePane"), AJ_Union);
|
||||
auto_cap.RegisterControl(m_collPane2, AJ_UnionEnd);
|
||||
|
||||
auto_cap.RegisterPageTurn();
|
||||
@@ -165,13 +165,13 @@ void ScreenshotFrame::OnCaptureAllControls(wxCommandEvent& WXUNUSED(event))
|
||||
|
||||
auto_cap.RegisterPageTurn();
|
||||
|
||||
auto_cap.RegisterControl(m_colourPicker1, _T("wxColourPickerCtrl"));
|
||||
auto_cap.RegisterControl(m_fontPicker1, _T("wxFontPickerCtrl"));
|
||||
auto_cap.RegisterControl(m_filePicker1, _T("wxFilePickerCtrl"), AJ_RegionAdjust);
|
||||
auto_cap.RegisterControl(m_calendar1, _T("wxCalendarCtrl"), AJ_RegionAdjust);
|
||||
auto_cap.RegisterControl(m_datePicker1, _T("wxDatePickerCtrl"));
|
||||
auto_cap.RegisterControl(m_genericDirCtrl1, _T("wxGenericDirCtrl"));
|
||||
auto_cap.RegisterControl(m_dirPicker1, _T("wxDirPickerCtrl"), AJ_RegionAdjust);
|
||||
auto_cap.RegisterControl(m_colourPicker1, wxT("wxColourPickerCtrl"));
|
||||
auto_cap.RegisterControl(m_fontPicker1, wxT("wxFontPickerCtrl"));
|
||||
auto_cap.RegisterControl(m_filePicker1, wxT("wxFilePickerCtrl"), AJ_RegionAdjust);
|
||||
auto_cap.RegisterControl(m_calendar1, wxT("wxCalendarCtrl"), AJ_RegionAdjust);
|
||||
auto_cap.RegisterControl(m_datePicker1, wxT("wxDatePickerCtrl"));
|
||||
auto_cap.RegisterControl(m_genericDirCtrl1, wxT("wxGenericDirCtrl"));
|
||||
auto_cap.RegisterControl(m_dirPicker1, wxT("wxDirPickerCtrl"), AJ_RegionAdjust);
|
||||
|
||||
auto_cap.RegisterPageTurn();
|
||||
|
||||
|
Reference in New Issue
Block a user