From d9384bfb6d08a112b1ec096030f2939ae255cc5a Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Mon, 9 Jan 2012 14:04:25 +0000 Subject: [PATCH] no code changes, fixed some typos git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/doxygen/overviews/nonenglish.h | 2 +- docs/doxygen/overviews/unicode.h | 2 +- docs/doxygen/overviews/xrc.h | 2 +- include/wx/affinematrix2d.h | 2 +- include/wx/affinematrix2dbase.h | 2 +- include/wx/eventfilter.h | 4 ++-- include/wx/tbarbase.h | 2 +- interface/wx/defs.h | 2 +- interface/wx/eventfilter.h | 2 +- src/common/affinematrix2d.cpp | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/doxygen/overviews/nonenglish.h b/docs/doxygen/overviews/nonenglish.h index 3cd30380e4..37fc8cae43 100644 --- a/docs/doxygen/overviews/nonenglish.h +++ b/docs/doxygen/overviews/nonenglish.h @@ -110,7 +110,7 @@ wxLocale::GetSystemEncodingName) by the user's operating system. By convention, you should only use characters without diacritics (i.e. 7-bit ASCII strings) for msgids in the source code and write them in English. -If you port software to wxWindows, you may be confronted with legacy source +If you port software to wxWidgets, you may be confronted with legacy source code containing non-English string literals. Instead of translating the strings in the source code to English and putting the original strings into message catalog, you may configure wxWidgets to use non-English msgids and translate to diff --git a/docs/doxygen/overviews/unicode.h b/docs/doxygen/overviews/unicode.h index 6b3119296d..4013ff8e06 100644 --- a/docs/doxygen/overviews/unicode.h +++ b/docs/doxygen/overviews/unicode.h @@ -198,7 +198,7 @@ work. Here are some examples, using a wxString object @c s and some integer @c n: - Writing @code switch ( s[n] ) @endcode doesn't work because the argument of - the switch statement must an integer expression so you need to replace + the switch statement must be an integer expression so you need to replace @c s[n] with @code s[n].GetValue() @endcode. You may also force the conversion to @c char or @c wchar_t by using an explicit cast but beware that converting the value to char uses the conversion to current locale and may diff --git a/docs/doxygen/overviews/xrc.h b/docs/doxygen/overviews/xrc.h index cb9aae7c96..d9d126fe6a 100644 --- a/docs/doxygen/overviews/xrc.h +++ b/docs/doxygen/overviews/xrc.h @@ -31,7 +31,7 @@ There are several advantages to using XRC resources: @li The XRC format uses sizers for flexibility, allowing dialogs to be resizable and highly portable. @li The XRC format is a wxWidgets standard, and can be generated or - postprocessed by any program that understands it. As it is basedon the XML + postprocessed by any program that understands it. As it is based on the XML standard, existing XML editors can be used for simple editing purposes. XRC was written by Vaclav Slavik. diff --git a/include/wx/affinematrix2d.h b/include/wx/affinematrix2d.h index cb94be4da1..6516cd46f5 100644 --- a/include/wx/affinematrix2d.h +++ b/include/wx/affinematrix2d.h @@ -4,7 +4,7 @@ // Author: Based on wxTransformMatrix by Chris Breeze, Julian Smart // Created: 2011-04-05 // Copyright: (c) wxWidgets team -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_AFFINEMATRIX2D_H_ diff --git a/include/wx/affinematrix2dbase.h b/include/wx/affinematrix2dbase.h index 30b3256500..94b1955aa3 100644 --- a/include/wx/affinematrix2dbase.h +++ b/include/wx/affinematrix2dbase.h @@ -4,7 +4,7 @@ // Author: Catalin Raceanu // Created: 2011-04-06 // Copyright: (c) wxWidgets team -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_AFFINEMATRIX2DBASE_H_ diff --git a/include/wx/eventfilter.h b/include/wx/eventfilter.h index 0aec4a3f8f..60ba223197 100644 --- a/include/wx/eventfilter.h +++ b/include/wx/eventfilter.h @@ -3,7 +3,7 @@ // Purpose: wxEventFilter class declaration. // Author: Vadim Zeitlin // Created: 2011-11-21 -// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $ +// RCS-ID: $Id$ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -51,7 +51,7 @@ public: // This method allows to filter all the events processed by the program, so // you should try to return quickly from it to avoid slowing down the - // program to the crawl. + // program to a crawl. // // Return value should be -1 to continue with the normal event processing, // or true or false to stop further processing and pretend that the event diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index f6ef259ce3..45e5ac4cb5 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -473,7 +473,7 @@ public: { return GetToolBitmapSize(); } // returns a (non separator) tool containing the point (x, y) or NULL if - // there is no tool at this point (corrdinates are client) + // there is no tool at this point (coordinates are client) virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const = 0; diff --git a/interface/wx/defs.h b/interface/wx/defs.h index c1fe02ada7..8052ca2a49 100644 --- a/interface/wx/defs.h +++ b/interface/wx/defs.h @@ -896,7 +896,7 @@ enum wxKeyCode * to improve compatibility with other systems, WXK_RAW_CONTROL may * be used to obtain the state of the actual 'Control' key * ('WXK_CONTROL' would obtain the status of the 'Command' key). - * Under Windows/Linux/Others, this is equivalent to WXK_RAW_CONTROL + * Under Windows/Linux/Others, this is equivalent to WXK_CONTROL */ WXK_RAW_CONTROL, WXK_MENU, diff --git a/interface/wx/eventfilter.h b/interface/wx/eventfilter.h index 4138f1fbb3..5cb0ef8370 100644 --- a/interface/wx/eventfilter.h +++ b/interface/wx/eventfilter.h @@ -121,7 +121,7 @@ public: This method allows to filter all the events processed by the program, so you should try to return quickly from it to avoid slowing down the - program to the crawl. + program to a crawl. Although the return type of this method is @c int, this is only due to backwards compatibility concerns and the actual return value must be diff --git a/src/common/affinematrix2d.cpp b/src/common/affinematrix2d.cpp index b4605d4e53..5df1bac1e6 100644 --- a/src/common/affinematrix2d.cpp +++ b/src/common/affinematrix2d.cpp @@ -4,7 +4,7 @@ // Author: Based on wxTransformMatrix by Chris Breeze, Julian Smart // Created: 2011-04-05 // Copyright: (c) wxWidgets team -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" -- 2.45.2