From d13b34d3f2be575d59747a5926000be7b28a45dc Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Sun, 3 Apr 2011 20:31:32 +0000 Subject: [PATCH] No code changes, fixed various typos. Applied patch by snowleopard2 fixing typos in interface/. Extended the fixes throughout trunk. Closes #13076. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- .../ac_raf_func_which_getservbyname_r.m4 | 2 +- configure.in | 4 ++-- demos/bombs/readme.txt | 2 +- docs/changes.txt | 10 ++++----- docs/doxygen/mainpages/cat_classes.h | 14 ++++++------ docs/doxygen/overviews/customwidgets.h | 2 +- docs/publicity/announce.txt | 2 +- include/wx/combo.h | 2 +- include/wx/defs.h | 2 +- include/wx/dialup.h | 2 +- include/wx/dynarray.h | 2 +- include/wx/gbsizer.h | 2 +- include/wx/generic/filepickerg.h | 6 ++--- include/wx/generic/statusbr.h | 2 +- include/wx/geometry.h | 8 +++---- include/wx/glcanvas.h | 2 +- include/wx/gtk/dataview.h | 2 +- include/wx/gtk1/window.h | 2 +- include/wx/headercol.h | 6 ++--- include/wx/html/htmlwin.h | 4 ++-- include/wx/mimetype.h | 2 +- include/wx/msw/dialog.h | 4 ++-- include/wx/msw/setup0.h | 2 +- include/wx/msw/setup_inc.h | 2 +- include/wx/osx/dataview.h | 2 +- include/wx/platform.h | 2 +- include/wx/propgrid/propgridiface.h | 2 +- include/wx/protocol/ftp.h | 2 +- include/wx/rawbmp.h | 2 +- include/wx/richtext/richtextbuffer.h | 22 +++++++++---------- include/wx/richtext/richtextformatdlg.h | 2 +- include/wx/toplevel.h | 2 +- include/wx/univ/setup0.h | 2 +- include/wx/univ/stdrend.h | 2 +- include/wx/window.h | 2 +- interface/wx/app.h | 2 +- interface/wx/brush.h | 2 +- interface/wx/caret.h | 2 +- interface/wx/chartype.h | 2 +- interface/wx/cmdproc.h | 2 +- interface/wx/colordlg.h | 2 +- interface/wx/colour.h | 2 +- interface/wx/colourdata.h | 2 +- interface/wx/combo.h | 2 +- interface/wx/config.h | 4 ++-- interface/wx/datstrm.h | 6 ++--- interface/wx/dcbuffer.h | 4 ++-- interface/wx/debugrpt.h | 2 +- interface/wx/defs.h | 2 +- interface/wx/dialog.h | 4 ++-- interface/wx/dialup.h | 2 +- interface/wx/docview.h | 4 ++-- interface/wx/dynarray.h | 2 +- interface/wx/fdrepdlg.h | 4 ++-- interface/wx/ffile.h | 2 +- interface/wx/filename.h | 8 +++---- interface/wx/frame.h | 4 ++-- interface/wx/fswatcher.h | 2 +- interface/wx/gbsizer.h | 4 ++-- interface/wx/geometry.h | 8 +++---- interface/wx/glcanvas.h | 4 ++-- interface/wx/graphics.h | 2 +- interface/wx/grid.h | 6 ++--- interface/wx/headercol.h | 8 +++---- interface/wx/help.h | 2 +- interface/wx/html/helpdlg.h | 2 +- interface/wx/html/helpfrm.h | 2 +- interface/wx/list.h | 10 ++++----- interface/wx/listctrl.h | 2 +- interface/wx/log.h | 4 ++-- interface/wx/menuitem.h | 2 +- interface/wx/minifram.h | 2 +- interface/wx/print.h | 4 ++-- interface/wx/process.h | 2 +- interface/wx/propgrid/propgridiface.h | 2 +- interface/wx/rawbmp.h | 2 +- interface/wx/ribbon/control.h | 4 ++-- interface/wx/ribbon/panel.h | 4 ++-- interface/wx/scrolwin.h | 2 +- interface/wx/settings.h | 6 ++--- interface/wx/slider.h | 2 +- interface/wx/statline.h | 2 +- interface/wx/strconv.h | 2 +- interface/wx/stream.h | 2 +- interface/wx/sysopt.h | 4 ++-- interface/wx/textctrl.h | 2 +- interface/wx/toplevel.h | 2 +- interface/wx/treectrl.h | 2 +- interface/wx/uiaction.h | 2 +- interface/wx/ustring.h | 18 +++++++-------- interface/wx/utils.h | 2 +- interface/wx/vector.h | 2 +- interface/wx/vscroll.h | 6 ++--- interface/wx/window.h | 8 +++---- interface/wx/wizard.h | 2 +- samples/dnd/dnd.cpp | 2 +- samples/grid/griddemo.cpp | 2 +- samples/menu/menu.cpp | 4 ++-- samples/propgrid/tests.cpp | 2 +- samples/widgets/checkbox.cpp | 2 +- samples/xrc/custclas.h | 4 ++-- src/cocoa/app.mm | 2 +- src/cocoa/window.mm | 2 +- src/common/datavcmn.cpp | 2 +- src/common/datetimefmt.cpp | 4 ++-- src/common/dcbase.cpp | 2 +- src/common/dcgraph.cpp | 2 +- src/common/imagtga.cpp | 2 +- src/generic/dirdlgg.cpp | 2 +- src/generic/grid.cpp | 2 +- src/generic/gridctrl.cpp | 2 +- src/generic/headerctrlg.cpp | 2 +- src/generic/logg.cpp | 2 +- src/generic/scrlwing.cpp | 2 +- src/gtk/assertdlg_gtk.cpp | 4 ++-- src/gtk/collpane.cpp | 4 ++-- src/gtk/dataview.cpp | 4 ++-- src/gtk/dirdlg.cpp | 2 +- src/gtk/filedlg.cpp | 2 +- src/gtk/print.cpp | 2 +- src/gtk1/window.cpp | 2 +- src/html/htmlcell.cpp | 4 ++-- src/html/m_tables.cpp | 4 ++-- src/msw/button.cpp | 2 +- src/msw/dialog.cpp | 2 +- src/msw/filedlg.cpp | 2 +- src/msw/headerctrl.cpp | 2 +- src/msw/listctrl.cpp | 2 +- src/msw/statusbar.cpp | 2 +- src/msw/toplevel.cpp | 4 ++-- src/os2/button.cpp | 2 +- src/os2/listctrl.cpp | 2 +- src/os2/menuitem.cpp | 2 +- src/os2/toplevel.cpp | 4 ++-- src/os2/window.cpp | 2 +- src/osx/carbon/dataview.cpp | 6 ++--- src/osx/carbon/graphics.cpp | 2 +- src/osx/carbon/listbox.cpp | 2 +- src/osx/cocoa/dataview.mm | 8 +++---- tests/controls/buttontest.cpp | 2 +- tests/streams/bstream.h | 6 ++--- tests/streams/zlibstream.cpp | 4 ++-- 142 files changed, 235 insertions(+), 235 deletions(-) diff --git a/build/aclocal/ac_raf_func_which_getservbyname_r.m4 b/build/aclocal/ac_raf_func_which_getservbyname_r.m4 index d14fb20d30..ed90549812 100644 --- a/build/aclocal/ac_raf_func_which_getservbyname_r.m4 +++ b/build/aclocal/ac_raf_func_which_getservbyname_r.m4 @@ -3,7 +3,7 @@ dnl dnl Provides a test to determine the correct way to call dnl getservbyname_r: dnl -dnl - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g linux) +dnl - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g. linux) dnl - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris) dnl - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1) dnl diff --git a/configure.in b/configure.in index e30e70d639..606bae1456 100644 --- a/configure.in +++ b/configure.in @@ -534,7 +534,7 @@ if test "$wxUSE_GUI" = "yes"; then fi done else - dnl try to guess the most apropriate toolkit for this platform + dnl try to guess the most appropriate toolkit for this platform for toolkit in $ALL_TOOLKITS; do var=DEFAULT_DEFAULT_wxUSE_$toolkit eval "wxUSE_$toolkit=\$${var}" @@ -4275,7 +4275,7 @@ AC_CHECK_TYPES([mbstate_t], dnl check for vsnprintf() -- a safe version of vsprintf()) dnl -dnl the trouble here is that on some systems (e.g HP-UX 10) this function is +dnl the trouble here is that on some systems (e.g. HP-UX 10) this function is dnl present in libc but not in the system headers and so AC_CHECK_FUNCS (which, dnl stupidly, provides a dummy function declaration inside its extension) dnl succeeds, even with C++ compiler, but the compilation of wxWidgets fails diff --git a/demos/bombs/readme.txt b/demos/bombs/readme.txt index 91983e7bed..82987e1c8b 100644 --- a/demos/bombs/readme.txt +++ b/demos/bombs/readme.txt @@ -73,6 +73,6 @@ is an unfortunate reflection of the reality of earlier versions of wxWindows :-)) to wxBombs. 3) Added SetClientData to resize the window on Restart; eliminated -scrollbars; made the frame unresizeable. +scrollbars; made the frame unresizable. 4) Added makefile.dos for VC++ 1.x, makefile.wat for Watcom C++. \ No newline at end of file diff --git a/docs/changes.txt b/docs/changes.txt index a633e0bfa1..e9acd5e755 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -948,7 +948,7 @@ wxMSW: - Fix centering wxFileDialog and allow positioning it. - Allow centering wxMessageDialog on its parent window (troelsk). - Use vertical scrollbar in wxMessageDialog if it's too big to fit on screen. -- Show resize gripper on resizeable dialogs (Kolya Kosenko). +- Show resize gripper on resizable dialogs (Kolya Kosenko). - Implement support for display enumeration under WinCE (Vince Harron). - Use different Win32 class names in different wx instances (Thomas Hauk). - Support multiline labels for wxCheckBox and wxToggleButton. @@ -1720,7 +1720,7 @@ All (GUI): - Fixed centering of top level windows on secondary displays. - Implemented wxDisplay::GetFromWindow() for platforms other than MSW. - UpdateUI handler can now show/hide the window too (Ronald Weiss). -- More than one filter allowed in in wxDocTemplate filter. +- More than one filter allowed in wxDocTemplate filter. - Added wxListBox::HitTest(). - Added wxDisplay::GetClientArea(). - Indices and counts in wxControlWithItems derived API are unsigned. @@ -2665,7 +2665,7 @@ wxMSW: - several fixes to owner drawn menu items (Christian Sturmlechner) - wxGauge now supports full 32 bit range (Miroslav Rajcic) - make it possible to give focus to the notebook tabs (Hajo Kirchhoff) -- MDI child frames are not always resizeable any more (Andrei Fortuna) +- MDI child frames are not always resizable any more (Andrei Fortuna) - fixed enumerating of entries/groups under '/' in wxRegConfig - added wxSYS_ICONTITLE_FONT (Andreas Pflug) - added wxPATH_NORM_SHORTCUT to wxFileName @@ -2772,7 +2772,7 @@ All GUI ports: - added wxRenderer class allowing to customize the drawing of generic controls - added wxCLOSE_BOX style for dialogs and frames - added wxSplitterWindow and wxWizard handlers to XRC -- wxWizard is now sizer-friendly and may be made resizeable (Robert Vazan) +- wxWizard is now sizer-friendly and may be made resizable (Robert Vazan) - added proportion to wxFlexGridSizer::AddGrowableRow/Col (Maxim Babitski) - added wxFlexGridSizer::SetFlexibleDirection() (Szczepan Holyszewski) - implemented GetEditControl for wxGenericTreeCtrl (Peter Stieber) @@ -3533,7 +3533,7 @@ wxMSW: - wxFileDialog: adjusts struct size if there's an error (struct sizes can be different on different versions of Windows) - wxImageList::GetSize() documented and added to wxMSW -- fixed default dialog style to make them non resizeable again +- fixed default dialog style to make them non resizable again - fixed wxFrame::IsShown() which always returned TRUE before wxGTK: diff --git a/docs/doxygen/mainpages/cat_classes.h b/docs/doxygen/mainpages/cat_classes.h index c1a895e057..6524ffff0c 100644 --- a/docs/doxygen/mainpages/cat_classes.h +++ b/docs/doxygen/mainpages/cat_classes.h @@ -655,13 +655,13 @@ These are the data structure classes supported by wxWidgets. These classes define objects for performing conversions between different multibyte and Unicode encodings and wide character strings. -@li wxMBConv: Base class for all convertors, defines the API implemented by all - the other convertor classes. -@li wxMBConvUTF7: Convertor for UTF-7 -@li wxMBConvUTF8: Convertor for UTF-8 -@li wxMBConvUTF16: Convertor for UTF-16 -@li wxMBConvUTF32: Convertor for UTF-32 -@li wxCSConv: Convertor for any system-supported encoding which can be +@li wxMBConv: Base class for all converters, defines the API implemented by all + the other converter classes. +@li wxMBConvUTF7: Converter for UTF-7 +@li wxMBConvUTF8: Converter for UTF-8 +@li wxMBConvUTF16: Converter for UTF-16 +@li wxMBConvUTF32: Converter for UTF-32 +@li wxCSConv: Converter for any system-supported encoding which can be specified by name. Related Overviews: @ref overview_mbconv diff --git a/docs/doxygen/overviews/customwidgets.h b/docs/doxygen/overviews/customwidgets.h index 8891e1bccf..d427746e82 100644 --- a/docs/doxygen/overviews/customwidgets.h +++ b/docs/doxygen/overviews/customwidgets.h @@ -135,7 +135,7 @@ The organization used by wxWidgets consists in: - declaring the real widget class inheriting from the Base version in platform-specific headers; see for example the wxWidgets' @c "wx/gtk/button.h" file. -- separing the different implementations in different source files, putting +- separating the different implementations in different source files, putting all common stuff in a separate source. See for example the wxWidgets' @c "src/common/btncmn.cpp", @c "src/gtk/button.cpp" and @c "src/msw/button.cpp" files. diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt index 7129a07711..eee1e4b6ee 100644 --- a/docs/publicity/announce.txt +++ b/docs/publicity/announce.txt @@ -68,7 +68,7 @@ and use than MFC and other frameworks. As well as comprehensive support for the usual widgets, advanced features include: HTML viewing/printing, wxImage class providing -handlers for reading and writing many image types, resizeable panels +handlers for reading and writing many image types, resizable panels and dialogs on all platforms, document/view, OpenGL support, HTML-based and context-sensitive help, wizards, drag and drop, a grid class, ODBC support, threads, sockets, container classes, diff --git a/include/wx/combo.h b/include/wx/combo.h index 2196b4e5cb..4c7f0867b3 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -641,7 +641,7 @@ protected: // main (ie. topmost) window of a composite control (default = this) wxWindow* m_mainCtrlWnd; - // used to prevent immediate re-popupping incase closed popup + // used to prevent immediate re-popupping in case closed popup // by clicking on the combo control (needed because of inconsistent // transient implementation across platforms). wxLongLong m_timeCanAcceptClick; diff --git a/include/wx/defs.h b/include/wx/defs.h index d13d5a77ed..778c8fcc75 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2307,7 +2307,7 @@ enum wxDeprecatedGUIConstants wxTRANSPARENT, /* Brush & Pen Stippling. Note that a stippled pen cannot be dashed!! */ - /* Note also that stippling a Pen IS meaningfull, because a Line is */ + /* Note also that stippling a Pen IS meaningful, because a Line is */ wxSTIPPLE_MASK_OPAQUE, /* mask is used for blitting monochrome using text fore and back ground colors */ wxSTIPPLE_MASK, /* mask is used for masking areas in the stipple bitmap (TO DO) */ /* drawn with a Pen, and without any Brush -- and it can be stippled. */ diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 75c7c63085..f907c7ac23 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -171,7 +171,7 @@ public: bool IsConnectedEvent() const { return GetEventType() == wxEVT_DIALUP_CONNECTED; } - // does this event come from wxDialUpManager::Dial() or from some extrenal + // does this event come from wxDialUpManager::Dial() or from some external // process (i.e. does it result from our own attempt to establish the // connection)? bool IsOwnEvent() const { return m_id != 0; } diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index 1fc89c9939..5eced995d9 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -636,7 +636,7 @@ private: \ // that wants to export a wxArray daubed with your own import/export goo. // // Finally, you can define the macro below as something special to modify the -// arrays defined by a simple WX_FOO_ARRAY as well. By default is is empty. +// arrays defined by a simple WX_FOO_ARRAY as well. By default is empty. #define wxARRAY_DEFAULT_EXPORT // ---------------------------------------------------------------------------- diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h index 8d3c74adf4..f0012b7a44 100644 --- a/include/wx/gbsizer.h +++ b/include/wx/gbsizer.h @@ -160,7 +160,7 @@ public: // is successful and after the next Layout the item will be resized. bool SetSpan( const wxGBSpan& span ); - // Returns true if this item and the other item instersect + // Returns true if this item and the other item intersect bool Intersects(const wxGBSizerItem& other); // Returns true if the given pos/span would intersect with this item. diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h index 7469df9137..d7a0b495e6 100644 --- a/include/wx/generic/filepickerg.h +++ b/include/wx/generic/filepickerg.h @@ -49,7 +49,7 @@ public: virtual wxControl *AsControl() { return this; } -public: // overrideable +public: // overridable virtual wxDialog *CreateDialog() = 0; @@ -114,7 +114,7 @@ public: pos, size, style, validator, name); } -public: // overrideable +public: // overridable virtual long GetDialogStyle() const { @@ -190,7 +190,7 @@ public: pos, size, style, validator, name); } -public: // overrideable +public: // overridable virtual long GetDialogStyle() const { diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h index 6b49e345d7..7d54f17010 100644 --- a/include/wx/generic/statusbr.h +++ b/include/wx/generic/statusbr.h @@ -81,7 +81,7 @@ protected: virtual void InitColours(); // true if the status bar shows the size grip: for this it must have - // wxSTB_SIZEGRIP style and the window it is attached to must be resizeable + // wxSTB_SIZEGRIP style and the window it is attached to must be resizable // and not maximized bool ShowsSizeGrip() const; diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 11073dc02b..8e41705704 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -534,8 +534,8 @@ public: inline wxSize GetSize() { return wxSize((int) m_width, (int) m_height); } - // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately + // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their + // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately inline wxDouble GetLeft() const { return m_x; } inline void SetLeft( wxDouble n ) { m_width += m_x - n; m_x = n; } @@ -661,8 +661,8 @@ public: inline wxPoint2DInt GetPosition() { return wxPoint2DInt(m_x, m_y); } inline wxSize GetSize() { return wxSize(m_width, m_height); } - // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately + // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their + // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately inline wxInt32 GetLeft() const { return m_x; } inline void SetLeft( wxInt32 n ) { m_width += m_x - n; m_x = n; } diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h index b3d3c5d43e..a581b4f463 100644 --- a/include/wx/glcanvas.h +++ b/include/wx/glcanvas.h @@ -49,7 +49,7 @@ enum WX_GL_MIN_ACCUM_BLUE, // use blue buffer with most bits (> MIN_ACCUM_BLUE bits) WX_GL_MIN_ACCUM_ALPHA, // use alpha buffer with most bits (> MIN_ACCUM_ALPHA bits) WX_GL_SAMPLE_BUFFERS, // 1 for multisampling support (antialiasing) - WX_GL_SAMPLES // 4 for 2x2 antialising supersampling on most graphics cards + WX_GL_SAMPLES // 4 for 2x2 antialiasing supersampling on most graphics cards }; #define wxGLCanvasName wxT("GLCanvas") diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h index 0ca210c132..7a23a2e9bb 100644 --- a/include/wx/gtk/dataview.h +++ b/include/wx/gtk/dataview.h @@ -46,7 +46,7 @@ public: virtual void SetSortOrder( bool ascending ); virtual void SetAsSortKey(bool sort = true); - virtual void SetResizeable( bool resizeable ); + virtual void SetResizeable( bool resizable ); virtual void SetHidden( bool hidden ); virtual void SetMinWidth( int minWidth ); diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index cb492cae04..8d37e57148 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -155,7 +155,7 @@ public: void GtkUpdateScrollbar(int orient); // Called from GTK signal handlers. it indicates that - // the layouting functions have to be called later on + // the layout functions have to be called later on // (i.e. in idle time, implemented in OnInternalIdle() ). void GtkUpdateSize() { m_sizeSet = false; } diff --git a/include/wx/headercol.h b/include/wx/headercol.h index 051ebbf14e..815c41f82a 100644 --- a/include/wx/headercol.h +++ b/include/wx/headercol.h @@ -97,7 +97,7 @@ public: // unspecified/default virtual int GetWidth() const = 0; - // minimal width can be set for resizeable columns to forbid resizing them + // minimal width can be set for resizable columns to forbid resizing them // below the specified size (set to 0 to remove) virtual int GetMinWidth() const = 0; @@ -177,8 +177,8 @@ public: void ClearFlag(int flag); void ToggleFlag(int flag); - virtual void SetResizeable(bool resizeable) - { ChangeFlag(wxCOL_RESIZABLE, resizeable); } + virtual void SetResizeable(bool resizable) + { ChangeFlag(wxCOL_RESIZABLE, resizable); } virtual void SetSortable(bool sortable) { ChangeFlag(wxCOL_SORTABLE, sortable); } virtual void SetReorderable(bool reorderable) diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index f0fee49926..ff1bf5f385 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -472,11 +472,11 @@ protected: // Each wxHtmlWindow has it's own parser because sharing one global // parser would be problematic (because of reentrancy) wxHtmlWinParser *m_Parser; - // contains name of actualy opened page or empty string if no page opened + // contains name of actually opened page or empty string if no page opened wxString m_OpenedPage; // contains name of current anchor within m_OpenedPage wxString m_OpenedAnchor; - // contains title of actualy opened page or empty string if no tag + // contains title of actually opened page or empty string if no <TITLE> tag wxString m_OpenedPageTitle; // class for opening files (file system) wxFileSystem* m_FS; diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h index 3f7516d63b..0bffcb0fee 100644 --- a/include/wx/mimetype.h +++ b/include/wx/mimetype.h @@ -389,7 +389,7 @@ public: // operations // expand a string in the format of GetOpenCommand (which may contain - // '%s' and '%t' format specificators for the file name and mime type + // '%s' and '%t' format specifiers for the file name and mime type // and %{param} constructions). static wxString ExpandCommand(const wxString& command, const MessageParameters& params); diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index e0274ff14a..5726427683 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -16,7 +16,7 @@ // this option is always enabled (there doesn't seem to be any good reason to // disable it) for desktop Windows versions but Windows CE dialogs are usually -// not resizeable and never show resize gripper anyhow so don't use it there +// not resizable and never show resize gripper anyhow so don't use it there #ifdef __WXWINCE__ #define wxUSE_DIALOG_SIZEGRIP 0 #else @@ -114,7 +114,7 @@ protected: private: #if wxUSE_DIALOG_SIZEGRIP // these functions deal with the gripper window shown in the corner of - // resizeable dialogs + // resizable dialogs void CreateGripper(); void DestroyGripper(); void ShowGripper(bool show); diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 1f640b4861..6f370d3044 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -1485,7 +1485,7 @@ // Recommended setting: 1, required by wxMediaCtrl #define wxUSE_ACTIVEX 1 -// wxDC cacheing implementation +// wxDC caching implementation #define wxUSE_DC_CACHEING 1 // Set this to 1 to enable wxDIB class used internally for manipulating diff --git a/include/wx/msw/setup_inc.h b/include/wx/msw/setup_inc.h index 95a314740b..74efe5b8d0 100644 --- a/include/wx/msw/setup_inc.h +++ b/include/wx/msw/setup_inc.h @@ -63,7 +63,7 @@ // Recommended setting: 1, required by wxMediaCtrl #define wxUSE_ACTIVEX 1 -// wxDC cacheing implementation +// wxDC caching implementation #define wxUSE_DC_CACHEING 1 // Set this to 1 to enable wxDIB class used internally for manipulating diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h index ae68663599..e2ca2a2405 100644 --- a/include/wx/osx/dataview.h +++ b/include/wx/osx/dataview.h @@ -60,7 +60,7 @@ public: virtual void SetMaxWidth (int maxWidth); virtual void SetMinWidth (int minWidth); virtual void SetReorderable(bool reorderable); - virtual void SetResizeable (bool resizeable); + virtual void SetResizeable (bool resizable); virtual void SetSortable (bool sortable); virtual void SetSortOrder (bool ascending); virtual void SetTitle (wxString const& title); diff --git a/include/wx/platform.h b/include/wx/platform.h index e4197527ed..137d069566 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -273,7 +273,7 @@ /* Preprocessor in older Borland compilers have major problems concatenating with ##. Specifically, if the string operands being - concatenated have special meaning (e.g L"str", 123i64 etc) + concatenated have special meaning (e.g. L"str", 123i64 etc) then ## will not concatenate the operands correctly. As a workaround, define wxPREPEND* and wxAPPEND* without using diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h index 8dd9472647..9cc773d493 100644 --- a/include/wx/propgrid/propgridiface.h +++ b/include/wx/propgrid/propgridiface.h @@ -889,7 +889,7 @@ public: /** Set proportion of a auto-stretchable column. wxPG_SPLITTER_AUTO_CENTER window style needs to be used to indicate that columns are auto- - resizeable. + resizable. @returns Returns @false on failure. diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h index fd8326ab4a..894c52420c 100644 --- a/include/wx/protocol/ftp.h +++ b/include/wx/protocol/ftp.h @@ -139,7 +139,7 @@ protected: wxString GetPortCmdArgument(const wxIPV4address& Local, const wxIPV4address& New); // accept connection from server in active mode, returns the same socket as - // passed in in passive mode + // passed in passive mode wxSocketBase *AcceptIfActive(wxSocketBase *sock); diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index 2731869eea..ff353e3988 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -596,7 +596,7 @@ struct wxPixelDataOut<wxBitmap> // data access // ----------- - // access to invidividual colour components + // access to individual colour components ChannelType& Red() { return m_ptr[PixelFormat::RED]; } ChannelType& Green() { return m_ptr[PixelFormat::GREEN]; } ChannelType& Blue() { return m_ptr[PixelFormat::BLUE]; } diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h index ffff1c8428..dbb7842cf4 100644 --- a/include/wx/richtext/richtextbuffer.h +++ b/include/wx/richtext/richtextbuffer.h @@ -1977,7 +1977,7 @@ public: virtual ~wxRichTextObject(); -// Overrideables +// Overridables /** Draw the item, within the given range. Some objects may ignore the range (for @@ -2519,7 +2519,7 @@ public: wxRichTextCompositeObject(wxRichTextObject* parent = NULL); virtual ~wxRichTextCompositeObject(); -// Overrideables +// Overridables /// Hit-testing: returns a flag indicating hit test details, plus /// information about position @@ -2619,7 +2619,7 @@ public: wxRichTextParagraphLayoutBox(const wxRichTextParagraphLayoutBox& obj): wxRichTextCompositeObject() { Init(); Copy(obj); } ~wxRichTextParagraphLayoutBox(); -// Overrideables +// Overridables /// Hit-testing: returns a flag indicating hit test details, plus /// information about position @@ -2955,7 +2955,7 @@ public: wxRichTextBox(const wxRichTextBox& obj): wxRichTextParagraphLayoutBox() { Copy(obj); } -// Overrideables +// Overridables /** Draws the item. @@ -3017,7 +3017,7 @@ public: wxRichTextLine(const wxRichTextLine& obj) { Init( NULL); Copy(obj); } virtual ~wxRichTextLine() {} -// Overrideables +// Overridables // Accessors @@ -3114,7 +3114,7 @@ public: virtual ~wxRichTextParagraph(); wxRichTextParagraph(const wxRichTextParagraph& obj): wxRichTextCompositeObject() { Copy(obj); } -// Overrideables +// Overridables /// Draw the item virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); @@ -3245,7 +3245,7 @@ public: wxRichTextPlainText(const wxString& text = wxEmptyString, wxRichTextObject* parent = NULL, wxRichTextAttr* style = NULL); wxRichTextPlainText(const wxRichTextPlainText& obj): wxRichTextObject() { Copy(obj); } -// Overrideables +// Overridables /// Draw the item virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); @@ -3444,7 +3444,7 @@ public: wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent = NULL, wxRichTextAttr* charStyle = NULL); wxRichTextImage(const wxRichTextImage& obj): wxRichTextObject(obj) { Copy(obj); } -// Overrideables +// Overridables /// Draw the item virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); @@ -3949,7 +3949,7 @@ public: wxRichTextCell(const wxRichTextCell& obj): wxRichTextBox() { Copy(obj); } -// Overrideables +// Overridables /** Draws the item. @@ -4017,7 +4017,7 @@ public: wxRichTextTable(const wxRichTextTable& obj): wxRichTextBox() { Copy(obj); } -// Overrideables +// Overridables // Draws the object. virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); @@ -4156,7 +4156,7 @@ protected: // Problem: if boxes are immediate children of a box, this will cause problems // with wxRichTextParagraphLayoutBox functions (and functions elsewhere) that // expect to find just paragraphs. May have to adjust the way we handle the - // hierarchy to accept non-paragraph objects in a a paragraph layout box. + // hierarchy to accept non-paragraph objects in a paragraph layout box. // We'll be overriding much wxRichTextParagraphLayoutBox functionality so this // may not be such a problem. Perhaps the table should derive from a different // class? diff --git a/include/wx/richtext/richtextformatdlg.h b/include/wx/richtext/richtextformatdlg.h index de3aa666a8..9b0898e491 100644 --- a/include/wx/richtext/richtextformatdlg.h +++ b/include/wx/richtext/richtextformatdlg.h @@ -88,7 +88,7 @@ public: wxRichTextFormattingDialogFactory() {} virtual ~wxRichTextFormattingDialogFactory() {} -// Overrideables +// Overridables /// Create all pages, under the dialog's book control, also calling AddPage virtual bool CreatePages(long pages, wxRichTextFormattingDialog* dialog); diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index 92aedc43ca..d6af2b0aa1 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase; // ---------------------------------------------------------------------------- /* - Summary of the bits used (some of them are defined in wx/frame.g and + Summary of the bits used (some of them are defined in wx/frame.h and wx/dialog.h and not here): +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 0acafc89fa..c98489ab7d 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -1484,7 +1484,7 @@ // Recommended setting: 1, required by wxMediaCtrl #define wxUSE_ACTIVEX 1 -// wxDC cacheing implementation +// wxDC caching implementation #define wxUSE_DC_CACHEING 1 // Set this to 1 to enable wxDIB class used internally for manipulating diff --git a/include/wx/univ/stdrend.h b/include/wx/univ/stdrend.h index 2fd6a5e351..62aa0753b1 100644 --- a/include/wx/univ/stdrend.h +++ b/include/wx/univ/stdrend.h @@ -322,7 +322,7 @@ protected: // return the frame icon bitmap virtual wxBitmap GetFrameButtonBitmap(FrameButtonType type) = 0; - // get the width of either normal or resizeable frame border depending on + // get the width of either normal or resizable frame border depending on // whether flags contains wxTOPLEVEL_RESIZEABLE bit // // notice that these methods only make sense with standard border drawing diff --git a/include/wx/window.h b/include/wx/window.h index 0891760ee3..07f1f084bb 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -480,7 +480,7 @@ public: // windows this is just the client area of the window, but for // some like scrolled windows it is more or less independent of // the screen window size. You may override the DoXXXVirtual - // methods below for classes where that is is the case. + // methods below for classes where that is the case. void SetVirtualSize( const wxSize &size ) { DoSetVirtualSize( size.x, size.y ); } void SetVirtualSize( int x, int y ) { DoSetVirtualSize( x, y ); } diff --git a/interface/wx/app.h b/interface/wx/app.h index d058e9c0ca..f3530be291 100644 --- a/interface/wx/app.h +++ b/interface/wx/app.h @@ -372,7 +372,7 @@ public: /** This function may be called if something fatal happens: an unhandled - exception under Win32 or a a fatal signal under Unix, for example. However, + exception under Win32 or a fatal signal under Unix, for example. However, this will not happen by default: you have to explicitly call wxHandleFatalExceptions() to enable this. diff --git a/interface/wx/brush.h b/interface/wx/brush.h index 4531a3e531..44f9c89e20 100644 --- a/interface/wx/brush.h +++ b/interface/wx/brush.h @@ -201,7 +201,7 @@ public: A transparent brush is simply a brush with wxBRUSHSTYLE_TRANSPARENT style. - Notice that this function works even for non-initialized brushs (for + Notice that this function works even for non-initialized brushes (for which it returns @false) unlike tests of the form <code>GetStyle() == wxBRUSHSTYLE_TRANSPARENT</code> which would assert if the brush is invalid. diff --git a/interface/wx/caret.h b/interface/wx/caret.h index 374d233afd..de8bcc0272 100644 --- a/interface/wx/caret.h +++ b/interface/wx/caret.h @@ -104,7 +104,7 @@ public: /** Returns @true if the caret is visible and @false if it is permanently - hidden (if it is is blinking and not shown currently but will be after + hidden (if it is blinking and not shown currently but will be after the next blink, this method still returns @true). */ bool IsVisible() const; diff --git a/interface/wx/chartype.h b/interface/wx/chartype.h index 7678cec9c8..5f380cba21 100644 --- a/interface/wx/chartype.h +++ b/interface/wx/chartype.h @@ -37,7 +37,7 @@ This macro can be used in the code which needs to compile with both wxWidgets 2 and 3 versions in places where v2 API requires a Unicode string - (in Unicode build) and v3 API only accepts a standard standard narrow + (in Unicode build) and v3 API only accepts a standard narrow string as in e.g. wxCmdLineEntryDesc structure objects initializers. Example of use: diff --git a/interface/wx/cmdproc.h b/interface/wx/cmdproc.h index 2f418bf36b..932cca841c 100644 --- a/interface/wx/cmdproc.h +++ b/interface/wx/cmdproc.h @@ -75,7 +75,7 @@ public: know the ordering of Undos; the user can never Undo at an arbitrary position in the command history. - Restore the entire document state (perhaps using document - transactioning). Potentially very inefficient, but possibly easier to + transacting). Potentially very inefficient, but possibly easier to code if the user interface and data are complex, and an "inverse execute" operation is hard to write. The docview sample uses the first method, to remove or restore segments in the drawing. diff --git a/interface/wx/colordlg.h b/interface/wx/colordlg.h index 2cec9c31c5..543698e037 100644 --- a/interface/wx/colordlg.h +++ b/interface/wx/colordlg.h @@ -25,7 +25,7 @@ public: of colour data, which will be copied to the colour dialog's colour data. - Custom colours from colour data object will be be used in the dialog's + Custom colours from colour data object will be used in the dialog's colour palette. Invalid entries in custom colours list will be ignored on some platforms(GTK) or replaced with white colour on platforms where custom colours palette has fixed size (MSW). diff --git a/interface/wx/colour.h b/interface/wx/colour.h index a0176ab1cc..bf051c3ff1 100644 --- a/interface/wx/colour.h +++ b/interface/wx/colour.h @@ -187,7 +187,7 @@ public: /** Sets the RGB intensity values using the given values (first overload), extracting them from the packed long (second overload), using the given - string (third overloard). + string (third overload). When using third form, Set() accepts: colour names (those listed in wxColourDatabase), the CSS-like @c "rgb(r,g,b)" or @c "rgba(r,g,b,a)" syntax diff --git a/interface/wx/colourdata.h b/interface/wx/colourdata.h index 45b5aab175..0f02934d06 100644 --- a/interface/wx/colourdata.h +++ b/interface/wx/colourdata.h @@ -87,7 +87,7 @@ public: void SetCustomColour(int i, const wxColour& colour); /** - Converts the colours saved in this class in a string form, separing + Converts the colours saved in this class in a string form, separating the various colours with a comma. */ wxString ToString() const; diff --git a/interface/wx/combo.h b/interface/wx/combo.h index 00ba186a5f..d3ba84ff39 100644 --- a/interface/wx/combo.h +++ b/interface/wx/combo.h @@ -864,7 +864,7 @@ protected: /** This member function is not normally called in application code. Instead, it can be implemented in a derived class to return default - wxComboPopup, incase @a popup is @NULL. + wxComboPopup, in case @a popup is @NULL. @note If you have implemented OnButtonClick() to do something else than show the popup, then DoSetPopupControl() must always set @a popup diff --git a/interface/wx/config.h b/interface/wx/config.h index 48f0095514..7fc1911798 100644 --- a/interface/wx/config.h +++ b/interface/wx/config.h @@ -312,7 +312,7 @@ public: @n The @c wxCONFIG_USE_NO_ESCAPE_CHARACTERS style can be helpful if your config file must be read or written to by a non-wxWidgets program (which might not understand the escape characters). Note, however, - that if @c wxCONFIG_USE_NO_ESCAPE_CHARACTERS style is used, it is is + that if @c wxCONFIG_USE_NO_ESCAPE_CHARACTERS style is used, it is now your application's responsibility to ensure that there is no newline or other illegal characters in a value, before writing that value to the file. @@ -763,7 +763,7 @@ public: /** Delete the whole underlying object (disk file, registry key, ...). - Primarly for use by uninstallation routine. + Primarily for use by uninstallation routine. */ virtual bool DeleteAll() = 0; diff --git a/interface/wx/datstrm.h b/interface/wx/datstrm.h index a37220bee0..f570c3eec4 100644 --- a/interface/wx/datstrm.h +++ b/interface/wx/datstrm.h @@ -36,7 +36,7 @@ public: @param stream The output stream. @param conv - Charset conversion object object used to encoding Unicode strings + Charset conversion object used to encoding Unicode strings before writing them to the stream in Unicode mode (see WriteString() for a detailed description). Note that you must not destroy @a conv before you destroy this wxDataOutputStream @@ -184,7 +184,7 @@ public: @param stream The input stream. @param conv - Charset conversion object object used to decode strings in Unicode + Charset conversion object used to decode strings in Unicode mode (see ReadString() for a detailed description). Note that you must not destroy @a conv before you destroy this wxDataInputStream instance! @@ -272,7 +272,7 @@ public: In Unicode build of wxWidgets, the fuction first reads multibyte (char*) string from the stream and then converts it to Unicode using the @e conv object passed to constructor and returns the result as - wxString. You are responsible for using the same convertor as when + wxString. You are responsible for using the same converter as when writing the stream. @see wxDataOutputStream::WriteString() diff --git a/interface/wx/dcbuffer.h b/interface/wx/dcbuffer.h index ef03428a37..ec2bb28d70 100644 --- a/interface/wx/dcbuffer.h +++ b/interface/wx/dcbuffer.h @@ -10,7 +10,7 @@ @class wxBufferedDC This class provides a simple way to avoid flicker: when drawing on it, - everything is infact first drawn on an in-memory buffer (a wxBitmap) and + everything is in fact first drawn on an in-memory buffer (a wxBitmap) and then copied to the screen, using the associated wxDC, only once, when this object is destroyed. wxBufferedDC itself is typically associated with wxClientDC, if you want to use it in your @c EVT_PAINT handler, you should @@ -120,7 +120,7 @@ public: The difference between wxBufferedPaintDC and this class is that this class won't double-buffer on platforms which have native double-buffering - already, avoiding any unneccessary buffering to avoid flicker. + already, avoiding any unnecessary buffering to avoid flicker. wxAutoBufferedPaintDC is simply a typedef of wxPaintDC on platforms that have native double-buffering, otherwise, it is a typedef of diff --git a/interface/wx/debugrpt.h b/interface/wx/debugrpt.h index 65aa1a5185..77686c1ded 100644 --- a/interface/wx/debugrpt.h +++ b/interface/wx/debugrpt.h @@ -253,7 +253,7 @@ public: /** Retrieves the name (relative to GetDirectory()) and the description of the file with the given index. If @a n is greater than or equal to the - number of filse, @false is returned. + number of files, then @false is returned. */ bool GetFile(size_t n, wxString* name, wxString* desc) const; diff --git a/interface/wx/defs.h b/interface/wx/defs.h index 9971fa818e..2513b04c38 100644 --- a/interface/wx/defs.h +++ b/interface/wx/defs.h @@ -33,7 +33,7 @@ enum wxOrientation */ wxBOTH = wxVERTICAL | wxHORIZONTAL, - /// A synonim for @c wxBOTH. + /// A synonym for @c wxBOTH. wxORIENTATION_MASK = wxBOTH }; diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h index 093d0c42ec..994b7d36c7 100644 --- a/interface/wx/dialog.h +++ b/interface/wx/dialog.h @@ -88,7 +88,7 @@ enum wxDialogLayoutAdaptationMode Equivalent to a combination of wxCAPTION, wxCLOSE_BOX and wxSYSTEM_MENU (the last one is not used under Unix). @style{wxRESIZE_BORDER} - Display a resizeable frame around the window. + Display a resizable frame around the window. @style{wxSYSTEM_MENU} Display a system menu. @style{wxCLOSE_BOX} @@ -638,7 +638,7 @@ public: /** @class wxDialogLayoutAdapter - This abstract class is the base for classes that help wxWidgets peform + This abstract class is the base for classes that help wxWidgets perform run-time layout adaptation of dialogs. Principally, this is to cater for small displays by making part of the dialog scroll, but the application developer may find other uses for layout adaption. diff --git a/interface/wx/dialup.h b/interface/wx/dialup.h index c0c606d4e3..91a96d6a1a 100644 --- a/interface/wx/dialup.h +++ b/interface/wx/dialup.h @@ -207,7 +207,7 @@ public: bool IsConnectedEvent() const; /** - Does this event come from wxDialUpManager::Dial() or from some extrenal + Does this event come from wxDialUpManager::Dial() or from some external process (i.e. does it result from our own attempt to establish the connection)? */ diff --git a/interface/wx/docview.h b/interface/wx/docview.h index 14bf99ba6a..20ad3423a8 100644 --- a/interface/wx/docview.h +++ b/interface/wx/docview.h @@ -683,7 +683,7 @@ public: @param noTemplates Number of templates being pointed to by the templates pointer. @param sort - If more than one template is passed in in templates, then this + If more than one template is passed into templates, then this parameter indicates whether the list of templates that the user will have to choose from is sorted or not when shown the choice box dialog. Default is @false. @@ -709,7 +709,7 @@ public: @param noTemplates Number of templates being pointed to by the templates pointer. @param sort - If more than one template is passed in in templates, then this + If more than one template is passed into templates, then this parameter indicates whether the list of templates that the user will have to choose from is sorted or not when shown the choice box dialog. Default is @false. diff --git a/interface/wx/dynarray.h b/interface/wx/dynarray.h index cdecd0f618..f9066994d6 100644 --- a/interface/wx/dynarray.h +++ b/interface/wx/dynarray.h @@ -124,7 +124,7 @@ however dumb, C++ compiler in the world. Remember to include @<wx/arrimpl.cpp@> just before each - WX_DEFINE_OBJARRAY() ocurrence in your code, even if you have several in + WX_DEFINE_OBJARRAY() occurrence in your code, even if you have several in the same file. Things are much simpler for wxArray and wxSortedArray however: it is enough diff --git a/interface/wx/fdrepdlg.h b/interface/wx/fdrepdlg.h index eaf6add16f..66091f28ac 100644 --- a/interface/wx/fdrepdlg.h +++ b/interface/wx/fdrepdlg.h @@ -67,7 +67,7 @@ class wxFindDialogEvent : public wxCommandEvent { public: /** - Constuctor used by wxWidgets only. + Constructor used by wxWidgets only. */ wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0); @@ -117,7 +117,7 @@ class wxFindReplaceData : public wxObject { public: /** - Constuctor initializes the flags to default value (0). + Constructor initializes the flags to default value (0). */ wxFindReplaceData(wxUint32 flags = 0); diff --git a/interface/wx/ffile.h b/interface/wx/ffile.h index 644bb10385..097bf94e3a 100644 --- a/interface/wx/ffile.h +++ b/interface/wx/ffile.h @@ -106,7 +106,7 @@ public: void Detach(); /** - Returns @true if the an attempt has been made to read @e past + Returns @true if an attempt has been made to read @e past the end of the file. Note that the behaviour of the file descriptor based class wxFile is different as diff --git a/interface/wx/filename.h b/interface/wx/filename.h index 5548f04f97..07c94f0997 100644 --- a/interface/wx/filename.h +++ b/interface/wx/filename.h @@ -129,7 +129,7 @@ wxULongLong wxInvalidSize; wxFileName::IsDirReadable() use wxFileName::GetPath() whereas methods dealing with file names like wxFileName::IsFileReadable() use wxFileName::GetFullPath(). - If it is not known wether a string contains a directory name or a complete + If it is not known whether a string contains a directory name or a complete file name (such as when interpreting user input) you need to use the static function wxFileName::DirExists() (or its identical variants wxDir::Exists() and wxDirExists()) and construct the wxFileName instance accordingly. @@ -332,7 +332,7 @@ public: wxPathFormat format = wxPATH_NATIVE); /** - Creates the file name from volumne, path, name and extension. + Creates the file name from volume, path, name and extension. */ void Assign(const wxString& volume, const wxString& path, const wxString& name, @@ -341,7 +341,7 @@ public: wxPathFormat format = wxPATH_NATIVE); /** - Creates the file name from volumne, path, name and extension. + Creates the file name from volume, path, name and extension. */ void Assign(const wxString& volume, const wxString& path, const wxString& name, @@ -558,7 +558,7 @@ public: suffixes of B, KB, MB, GB, TB for bytes, kilobytes, megabytes, gigabytes and terabytes respectively. With the IEC convention the names of the units are changed to B, KiB, MiB, GiB and TiB for bytes, - kibibytes, mebibyes, gibibytes and tebibytes. Finally, with SI + kibibytes, mebibytes, gibibytes and tebibytes. Finally, with SI convention the same B, KB, MB, GB and TB suffixes are used but in their correct SI meaning, i.e. as multiples of 1000 and not 1024. diff --git a/interface/wx/frame.h b/interface/wx/frame.h index 9e6d5ffb65..fc2ac1554e 100644 --- a/interface/wx/frame.h +++ b/interface/wx/frame.h @@ -70,7 +70,7 @@ recommended to only use it together with wxCAPTION for consistent behaviour under all platforms. @style{wxRESIZE_BORDER} - Displays a resizeable border around the window. + Displays a resizable border around the window. @style{wxFRAME_TOOL_WINDOW} Causes a frame with a small title bar to be created; the frame does not appear in the taskbar under Windows or GTK+. @@ -89,7 +89,7 @@ with the SetShape() method. @endStyleTable - The default frame style is for normal, resizeable frames. + The default frame style is for normal, resizable frames. To create a frame which cannot be resized by user, you may use the following combination of styles: diff --git a/interface/wx/fswatcher.h b/interface/wx/fswatcher.h index db821c797a..37167c7d75 100644 --- a/interface/wx/fswatcher.h +++ b/interface/wx/fswatcher.h @@ -160,7 +160,7 @@ public: @class wxFileSystemWatcherEvent A class of events sent when a file system event occurs. Types of events - reported may vary depending on a platfrom, however all platforms report + reported may vary depending on a platform, however all platforms report at least creation of new file/directory and access, modification, move (rename) or deletion of an existing one. diff --git a/interface/wx/gbsizer.h b/interface/wx/gbsizer.h index a45881ca7b..5c7b76cfb0 100644 --- a/interface/wx/gbsizer.h +++ b/interface/wx/gbsizer.h @@ -217,7 +217,7 @@ public: The wxGBSizerItem class is used by the wxGridBagSizer for tracking the items in the sizer. It adds grid position and spanning information to the - normal wxSizerItem by adding wxGBPosition and wxGBSpan attrbibutes. Most of + normal wxSizerItem by adding wxGBPosition and wxGBSpan attributes. Most of the time you will not need to use a wxGBSizerItem directly in your code, but there are a couple of cases where it is handy. @@ -268,7 +268,7 @@ public: //@} /** - Returns @true if this item and the @a other item instersect. + Returns @true if this item and the @a other item intersect. */ bool Intersects(const wxGBSizerItem& other); /** diff --git a/interface/wx/geometry.h b/interface/wx/geometry.h index 139c783785..9a7624a258 100644 --- a/interface/wx/geometry.h +++ b/interface/wx/geometry.h @@ -150,8 +150,8 @@ public: wxPoint2DDouble GetPosition(); wxSize GetSize(); - // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately + // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their + // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately wxDouble GetLeft() const; void SetLeft( wxDouble n ); @@ -241,8 +241,8 @@ public: wxPoint2DInt GetPosition(); wxSize GetSize(); - // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately + // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their + // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately wxInt32 GetLeft() const; void SetLeft( wxInt32 n ); diff --git a/interface/wx/glcanvas.h b/interface/wx/glcanvas.h index 646a546d99..49a38c958e 100644 --- a/interface/wx/glcanvas.h +++ b/interface/wx/glcanvas.h @@ -137,7 +137,7 @@ enum /// 1 for multisampling support (antialiasing) WX_GL_SAMPLE_BUFFERS, - /// 4 for 2x2 antialising supersampling on most graphics cards + /// 4 for 2x2 antialiasing supersampling on most graphics cards WX_GL_SAMPLES }; @@ -215,7 +215,7 @@ public: constants. If a constant should be followed by a value, put it in the next array position. For example, WX_GL_DEPTH_SIZE should be followed by the value that indicates the number of bits for the - depth buffer, e.g: + depth buffer, e.g.: @code attribList[n++] = WX_GL_DEPTH_SIZE; attribList[n++] = 32; diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h index 86ee53fd01..5239de61f7 100644 --- a/interface/wx/graphics.h +++ b/interface/wx/graphics.h @@ -403,7 +403,7 @@ public: /** Creates a native brush with a radial gradient. - The brush originats at (@a xo, @a yc) and ends on a circle around + The brush originates at (@a xo, @a yc) and ends on a circle around (@a xc, @a yc) with the given @a radius. The gradient may be specified either by its start and end colours @a diff --git a/interface/wx/grid.h b/interface/wx/grid.h index 90c5d9a3a5..332011b2a5 100644 --- a/interface/wx/grid.h +++ b/interface/wx/grid.h @@ -1630,7 +1630,7 @@ struct wxGridSizesInfo The default table class is called wxGridStringTable and holds an array of strings. An instance of such a class is created by CreateGrid(). - wxGridCellRenderer is the abstract base class for rendereing contents in a + wxGridCellRenderer is the abstract base class for rendering contents in a cell. The following renderers are predefined: - wxGridCellBoolRenderer @@ -2781,7 +2781,7 @@ public: @a resizeExistingRows is @true. If @a height is less than GetRowMinimalAcceptableHeight(), then the - minimal acceptable heihgt is used instead of it. + minimal acceptable height is used instead of it. */ void SetDefaultRowSize(int height, bool resizeExistingRows = false); @@ -3009,7 +3009,7 @@ public: Notice that currently there is no way to make some columns resizable in a grid where columns can't be resized by default as there doesn't seem to be any need for this in practice. There is also no way to make the - column marked as fixed using this method resizeable again because it is + column marked as fixed using this method resizable again because it is supposed that fixed columns are used for static parts of the grid and so should remain fixed during the entire grid lifetime. diff --git a/interface/wx/headercol.h b/interface/wx/headercol.h index b8509e8423..d554115362 100644 --- a/interface/wx/headercol.h +++ b/interface/wx/headercol.h @@ -221,7 +221,7 @@ public: /** Set the minimal column width. - This method can be used with resizeable columns (i.e. those for which + This method can be used with resizable columns (i.e. those for which wxCOL_RESIZABLE flag is set in GetFlags() or, alternatively, IsResizeable() returns @true) to prevent the user from making them narrower than the given width. @@ -302,11 +302,11 @@ public: Call this to enable or disable interactive resizing of the column by the user. - By default, the columns are resizeable. + By default, the columns are resizable. - Equivalent to ChangeFlag(wxCOL_RESIZABLE, resizeable). + Equivalent to ChangeFlag(wxCOL_RESIZABLE, resizable). */ - virtual void SetResizeable(bool resizeable); + virtual void SetResizeable(bool resizable); /** Allow clicking the column to sort the control contents by the field in diff --git a/interface/wx/help.h b/interface/wx/help.h index ae7ac421fc..8a3d0e4899 100644 --- a/interface/wx/help.h +++ b/interface/wx/help.h @@ -208,7 +208,7 @@ public: virtual bool LoadFile(const wxString& file = wxEmptyString); /** - Overrideable member called when this application's viewer is quit by the user. + Overridable member called when this application's viewer is quit by the user. This does not work for all help controllers. */ virtual bool OnQuit(); diff --git a/interface/wx/html/helpdlg.h b/interface/wx/html/helpdlg.h index 668048e680..a6f32a938b 100644 --- a/interface/wx/html/helpdlg.h +++ b/interface/wx/html/helpdlg.h @@ -56,7 +56,7 @@ public: /** Sets the help controller associated with the dialog. */ - void SetController(wxHtmlHelpController* contoller); + void SetController(wxHtmlHelpController* controller); /** Sets the dialog's title format. diff --git a/interface/wx/html/helpfrm.h b/interface/wx/html/helpfrm.h index 3c679ae591..73f735380c 100644 --- a/interface/wx/html/helpfrm.h +++ b/interface/wx/html/helpfrm.h @@ -59,7 +59,7 @@ public: /** Sets the help controller associated with the frame. */ - void SetController(wxHtmlHelpController* contoller); + void SetController(wxHtmlHelpController* controller); /** Sets the frame's title format. diff --git a/interface/wx/list.h b/interface/wx/list.h index ee97ee6aa8..32d115cf96 100644 --- a/interface/wx/list.h +++ b/interface/wx/list.h @@ -12,7 +12,7 @@ This class has been rewritten to be type safe and to provide the full API of the STL std::list container and should be used like it. The exception is that wxList<T> actually stores pointers and therefore its - iterators return pointers and not references to the actual objets in the list + iterators return pointers and not references to the actual objects in the list (see example below) and @e value_type is defined as @e T*. wxList<T> destroys an object after removing it only if wxList<T>::DeleteContents has been called. @@ -132,7 +132,7 @@ public: void DeleteContents(bool destroy); /** - Deletes the given element refered to by @a iter from the list + Deletes the given element referred to by @a iter from the list if @a iter is a valid iterator. Returns @true if successful. Deletes the actual object if DeleteContents( @true ) was called previously. @@ -148,9 +148,9 @@ public: bool DeleteObject(T* object); /** - Removes element refered to be @a iter. + Removes element referred to be @a iter. - Deletes the actualy object if DeleteContents( @true ) was called previously. + Deletes the actual object if DeleteContents( @true ) was called previously. */ void Erase(const compatibility_iterator& iter); @@ -192,7 +192,7 @@ public: T* object); /** - Inserts @a object before the object refered to be @a iter. + Inserts @a object before the object referred to be @a iter. */ wxList<T>::compatibility_iterator Insert(compatibility_iterator iter, T* object); diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h index 5b50f98537..11a852a3d9 100644 --- a/interface/wx/listctrl.h +++ b/interface/wx/listctrl.h @@ -575,7 +575,7 @@ public: coordinates, of the given subitem, i.e. the part of the row @a item in the column @a subItem. - This method is only meaningfull when the wxListCtrl is in the report mode. + This method is only meaningful when the wxListCtrl is in the report mode. If @a subItem parameter is equal to the special value @c wxLIST_GETSUBITEMRECT_WHOLEITEM the return value is the same as for GetItemRect(). diff --git a/interface/wx/log.h b/interface/wx/log.h index 8a2a670225..26f9180ce0 100644 --- a/interface/wx/log.h +++ b/interface/wx/log.h @@ -747,7 +747,7 @@ public: Note that the latter must be called the same number of times as the former to undo it, i.e. if you call Suspend() twice you must call Resume() twice as well. - Note that suspending the logging means that the log sink won't be be flushed + Note that suspending the logging means that the log sink won't be flushed periodically, it doesn't have any effect if the current log target does the logging immediately without waiting for Flush() to be called (the standard GUI log target only shows the log dialog when it is flushed, so Suspend() @@ -869,7 +869,7 @@ public: /** Sets the timestamp format prepended by the default log targets to all messages. The string may contain any normal characters as well as % - prefixed format specificators, see @e strftime() manual for details. + prefixed format specifiers, see @e strftime() manual for details. Passing an empty string to this function disables message time stamping. */ static void SetTimestamp(const wxString& format); diff --git a/interface/wx/menuitem.h b/interface/wx/menuitem.h index fd170e5d5c..b0b0f991f0 100644 --- a/interface/wx/menuitem.h +++ b/interface/wx/menuitem.h @@ -349,7 +349,7 @@ public: /** Sets the label associated with the menu item. - Note that if the ID of this menu item corrisponds to a stock ID, then it is + Note that if the ID of this menu item corresponds to a stock ID, then it is not necessary to specify a label: wxWidgets will automatically use the stock item label associated with that ID. See the @ref wxMenuItem::wxMenuItem "constructor" for more info. diff --git a/interface/wx/minifram.h b/interface/wx/minifram.h index 5795721153..3f4f80d110 100644 --- a/interface/wx/minifram.h +++ b/interface/wx/minifram.h @@ -35,7 +35,7 @@ @style{wxSYSTEM_MENU} Displays a system menu (Windows and Motif only). @style{wxRESIZE_BORDER} - Displays a resizeable border around the window. + Displays a resizable border around the window. @endStyleTable @remarks diff --git a/interface/wx/print.h b/interface/wx/print.h index 4f522e885e..ad0ef0ea31 100644 --- a/interface/wx/print.h +++ b/interface/wx/print.h @@ -747,14 +747,14 @@ public: void MapScreenSizeToDevice(); /** - This sets the user scale of the wxDC assocated with this wxPrintout to the same + This sets the user scale of the wxDC associated with this wxPrintout to the same scale as MapScreenSizeToPaper() but sets the logical origin to the top left corner of the page rectangle. */ void MapScreenSizeToPage(); /** - This sets the user scale of the wxDC assocated with this wxPrintout to the same + This sets the user scale of the wxDC associated with this wxPrintout to the same scale as MapScreenSizeToPageMargins() but sets the logical origin to the top left corner of the page margins specified by the given wxPageSetupDialogData object. */ diff --git a/interface/wx/process.h b/interface/wx/process.h index 03e29baf59..7d62189291 100644 --- a/interface/wx/process.h +++ b/interface/wx/process.h @@ -169,7 +169,7 @@ public: wxInputStream* GetInputStream() const; /** - It returns an output stream correspoding to the input stream of the subprocess. + It returns an output stream corresponding to the input stream of the subprocess. If it is @NULL, you have not turned on the redirection or already called CloseOutput(). diff --git a/interface/wx/propgrid/propgridiface.h b/interface/wx/propgrid/propgridiface.h index f405388b64..dba072c5e5 100644 --- a/interface/wx/propgrid/propgridiface.h +++ b/interface/wx/propgrid/propgridiface.h @@ -720,7 +720,7 @@ public: /** Set proportion of a auto-stretchable column. wxPG_SPLITTER_AUTO_CENTER window style needs to be used to indicate that columns are auto- - resizeable. + resizable. @returns Returns @false on failure. diff --git a/interface/wx/rawbmp.h b/interface/wx/rawbmp.h index ee50bcc4f7..50d3656b9c 100644 --- a/interface/wx/rawbmp.h +++ b/interface/wx/rawbmp.h @@ -202,7 +202,7 @@ public: //@{ /** - Data Access: Access to invidividual colour components. + Data Access: Access to individual colour components. */ ChannelType& Red(); ChannelType& Green(); diff --git a/interface/wx/ribbon/control.h b/interface/wx/ribbon/control.h index 58b9996d3c..8f497ef614 100644 --- a/interface/wx/ribbon/control.h +++ b/interface/wx/ribbon/control.h @@ -106,7 +106,7 @@ public: /** If sizing is not continuous, then return a suitable size for the control - which is larger then the current size. + which is larger than the current size. @param direction The direction(s) in which the size should increase. @@ -121,7 +121,7 @@ public: /** If sizing is not continuous, then return a suitable size for the control - which is larger then the given size. + which is larger than the given size. @param direction The direction(s) in which the size should increase. diff --git a/interface/wx/ribbon/panel.h b/interface/wx/ribbon/panel.h index 627ddfcfae..aa56900d81 100644 --- a/interface/wx/ribbon/panel.h +++ b/interface/wx/ribbon/panel.h @@ -141,9 +141,9 @@ public: Show the panel externally expanded. When a panel is minimised, it can be shown full-size in a pop-out - window, which is refered to as being (externally) expanded. Note that + window, which is referred to as being (externally) expanded. Note that when a panel is expanded, there exist two panels - the original panel - (which is refered to as the dummy panel) and the expanded panel. The + (which is referred to as the dummy panel) and the expanded panel. The original is termed a dummy as it sits in the ribbon bar doing nothing, while the expanded panel holds the panel children. diff --git a/interface/wx/scrolwin.h b/interface/wx/scrolwin.h index 0185f50cb4..fea0ad5b27 100644 --- a/interface/wx/scrolwin.h +++ b/interface/wx/scrolwin.h @@ -32,7 +32,7 @@ enum wxScrollbarVisibility - ::wxScrolledCanvas, aka wxScrolled<wxWindow>, derives from wxWindow and so doesn't handle children specially. This is suitable e.g. for - implementating scrollable controls such as tree or list controls. + implementing scrollable controls such as tree or list controls. Starting from version 2.4 of wxWidgets, there are several ways to use a ::wxScrolledWindow (and now wxScrolled). In particular, there are diff --git a/interface/wx/settings.h b/interface/wx/settings.h index 512b1aa967..c7d37ee64d 100644 --- a/interface/wx/settings.h +++ b/interface/wx/settings.h @@ -75,7 +75,7 @@ enum wxSystemColour wxSYS_COLOUR_3DLIGHT, //!< Light colour for three-dimensional display elements. wxSYS_COLOUR_INFOTEXT, //!< Text colour for tooltip controls. wxSYS_COLOUR_INFOBK, //!< Background colour for tooltip controls. - wxSYS_COLOUR_LISTBOX, //!< Background colour for list-like contols. + wxSYS_COLOUR_LISTBOX, //!< Background colour for list-like controls. wxSYS_COLOUR_HOTLIGHT, //!< Colour for a hyperlink or hot-tracked item. /** @@ -136,7 +136,7 @@ enum wxSystemColour //!< Synonym for @c wxSYS_COLOUR_BTNHIGHLIGHT. /** - Synonim for @c wxSYS_COLOUR_BTNFACE. + Synonym for @c wxSYS_COLOUR_BTNFACE. On wxMSW this colour should be used as the background colour of wxFrames which are used as containers of controls; this is in fact the @@ -273,7 +273,7 @@ public: The value of @a win determines if the metric returned is a global value or a wxWindow based value, in which case it might determine the widget, the display the window is on, or something similar. The window given should be as - close to the metric as possible (e.g a wxTopLevelWindow in case of the + close to the metric as possible (e.g. a wxTopLevelWindow in case of the wxSYS_CAPTION_Y metric). @a index can be one of the ::wxSystemMetric enum values. diff --git a/interface/wx/slider.h b/interface/wx/slider.h index 3288da2ff4..882c8bcb2b 100644 --- a/interface/wx/slider.h +++ b/interface/wx/slider.h @@ -41,7 +41,7 @@ @style{wxSL_SELRANGE} Allows the user to select a range on the slider. Windows only. @style{wxSL_INVERSE} - Inverses the mininum and maximum endpoints on the slider. Not + Inverses the minimum and maximum endpoints on the slider. Not compatible with wxSL_SELRANGE. @endStyleTable diff --git a/interface/wx/statline.h b/interface/wx/statline.h index 0a4ba0536d..57c21511e8 100644 --- a/interface/wx/statline.h +++ b/interface/wx/statline.h @@ -14,7 +14,7 @@ The line may be only vertical or horizontal. Moreover, not all ports (notably not wxGTK) support specifying the transversal direction of the - line (e.g. height for a horizontal line) so for maximial portability you + line (e.g. height for a horizontal line) so for maximal portability you should specify it as wxDefaultCoord. @beginStyleTable diff --git a/interface/wx/strconv.h b/interface/wx/strconv.h index 5e50ec49f5..c5384a8e43 100644 --- a/interface/wx/strconv.h +++ b/interface/wx/strconv.h @@ -277,7 +277,7 @@ public: /** @deprecated This function is deprecated, please use ToWChar() instead. - Converts from a string @a in in multibyte encoding to Unicode putting up to + Converts from a string @a in multibyte encoding to Unicode putting up to @a outLen characters into the buffer @e out. If @a out is @NULL, only the length of the string which would result diff --git a/interface/wx/stream.h b/interface/wx/stream.h index 7ab40df660..36617cc091 100644 --- a/interface/wx/stream.h +++ b/interface/wx/stream.h @@ -589,7 +589,7 @@ public: /** Reads the specified amount of bytes and stores the data in buffer. - To check if the call was successfull you must use LastRead() to check + To check if the call was successful you must use LastRead() to check if this call did actually read @a size bytes (if it didn't, GetLastError() should return a meaningful value). diff --git a/interface/wx/sysopt.h b/interface/wx/sysopt.h index a3bc77240f..08fb8b211c 100644 --- a/interface/wx/sysopt.h +++ b/interface/wx/sysopt.h @@ -46,7 +46,7 @@ @flag{no-maskblt} 1 to never use WIN32's MaskBlt function, 0 to allow it to be used where possible. Default: 0. In some circumstances the MaskBlt function can be slower than using - the fallback code, especially if using DC cacheing. By default, MaskBlt will be + the fallback code, especially if using DC caching. By default, MaskBlt will be used where it is implemented by the operating system and driver. @flag{msw.remap} If 1 (the default), wxToolBar bitmap colours will be remapped to the current @@ -117,7 +117,7 @@ Also known as wxWINDOW_DEFAULT_VARIANT. @flag{mac.listctrl.always_use_generic} Tells wxListCtrl to use the generic control even when it is capable of - using the native control instead. Also knwon as wxMAC_ALWAYS_USE_GENERIC_LISTCTRL. + using the native control instead. Also known as wxMAC_ALWAYS_USE_GENERIC_LISTCTRL. @flag{mac.textcontrol-use-spell-checker} This option only has effect for Mac OS X 10.4 and higher. If 1 activates the spell checking in wxTextCtrl. diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h index de93cdb340..746954eca8 100644 --- a/interface/wx/textctrl.h +++ b/interface/wx/textctrl.h @@ -796,7 +796,7 @@ public: void SetTabs(const wxArrayInt& tabs); /** - Sets the text foreground colout. + Sets the text foreground colour. */ void SetTextColour(const wxColour& colText); diff --git a/interface/wx/toplevel.h b/interface/wx/toplevel.h index 888f38a221..55be716a7d 100644 --- a/interface/wx/toplevel.h +++ b/interface/wx/toplevel.h @@ -445,7 +445,7 @@ public: @param alpha Determines how opaque or transparent the window will be, if the - platform supports the opreration. A value of 0 sets the window to be + platform supports the operation. A value of 0 sets the window to be fully transparent, and a value of 255 sets the window to be fully opaque. */ diff --git a/interface/wx/treectrl.h b/interface/wx/treectrl.h index 6bd7e2378c..500c31d863 100644 --- a/interface/wx/treectrl.h +++ b/interface/wx/treectrl.h @@ -15,7 +15,7 @@ wxTreeItemId handles, which may be tested for validity by calling wxTreeItemId::IsOk(). - A similar control with a fully native implemtation for GTK+ and OS X + A similar control with a fully native implementation for GTK+ and OS X as well is wxDataViewTreeCtrl. To intercept events from a tree control, use the event table macros diff --git a/interface/wx/uiaction.h b/interface/wx/uiaction.h index b74ef64de0..27a707a020 100644 --- a/interface/wx/uiaction.h +++ b/interface/wx/uiaction.h @@ -94,7 +94,7 @@ public: y start coordinate, in screen coordinates. @param x2 - x desintation coordinate, in screen coordinates. + x destination coordinate, in screen coordinates. @param y2 y destination coordinate, in screen coordinates. diff --git a/interface/wx/ustring.h b/interface/wx/ustring.h index df974ee125..062d32a785 100644 --- a/interface/wx/ustring.h +++ b/interface/wx/ustring.h @@ -14,7 +14,7 @@ each character is stored using a 32-bit value. This is different from wxString which may store a character either as a UTF-8 or as a UTF-16 sequence and different from @c std::string which stores a string - as a squence of simple 8-bit charactesr and also different from + as a sequence of simple 8-bit characters and also different from @c std::wstring which stores the string differently depending on the definition of wchar_t. @@ -151,35 +151,35 @@ public: /** - Assigment from a 7-bit ASCII string literal + Assignment from a 7-bit ASCII string literal */ wxUString &assignFromAscii( const char *str ); /** - Assigment from a 7-bit ASCII string literal + Assignment from a 7-bit ASCII string literal */ wxUString &assignFromAscii( const char *str, size_t n ); /** - Assigment from a UTF-8 string literal + Assignment from a UTF-8 string literal */ wxUString &assignFromUTF8( const char *str ); /** - Assigment from a UTF-8 string literal + Assignment from a UTF-8 string literal */ wxUString &assignFromUTF8( const char *str, size_t n ); /** - Assigment from a UTF-16 string literal + Assignment from a UTF-16 string literal */ wxUString &assignFromUTF16( const wxChar16* str ); /** - Assigment from a UTF-16 string literal + Assignment from a UTF-16 string literal */ wxUString &assignFromUTF16( const wxChar16* str, size_t n ); /** - Assigment from a C string literal using wxConvLibc + Assignment from a C string literal using wxConvLibc */ wxUString &assignFromCString( const char* str ); /** - Assigment from a C string literal using @a conv + Assignment from a C string literal using @a conv */ wxUString &assignFromCString( const char* str, const wxMBConv &conv ); diff --git a/interface/wx/utils.h b/interface/wx/utils.h index 6d8ac1bf48..120ed37cc3 100644 --- a/interface/wx/utils.h +++ b/interface/wx/utils.h @@ -711,7 +711,7 @@ wxString wxGetOsDescription(); 'uname -r' command); e.g. "2" and "6" if the machine is using kernel 2.6.19. For Mac OS X systems (@c wxOS_MAC) the major and minor version integers are the - natural version numbers associated with the OS; e.g. "10" and and "6" if the machine + natural version numbers associated with the OS; e.g. "10" and "6" if the machine is using Mac OS X Snow Leopard. For Windows-like systems (@c wxOS_WINDOWS) the major and minor version integers will diff --git a/interface/wx/vector.h b/interface/wx/vector.h index 74843ed89d..ec5f3ed401 100644 --- a/interface/wx/vector.h +++ b/interface/wx/vector.h @@ -77,7 +77,7 @@ public: wxVector(size_type size, const value_type& value); /** - Copy onstructor. + Copy constructor. */ wxVector(const wxVector<T>& c); diff --git a/interface/wx/vscroll.h b/interface/wx/vscroll.h index 75d07d93c8..75c8a736a9 100644 --- a/interface/wx/vscroll.h +++ b/interface/wx/vscroll.h @@ -715,7 +715,7 @@ public: const wxString& name = wxPanelNameStr); /** - Same as the non-default constuctor, but returns a status code: @true if + Same as the non-default constructor, but returns a status code: @true if ok, @false if the window couldn't be created. Just as with the constructor, the @c wxVSCROLL style is always used, @@ -791,7 +791,7 @@ public: const wxString& name = wxPanelNameStr); /** - Same as the non-default constuctor, but returns a status code: @true if + Same as the non-default constructor, but returns a status code: @true if ok, @false if the window couldn't be created. Just as with the constructor, the @c wxHSCROLL style is always used, @@ -868,7 +868,7 @@ public: const wxString& name = wxPanelNameStr); /** - Same as the non-default constuctor, but returns a status code: @true if + Same as the non-default constructor, but returns a status code: @true if ok, @false if the window couldn't be created. Just as with the constructor, the @c wxHSCROLL and @c wxVSCROLL styles diff --git a/interface/wx/window.h b/interface/wx/window.h index e82abf20c8..6a13cadcfd 100644 --- a/interface/wx/window.h +++ b/interface/wx/window.h @@ -491,7 +491,7 @@ public: */ wxWindow* GetPrevSibling() const; /** - Reparents the window, i.e the window will be removed from its + Reparents the window, i.e. the window will be removed from its current parent window (e.g. a non-standard toolbar in a wxFrame) and then re-inserted into another. @@ -2083,7 +2083,7 @@ public: /** Sets the style of the window. Please note that some styles cannot be changed - after the window creation and that Refresh() might need to be be called + after the window creation and that Refresh() might need to be called after changing the others for the change to take place immediately. See @ref overview_windowstyles "Window styles" for more information about flags. @@ -2787,7 +2787,7 @@ public: /** - @name Constraints, sizers and window layouting functions + @name Constraints, sizers and window layout functions */ //@{ @@ -2830,7 +2830,7 @@ public: This method calls SetSizer() and then wxSizer::SetSizeHints which sets the initial window size to the size needed to accommodate all sizer elements and sets the size hints which, if this window is a top level one, prevent the user from - resizing it to be less than this minimial size. + resizing it to be less than this minimal size. */ void SetSizerAndFit(wxSizer* sizer, bool deleteOld = true); diff --git a/interface/wx/wizard.h b/interface/wx/wizard.h index 9ffdbc8650..9244c18aca 100644 --- a/interface/wx/wizard.h +++ b/interface/wx/wizard.h @@ -495,7 +495,7 @@ public: Also, the wizard will never be smaller than the default size. The recommended way to use this function is to lay out all wizard pages - using the sizers (even though the wizard is not resizeable) and then use + using the sizers (even though the wizard is not resizable) and then use wxSizer::CalcMin() in a loop to calculate the maximum of minimal sizes of the pages and pass it to SetPageSize(). */ diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp index fe98c7449d..c2175a9d4b 100644 --- a/samples/dnd/dnd.cpp +++ b/samples/dnd/dnd.cpp @@ -1177,7 +1177,7 @@ void DnDFrame::OnHelp(wxCommandEvent& /* event */) wxT("it to wordpad or any other droptarget accepting text (and of course you can just drag it\n") wxT("to the right pane). Due to a lot of trace messages, the cursor might take some time to \n") wxT("change, don't release the mouse button until it does. You can change the string being\n") - wxT("dragged in in \"File|Test drag...\" dialog.\n") + wxT("dragged in \"File|Test drag...\" dialog.\n") wxT("\n") wxT("\n") wxT("Please send all questions/bug reports/suggestions &c to \n") diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp index 1c31da2e08..4b2353dec6 100644 --- a/samples/grid/griddemo.cpp +++ b/samples/grid/griddemo.cpp @@ -471,7 +471,7 @@ GridFrame::GridFrame() grid->SetCellAlignment(7, 1, wxALIGN_CENTRE, wxALIGN_CENTRE); grid->SetCellValue(7, 1, wxT("Big box!")); - // create a separator-like row: it's grey and it's non-resizeable + // create a separator-like row: it's grey and it's non-resizable grid->DisableRowResize(10); grid->SetRowSize(10, 30); attr = new wxGridCellAttr; diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index d49ead6e8e..4c3b8dc902 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -47,8 +47,8 @@ #define USE_CONTEXT_MENU 1 #endif -// this sample is usefull when new port is developed -// and usually new port has majority of flags turned off +// this sample is useful when a new port is developed +// and usually a new port has majority of flags turned off #if wxUSE_LOG && wxUSE_TEXTCTRL #define USE_LOG_WINDOW 1 #else diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp index 96b90ba23f..d6fe0d2fd1 100644 --- a/samples/propgrid/tests.cpp +++ b/samples/propgrid/tests.cpp @@ -1392,7 +1392,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive ) s = wxString::Format(wxT("%i tests failed!!!"), failures); #ifdef __WXDEBUG__ else - s = wxString::Format(wxT("All tests were successfull, but there were %i warnings!"), wxPGGlobalVars->m_warnings); + s = wxString::Format(wxT("All tests were successful, but there were %i warnings!"), wxPGGlobalVars->m_warnings); #endif RT_MSG(s) for ( i=0; i<errorMessages.size(); i++ ) diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp index fbbc43b258..ae6261a898 100644 --- a/samples/widgets/checkbox.cpp +++ b/samples/widgets/checkbox.cpp @@ -112,7 +112,7 @@ protected: // the controls // ------------ - // the contols to choose the checkbox style + // the controls to choose the checkbox style wxCheckBox *m_chkRight; wxRadioBox *m_radioKind; diff --git a/samples/xrc/custclas.h b/samples/xrc/custclas.h index aebc043ee0..1072f6b9fe 100644 --- a/samples/xrc/custclas.h +++ b/samples/xrc/custclas.h @@ -28,7 +28,7 @@ class MyResizableListCtrl : public wxListCtrl { // Very helpful wxWidgets macro required for wxWidgets-RTTI tracing: By using this - // you will see "Leaked one object of type myResizeableListCtrl" in the debug log, + // you will see "Leaked one object of type myResizableListCtrl" in the debug log, // along with which line you if was created, but you forget to free the memory. // NOTE: Using this REQUIRES a default constructor: that means either: giving a // default value for all parameters in your constructor, or else having a dummy @@ -60,7 +60,7 @@ public: const wxString &name = wxT("myResizableListCtrl") ); - // Destuctor. + // Destructor. ~MyResizableListCtrl(){}; protected: diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index f05ea8c419..c353fec89a 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -354,7 +354,7 @@ static int sg_cApplicationWillUpdate = 0; before the run loop waits and send the idle events from there. It also has the desirable effect of only sending the wx idle events when - the event loop is actualy going to block. If the event loop is being + the event loop is actually going to block. If the event loop is being pumped manualy (e.g. like a PeekMessage) then the kCFRunLoopBeforeWaiting observer never fires. Our Yield() method depends on this because sending idle events from within Yield would be bad. diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 8a432a0609..8fb822a76f 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -735,7 +735,7 @@ int wxWindowCocoaScrollView::GetScrollPos(wxOrientation orient) position is at range-thumbsize. The range of an NSScroller is 0.0 to 1.0. Much easier! NOTE: Apple doesn't really specify - but GNUStep docs do say that 0.0 is top/left and 1.0 is bottom/right. This is actualy + but GNUStep docs do say that 0.0 is top/left and 1.0 is bottom/right. This is actually in contrast to NSSlider which generally has 1.0 at the TOP when it's done vertically. */ CGFloat cocoaScrollPos = [cocoaScroller floatValue]; diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 10d606aefe..99dda0cf2a 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -2245,7 +2245,7 @@ bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id, wxDATAVIEW_CELL_EDITABLE, -1, // default width wxALIGN_NOT, // and alignment - 0 // not resizeable + 0 // not resizable ); return true; diff --git a/src/common/datetimefmt.cpp b/src/common/datetimefmt.cpp index a073b3fcfc..254c703436 100644 --- a/src/common/datetimefmt.cpp +++ b/src/common/datetimefmt.cpp @@ -320,7 +320,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const format.Replace("%X",wxLocale::GetInfo(wxLOCALE_TIME_FMT)); #endif // we have to use our own implementation if the date is out of range of - // strftime() or if we use non standard specificators + // strftime() or if we use non standard specifiers #ifdef wxHAS_STRFTIME time_t time = GetTicks(); @@ -668,7 +668,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const } // no, it wasn't the width - wxFAIL_MSG(wxT("unknown format specificator")); + wxFAIL_MSG(wxT("unknown format specifier")); // fall through and just copy it nevertheless diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index f57ba4c854..02f5ee8a3e 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -1602,7 +1602,7 @@ void wxDCImpl::CalculateEllipticPoints( wxPointList* points, y2 = y2-y-y+1; --y; } - // old y now to big: set point with old y, old x + // old y now too big: set point with old y, old x if( bNewPoint && x>1) { int x1 = x - 1; diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index 854196debd..42f58a3721 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -59,7 +59,7 @@ static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode { case wxCOPY: // src // since we are supporting alpha, _OVER is closer to the intention than _SOURCE - // since the latter would overwrite even when alpha is is not set to opaque + // since the latter would overwrite even when alpha is not set to opaque *op = wxCOMPOSITION_OVER; break; case wxOR: // src OR dst diff --git a/src/common/imagtga.cpp b/src/common/imagtga.cpp index b5a583157e..319324ef9a 100644 --- a/src/common/imagtga.cpp +++ b/src/common/imagtga.cpp @@ -846,7 +846,7 @@ bool wxTGAHandler::DoCanRead(wxInputStream& stream) unsigned char hdr[HDR_SIZE]; stream.Read(hdr, HDR_SIZE); // it's ok to modify the stream position here - // Check wether we can read the file or not. + // Check whether we can read the file or not. short colorType = hdr[HDR_COLORTYPE]; if ( colorType != wxTGA_UNMAPPED && colorType != wxTGA_MAPPED ) diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp index 5efbbf63ad..14cf31b5a0 100644 --- a/src/generic/dirdlgg.cpp +++ b/src/generic/dirdlgg.cpp @@ -166,7 +166,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent, topsizer->Add(m_dirCtrl, wxSizerFlags(flagsBorder2).Proportion(1).Expand()); #ifndef __SMARTPHONE__ - // Make the an option depending on a flag? + // TODO: Make this an option depending on a flag? wxCheckBox * check = new wxCheckBox(this, ID_SHOW_HIDDEN, _("Show &hidden directories")); topsizer->Add(check, wxSizerFlags(flagsBorder2).Right()); diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 6a2bf5e506..423cfe8bb8 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -3069,7 +3069,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow()); m_dragLastPos = -1; } - else // not on row separator or it's not resizeable + else // not on row separator or it's not resizable { row = YToRow(y); if ( row >=0 && diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp index b9743847ce..ff201c0189 100644 --- a/src/generic/gridctrl.cpp +++ b/src/generic/gridctrl.cpp @@ -311,7 +311,7 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid, while ( tk.HasMoreTokens() ) { wxString tok = tk.GetNextToken(); - //FIXME: this causes us to print an extra unnecesary + //FIXME: this causes us to print an extra unnecessary // space at the end of the line. But it // is invisible , simplifies the size calculation // and ensures tokens are separated in the display diff --git a/src/generic/headerctrlg.cpp b/src/generic/headerctrlg.cpp index f0f7cde162..279c1d031b 100644 --- a/src/generic/headerctrlg.cpp +++ b/src/generic/headerctrlg.cpp @@ -180,7 +180,7 @@ unsigned int wxHeaderCtrl::FindColumnAtPoint(int x, bool *onSeparator) const pos += col.GetWidth(); - // if the column is resizeable, check if we're approximatively over the + // if the column is resizable, check if we're approximatively over the // line separating it from the next column // // TODO: don't hardcode sensitivity diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index 4cbdd36235..55bdeaec45 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -726,7 +726,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent, bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); // create the controls which are always shown and layout them: we use - // sizers even though our window is not resizeable to calculate the size of + // sizers even though our window is not resizable to calculate the size of // the dialog properly wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL); diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index 7dcd4ba055..7c84a72e18 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -1111,7 +1111,7 @@ void wxScrollHelperBase::HandleOnChildFocus(wxChildFocusEvent& event) // part of a wxComboCtrl visible and the button would still be outside the // scrolled area. But do so only if the parent fits *entirely* inside the // scrolled window. In other situations, such as nested wxPanel or - // wxScrolledWindows, the parent might be way to big to fit inside the + // wxScrolledWindows, the parent might be way too big to fit inside the // scrolled window. If that is the case, then make only the focused window // visible if ( win->GetParent() != m_targetWindow) diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp index c1902fae8f..0deb8617ef 100644 --- a/src/gtk/assertdlg_gtk.cpp +++ b/src/gtk/assertdlg_gtk.cpp @@ -353,8 +353,8 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg) dlg->callback = NULL; dlg->userdata = NULL; - /* the resizeable property of this window is modified by the expander: - when it's collapsed, the window must be non-resizeable! */ + /* the resizable property of this window is modified by the expander: + when it's collapsed, the window must be non-resizable! */ gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE); gtk_widget_pop_composite_child (); gtk_widget_show_all (GTK_WIDGET(dlg)); diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp index e81789300e..a902d113a3 100644 --- a/src/gtk/collpane.cpp +++ b/src/gtk/collpane.cpp @@ -95,7 +95,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), // 1) need to update our size hints // NB: this function call won't actually do any long operation - // (redraw/relayouting/resizing) so that it's flicker-free + // (redraw/relayout/resize) so that it's flicker-free p->SetMinSize(sz); if (p->HasFlag(wxCP_NO_TLW_RESIZE)) @@ -123,7 +123,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), // transition. This may be sometimes undesired but *is* // necessary and if you look carefully, all GTK+ programs using // GtkExpander perform this trick (e.g. the standard "open file" - // dialog of GTK+>=2.4 is not resizeable when the expander is + // dialog of GTK+>=2.4 is not resizable when the expander is // collapsed!) gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded()); diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index a07d7a659f..6be2f8b81b 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -3114,9 +3114,9 @@ void wxDataViewColumn::SetHidden( bool hidden ) gtk_tree_view_column_set_visible( GTK_TREE_VIEW_COLUMN(m_column), !hidden ); } -void wxDataViewColumn::SetResizeable( bool resizeable ) +void wxDataViewColumn::SetResizeable( bool resizable ) { - gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizeable ); + gtk_tree_view_column_set_resizable( GTK_TREE_VIEW_COLUMN(m_column), resizable ); } void wxDataViewColumn::SetAlignment( wxAlignment align ) diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp index 7f06ed819a..c6655fdaef 100644 --- a/src/gtk/dirdlg.cpp +++ b/src/gtk/dirdlg.cpp @@ -135,7 +135,7 @@ wxDirDialog::wxDirDialog(wxWindow* parent, // local-only property could be set to false to allow non-local files to be loaded. // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere // and the GtkFileChooserDialog should probably also be created with a backend, - // e.g "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend). + // e.g. "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend). // Currently local-only is kept as the default - true: // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index cff12d8f6f..a9359fa3ff 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -235,7 +235,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, // local-only property could be set to false to allow non-local files to be // loaded. In that case get/set_uri(s) should be used instead of // get/set_filename(s) everywhere and the GtkFileChooserDialog should - // probably also be created with a backend, e.g "gnome-vfs", "default", ... + // probably also be created with a backend, e.g. "gnome-vfs", "default", ... // (gtk_file_chooser_dialog_new_with_backend). Currently local-only is kept // as the default - true: // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp index 39c517b0fd..d72c2a9a5e 100644 --- a/src/gtk/print.cpp +++ b/src/gtk/print.cpp @@ -57,7 +57,7 @@ wxFORCE_LINK_THIS_MODULE(gtk_print) #include "wx/gtk/private/object.h" -// Usefull to convert angles from/to Rad to/from Deg. +// Useful to convert angles from/to Rad to/from Deg. static const double RAD2DEG = 180.0 / M_PI; static const double DEG2RAD = M_PI / 180.0; diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index c339054997..58956c1c97 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -1680,7 +1680,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, break; default: - // unknwon button, don't process + // unknown button, don't process return FALSE; } diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index 52640fae19..f79224c539 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -870,7 +870,7 @@ void wxHtmlContainerCell::Layout(int w) /* - LAYOUTING : + LAYOUT : */ @@ -878,7 +878,7 @@ void wxHtmlContainerCell::Layout(int w) s_indent = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft; s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); - // my own layouting: + // my own layout: wxHtmlCell *cell = m_Cells, *line = m_Cells; while (cell != NULL) diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index 5b5b22fca1..078525080b 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -43,7 +43,7 @@ struct colStruct // ('width' is the number, 'units' determines its meaning) int minWidth, maxWidth; // minimal/maximal column width. This is needed by HTML 4.0 - // layouting algorithm and can be determined by trying to + // layout algorithm and can be determined by trying to // layout table cells with width=1 and width=infinity int leftpos, pixwidth, maxrealwidth; // temporary (depends on actual width of table) @@ -460,7 +460,7 @@ void wxHtmlTableCell::Layout(int w) /* - LAYOUTING : + LAYOUT : */ diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 433a71e73d..10bb135fb5 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -518,7 +518,7 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const ); // we must use WS_CLIPSIBLINGS with the buttons or they would draw over - // each other in any resizeable dialog which has more than one button in + // each other in any resizable dialog which has more than one button in // the bottom msStyle |= WS_CLIPSIBLINGS; diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index b883fd5be4..b04985d6c2 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -420,7 +420,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar } #endif // wxUSE_DIALOG_SIZEGRIP - // the Windows dialogs unfortunately are not meant to be resizeable + // the Windows dialogs unfortunately are not meant to be resizable // at all and their standard class doesn't include CS_[VH]REDRAW // styles which means that the window is not refreshed properly // after the resize and no amount of WS_CLIPCHILDREN/SIBLINGS can diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 32b87f7817..cf0bb81e98 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -65,7 +65,7 @@ // ---------------------------------------------------------------------------- // standard dialog size for the old Windows systems where the dialog wasn't -// resizeable +// resizable static wxRect gs_rectDialog(0, 0, 428, 266); // ============================================================================ diff --git a/src/msw/headerctrl.cpp b/src/msw/headerctrl.cpp index 9144513d5b..c6c4de551a 100644 --- a/src/msw/headerctrl.cpp +++ b/src/msw/headerctrl.cpp @@ -561,7 +561,7 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // ASCII and Unicode versions of this message case HDN_BEGINTRACKA: case HDN_BEGINTRACKW: - // non-resizeable columns can't be resized no matter what, don't + // non-resizable columns can't be resized no matter what, don't // even generate any events for them if ( !GetColumn(idx).IsResizeable() ) { diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index fbcfbe7a6d..b5913ea90c 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -1442,7 +1442,7 @@ void wxListCtrl::InitEditControl(WXHWND hWnd) m_textCtrl->SubclassWin(hWnd); m_textCtrl->SetParent(this); - // we must disallow TABbing away from the control while the edit contol is + // we must disallow TABbing away from the control while the edit control is // shown because this leaves it in some strange state (just try removing // this line and then pressing TAB while editing an item in listctrl // inside a panel) diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp index 3e374ca695..6f58f7cb00 100644 --- a/src/msw/statusbar.cpp +++ b/src/msw/statusbar.cpp @@ -89,7 +89,7 @@ WXDWORD wxStatusBar::MSWGetStyle(long style, WXDWORD *exstyle) const WXDWORD msStyle = wxStatusBarBase::MSWGetStyle(style, exstyle); // wxSTB_SIZEGRIP is part of our default style but it doesn't make sense to - // show size grip if this is the status bar of a non-resizeable TLW so turn + // show size grip if this is the status bar of a non-resizable TLW so turn // it off in such case wxWindow * const parent = GetParent(); wxCHECK_MSG( parent, msStyle, wxS("Status bar must have a parent") ); diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 87508df811..07496bff06 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -496,8 +496,8 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, if ( GetExtraStyle() & wxTOPLEVEL_EX_DIALOG ) { // we have different dialog templates to allows creation of dialogs - // with & without captions under MSWindows, resizeable or not (but a - // resizeable dialog always has caption - otherwise it would look too + // with & without captions under MSWindows, resizable or not (but a + // resizable dialog always has caption - otherwise it would look too // strange) // we need 3 additional WORDs for dialog menu, class and title (as we diff --git a/src/os2/button.cpp b/src/os2/button.cpp index ce0c00f818..684ee92aa6 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -381,7 +381,7 @@ WXDWORD wxButton::OS2GetStyle( // // We must use WS_CLIPSIBLINGS with the buttons or they would draw over - // each other in any resizeable dialog which has more than one button in + // each other in any resizable dialog which has more than one button in // the bottom // dwStyle |= WS_CLIPSIBLINGS; diff --git a/src/os2/listctrl.cpp b/src/os2/listctrl.cpp index 50283974a6..cf9a922745 100644 --- a/src/os2/listctrl.cpp +++ b/src/os2/listctrl.cpp @@ -2247,7 +2247,7 @@ long wxListCtrl::InsertItem ( vInsert.fInvalidateRecord = TRUE; // - // Check wether we need to allocate our internal data + // Check whether we need to allocate our internal data // bool bNeedInternalData = ((rInfo.GetMask() & wxLIST_MASK_DATA) || rInfo.HasAttributes() diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 3b5ff83d76..3eccd6eb75 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -492,7 +492,7 @@ bool wxMenuItem::OnMeasureItem( size_t* pWidth, size_t* pHeight ) if (m_bmpChecked.Ok()) { // - // Is BMP height larger then text height? + // Is BMP height larger than text height? // size_t nAdjustedHeight = m_bmpChecked.GetHeight() + wxSystemSettings::GetMetric(wxSYS_EDGE_Y); diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp index 48895e88ee..b605488501 100644 --- a/src/os2/toplevel.cpp +++ b/src/os2/toplevel.cpp @@ -638,8 +638,8 @@ bool wxTopLevelWindowOS2::Create( { // // We have different dialog templates to allow creation of dialogs - // with & without captions under OS2indows, resizeable or not (but a - // resizeable dialog always has caption - otherwise it would look too + // with & without captions under OS2indows, resizable or not (but a + // resizable dialog always has caption - otherwise it would look too // strange) // ULONG ulDlgTemplate; diff --git a/src/os2/window.cpp b/src/os2/window.cpp index 2974b884e3..0c0bbef6b2 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -1251,7 +1251,7 @@ void wxWindowOS2::DoGetPosition( // use WinQueryWindowPos. This call, unlike the WIN32 call, however, // returns a position relative to it's parent, so no parent adujstments // are needed under OS/2. Also, windows should be created using - // wxWindow coordinates, i.e 0,0 is the TOP left. + // wxWindow coordinates, i.e. 0,0 is the TOP left. // if (IsKindOf(CLASSINFO(wxFrame))) { diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp index 48b992758b..4975013a64 100644 --- a/src/osx/carbon/dataview.cpp +++ b/src/osx/carbon/dataview.cpp @@ -2632,10 +2632,10 @@ void wxDataViewColumn::SetReorderable(bool reorderable) } } -void wxDataViewColumn::SetResizeable(bool resizeable) +void wxDataViewColumn::SetResizeable(bool resizable) { // first set the internal flag of the column: - if (resizeable) + if (resizable) m_flags |= wxDATAVIEW_COL_RESIZABLE; else m_flags &= ~wxDATAVIEW_COL_RESIZABLE; @@ -2651,7 +2651,7 @@ void wxDataViewColumn::SetResizeable(bool resizeable) DataBrowserListViewHeaderDesc headerDescription; verify_noerr(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription)); - if (resizeable) + if (resizable) { if (GetMinWidth() >= GetMaxWidth()) { diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index f165cbfdaa..73bc32c5b6 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -2170,7 +2170,7 @@ void wxMacCoreGraphicsContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble CGRect r = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h ); if ( refdata->IsMonochrome() == 1 ) { - // is is a mask, the '1' in the mask tell where to draw the current brush + // is a mask, the '1' in the mask tell where to draw the current brush if ( !m_brush.IsNull() ) { if ( ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() ) diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp index bc09cb8df0..4301982e51 100644 --- a/src/osx/carbon/listbox.cpp +++ b/src/osx/carbon/listbox.cpp @@ -137,7 +137,7 @@ int wxMacDataBrowserListControl::DoListHitTest(const wxPoint& inpoint) const } if ( point.y < bounds.top ) - // index(bounds) greater then key(point) + // index(bounds) greater than key(point) high = mid - 1; else // index(bounds) less than key(point) diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index 452c36350b..2aeac7950d 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -329,7 +329,7 @@ NSTableColumn* CreateNativeColumn(const wxDataViewColumn *column) [nativeColumn setMinWidth:column->GetMinWidth()]; [nativeColumn setMaxWidth:column->GetMaxWidth()]; } - else // column is not resizeable [by user] + else // column is not resizable [by user] { // if the control doesn't show a header, make the columns resize // automatically, this is particularly important for the single column @@ -3137,10 +3137,10 @@ bool wxDataViewColumn::IsHidden() const return [m_NativeDataPtr->GetNativeColumnPtr() isHidden]; } -void wxDataViewColumn::SetResizeable(bool resizeable) +void wxDataViewColumn::SetResizeable(bool resizable) { - wxDataViewColumnBase::SetResizeable(resizeable); - if (resizeable) + wxDataViewColumnBase::SetResizeable(resizable); + if (resizable) [m_NativeDataPtr->GetNativeColumnPtr() setResizingMask:NSTableColumnUserResizingMask]; else [m_NativeDataPtr->GetNativeColumnPtr() setResizingMask:NSTableColumnNoResizing]; diff --git a/tests/controls/buttontest.cpp b/tests/controls/buttontest.cpp index 64247d03f3..9d6e9a4e29 100644 --- a/tests/controls/buttontest.cpp +++ b/tests/controls/buttontest.cpp @@ -147,7 +147,7 @@ void ButtonTestCase::Auth() void ButtonTestCase::BitmapMargins() { - //Some functions only work on specific platfroms in which case we can use + //Some functions only work on specific platforms in which case we can use //a preprocessor check #ifdef __WXMSW__ //We must set a bitmap before we can set its margins, when writing unit diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h index 3a0fc092a4..83f7d9d49e 100644 --- a/tests/streams/bstream.h +++ b/tests/streams/bstream.h @@ -81,7 +81,7 @@ protected: const TStreamIn &stream_in = CreateInStream(); CPPUNIT_ASSERT(!stream_in.Eof()); - // Size should be greater then zero. + // Size should be greater than zero. // Note: streams not supporting this should register this test // with CPPUNIT_TEST_FAIL instead of CPPUNIT_TEST. CPPUNIT_ASSERT(stream_in.GetSize() != 0); @@ -419,7 +419,7 @@ protected: return; delete m_pCurrentIn; m_pCurrentIn = NULL; - // Incase something extra needs to be done. + // In case something extra needs to be done. DoDeleteInStream(); } void DeleteOutStream() @@ -431,7 +431,7 @@ protected: delete m_pCurrentOut; m_pCurrentOut = NULL; - // Incase something extra needs to be done. + // In case something extra needs to be done. DoDeleteOutStream(); } diff --git a/tests/streams/zlibstream.cpp b/tests/streams/zlibstream.cpp index d25bce0781..af5fd16cdd 100644 --- a/tests/streams/zlibstream.cpp +++ b/tests/streams/zlibstream.cpp @@ -463,8 +463,8 @@ void zlibStream::doDecompress_ExternalData(const unsigned char *data, const char // Check if we are in an infinite loop by multiplying value_size // by 5 to have a *much* bigger range then the real range. - // Note: Incase you ask your self, why 5, the answer is no reason... - // it is not to big and not to small a size, nothing more + // Note: In case you ask yourself, why 5, the answer is no reason... + // it is not too big and not to small a size, nothing more // nothing less to it. if (i > (value_size*5)) { -- 2.45.2