Merge branch 'spelling-fixes'

Fix spelling mistakes found by codespell in the headers and
documentation.

See https://github.com/wxWidgets/wxWidgets/pull/1909
This commit is contained in:
Vadim Zeitlin
2020-06-28 15:23:35 +02:00
124 changed files with 166 additions and 160 deletions

View File

@@ -209,7 +209,7 @@ so a line like this could be added to version-script.in:
\*wxGenericListCtrl*GetItemFont*; \*wxGenericListCtrl*GetItemFont*;
Allow for the fact that the name mangling is going to vary from compiler to Allow for the fact that the name mangling is going to vary from compiler to
complier. compiler.
When adding a class you can match all the symbols it adds with a single When adding a class you can match all the symbols it adds with a single
pattern, so long as that pattern is not likely to also match other symbols. pattern, so long as that pattern is not likely to also match other symbols.

View File

@@ -51,7 +51,7 @@ The following files need to be modified when adding a new `wxUSE_FOO`:
section. Please keep the alphabetic order. section. Please keep the alphabetic order.
If there are any dependencies, i.e. `wxUSE_FOO` requires `wxUSE_BAR` and If there are any dependencies, i.e. `wxUSE_FOO` requires `wxUSE_BAR` and
`wxUSE_BAZ`, check for thme here too. `wxUSE_BAZ`, check for them here too.
- `include/wx/msw/chkconf.h` for MSW-specific options - `include/wx/msw/chkconf.h` for MSW-specific options

View File

@@ -177,7 +177,7 @@ E.g. to create documentation for `v3.0.z` release:
## Announcement ## Announcement
Update https://www.wxwidgets.org: Update https://www.wxwidgets.org:
* Update release information (at least `version` and `released`) in `_data/relases.yml`. * Update release information (at least `version` and `released`) in `_data/releases.yml`.
* Update the list of compilers used for making MSW binaries in * Update the list of compilers used for making MSW binaries in
`downloads/index.md` if necessary (note that there is no need to update `downloads/index.md` if necessary (note that there is no need to update
anything else, the page will dynamically show the release files with the anything else, the page will dynamically show the release files with the

View File

@@ -214,7 +214,7 @@ ALIASES += rightCurly="}"
# For indicating a sample location # For indicating a sample location
ALIASES += sampledir{1}="@e Location: @c samples/\1 subdirectory of your wxWidgets installation or https://github.com/wxWidgets/wxWidgets/tree/master/samples/\1" ALIASES += sampledir{1}="@e Location: @c samples/\1 subdirectory of your wxWidgets installation or https://github.com/wxWidgets/wxWidgets/tree/master/samples/\1"
# For refering to the corresponding sample in a class document or a overview # For referring to the corresponding sample in a class document or a overview
# Usually placed in the queue of @see # Usually placed in the queue of @see
ALIASES += sample{1}="\ref page_samples_\1" ALIASES += sample{1}="\ref page_samples_\1"

View File

@@ -10,7 +10,7 @@
@defgroup group_class_help Help @defgroup group_class_help Help
@ingroup group_class @ingroup group_class
Classes for loading and displaying help manuals or help informations in general. Classes for loading and displaying help manuals or help information in general.
*/ */

View File

@@ -126,7 +126,7 @@ Controls that are not static can have wxValidator associated with them.
mode mode
@li wxNotebook: A notebook class @li wxNotebook: A notebook class
@li wxOwnerDrawnComboBox: A combobox with owner-drawn list items @li wxOwnerDrawnComboBox: A combobox with owner-drawn list items
@li wxPropertyGrid: A complex control to display hierachical, editable information @li wxPropertyGrid: A complex control to display hierarchical, editable information
@li wxRadioBox: A group of radio buttons @li wxRadioBox: A group of radio buttons
@li wxRadioButton: A round button to be used with others in a mutually @li wxRadioButton: A round button to be used with others in a mutually
exclusive way exclusive way

View File

@@ -13,7 +13,7 @@
In addition to the wxWidgets libraries (see @ref page_libs), some utilities In addition to the wxWidgets libraries (see @ref page_libs), some utilities
are available to the users in the @c utils hierarchy (even if some of them are are available to the users in the @c utils hierarchy (even if some of them are
explicitly conceived for wxWidgets maintainance and will probably be of explicitly conceived for wxWidgets maintenance and will probably be of
little use to others). little use to others).
Please note that these utilities only represent the utilities developed and Please note that these utilities only represent the utilities developed and

View File

@@ -26,7 +26,7 @@ Using the CMake Command Line {#cmake_cli}
2. Change into the created folder 2. Change into the created folder
3. Run `cmake -G "Unix Makefiles" path_to_wxWidgets_root` 3. Run `cmake -G "Unix Makefiles" path_to_wxWidgets_root`
4. After that you can run `cmake --build .` to start the build process or 4. After that you can run `cmake --build .` to start the build process or
directly use your choosen build system. directly use your chosen build system.
Run `cmake --help` to see a list of available generators on your platform. Run `cmake --help` to see a list of available generators on your platform.
These can than be specified using the -G command line option. On Windows it These can than be specified using the -G command line option. On Windows it

View File

@@ -12,7 +12,7 @@
@tableofcontents @tableofcontents
Typically combining the existing @ref group_class_ctrl controls in wxDialogs Typically combining the existing @ref group_class_ctrl controls in wxDialogs
and wxFrames is sufficient to fullfill any GUI design. Using the wxWidgets and wxFrames is sufficient to fulfill any GUI design. Using the wxWidgets
standard controls makes your GUI looks native on all ports and is obviously standard controls makes your GUI looks native on all ports and is obviously
easier and faster. easier and faster.

View File

@@ -106,7 +106,7 @@ just @c wxDateTime::Now() + wxDateSpan::Month()).
@section overview_datetime_arithmetics Date Arithmetics @section overview_datetime_arithmetics Date Arithmetic
Many different operations may be performed with the dates, however not all of Many different operations may be performed with the dates, however not all of
them make sense. For example, multiplying a date by a number is an invalid them make sense. For example, multiplying a date by a number is an invalid

View File

@@ -84,7 +84,7 @@ The scaling of the drawn image typically differs from the screen to the preview
and printed images. This class provides a set of routines named and printed images. This class provides a set of routines named
FitThisSizeToXXX(), MapScreenSizeToXXX(), and GetLogicalXXXRect, which can be FitThisSizeToXXX(), MapScreenSizeToXXX(), and GetLogicalXXXRect, which can be
used to set the user scale and origin of the wxPrintout's DC so that your class used to set the user scale and origin of the wxPrintout's DC so that your class
can easily map your image to the printout withough getting into the details of can easily map your image to the printout without getting into the details of
screen and printer PPI and scaling. See the printing sample for examples of how screen and printer PPI and scaling. See the printing sample for examples of how
these routines are used. these routines are used.

View File

@@ -415,7 +415,7 @@ set the focus back to the top-level object.
An event will be sent to the control when the focus changes. An event will be sent to the control when the focus changes.
When the user clicks on the control, wxRichTextCtrl determines which container When the user clicks on the control, wxRichTextCtrl determines which container
to set as the current object focus by calling the found container's overrided to set as the current object focus by calling the found container's overridden
wxRichTextObject::AcceptsFocus function. For example, although a table is a wxRichTextObject::AcceptsFocus function. For example, although a table is a
container, it must not itself be the object focus because there is no text container, it must not itself be the object focus because there is no text
editing at the table level. Instead, a cell within the table must accept the editing at the table level. Instead, a cell within the table must accept the

View File

@@ -115,7 +115,7 @@ These come in two varieties:
("\<label\>Cancel\</label\>"), but they may use nested subelements too (e.g. ("\<label\>Cancel\</label\>"), but they may use nested subelements too (e.g.
@ref overview_xrcformat_type_font "font property"). A property can only be @ref overview_xrcformat_type_font "font property"). A property can only be
listed once in an object's definition. listed once in an object's definition.
-# Child objects. Window childs, sizers, sizer items or notebook pages -# Child objects. Window children, sizers, sizer items or notebook pages
are all examples of child objects. They are represented using nested are all examples of child objects. They are represented using nested
@c \<object\> elements and are can be repeated more than once. The specifics @c \<object\> elements and are can be repeated more than once. The specifics
of which object classes are allowed as children are class-specific and of which object classes are allowed as children are class-specific and
@@ -1819,7 +1819,7 @@ objects have the following properties:
@endTable @endTable
A wxRibbonPage may have children of any type derived from wxRibbonControl. A wxRibbonPage may have children of any type derived from wxRibbonControl.
Most commontly, wxRibbonPanel is used. As a special case, the @c panel Most commonly, wxRibbonPanel is used. As a special case, the @c panel
pseudo-class may be used instead of @c wxRibbonPanel when used as wxRibbonPage pseudo-class may be used instead of @c wxRibbonPanel when used as wxRibbonPage
children. children.

View File

@@ -14,7 +14,7 @@ fname = sys.argv[1] + ".plist"
# The second argument is the key to replace # The second argument is the key to replace
key = sys.argv[2] key = sys.argv[2]
# The thrid argument is the value of the key # The third argument is the value of the key
val = sys.argv[3] val = sys.argv[3]
# Handle boolean values # Handle boolean values

View File

@@ -16,7 +16,7 @@ List of classes which should use their native GTK+ equivalents but don't:
Not possible because GTK's GtkHPane and GtkVPane Not possible because GTK's GtkHPane and GtkVPane
only support either horizontal or vertical panes only support either horizontal or vertical panes
(therefore their names) whereas wxSplitterWindow (therefore their names) whereas wxSplitterWindow
supports both and can even change orientiation at supports both and can even change orientation at
runtime. runtime.
- wxDatePickerCtrl - wxDatePickerCtrl

View File

@@ -14,7 +14,7 @@ to write wxWidgets applications for the [GNOME][] desktop, I will focus on the
GTK+ port, which is generally referred to as wxGTK. GTK+ port, which is generally referred to as wxGTK.
wxGTK still supports the old version GTK+ 1.2, but it now defaults to the wxGTK still supports the old version GTK+ 1.2, but it now defaults to the
uptodate version GTK+ 2.X, which is the basis for the current GNOME desktop. By up-to-date version GTK+ 2.X, which is the basis for the current GNOME desktop. By
way of using GTK+ 2.X and its underlying text rendering library [Pango][], wxGTK way of using GTK+ 2.X and its underlying text rendering library [Pango][], wxGTK
fully supports the Unicode character set and it can render text in any language fully supports the Unicode character set and it can render text in any language
and script, that is supported by Pango. and script, that is supported by Pango.
@@ -111,7 +111,7 @@ single application binary. This was possible since most of the relevant
functionality was either located in the only required library (GTK+) or was functionality was either located in the only required library (GTK+) or was
implemented within wxWidgets. Recent development outside the actual GTK+ project implemented within wxWidgets. Recent development outside the actual GTK+ project
has made it necessary to rethink this design and make use of other projects' has made it necessary to rethink this design and make use of other projects'
features in order to stay uptodate with current techological trends. Therefore, features in order to stay up-to-date with current techological trends. Therefore,
a system was implemented within wxWidgets that queries the system at runtime a system was implemented within wxWidgets that queries the system at runtime
about various libraries and makes use of their features whenever possible, but about various libraries and makes use of their features whenever possible, but
falls back to a reasonable solution if not. The result is that you can create falls back to a reasonable solution if not. The result is that you can create

View File

@@ -603,7 +603,7 @@ application.
Advanced Library Configurations {#msw_advanced} Advanced Library Configurations {#msw_advanced}
=============================== ===============================
Build instructions to less common library configurations using different UI Build instructions to less common library configurations using different UI
backends are avaiable here. backends are available here.
@subpage plat_msw_msys2 "Building with Win32 MSys2 backend" @subpage plat_msw_msys2 "Building with Win32 MSys2 backend"

View File

@@ -75,7 +75,7 @@ documentation had to be corrected by hand making this effort one of
the biggest in the development cycle leading up wxWidgets 3.0. the biggest in the development cycle leading up wxWidgets 3.0.
Additionally, tools were written to automatically compare the Additionally, tools were written to automatically compare the
signature of the many class methods to the documentation. The result signature of the many class methods to the documentation. The result
is more correct documentation with better formating and built-in is more correct documentation with better formatting and built-in
searching and screenshots of many controls. Since Doxygen is a searching and screenshots of many controls. Since Doxygen is a
wide-spread format and easy to learn, the new documentation is much wide-spread format and easy to learn, the new documentation is much
easier to edit, correct and read. See the <A HREF="https://docs.wxwidgets.org/trunk/index.html">wxWidgets easier to edit, correct and read. See the <A HREF="https://docs.wxwidgets.org/trunk/index.html">wxWidgets
@@ -147,10 +147,10 @@ see <A HREF="https://docs.wxwidgets.org/trunk/classwx_d_c.html">wxDC</A>,
<A HREF="https://docs.wxwidgets.org/trunk/classwx_brush.html">wxBrush</A>), <A HREF="https://docs.wxwidgets.org/trunk/classwx_brush.html">wxBrush</A>),
it has not changed much since its initial inception and so the code it has not changed much since its initial inception and so the code
was completely reorganized using a single set of frontend classes and was completely reorganized using a single set of frontend classes and
different backends which will make maintainance much easier without different backends which will make maintenance much easier without
having to care for binary backwards compatibility and it also helped having to care for binary backwards compatibility and it also helped
isolate a number of subtle platform differences. The old drawing API isolate a number of subtle platform differences. The old drawing API
is good enough for many tasks and reflects the drawing capabilites of is good enough for many tasks and reflects the drawing capabilities of
the 1990's but it didn't make use of advanced features such as the 1990's but it didn't make use of advanced features such as
transparency, anti-aliasing and free matrix transforms of modern 2D transparency, anti-aliasing and free matrix transforms of modern 2D
graphics systems such as GDI+ on Windows, Cairo on Linux (and graphics systems such as GDI+ on Windows, Cairo on Linux (and
@@ -165,12 +165,12 @@ wxBRUSHSTYLE_SOLID etc. and the reference counting system was
streamlined and made identical on all platforms.</P> streamlined and made identical on all platforms.</P>
<H3 CLASS="western">Changes to wxBase</H3> <H3 CLASS="western">Changes to wxBase</H3>
<P ALIGN=JUSTIFY>wxBase is the name of the non-GUI part of wxWidgets <P ALIGN=JUSTIFY>wxBase is the name of the non-GUI part of wxWidgets
libary which provides basic class such as the aforementioned wxString library which provides basic class such as the aforementioned wxString
class, container classes, as well as classes for threading, class, container classes, as well as classes for threading,
networking, XML parsing, path and configuration management, logging, networking, XML parsing, path and configuration management, logging,
debugging etc. These functions and classes have been separated into debugging etc. These functions and classes have been separated into
their own library both for being able to write non-GUI apps as well their own library both for being able to write non-GUI apps as well
as to make maintainance easier through reduced interdependence. as to make maintenance easier through reduced interdependence.
</P> </P>
<P ALIGN=JUSTIFY>Many of the changes to wxString and the container <P ALIGN=JUSTIFY>Many of the changes to wxString and the container
classes are located in wxBase, but on top of that support to wxBase classes are located in wxBase, but on top of that support to wxBase

View File

@@ -85,7 +85,7 @@ Hmm. I might buy a mug that had, say, a wxLogo and "wxWidgets" (and
maybe the website URL underneath in smaller type) on one side and maybe the website URL underneath in smaller type) on one side and
"Specialization is for insects ... and templates" on the other. "Specialization is for insects ... and templates" on the other.
.. only if it held at leat a full half (imperial) pint, mind. Not .. only if it held at least a full half (imperial) pint, mind. Not
one of those wussy 8.5 fl.oz. jobbies. one of those wussy 8.5 fl.oz. jobbies.
That'd be a nice ice-breaker when working at a new client's site - That'd be a nice ice-breaker when working at a new client's site -

View File

@@ -2,11 +2,11 @@
## Internals ## Internals
wxQT uses the same techniques like other ports to wrap the Qt toolkit classes inside the wxWidget hierachy (especially similar to wxGTK). wxQT uses the same techniques like other ports to wrap the Qt toolkit classes inside the wxWidget hierarchy (especially similar to wxGTK).
### Current (original) Approach ### Current (original) Approach
An '''internal pointer m_qtWindow''' in wxWindow holds the reference to the QWidget (or derived) counterpart, and is accesible through the virtual method '''GetHandle'''. An '''internal pointer m_qtWindow''' in wxWindow holds the reference to the QWidget (or derived) counterpart, and is accessible through the virtual method '''GetHandle'''.
This pointer and other window styles are set up in the '''PostCreation''' method that must be called by the derived classes (mostly controls) to initialize the widget correctly. This pointer and other window styles are set up in the '''PostCreation''' method that must be called by the derived classes (mostly controls) to initialize the widget correctly.
Not doing so will cause painting and deletion issues, as the base class will not know how to handle the Qt widget. Not doing so will cause painting and deletion issues, as the base class will not know how to handle the Qt widget.
wxControl even provides a protected method '''QtCreateControl''' that will do the common initialization (including post creation step, moving, sizing, etc., and calling the base to add the child to the parent). wxControl even provides a protected method '''QtCreateControl''' that will do the common initialization (including post creation step, moving, sizing, etc., and calling the base to add the child to the parent).
@@ -19,7 +19,7 @@ Many controls have also other pointers to allow to map different sub-widgets and
### New (tentative) Approach ### New (tentative) Approach
In the other end, Top Level Windows (frames and dialogs) '''uses directly the internal window pointer''', doing a static cast to return the correct type for GetHandle, avoiding multilevel pointer hierarchies. In the other end, Top Level Windows (frames and dialogs) '''uses directly the internal window pointer''', doing a static cast to return the correct type for GetHandle, avoiding multilevel pointer hierarchies.
This would be the ideal solution, but not all classes could be mapped 1:1 and that could introduce potential issues (i.e. invalid static casts) and more boilerplate due to additional specific accesor methods. This would be the ideal solution, but not all classes could be mapped 1:1 and that could introduce potential issues (i.e. invalid static casts) and more boilerplate due to additional specific accessor methods.
For a longer discussion of pro and cons, see [PR#43 comments](https://github.com/reingart/wxWidgets/pull/43) For a longer discussion of pro and cons, see [PR#43 comments](https://github.com/reingart/wxWidgets/pull/43)
@@ -59,7 +59,7 @@ The approach chosen was to use templates to help inherit QObject's (QWidget), pr
### Delete later ### Delete later
Both templates also have some safety checks to avoid invalid spurious access to deleted wx objects (using a special pointer to the wx instance stored in the Qt object, that is reseted to NULL when the wx counterpart is marked to deletion). Both templates also have some safety checks to avoid invalid spurious access to deleted wx objects (using a special pointer to the wx instance stored in the Qt object, that is reset to NULL when the wx counterpart is marked to deletion).
This is due that in some situations, Qt object could still be referenced in the Qt event queue, so it cannot be removed immediately. This is due that in some situations, Qt object could still be referenced in the Qt event queue, so it cannot be removed immediately.

View File

@@ -140,7 +140,7 @@ the android_armv5/ android_armv7/ android_x86/ pre-compiled folders to
cross-compile for that architectures) cross-compile for that architectures)
Then, create a build directory (under the wxWidgets folder), configure for Then, create a build directory (under the wxWidgets folder), configure for
Andrid (disable currently unsupported/uneeded features) and run make: Android (disable currently unsupported/unneeded features) and run make:
cd ~/src/wxWidgets cd ~/src/wxWidgets
mkdir bldqt5droid mkdir bldqt5droid

View File

@@ -44,7 +44,7 @@ public:
// sets the matrix to the respective values // sets the matrix to the respective values
virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) = 0; virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) = 0;
// gets the component valuess of the matrix // gets the component values of the matrix
virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const = 0; virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const = 0;
// concatenates the matrix // concatenates the matrix

View File

@@ -26,7 +26,7 @@
// dock art provider code - a dock provider provides all drawing // dock art provider code - a dock provider provides all drawing
// functionality to the wxAui dock manager. This allows the dock // functionality to the wxAui dock manager. This allows the dock
// manager to have plugable look-and-feels // manager to have pluggable look-and-feels
class WXDLLIMPEXP_AUI wxAuiDockArt class WXDLLIMPEXP_AUI wxAuiDockArt
{ {

View File

@@ -74,7 +74,7 @@ protected:
// under the name "wxColourPickerWidget". // under the name "wxColourPickerWidget".
// NOTE: wxColourPickerCtrl allocates a wxColourPickerWidget and relies on the // NOTE: wxColourPickerCtrl allocates a wxColourPickerWidget and relies on the
// fact that all classes being mapped as wxColourPickerWidget have the // fact that all classes being mapped as wxColourPickerWidget have the
// same prototype for their contructor (and also explains why we use // same prototype for their constructor (and also explains why we use
// define instead of a typedef) // define instead of a typedef)
// since GTK > 2.4, there is GtkColorButton // since GTK > 2.4, there is GtkColorButton
#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)

View File

@@ -723,7 +723,7 @@ public:
// get the broken down date/time representation in the given timezone // get the broken down date/time representation in the given timezone
// //
// If you wish to get several time components (day, month and year), // If you wish to get several time components (day, month and year),
// consider getting the whole Tm strcuture first and retrieving the // consider getting the whole Tm structure first and retrieving the
// value from it - this is much more efficient // value from it - this is much more efficient
Tm GetTm(const TimeZone& tz = Local) const; Tm GetTm(const TimeZone& tz = Local) const;
@@ -861,7 +861,7 @@ public:
return m_time != dt.m_time; return m_time != dt.m_time;
} }
// arithmetics with dates (see also below for more operators) // arithmetic with dates (see also below for more operators)
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// return the sum of the date with a time span (positive or negative) // return the sum of the date with a time span (positive or negative)
@@ -1207,7 +1207,7 @@ public:
// no dtor // no dtor
// arithmetics with time spans (see also below for more operators) // arithmetic with time spans (see also below for more operators)
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// return the sum of two timespans // return the sum of two timespans
@@ -1448,7 +1448,7 @@ public:
// returns 7*GetWeeks() + GetDays() // returns 7*GetWeeks() + GetDays()
int GetTotalDays() const { return 7*m_weeks + m_days; } int GetTotalDays() const { return 7*m_weeks + m_days; }
// arithmetics with date spans (see also below for more operators) // arithmetic with date spans (see also below for more operators)
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// return sum of two date spans // return sum of two date spans
@@ -1848,7 +1848,7 @@ inline bool wxDateTime::IsEqualUpTo(const wxDateTime& dt,
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxDateTime arithmetics // wxDateTime arithmetic
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
inline wxDateTime wxDateTime::Add(const wxTimeSpan& diff) const inline wxDateTime wxDateTime::Add(const wxTimeSpan& diff) const
@@ -1997,7 +1997,7 @@ inline int wxTimeSpan::GetWeeks() const
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxTimeSpan arithmetics // wxTimeSpan arithmetic
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
inline wxTimeSpan wxTimeSpan::Add(const wxTimeSpan& diff) const inline wxTimeSpan wxTimeSpan::Add(const wxTimeSpan& diff) const

View File

@@ -528,7 +528,7 @@ public:
virtual void ComputeScaleAndOrigin(); virtual void ComputeScaleAndOrigin();
// this needs to overidden if the axis is inverted // this needs to overridden if the axis is inverted
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
virtual double GetContentScaleFactor() const { return m_contentScaleFactor; } virtual double GetContentScaleFactor() const { return m_contentScaleFactor; }

View File

@@ -98,7 +98,7 @@
*/ */
#pragma warning(disable: 4127) /* conditional expression is constant */ #pragma warning(disable: 4127) /* conditional expression is constant */
/* There are too many false positivies for this one, particularly when /* There are too many false positives for this one, particularly when
using templates like wxVector<T> */ using templates like wxVector<T> */
/* class 'foo' needs to have dll-interface to be used by clients of /* class 'foo' needs to have dll-interface to be used by clients of
class 'bar'" */ class 'bar'" */

View File

@@ -118,7 +118,7 @@ public:
// set misc wxDialUpManager options // set misc wxDialUpManager options
// -------------------------------- // --------------------------------
// enable automatical checks for the connection status and sending of // enable automatic checks for the connection status and sending of
// wxEVT_DIALUP_CONNECTED/wxEVT_DIALUP_DISCONNECTED events. The interval // wxEVT_DIALUP_CONNECTED/wxEVT_DIALUP_DISCONNECTED events. The interval
// parameter is only for Unix where we do the check manually: under // parameter is only for Unix where we do the check manually: under
// Windows, the notification about the change of connection status is // Windows, the notification about the change of connection status is

View File

@@ -187,9 +187,9 @@ public:
virtual bool GetData() = 0; virtual bool GetData() = 0;
// sets the default action for drag and drop: // sets the default action for drag and drop:
// use wxDragMove or wxDragCopy to set deafult action to move or copy // use wxDragMove or wxDragCopy to set default action to move or copy
// and use wxDragNone (default) to set default action specified by // and use wxDragNone (default) to set default action specified by
// initialization of draging (see wxDropSourceBase::DoDragDrop()) // initialization of dragging (see wxDropSourceBase::DoDragDrop())
void SetDefaultAction(wxDragResult action) void SetDefaultAction(wxDragResult action)
{ m_defaultAction = action; } { m_defaultAction = action; }

View File

@@ -39,7 +39,7 @@ typedef wxDLManifest wxDLImports;
// wxDL is not virtual and we deliberately hide some of it's // wxDL is not virtual and we deliberately hide some of it's
// methods here. // methods here.
// //
// Unless you know exacty why you need to, you probably shouldn't // Unless you know exactly why you need to, you probably shouldn't
// instantiate this class directly anyway, use wxPluginManager // instantiate this class directly anyway, use wxPluginManager
// instead. // instead.

View File

@@ -96,7 +96,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
bool Convert(wchar_t* str) const { return Convert(str, str); } bool Convert(wchar_t* str) const { return Convert(str, str); }
// Return equivalent(s) for given font that are used // Return equivalent(s) for given font that are used
// under given platform. wxPLATFORM_CURRENT means the plaform // under given platform. wxPLATFORM_CURRENT means the platform
// this binary was compiled for // this binary was compiled for
// //
// Examples: // Examples:

View File

@@ -2190,7 +2190,7 @@ public:
*ypos = GetY(); *ypos = GetY();
} }
// This version if provided only for backwards compatiblity, don't use. // This version if provided only for backwards compatibility, don't use.
void GetPosition(long *xpos, long *ypos) const void GetPosition(long *xpos, long *ypos) const
{ {
if (xpos) if (xpos)

View File

@@ -59,7 +59,7 @@ public:
private: private:
// Objects of this class are made to be stored in a linked list in // Objects of this class are made to be stored in a linked list in
// wxEvtHandler so put the next node ponter directly in the class itself. // wxEvtHandler so put the next node pointer directly in the class itself.
wxEventFilter* m_next; wxEventFilter* m_next;
// And provide access to it for wxEvtHandler [only]. // And provide access to it for wxEvtHandler [only].

View File

@@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialogImpl;
// Flags for wxFindReplaceData.Flags // Flags for wxFindReplaceData.Flags
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// flages used by wxFindDialogEvent::GetFlags() // flags used by wxFindDialogEvent::GetFlags()
enum wxFindReplaceFlags enum wxFindReplaceFlags
{ {
// downward search/replace selected (otherwise - upwards) // downward search/replace selected (otherwise - upwards)

View File

@@ -133,7 +133,7 @@ public:
wxFileName(const wxFileName& filepath) { Assign(filepath); } wxFileName(const wxFileName& filepath) { Assign(filepath); }
// from a full filename: if it terminates with a '/', a directory path // from a full filename: if it terminates with a '/', a directory path
// is contructed (the name will be empty), otherwise a file name and // is constructed (the name will be empty), otherwise a file name and
// extension are extracted from it // extension are extracted from it
wxFileName( const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE ) wxFileName( const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE )
{ Assign( fullpath, format ); m_dontFollowLinks = false; } { Assign( fullpath, format ); m_dontFollowLinks = false; }

View File

@@ -126,7 +126,7 @@ protected:
// under the name "wxFilePickerWidget" and "wxDirPickerWidget". // under the name "wxFilePickerWidget" and "wxDirPickerWidget".
// NOTE: wxFileDirPickerCtrlBase will allocate a wx{File|Dir}PickerWidget and this // NOTE: wxFileDirPickerCtrlBase will allocate a wx{File|Dir}PickerWidget and this
// requires that all classes being mapped as wx{File|Dir}PickerWidget have the // requires that all classes being mapped as wx{File|Dir}PickerWidget have the
// same prototype for the contructor... // same prototype for the constructor...
// since GTK >= 2.6, there is GtkFileButton // since GTK >= 2.6, there is GtkFileButton
#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
#include "wx/gtk/filepicker.h" #include "wx/gtk/filepicker.h"

View File

@@ -18,7 +18,7 @@
#include "wx/toplevel.h" // the base class #include "wx/toplevel.h" // the base class
#include "wx/statusbr.h" #include "wx/statusbr.h"
// the default names for various classs // the default names for various classes
extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[]; extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[];

View File

@@ -24,7 +24,7 @@
#define wxGA_HORIZONTAL wxHORIZONTAL #define wxGA_HORIZONTAL wxHORIZONTAL
#define wxGA_VERTICAL wxVERTICAL #define wxGA_VERTICAL wxVERTICAL
// Available since Windows 7 only. With this style, the value of guage will // Available since Windows 7 only. With this style, the value of gauge will
// reflect on the taskbar button. // reflect on the taskbar button.
#define wxGA_PROGRESS 0x0010 #define wxGA_PROGRESS 0x0010
// Win32 only, is default (and only) on some other platforms // Win32 only, is default (and only) on some other platforms

View File

@@ -224,7 +224,7 @@ enum wxEllipsizeMode
#endif // platform #endif // platform
/* Another macro: this one is for portable creation of bitmaps. We assume that /* Another macro: this one is for portable creation of bitmaps. We assume that
under Unix bitmaps live in XPMs and under Windows they're in ressources. under Unix bitmaps live in XPMs and under Windows they're in resources.
*/ */
#if defined(__WINDOWS__) && wxUSE_WXDIB #if defined(__WINDOWS__) && wxUSE_WXDIB

View File

@@ -90,7 +90,7 @@ public:
void PsPrint( const wxString& psdata ); void PsPrint( const wxString& psdata );
// Overrridden for wxPrinterDC Impl // Overridden for wxPrinterDC Impl
virtual int GetResolution() const wxOVERRIDE; virtual int GetResolution() const wxOVERRIDE;
virtual wxRect GetPaperRect() const wxOVERRIDE; virtual wxRect GetPaperRect() const wxOVERRIDE;

View File

@@ -302,7 +302,7 @@ public:
// version only checks that the event has no modifiers. The derived // version only checks that the event has no modifiers. The derived
// classes are supposed to do "if ( base::IsAcceptedKey() && ... )" in // classes are supposed to do "if ( base::IsAcceptedKey() && ... )" in
// their IsAcceptedKey() implementation, although, of course, it is not a // their IsAcceptedKey() implementation, although, of course, it is not a
// mandatory requirment. // mandatory requirement.
// //
// NB: if the key is F2 (special), editing will always start and this // NB: if the key is F2 (special), editing will always start and this
// method will not be called at all (but StartingKey() will) // method will not be called at all (but StartingKey() will)

View File

@@ -210,7 +210,7 @@ public:
{ return new wxGridCellFloatEditor(m_width, m_precision); } { return new wxGridCellFloatEditor(m_width, m_precision); }
// parameters string format is "width[,precision[,format]]" // parameters string format is "width[,precision[,format]]"
// format to choose beween f|e|g|E|G (f is used by default) // format to choose between f|e|g|E|G (f is used by default)
virtual void SetParameters(const wxString& params) wxOVERRIDE; virtual void SetParameters(const wxString& params) wxOVERRIDE;
protected: protected:

View File

@@ -140,7 +140,7 @@ private:
int m_col; int m_col;
}; };
// header control retreiving column information from the grid // header control retrieving column information from the grid
class wxGridHeaderCtrl : public wxHeaderCtrl class wxGridHeaderCtrl : public wxHeaderCtrl
{ {
public: public:

View File

@@ -120,7 +120,7 @@ protected:
// called to disable the other windows while this dialog is shown // called to disable the other windows while this dialog is shown
void DisableOtherWindows(); void DisableOtherWindows();
// must be called to reenable the other windows temporarily disabled while // must be called to re-enable the other windows temporarily disabled while
// the dialog was shown // the dialog was shown
void ReenableOtherWindows(); void ReenableOtherWindows();

View File

@@ -104,7 +104,7 @@ class WXDLLIMPEXP_FWD_CORE wxGraphicsBitmap;
/* /*
* notes about the graphics context apis * notes about the graphics context apis
* *
* angles : are measured in radians, 0.0 being in direction of positiv x axis, PI/2 being * angles : are measured in radians, 0.0 being in direction of positive x axis, PI/2 being
* in direction of positive y axis. * in direction of positive y axis.
*/ */
@@ -218,7 +218,7 @@ public:
virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
wxDouble tx=0.0, wxDouble ty=0.0); wxDouble tx=0.0, wxDouble ty=0.0);
// gets the component valuess of the matrix // gets the component values of the matrix
virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL,
wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const; wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;

View File

@@ -97,7 +97,7 @@ public:
virtual wxSize GetPPI() const wxOVERRIDE; virtual wxSize GetPPI() const wxOVERRIDE;
virtual int GetDepth() const wxOVERRIDE; virtual int GetDepth() const wxOVERRIDE;
// overrriden here for RTL // overridden here for RTL
virtual void SetDeviceOrigin( wxCoord x, wxCoord y ) wxOVERRIDE; virtual void SetDeviceOrigin( wxCoord x, wxCoord y ) wxOVERRIDE;
virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) wxOVERRIDE; virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) wxOVERRIDE;

View File

@@ -124,7 +124,7 @@ public:
}; };
DecorSize m_decorSize; DecorSize m_decorSize;
// private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and // private gtk_timeout_add result for mimicking wxUSER_ATTENTION_INFO and
// wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle. // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
int m_urgency_hint; int m_urgency_hint;
// timer for detecting WM with broken _NET_REQUEST_FRAME_EXTENTS handling // timer for detecting WM with broken _NET_REQUEST_FRAME_EXTENTS handling

View File

@@ -45,7 +45,7 @@ protected:
void DoConvertToPng(); void DoConvertToPng();
private: private:
// virtual function hiding supression // virtual function hiding suppression
size_t GetDataSize(const wxDataFormat& format) const size_t GetDataSize(const wxDataFormat& format) const
{ return(wxDataObjectSimple::GetDataSize(format)); } { return(wxDataObjectSimple::GetDataSize(format)); }
bool GetDataHere(const wxDataFormat& format, void* pBuf) const bool GetDataHere(const wxDataFormat& format, void* pBuf) const
@@ -71,7 +71,7 @@ public:
virtual bool SetData(size_t len, const void *buf); virtual bool SetData(size_t len, const void *buf);
private: private:
// virtual function hiding supression // virtual function hiding suppression
size_t GetDataSize(const wxDataFormat& format) const size_t GetDataSize(const wxDataFormat& format) const
{ return(wxDataObjectSimple::GetDataSize(format)); } { return(wxDataObjectSimple::GetDataSize(format)); }
bool GetDataHere(const wxDataFormat& format, void* pBuf) const bool GetDataHere(const wxDataFormat& format, void* pBuf) const

View File

@@ -101,7 +101,7 @@ public:
long m_gdkFunc, long m_gdkFunc,
m_gdkDecor; m_gdkDecor;
// private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and // private gtk_timeout_add result for mimicking wxUSER_ATTENTION_INFO and
// wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle. // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
int m_urgency_hint; int m_urgency_hint;

View File

@@ -317,7 +317,7 @@ public:
// sort the children of this item using the specified callback function // sort the children of this item using the specified callback function
// (it should return -1, 0 or +1 as usual), if it's not specified // (it should return -1, 0 or +1 as usual), if it's not specified
// alphabetical comparaison is performed. // alphabetical comparison is performed.
// //
// NB: this function is not reentrant! // NB: this function is not reentrant!
void SortChildren(const wxTreeItemId& item, void SortChildren(const wxTreeItemId& item,

View File

@@ -211,7 +211,7 @@ public:
bool m_needsStyleChange:1; // May not be able to change bool m_needsStyleChange:1; // May not be able to change
// background style until OnIdle // background style until OnIdle
// C++ has no virtual methods in the constrcutor of any class but we need // C++ has no virtual methods in the constructor of any class but we need
// different methods of inserting a child window into a wxFrame, // different methods of inserting a child window into a wxFrame,
// wxMDIFrame, wxNotebook etc. this is the callback that will get used. // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
wxInsertChildFunction m_insertCallback; wxInsertChildFunction m_insertCallback;

View File

@@ -119,7 +119,7 @@ private:
void DoRemoveNode( wxHashTableBase_Node* node ); void DoRemoveNode( wxHashTableBase_Node* node );
// destroys data contained in the node if appropriate: // destroys data contained in the node if appropriate:
// deletes the key if it is a string and destrys // deletes the key if it is a string and destroys
// the value if m_deleteContents is true // the value if m_deleteContents is true
void DoDestroyNode( wxHashTableBase_Node* node ); void DoDestroyNode( wxHashTableBase_Node* node );

View File

@@ -203,7 +203,7 @@ protected:
wxHtmlBookRecArray m_bookRecords; wxHtmlBookRecArray m_bookRecords;
wxHtmlHelpDataItems m_contents; // list of all available books and pages wxHtmlHelpDataItems m_contents; // list of all available books and pages
wxHtmlHelpDataItems m_index; // list of index itesm wxHtmlHelpDataItems m_index; // list of index items
protected: protected:
// Imports .hhp files (MS HTML Help Workshop) // Imports .hhp files (MS HTML Help Workshop)

View File

@@ -45,7 +45,7 @@ public:
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
// wxHtmlFilterPlainText // wxHtmlFilterPlainText
// This filter is used as default filter if no other can // This filter is used as default filter if no other can
// be used (= uknown type of file). It is used by // be used (= unknown type of file). It is used by
// wxHtmlWindow itself. // wxHtmlWindow itself.
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------

View File

@@ -163,7 +163,7 @@ protected:
// Adds tag and proceeds it. Parse() may (and usually is) called from this method. // Adds tag and proceeds it. Parse() may (and usually is) called from this method.
// This is called from Parse() and may be overridden. // This is called from Parse() and may be overridden.
// Default behaviour is that it looks for proper handler in m_Handlers. The tag is // Default behaviour is that it looks for proper handler in m_Handlers. The tag is
// ignored if no hander is found. // ignored if no handler is found.
// Derived class is *responsible* for filling in m_Handlers table. // Derived class is *responsible* for filling in m_Handlers table.
virtual void AddTag(const wxHtmlTag& tag); virtual void AddTag(const wxHtmlTag& tag);
@@ -236,7 +236,7 @@ public:
// is capable of handling italic, bold, font and paragraph tags // is capable of handling italic, bold, font and paragraph tags
virtual wxString GetSupportedTags() = 0; virtual wxString GetSupportedTags() = 0;
// This is hadling core method. It does all the Steps 1-3. // This is handling core method. It does all the Steps 1-3.
// To process step 2, you can call ParseInner() // To process step 2, you can call ParseInner()
// returned value : true if it called ParseInner(), // returned value : true if it called ParseInner(),
// false etherwise // false etherwise
@@ -282,7 +282,7 @@ public:
// (with respect to output encoding) // (with respect to output encoding)
wxString Parse(const wxString& input) const; wxString Parse(const wxString& input) const;
// Returns character for given entity or 0 if the enity is unknown // Returns character for given entity or 0 if the entity is unknown
wxChar GetEntityChar(const wxString& entity) const; wxChar GetEntityChar(const wxString& entity) const;
// Returns character that represents given Unicode code // Returns character that represents given Unicode code

View File

@@ -260,7 +260,7 @@ public:
// Set HTML page and display it. !! source is HTML document itself, // Set HTML page and display it. !! source is HTML document itself,
// it is NOT address/filename of HTML document. If you want to // it is NOT address/filename of HTML document. If you want to
// specify document location, use LoadPage() istead // specify document location, use LoadPage() instead
// Return value : false if an error occurred, true otherwise // Return value : false if an error occurred, true otherwise
virtual bool SetPage(const wxString& source); virtual bool SetPage(const wxString& source);
@@ -503,8 +503,8 @@ protected:
bool m_makingSelection; bool m_makingSelection;
#if wxUSE_CLIPBOARD #if wxUSE_CLIPBOARD
// time of the last doubleclick event, used to detect tripleclicks // time of the last double-click event, used to detect triple clicks
// (tripleclicks are used to select whole line): // (triple clicks are used to select whole line):
wxMilliClock_t m_lastDoubleClick; wxMilliClock_t m_lastDoubleClick;
// helper class to automatically scroll the window if the user is selecting // helper class to automatically scroll the window if the user is selecting

View File

@@ -249,7 +249,7 @@ private:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxHtmlWinTagHandler // wxHtmlWinTagHandler
// This is basicly wxHtmlTagHandler except // This is basically wxHtmlTagHandler except
// it is extended with protected member m_Parser pointing to // it is extended with protected member m_Parser pointing to
// the wxHtmlWinParser object // the wxHtmlWinParser object
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -401,7 +401,7 @@ public:
// (actually shades of grey) typically when you draw anti- // (actually shades of grey) typically when you draw anti-
// aliased text into a bitmap. The DC drawinf routines // aliased text into a bitmap. The DC drawinf routines
// draw grey values on the black background although they // draw grey values on the black background although they
// actually mean to draw white with differnt alpha values. // actually mean to draw white with different alpha values.
// This method reverses it, assuming a black (!) background // This method reverses it, assuming a black (!) background
// and white text (actually only the red channel is read). // and white text (actually only the red channel is read).
// The method will then fill up the whole image with the // The method will then fill up the whole image with the

View File

@@ -804,7 +804,7 @@ public:
// change the new log target // change the new log target
void SetLog(wxLog *logger); void SetLog(wxLog *logger);
// this can be used to temporarily disable (and then reenable) passing // this can be used to temporarily disable (and then re-enable) passing
// messages to the old logger (by default we do pass them) // messages to the old logger (by default we do pass them)
void PassMessages(bool bDoPass) { m_bPassMessages = bDoPass; } void PassMessages(bool bDoPass) { m_bPassMessages = bDoPass; }

View File

@@ -707,7 +707,7 @@ public:
wxLongLongWx operator-() const; wxLongLongWx operator-() const;
wxLongLongWx& Negate(); wxLongLongWx& Negate();
// subraction // subtraction
wxLongLongWx operator-(const wxLongLongWx& ll) const; wxLongLongWx operator-(const wxLongLongWx& ll) const;
wxLongLongWx& operator-=(const wxLongLongWx& ll); wxLongLongWx& operator-=(const wxLongLongWx& ll);

View File

@@ -15,7 +15,7 @@
// Helper to decide if an object of type T is "movable", i.e. if it can be // Helper to decide if an object of type T is "movable", i.e. if it can be
// copied to another memory location using memmove() or realloc() C functions. // copied to another memory location using memmove() or realloc() C functions.
// C++ only gurantees that POD types (including primitive types) are // C++ only guarantees that POD types (including primitive types) are
// movable. // movable.
template<typename T> template<typename T>
struct wxIsMovable struct wxIsMovable

View File

@@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_BASE wxIconLocation;
class WXDLLIMPEXP_FWD_BASE wxFileTypeImpl; class WXDLLIMPEXP_FWD_BASE wxFileTypeImpl;
class WXDLLIMPEXP_FWD_BASE wxMimeTypesManagerImpl; class WXDLLIMPEXP_FWD_BASE wxMimeTypesManagerImpl;
// these constants define the MIME informations source under UNIX and are used // these constants define the MIME information source under UNIX and are used
// by wxMimeTypesManager::Initialize() // by wxMimeTypesManager::Initialize()
enum wxMailcapStyle enum wxMailcapStyle
{ {

View File

@@ -102,7 +102,7 @@ public:
protected: protected:
// minimum size for the text ctrl // minimum size for the text ctrl
wxSize GetItemsSize() const; wxSize GetItemsSize() const;
// common part of all contructors // common part of all constructors
void Init(); void Init();
WXWidget m_menuWidget; WXWidget m_menuWidget;

View File

@@ -310,7 +310,7 @@ private:
// undesired effects. // undesired effects.
// //
// Usage: create an instance of this class on the stack to disable the size // Usage: create an instance of this class on the stack to disable the size
// optimisation, it will be reenabled as soon as the object goes out // optimisation, it will be re-enabled as soon as the object goes out
// from scope. // from scope.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -13,7 +13,7 @@
#if wxUSE_CLIPBOARD #if wxUSE_CLIPBOARD
// These functions superceded by wxClipboard, but retained in order to // These functions superseded by wxClipboard, but retained in order to
// implement wxClipboard, and for compatibility. // implement wxClipboard, and for compatibility.
// open/close the clipboard // open/close the clipboard

View File

@@ -125,7 +125,7 @@ public:
const void *bits = NULL); const void *bits = NULL);
// create a plain DIB (not a DIB section) from a DDB, the caller is // create a plain DIB (not a DIB section) from a DDB, the caller is
// responsable for freeing it using ::GlobalFree() // responsible for freeing it using ::GlobalFree()
static HGLOBAL ConvertFromBitmap(HBITMAP hbmp); static HGLOBAL ConvertFromBitmap(HBITMAP hbmp);
// creates a DIB from the given DDB or calculates the space needed by it: // creates a DIB from the given DDB or calculates the space needed by it:

View File

@@ -414,7 +414,7 @@ protected:
// get the internal data object for this item (may return NULL) // get the internal data object for this item (may return NULL)
wxMSWListItemData *MSWGetItemData(long item) const; wxMSWListItemData *MSWGetItemData(long item) const;
// get the item attribute, either by quering it for virtual control, or by // get the item attribute, either by querying it for virtual control, or by
// returning the one previously set using setter methods for a normal one // returning the one previously set using setter methods for a normal one
wxItemAttr *DoGetItemColumnAttr(long item, long column) const; wxItemAttr *DoGetItemColumnAttr(long item, long column) const;

View File

@@ -136,7 +136,7 @@ private:
// It is initially NULL and only allocated if we have any radio items. // It is initially NULL and only allocated if we have any radio items.
wxMenuRadioItemsData *m_radioData; wxMenuRadioItemsData *m_radioData;
// if true, insert a breal before appending the next item // if true, insert a break before appending the next item
bool m_doBreak; bool m_doBreak;
// the menu handle of this menu // the menu handle of this menu

View File

@@ -83,7 +83,7 @@ public:
// temporarily suppress multiple notifications that would be generated for // temporarily suppress multiple notifications that would be generated for
// them and generate a single one at the end using MSWNotifyShell() // them and generate a single one at the end using MSWNotifyShell()
// explicitly. // explicitly.
void MSWSuppressNotifications(bool supress); void MSWSuppressNotifications(bool suppress);
wxString wxString
GetExpandedCommand(const wxString& verb, GetExpandedCommand(const wxString& verb,

View File

@@ -56,7 +56,7 @@ extern WXDLLIMPEXP_CORE bool IsIidFromList(REFIID riid, const IID *aIids[], size
*/ */
/* /*
wxAutoULong: this class is used for automatically initalising m_cRef to 0 wxAutoULong: this class is used for automatically initialising m_cRef to 0
*/ */
class wxAutoULong class wxAutoULong
{ {

View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/private/graphicsd2d.h // Name: wx/msw/private/graphicsd2d.h
// Purpose: Allow functions from graphicsd2d.cpp to be used in othe files // Purpose: Allow functions from graphicsd2d.cpp to be used in other files
// Author: New Pagodi // Author: New Pagodi
// Created: 2017-10-31 // Created: 2017-10-31
// Copyright: (c) 2017 wxWidgets development team // Copyright: (c) 2017 wxWidgets development team

View File

@@ -68,7 +68,7 @@ public:
static bool Initialize(); static bool Initialize();
static void Uninitalize(); static void Uninitialize();
friend class wxWebViewEdgeModule; friend class wxWebViewEdgeModule;
}; };

View File

@@ -64,7 +64,7 @@ private:
// generic version does. This is done as part of DoNativeBeforeUpdate(). // generic version does. This is done as part of DoNativeBeforeUpdate().
void DispatchEvents(); void DispatchEvents();
// Updates the various timing informations for both determinate // Updates the various timing information for both determinate
// and indeterminate modes. Requires the shared object to have // and indeterminate modes. Requires the shared object to have
// been entered. // been entered.
void UpdateExpandedInformation(int value); void UpdateExpandedInformation(int value);

View File

@@ -33,8 +33,8 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Definitions for legacy Windows SDKs // Definitions for legacy Windows SDKs
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Some defintions introduced with Windows Vista might be missing in older SDKs // Some definitions introduced with Windows Vista might be missing in older SDKs
// Missing defintions are added here for compatiblity // Missing definitions are added here for compatibility
#ifndef VSCLASS_LISTVIEW #ifndef VSCLASS_LISTVIEW
#define LISS_NORMAL 1 #define LISS_NORMAL 1

View File

@@ -369,7 +369,7 @@ protected:
// NULL popup can be used to indicate default interface // NULL popup can be used to indicate default interface
virtual void DoSetPopupControl(wxComboPopup* popup) wxOVERRIDE; virtual void DoSetPopupControl(wxComboPopup* popup) wxOVERRIDE;
// clears all allocated client datas // clears all allocated client data
void ClearClientDatas(); void ClearClientDatas();
wxVListBoxComboPopup* GetVListBoxComboPopup() const wxVListBoxComboPopup* GetVListBoxComboPopup() const

View File

@@ -77,7 +77,7 @@ public:
{ m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; } { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }
// adding a CFType object to be released only at the end of the current event cycle (increases the // adding a CFType object to be released only at the end of the current event cycle (increases the
// refcount of the object passed), needed in case we are in the middle of an event concering an object // refcount of the object passed), needed in case we are in the middle of an event concerning an object
// we want to delete and cannot do it immediately // we want to delete and cannot do it immediately
// TODO change semantics to be in line with cocoa (make autrelease NOT increase the count) // TODO change semantics to be in line with cocoa (make autrelease NOT increase the count)
void MacAddToAutorelease( void* cfrefobj ); void MacAddToAutorelease( void* cfrefobj );

View File

@@ -59,7 +59,7 @@ public:
// item related methods // item related methods
// //
virtual bool Add (wxDataViewItem const& parent, wxDataViewItem const& item) = 0; // adds an item to the native control virtual bool Add (wxDataViewItem const& parent, wxDataViewItem const& item) = 0; // adds an item to the native control
virtual bool Add (wxDataViewItem const& parent, wxDataViewItemArray const& itesm) = 0; // adds a items to the native control virtual bool Add (wxDataViewItem const& parent, wxDataViewItemArray const& items) = 0; // adds items to the native control
virtual void Collapse (wxDataViewItem const& item) = 0; // collapses the passed item in the native control virtual void Collapse (wxDataViewItem const& item) = 0; // collapses the passed item in the native control
virtual void EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) = 0; // ensures that the passed item's value in the passed column is visible (column pointer can be NULL) virtual void EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) = 0; // ensures that the passed item's value in the passed column is visible (column pointer can be NULL)
virtual unsigned int GetCount() const = 0; // returns the number of items in the native control virtual unsigned int GetCount() const = 0; // returns the number of items in the native control
@@ -103,12 +103,12 @@ public:
// //
// other methods // other methods
// //
virtual void DoSetIndent (int indent) = 0; // sets the indention in the native control virtual void DoSetIndent (int indent) = 0; // sets the indentation in the native control
virtual void DoExpand (wxDataViewItem const& item) = 0; // expands the passed item in the native control virtual void DoExpand (wxDataViewItem const& item) = 0; // expands the passed item in the native control
virtual void HitTest (wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const = 0; // return the item and column pointer that contains with the passed point virtual void HitTest (wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const = 0; // return the item and column pointer that contains with the passed point
virtual void SetRowHeight(int height) = 0; // sets the height of all rows virtual void SetRowHeight(int height) = 0; // sets the height of all rows
virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height) = 0; // sets the height of the row containg the passed item in the native control virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height) = 0; // sets the height of the row containing the passed item in the native control
virtual void OnSize() = 0; // updates the layout of the native control after a size event virtual void OnSize() = 0; // updates the layout of the native control after a size event
virtual void StartEditor( const wxDataViewItem & item, unsigned int column ) = 0; // starts editing the passed in item and column virtual void StartEditor( const wxDataViewItem & item, unsigned int column ) = 0; // starts editing the passed in item and column
}; };

View File

@@ -176,7 +176,7 @@ public:
virtual void Popup(wxWindow *focus = NULL) wxOVERRIDE; virtual void Popup(wxWindow *focus = NULL) wxOVERRIDE;
virtual void Dismiss() wxOVERRIDE; virtual void Dismiss() wxOVERRIDE;
// Overridden to grab the input on some plaforms // Overridden to grab the input on some platforms
virtual bool Show( bool show = true ) wxOVERRIDE; virtual bool Show( bool show = true ) wxOVERRIDE;
protected: protected:

View File

@@ -62,7 +62,7 @@ public:
if (!DoAdd(watch)) if (!DoAdd(watch))
return false; return false;
// add watch to our map (always succeedes, checked above) // add watch to our map (always succeeds, checked above)
wxFSWatchEntries::value_type val(watch->GetPath(), watch); wxFSWatchEntries::value_type val(watch->GetPath(), watch);
return m_watches.insert(val).second; return m_watches.insert(val).second;
} }

View File

@@ -54,7 +54,7 @@ public :
virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
wxDouble tx=0.0, wxDouble ty=0.0) = 0; wxDouble tx=0.0, wxDouble ty=0.0) = 0;
// gets the component valuess of the matrix // gets the component values of the matrix
virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL,
wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const = 0; wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const = 0;

View File

@@ -76,7 +76,7 @@ public:
} }
// Ensure that we return true the first time we're called, // Ensure that we return true the first time we're called,
// asuming that the value will always be set to a non-default value. // assuming that the value will always be set to a non-default value.
return m_value == T(); return m_value == T();
} }

View File

@@ -1037,7 +1037,7 @@ public:
wxPGValidationInfo& validationInfo ) const; wxPGValidationInfo& validationInfo ) const;
// Converts text into wxVariant value appropriate for this property. // Converts text into wxVariant value appropriate for this property.
// Prameters: // Parameters:
// variant - On function entry this is the old value (should not be // variant - On function entry this is the old value (should not be
// wxNullVariant in normal cases). Translated value must be assigned // wxNullVariant in normal cases). Translated value must be assigned
// back to it. // back to it.

View File

@@ -593,7 +593,7 @@ enum wxPG_INTERNAL_FLAGS
// used to do the very same thing, but it hasn't been updated for a while // used to do the very same thing, but it hasn't been updated for a while
// and it is currently deprecated. // and it is currently deprecated.
// Please note that most member functions are inherited and as such not // Please note that most member functions are inherited and as such not
// documented heree. This means you will probably also want to read // documented here. This means you will probably also want to read
// wxPropertyGridInterface class reference. // wxPropertyGridInterface class reference.
// To process input from a propertygrid control, use these event handler // To process input from a propertygrid control, use these event handler
// macros to direct input to member functions that take a wxPropertyGridEvent // macros to direct input to member functions that take a wxPropertyGridEvent

View File

@@ -540,7 +540,7 @@ public:
// Hides or reveals a property. // Hides or reveals a property.
// hide - If true, hides property, otherwise reveals it. // hide - If true, hides property, otherwise reveals it.
// flags - By default changes are applied recursively. Set this paramter // flags - By default changes are applied recursively. Set this parameter
// wxPG_DONT_RECURSE to prevent this. // wxPG_DONT_RECURSE to prevent this.
bool HideProperty( wxPGPropArg id, bool HideProperty( wxPGPropArg id,
bool hide = true, bool hide = true,

View File

@@ -54,7 +54,7 @@ public:
: Widget( parent != NULL ? parent->GetHandle() : NULL ) : Widget( parent != NULL ? parent->GetHandle() : NULL )
, wxQtSignalHandler< Handler >( handler ) , wxQtSignalHandler< Handler >( handler )
{ {
// Set immediatelly as it is used to check if wxWindow is alive // Set immediately as it is used to check if wxWindow is alive
wxWindow::QtStoreWindowPointer( this, handler ); wxWindow::QtStoreWindowPointer( this, handler );
// Handle QWidget destruction signal AFTER it gets deleted // Handle QWidget destruction signal AFTER it gets deleted

View File

@@ -50,7 +50,7 @@ class WXDLLIMPEXP_FWD_CORE wxQtShortcutHandler;
* found in winevent_qt.(h|cpp) to send all Qt events here to QtHandleXXXEvent() * found in winevent_qt.(h|cpp) to send all Qt events here to QtHandleXXXEvent()
* methods. All these methods receive the Qt event and the handler. This is * methods. All these methods receive the Qt event and the handler. This is
* done because events of the containers (the scrolled part of the window) are * done because events of the containers (the scrolled part of the window) are
* sent to the same wxWindow instance, that must be able to differenciate them * sent to the same wxWindow instance, that must be able to differentiate them
* as some events need different handling (paintEvent) depending on that. * as some events need different handling (paintEvent) depending on that.
* We pass the QWidget pointer to all event handlers for consistency. * We pass the QWidget pointer to all event handlers for consistency.
*/ */

View File

@@ -57,7 +57,7 @@ public:
// several items at once, return true if any of them were selected // several items at once, return true if any of them were selected
bool OnItemsDeleted(unsigned item, unsigned numItems); bool OnItemsDeleted(unsigned item, unsigned numItems);
// select one item, use SelectRange() insted if possible! // select one item, use SelectRange() instead if possible!
// //
// returns true if the items selection really changed // returns true if the items selection really changed
bool SelectItem(unsigned item, bool select = true); bool SelectItem(unsigned item, bool select = true);

View File

@@ -143,7 +143,7 @@ public:
#endif // wxUSE_ON_FATAL_EXCEPTION #endif // wxUSE_ON_FATAL_EXCEPTION
protected: protected:
// this function must be overrided to process the given frame // this function must be overridden to process the given frame
virtual void OnStackFrame(const wxStackFrame& frame) = 0; virtual void OnStackFrame(const wxStackFrame& frame) = 0;
}; };

View File

@@ -3074,7 +3074,7 @@ public:
// Set the background colour used for a particular marker number when its folding block is selected. // Set the background colour used for a particular marker number when its folding block is selected.
void MarkerSetBackgroundSelected(int markerNumber, const wxColour& back); void MarkerSetBackgroundSelected(int markerNumber, const wxColour& back);
// Enable/disable highlight for current folding bloc (smallest one that contains the caret) // Enable/disable highlight for current folding block (smallest one that contains the caret)
void MarkerEnableHighlight(bool enabled); void MarkerEnableHighlight(bool enabled);
// Add a marker to a line, returning an ID which can be used to find or delete the marker. // Add a marker to a line, returning an ID which can be used to find or delete the marker.

View File

@@ -320,7 +320,7 @@ public:
// Called to verify that all expectations were met. This cannot be done in // Called to verify that all expectations were met. This cannot be done in
// the destructor, because ReportFailure() may throw (either because it's // the destructor, because ReportFailure() may throw (either because it's
// overriden or because wx's assertions handling is, globally). And // overridden or because wx's assertions handling is, globally). And
// throwing from the destructor would introduce all sort of problems, // throwing from the destructor would introduce all sort of problems,
// including messing up the order of errors in some cases. // including messing up the order of errors in some cases.
void CheckUnmetExpectations() void CheckUnmetExpectations()

View File

@@ -195,7 +195,7 @@ private:
// from m_tree (wxTreeCtrl) component. // from m_tree (wxTreeCtrl) component.
int DoInternalFindPageById(wxTreeItemId page) const; int DoInternalFindPageById(wxTreeItemId page) const;
// Updates page and wxTreeItemId correspondance. // Updates page and wxTreeItemId correspondence.
void DoInternalAddPage(size_t newPos, wxWindow *page, wxTreeItemId pageId); void DoInternalAddPage(size_t newPos, wxWindow *page, wxTreeItemId pageId);
// Removes the page from internal structure. // Removes the page from internal structure.

View File

@@ -121,7 +121,7 @@ public:
wxUint16 LowSurrogate() const { return LowSurrogate(m_value); } wxUint16 LowSurrogate() const { return LowSurrogate(m_value); }
// Conversions to char and wchar_t types: all of those are needed to be // Conversions to char and wchar_t types: all of those are needed to be
// able to pass wxUniChars to verious standard narrow and wide character // able to pass wxUniChars to various standard narrow and wide character
// functions // functions
operator char() const { return To8bit(m_value); } operator char() const { return To8bit(m_value); }
operator unsigned char() const { return (unsigned char)To8bit(m_value); } operator unsigned char() const { return (unsigned char)To8bit(m_value); }

View File

@@ -360,7 +360,7 @@ public:
// ------------------ // ------------------
// get the dimensions of the border: rect.x/y contain the width/height of // get the dimensions of the border: rect.x/y contain the width/height of
// the left/top side, width/heigh - of the right/bottom one // the left/top side, width/height - of the right/bottom one
virtual wxRect GetBorderDimensions(wxBorder border) const = 0; virtual wxRect GetBorderDimensions(wxBorder border) const = 0;
// the scrollbars may be drawn either inside the window border or outside // the scrollbars may be drawn either inside the window border or outside
@@ -397,7 +397,7 @@ public:
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL
// convert between text rectangle and client rectangle for text controls: // convert between text rectangle and client rectangle for text controls:
// the former is typicall smaller to leave margins around text // the former is typically smaller to leave margins around text
virtual wxRect GetTextTotalArea(const wxTextCtrl *text, virtual wxRect GetTextTotalArea(const wxTextCtrl *text,
const wxRect& rectText) const = 0; const wxRect& rectText) const = 0;

View File

@@ -131,7 +131,7 @@ protected:
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE; virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
// forces update of thumb's visual appearence (does nothing if m_dirty=false) // forces update of thumb's visual appearance (does nothing if m_dirty=false)
void UpdateThumb(); void UpdateThumb();
// SetThumbPosition() helper // SetThumbPosition() helper

View File

@@ -269,7 +269,7 @@ protected:
// draw complete rectangle // draw complete rectangle
void DrawRect(wxDC& dc, wxRect *rect, const wxPen& pen); void DrawRect(wxDC& dc, wxRect *rect, const wxPen& pen);
// draw the rectange using the first pen for the left and top sides // draw the rectangle using the first pen for the left and top sides
// and the second one for the bottom and right ones // and the second one for the bottom and right ones
void DrawShadedRect(wxDC& dc, wxRect *rect, void DrawShadedRect(wxDC& dc, wxRect *rect,
const wxPen& pen1, const wxPen& pen2); const wxPen& pen1, const wxPen& pen2);

View File

@@ -154,7 +154,7 @@ WXDLLIMPEXP_BASE bool wxIsPlatformLittleEndian();
WXDLLIMPEXP_BASE bool wxIsPlatform64Bit(); WXDLLIMPEXP_BASE bool wxIsPlatform64Bit();
#ifdef __LINUX__ #ifdef __LINUX__
// Get linux-distro informations // Get linux-distro information
WXDLLIMPEXP_BASE wxLinuxDistributionInfo wxGetLinuxDistributionInfo(); WXDLLIMPEXP_BASE wxLinuxDistributionInfo wxGetLinuxDistributionInfo();
#endif #endif
@@ -178,7 +178,7 @@ WXDLLIMPEXP_CORE bool wxGetKeyState(wxKeyCode key);
// in wxMSW. // in wxMSW.
WXDLLIMPEXP_CORE bool wxSetDetectableAutoRepeat( bool flag ); WXDLLIMPEXP_CORE bool wxSetDetectableAutoRepeat( bool flag );
// Returns the current state of the mouse position, buttons and modifers // Returns the current state of the mouse position, buttons and modifiers
WXDLLIMPEXP_CORE wxMouseState wxGetMouseState(); WXDLLIMPEXP_CORE wxMouseState wxGetMouseState();
#endif // wxUSE_GUI #endif // wxUSE_GUI
@@ -802,7 +802,7 @@ inline struct _XDisplay *wxGetX11Display()
// wxYield(): these functions are obsolete, please use wxApp methods instead! // wxYield(): these functions are obsolete, please use wxApp methods instead!
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// avoid redeclaring this function here if it had been already declated by // avoid redeclaring this function here if it had been already declared by
// wx/app.h, this results in warnings from g++ with -Wredundant-decls // wx/app.h, this results in warnings from g++ with -Wredundant-decls
#ifndef wx_YIELD_DECLARED #ifndef wx_YIELD_DECLARED
#define wx_YIELD_DECLARED #define wx_YIELD_DECLARED

View File

@@ -133,7 +133,7 @@ public:
void HandleOnMouseWheel(wxMouseEvent& event); void HandleOnMouseWheel(wxMouseEvent& event);
#endif // wxUSE_MOUSEWHEEL #endif // wxUSE_MOUSEWHEEL
// these functions must be overidden in the derived class to return // these functions must be overridden in the derived class to return
// orientation specific data (e.g. the width for vertically scrolling // orientation specific data (e.g. the width for vertically scrolling
// derivatives in the case of GetOrientationTargetSize()) // derivatives in the case of GetOrientationTargetSize())
virtual int GetOrientationTargetSize() const = 0; virtual int GetOrientationTargetSize() const = 0;

View File

@@ -490,7 +490,7 @@ inline int wxStrcoll_String(const wxString& s1, const T& s2)
} }
#ifndef wxNEEDS_DECL_BEFORE_TEMPLATE #ifndef wxNEEDS_DECL_BEFORE_TEMPLATE
// this is exactly the same WX_STRCMP_FUNC line as above, insde the // this is exactly the same WX_STRCMP_FUNC line as above, inside the
// wxNEEDS_DECL_BEFORE_TEMPLATE case // wxNEEDS_DECL_BEFORE_TEMPLATE case
WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
#endif #endif

View File

@@ -203,7 +203,7 @@ private:
// undesired effects. // undesired effects.
// //
// Usage: create an instance of this class on the stack to disable the size // Usage: create an instance of this class on the stack to disable the size
// optimisation, it will be reenabled as soon as the object goes out from scope. // optimisation, it will be re-enabled as soon as the object goes out from scope.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxNoOptimize class WXDLLIMPEXP_CORE wxNoOptimize

View File

@@ -171,7 +171,7 @@ public:
void SetAttributes(wxXmlAttribute *attr) { m_attrs = attr; } void SetAttributes(wxXmlAttribute *attr) { m_attrs = attr; }
virtual void AddAttribute(wxXmlAttribute *attr); virtual void AddAttribute(wxXmlAttribute *attr);
// If true, don't do encoding conversion to improve efficiency - node content is ACII text // If true, don't do encoding conversion to improve efficiency - node content is ASCII text
bool GetNoConversion() const { return m_noConversion; } bool GetNoConversion() const { return m_noConversion; }
void SetNoConversion(bool noconversion) { m_noConversion = noconversion; } void SetNoConversion(bool noconversion) { m_noConversion = noconversion; }

Some files were not shown because too many files have changed in this diff Show More