From e9670814f59ff30146eb4ea694a78a88bed014ae Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 18 Sep 2009 16:16:12 +0000 Subject: [PATCH] Use UTF-8 for all non-ASCII characters in the sources. Avoid mixing Latin-1, UTF-8 and Mac Roman (?) encodings in different source files, use UTF-8 everywhere. See #11116. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/chartype.h | 2 +- include/wx/datetime.h | 2 +- include/wx/wxchar.h | 2 +- include/wx/wxcrtvararg.h | 2 +- include/wx/xrc/xh_filectrl.h | 2 +- src/gtk1/listbox.cpp | 2 +- src/osx/carbon/listctrl_mac.cpp | 2 +- src/osx/cocoa/aboutdlg.mm | 10 ++-------- src/osx/core/fontenum.cpp | 2 +- src/palmos/listctrl.cpp | 2 +- src/unix/dialup.cpp | 8 ++++---- src/unix/net.cpp | 12 ++++++------ src/xrc/xh_filectrl.cpp | 2 +- 13 files changed, 22 insertions(+), 28 deletions(-) diff --git a/include/wx/chartype.h b/include/wx/chartype.h index a284e4de8c..480d1b1e2d 100644 --- a/include/wx/chartype.h +++ b/include/wx/chartype.h @@ -1,7 +1,7 @@ /* * Name: wx/chartype.h * Purpose: Declarations of wxChar and related types - * Author: Joel Farley, Ove Kåven + * Author: Joel Farley, Ove KÃ¥ven * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee * Created: 1998/06/12 * RCS-ID: $Id$ diff --git a/include/wx/datetime.h b/include/wx/datetime.h index dae827f700..dc59c920cd 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -247,7 +247,7 @@ public: // adoption of the Gregorian calendar (see IsGregorian()) // // All data and comments taken verbatim from "The Calendar FAQ (v 2.0)" - // by Claus T�ndering, http://www.pip.dknet.dk/~c-t/calendar.html + // by Claus Tøndering, http://www.pip.dknet.dk/~c-t/calendar.html // except for the comments "we take". // // Symbol "->" should be read as "was followed by" in the comments diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index b595181709..06d8157871 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////// // Name: wx/wxchar.h // Purpose: Declarations common to wx char/wchar_t usage (wide chars) -// Author: Joel Farley, Ove Kåven +// Author: Joel Farley, Ove KÃ¥ven // Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee // Created: 1998/06/12 // RCS-ID: $Id$ diff --git a/include/wx/wxcrtvararg.h b/include/wx/wxcrtvararg.h index e454f6c703..c364def554 100644 --- a/include/wx/wxcrtvararg.h +++ b/include/wx/wxcrtvararg.h @@ -2,7 +2,7 @@ // Name: wx/wxcrtvararg.h // Purpose: Type-safe ANSI and Unicode builds compatible wrappers for // printf(), scanf() and related CRT functions -// Author: Joel Farley, Ove Kåven +// Author: Joel Farley, Ove KÃ¥ven // Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee // Created: 2007-02-19 // RCS-ID: $Id$ diff --git a/include/wx/xrc/xh_filectrl.h b/include/wx/xrc/xh_filectrl.h index 82c5eac879..22eceff488 100644 --- a/include/wx/xrc/xh_filectrl.h +++ b/include/wx/xrc/xh_filectrl.h @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/xrc/xh_filectrl.h // Purpose: XML resource handler for wxFileCtrl -// Author: Kinaou Hervé +// Author: Kinaou Hervé // Created: 2009-05-11 // RCS-ID: $Id$ // Copyright: (c) 2009 wxWidgets development team diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 3c20900647..66feebd3c3 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -774,7 +774,7 @@ wxString wxListBox::GetRealLabel(GList *item) const str = wxString( label->label ); #if wxUSE_CHECKLISTBOX - // checklistboxes have "[±] " prepended to their lables, remove it + // checklistboxes have "[±] " prepended to their lables, remove it // // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk1/checklst.h if ( m_hasCheckBoxes ) diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp index 034b4d073d..987458a164 100644 --- a/src/osx/carbon/listctrl_mac.cpp +++ b/src/osx/carbon/listctrl_mac.cpp @@ -103,7 +103,7 @@ wxEND_HANDLERS_TABLE() wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) /* - TODO : Expose more information of a list's layout etc. via appropriate objects (ï¿  la NotebookPageInfo) + TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo) */ #else IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl) diff --git a/src/osx/cocoa/aboutdlg.mm b/src/osx/cocoa/aboutdlg.mm index 7d9d6f9cd4..f6f08b3e0e 100644 --- a/src/osx/cocoa/aboutdlg.mm +++ b/src/osx/cocoa/aboutdlg.mm @@ -29,14 +29,8 @@ #include "wx/osx/private.h" -/* -@"Credits": An NSAttributedString displayed in the info area of the panel. If not specified, this method then looks for a file named “Credits.html”, “Credits.rtf”, and “Credits.rtfd”, in that order, in the bundle returned by the NSBundle class method mainBundle. The first file found is used. If none is found, the info area is left blank. -@"ApplicationName": An NSString object displayed as the application’s name. If not specified, this method then uses the value of CFBundleName (localizable). If neither is found, this method uses [[NSProcessInfo processInfo] processName]. -@"ApplicationIcon": An NSImage object displayed as the application’s icon. If not specified, this method then looks for an image named “NSApplicationIcon”, using [NSImage imageNamed:@"NSApplicationIcon"]. If neither is available, this method uses the generic application icon. -@"Version": An NSString object with the build version number of the application (“58.4”), displayed as “(v58.4)”. If not specified, obtain from the CFBundleVersion key in infoDictionary; if not specified, leave blank (the “(v)” is not displayed). -@"Copyright": An NSString object with a line of copyright information. If not specified, this method then looks for the value of NSHumanReadableCopyright in the localized version infoDictionary. If neither is available, this method leaves the space blank. -@"ApplicationVersion": An NSString object with the application version (“Mac OS X”, “3”, “WebObjects 4.5”, “AppleWorks 6”,...). If not specified, obtain from the CFBundleShortVersionString key in infoDictionary. If neither is available, the build version, if available, is printed alone, as “Version x.x”. -*/ +// see http://developer.apple.com/mac/library/technotes/tn2006/tn2179.html for +// information about the various keys used here // helper class for HIAboutBox options class AboutBoxOptions : public wxCFRef diff --git a/src/osx/core/fontenum.cpp b/src/osx/core/fontenum.cpp index c7e7376ff2..72cc4ef8a6 100644 --- a/src/osx/core/fontenum.cpp +++ b/src/osx/core/fontenum.cpp @@ -92,7 +92,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, wxCFStringRef cfName(theName) ; fontFamilies.Add(cfName.AsString(wxLocale::GetSystemEncoding())); } - else if (status == kATSIterationScopeModified) // Make sure the font database hasnÕt changed. + else if (status == kATSIterationScopeModified) // Make sure the font database hasn't changed. { // reset the iterator status = ATSFontFamilyIteratorReset (kATSFontContextLocal, nil, nil, diff --git a/src/palmos/listctrl.cpp b/src/palmos/listctrl.cpp index a2c4920eab..b42949ca83 100644 --- a/src/palmos/listctrl.cpp +++ b/src/palmos/listctrl.cpp @@ -100,7 +100,7 @@ wxEND_HANDLERS_TABLE() wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) /* - TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo) + TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo) */ #else IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl) diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index 67e6150ff9..08e4817d6e 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -1,11 +1,11 @@ // -*- c++ -*- //////////////////////////////////////////////////////////////// // Name: src/unix/dialup.cpp // Purpose: Network related wxWidgets classes and functions -// Author: Karsten Ballüder +// Author: Karsten Ballüder // Modified by: // Created: 03.10.99 // RCS-ID: $Id$ -// Copyright: (c) Karsten Ballüder +// Copyright: (c) Karsten Ballüder // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -703,7 +703,7 @@ wxDialUpManagerImpl::CheckIfconfig() cmd << wxT(" >") << tmpfile << wxT('\''); /* I tried to add an option to wxExecute() to not close stdout, so we could let ifconfig write directly to the tmpfile, but - this does not work. That should be faster, as it doesn´t call + this does not work. That should be faster, as it doesn't call the shell first. I have no idea why. :-( (KB) */ if ( wxExecute(cmd,true /* sync */) == 0 ) { @@ -747,7 +747,7 @@ wxDialUpManagerImpl::CheckIfconfig() } else // could not run ifconfig correctly { - m_CanUseIfconfig = 0; // don´t try again + m_CanUseIfconfig = 0; // don't try again } (void) wxRemoveFile(tmpfile); diff --git a/src/unix/net.cpp b/src/unix/net.cpp index 2b9d2594ac..194f58e6ea 100644 --- a/src/unix/net.cpp +++ b/src/unix/net.cpp @@ -1,11 +1,11 @@ // -*- c++ -*- /////////////////////////////////////////////////////////////// // Name: unix/net.cpp // Purpose: Network related wxWindows classes and functions -// Author: Karsten Ballüder +// Author: Karsten Ballüder // Modified by: // Created: 03.10.99 // RCS-ID: $Id$ -// Copyright: (c) Karsten Ballüder +// Copyright: (c) Karsten Ballüder // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -143,7 +143,7 @@ public: { m_ConnectCommand = command; m_HangUpCommand = hupcmd; } private: - /// -1: don´t know, 0 = no, 1 = yes + /// -1: don't know, 0 = no, 1 = yes int m_IsOnline; /// Can we use ifconfig to list active devices? @@ -318,7 +318,7 @@ wxDialUpManagerImpl::CheckStatusInternal(void) } wxLogNull ln; // suppress all error messages - // Let´s try the ifconfig method first, should be fastest: + // Let's try the ifconfig method first, should be fastest: if(m_CanUseIfconfig != 0) // unknown or yes { wxASSERT(m_IfconfigPath.length()); @@ -328,7 +328,7 @@ wxDialUpManagerImpl::CheckStatusInternal(void) cmd << m_IfconfigPath << " >" << tmpfile << '\''; /* I tried to add an option to wxExecute() to not close stdout, so we could let ifconfig write directly to the tmpfile, but - this does not work. That should be faster, as it doesn´t call + this does not work. That should be faster, as it doesn't call the shell first. I have no idea why. :-( (KB) */ #if 0 // temporarily redirect stdout/stderr: @@ -378,7 +378,7 @@ wxDialUpManagerImpl::CheckStatusInternal(void) // else m_IsOnline remains -1 as we don't know for sure } else // could not run ifconfig correctly - m_CanUseIfconfig = 0; // don´t try again + m_CanUseIfconfig = 0; // don't try again (void) wxRemoveFile(tmpfile); if(m_IsOnline != -1) // we are done return; diff --git a/src/xrc/xh_filectrl.cpp b/src/xrc/xh_filectrl.cpp index bbb4e8b4ec..5b0e18cb2e 100644 --- a/src/xrc/xh_filectrl.cpp +++ b/src/xrc/xh_filectrl.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/xrc/xh_filectrl.cpp // Purpose: XML resource handler for wxFileCtrl -// Author: Kinaou Hervé +// Author: Kinaou Hervé // Created: 2009-05-11 // RCS-ID: $Id$ // Copyright: (c) 2009 wxWidgets development team -- 2.45.2