From 35227fd22657bbf2105514fb160ab2b44dfee3fe Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Dec 2007 02:57:58 +0000 Subject: [PATCH] don't use 8 bit characters in sources to avoid warnings in non-latin1 locales (patch 1841741) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@50711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/confbase.h | 4 ++-- include/wx/fileconf.h | 2 +- include/wx/generic/helpext.h | 2 +- include/wx/generic/progdlgg.h | 4 ++-- include/wx/regex.h | 4 ++-- src/common/config.cpp | 2 +- src/common/fileconf.cpp | 2 +- src/common/regex.cpp | 4 ++-- src/common/string.cpp | 6 +++--- src/generic/dcpsg.cpp | 14 +++++++------- src/generic/progdlgg.cpp | 4 ++-- src/msw/listctrl.cpp | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/wx/confbase.h b/include/wx/confbase.h index 567150c8b6..2d20b52710 100644 --- a/include/wx/confbase.h +++ b/include/wx/confbase.h @@ -2,11 +2,11 @@ // Name: confbase.h // Purpose: declaration of the base class of all config implementations // (see also: fileconf.h and msw/regconf.h and iniconf.h) -// Author: Karsten Ballüder & Vadim Zeitlin +// Author: Karsten Ballueder & Vadim Zeitlin // Modified by: // Created: 07.04.98 (adapted from appconf.h) // RCS-ID: $Id$ -// Copyright: (c) 1997 Karsten Ballüder Ballueder@usa.net +// Copyright: (c) 1997 Karsten Ballueder Ballueder@usa.net // Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h index a9c1b4fd7a..d7d36ffcad 100644 --- a/include/wx/fileconf.h +++ b/include/wx/fileconf.h @@ -5,7 +5,7 @@ // Modified by: // Created: 07.04.98 (adapted from appconf.cpp) // RCS-ID: $Id$ -// Copyright: (c) 1997 Karsten Ballüder & Vadim Zeitlin +// Copyright: (c) 1997 Karsten Ballueder & Vadim Zeitlin // Ballueder@usa.net // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h index ec671668fe..070c7629a6 100644 --- a/include/wx/generic/helpext.h +++ b/include/wx/generic/helpext.h @@ -1,7 +1,7 @@ /*-*- c++ -*-******************************************************** * helpext.h - an external help controller for wxWidgets * * * - * (C) 1998 by Karsten Ballüder (Ballueder@usa.net) * + * (C) 1998 by Karsten Ballueder (Ballueder@usa.net) * * License: wxWindows licence * * * * $Id$ diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 85cbeedabd..deea6ebbaf 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -1,11 +1,11 @@ //////////////////////////////////////////////////// // Name: progdlgg.h // Purpose: wxProgressDialog class -// Author: Karsten Ballüder +// Author: Karsten Ballueder // Modified by: // Created: 09.05.1999 // RCS-ID: $Id$ -// Copyright: (c) Karsten Ballüder +// Copyright: (c) Karsten Ballueder // Licence: wxWindows licence //////////////////////////////////////////////////// diff --git a/include/wx/regex.h b/include/wx/regex.h index 6d88ac10ec..d4ee4b0fb4 100644 --- a/include/wx/regex.h +++ b/include/wx/regex.h @@ -1,11 +1,11 @@ /////////////////////////////////////////////////////////////////////////////// // Name: wx/regex.h // Purpose: regular expression matching -// Author: Karsten Ballüder +// Author: Karsten Ballueder // Modified by: VZ at 13.07.01 (integrated to wxWin) // Created: 05.02.2000 // RCS-ID: $Id$ -// Copyright: (c) 2000 Karsten Ballüder +// Copyright: (c) 2000 Karsten Ballueder // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/src/common/config.cpp b/src/common/config.cpp index c9d1ec2a23..8046d5e92c 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 07.04.98 // RCS-ID: $Id$ -// Copyright: (c) 1997 Karsten Ballüder Ballueder@usa.net +// Copyright: (c) 1997 Karsten Ballueder Ballueder@usa.net // Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index 869e2cb041..d55bf0c17c 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 07.04.98 (adapted from appconf.cpp) // RCS-ID: $Id$ -// Copyright: (c) 1997 Karsten Ballüder & Vadim Zeitlin +// Copyright: (c) 1997 Karsten Ballueder & Vadim Zeitlin // Ballueder@usa.net // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/src/common/regex.cpp b/src/common/regex.cpp index 2e0068f0a3..0473a1c7c3 100644 --- a/src/common/regex.cpp +++ b/src/common/regex.cpp @@ -1,11 +1,11 @@ /////////////////////////////////////////////////////////////////////////////// // Name: src/common/regex.cpp // Purpose: regular expression matching -// Author: Karsten Ballüder and Vadim Zeitlin +// Author: Karsten Ballueder and Vadim Zeitlin // Modified by: // Created: 13.07.01 // RCS-ID: $Id$ -// Copyright: (c) 2000 Karsten Ballüder +// Copyright: (c) 2000 Karsten Ballueder // 2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/src/common/string.cpp b/src/common/string.cpp index 275fe8e2a0..12e8525613 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1589,9 +1589,9 @@ wxString& wxString::MakeLower() // --------------------------------------------------------------------------- // some compilers (VC++ 6.0 not to name them) return true for a call to -// isspace('ê') in the C locale which seems to be broken to me, but we have to -// live with this by checking that the character is a 7 bit one - even if this -// may fail to detect some spaces (I don't know if Unicode doesn't have +// isspace('\xEA') in the C locale which seems to be broken to me, but we have +// to live with this by checking that the character is a 7 bit one - even if +// this may fail to detect some spaces (I don't know if Unicode doesn't have // space-like symbols somewhere except in the first 128 chars), it is arguably // still better than trimming away accented letters inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); } diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index e50dd5581c..d56d02ffcd 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -2123,13 +2123,13 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, / these values from AFM files, too. Maybe later ... */ // NB: casts to int are needed to suppress gcc 3.3 warnings - lastWidths[196] = lastWidths[(int)'A']; // Ä - lastWidths[228] = lastWidths[(int)'a']; // ä - lastWidths[214] = lastWidths[(int)'O']; // Ö - lastWidths[246] = lastWidths[(int)'o']; // ö - lastWidths[220] = lastWidths[(int)'U']; // Ü - lastWidths[252] = lastWidths[(int)'u']; // ü - lastWidths[223] = lastWidths[(int)251]; // ß + lastWidths[196] = lastWidths[(int)'A']; // U+00C4 A Umlaute + lastWidths[228] = lastWidths[(int)'a']; // U+00E4 a Umlaute + lastWidths[214] = lastWidths[(int)'O']; // U+00D6 O Umlaute + lastWidths[246] = lastWidths[(int)'o']; // U+00F6 o Umlaute + lastWidths[220] = lastWidths[(int)'U']; // U+00DC U Umlaute + lastWidths[252] = lastWidths[(int)'u']; // U+00FC u Umlaute + lastWidths[223] = lastWidths[(int)251]; // U+00DF eszett (scharfes s) /* JC: calculate UnderlineThickness/UnderlinePosition */ diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index 50025bfa36..87baf6f8c7 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/generic/progdlgg.cpp // Purpose: wxProgressDialog class -// Author: Karsten Ballüder +// Author: Karsten Ballueder // Modified by: // Created: 09.05.1999 // RCS-ID: $Id$ -// Copyright: (c) Karsten Ballüder +// Copyright: (c) Karsten Ballueder // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index dbf0a17302..4f66abf45b 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -279,7 +279,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 (a la NotebookPageInfo) */ #else IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)