From c58f06c8e4fa47202b3e762ccd9fe992a837115c Mon Sep 17 00:00:00 2001 From: Blake-Madden <66873089+Blake-Madden@users.noreply.github.com> Date: Fri, 24 Nov 2023 07:02:58 -0500 Subject: [PATCH] Fix typos and repeated words in comments and documentation See #24085. (cherry picked from commit 2c1cdf9c02ce51c05695d04604ae7caa9c7e299a) --- build/cmake/README.md | 2 +- docs/contributing/how-to-release.md | 2 +- docs/doxygen/mainpages/samples.h | 2 +- docs/qt/architecture.md | 2 +- docs/qt/install.md | 2 +- interface/wx/webrequest.h | 2 +- interface/wx/xrc/xmlres.h | 2 +- src/msw/ole/activex.cpp | 2 +- utils/screenshotgen/src/autocapture.h | 12 ++++++------ 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build/cmake/README.md b/build/cmake/README.md index 82e13a28c6..552dba343a 100644 --- a/build/cmake/README.md +++ b/build/cmake/README.md @@ -25,7 +25,7 @@ Files * functions.cmake * contains various wxWidgets specific functions and macros used throughout the CMake files - * Every function should contain a short description of it's parameters as + * Every function should contain a short description of its parameters as a comment before the function/macro * install.cmake * Handles definitions for the `install` and `uninstall` target diff --git a/docs/contributing/how-to-release.md b/docs/contributing/how-to-release.md index 30de573160..42f25c276f 100644 --- a/docs/contributing/how-to-release.md +++ b/docs/contributing/how-to-release.md @@ -136,7 +136,7 @@ Update https://www.wxwidgets.org: anything else, the page will dynamically show the release files with the specified prefixes). * Add a news item. Usually a news item is enough but something - more can be called for for major releases + more can be called for major releases * Push the changes (or create the PR with them) to GitHub. Note that this will trigger the site rebuild which will fail if the release statistics are not available yet, so make sure to publish the release on GitHub first (or wait diff --git a/docs/doxygen/mainpages/samples.h b/docs/doxygen/mainpages/samples.h index 9dd572587e..0c0ae785a7 100644 --- a/docs/doxygen/mainpages/samples.h +++ b/docs/doxygen/mainpages/samples.h @@ -931,7 +931,7 @@ control. @section page_samples_webview wxWebView Sample -The wxWebView sample demonstarates the various capabilities of the wxWebView +The wxWebView sample demonstrates the various capabilities of the wxWebView control. It is set up as a simple single window web browser, but with support for many of the more complex wxWebView features, including browsing through archives. diff --git a/docs/qt/architecture.md b/docs/qt/architecture.md index c80d0406b9..8f353e1ed9 100644 --- a/docs/qt/architecture.md +++ b/docs/qt/architecture.md @@ -54,7 +54,7 @@ Qt objects needs to be sub-classed to re-implement events and connect signals (m The approach chosen was to use templates to help inherit QObject's (QWidget), providing a common base to handle events and signal infrastructure: -* `wxQtSignalHandler< wxWindow >`: allows emitting wx events for Qt events & signals. This should be used used for all QObjects derivatives that are not widgets, for example QAction (used for shortcut / accelerators). +* `wxQtSignalHandler< wxWindow >`: allows emitting wx events for Qt events & signals. This should be used for all QObjects derivatives that are not widgets, for example QAction (used for shortcut / accelerators). * `wxQtEventSignalHandler< QWidget, wxWindow >`: derived from `wxQtSignalHandler`, also handles basic events (change, focus, mouse, keyboard, paint, close, etc.). This should be used for all QWidget derivatives (controls, top level windows, etc.) ### Delete later diff --git a/docs/qt/install.md b/docs/qt/install.md index 455a80f687..854a5230df 100644 --- a/docs/qt/install.md +++ b/docs/qt/install.md @@ -118,7 +118,7 @@ for Windows (ran from Git Bash, or any other Unix-like shell): Building wxGT on Android {#qt_android} -------------------------- -Download Android Native Development Kit (NDK), tandalone Android Software +Download Android Native Development Kit (NDK), standalone Android Software Development Kit (SDK), install them and perform the following instructions to prepare the cross-compilation tool-chain to (change NDK and other paths): diff --git a/interface/wx/webrequest.h b/interface/wx/webrequest.h index ff8f100f42..5ef2887575 100644 --- a/interface/wx/webrequest.h +++ b/interface/wx/webrequest.h @@ -66,7 +66,7 @@ @section apple_http macOS and iOS App Transport Security - Starting with macOS 10.11 and iOS 9 an application cannot create unsecure + Starting with macOS 10.11 and iOS 9 an application cannot create insecure connections (this includes HTTP and unverified HTTPS). You have to include additional fields in your Info.plist to enable such connections. For further details see the documentation on NSAppTransportSecurity diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h index 18741f29ad..0febd4d6a2 100644 --- a/interface/wx/xrc/xmlres.h +++ b/interface/wx/xrc/xmlres.h @@ -263,7 +263,7 @@ public: @param doc A valid, i.e. non-null, document pointer ownership of which is passed to wxXmlResource, i.e. this pointer can't be used after - this function rteturns. + this function returns. @param name The name argument is optional, but may be provided if you plan to call Unload() later. It doesn't need to be an existing file or even conform to the usual form of file names as it is not diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index 122ec04dc8..3e0f1f99dc 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -786,7 +786,7 @@ wxVariant &wxActiveXEvent::operator [](size_t idx) { // copy the _real_ parameter into this one // NOTE: m_params stores the parameters in *reverse* order. - // Whyever, but this was the case in the original implementation of + // Whatever, but this was the case in the original implementation of // wxActiveXEvents::Invoke // Keep this convention. VARIANTARG& va = native->pDispParams->rgvarg[ native->pDispParams->cArgs - idx - 1 ]; diff --git a/utils/screenshotgen/src/autocapture.h b/utils/screenshotgen/src/autocapture.h index e4e6de2f55..bbaa069dee 100644 --- a/utils/screenshotgen/src/autocapture.h +++ b/utils/screenshotgen/src/autocapture.h @@ -45,7 +45,7 @@ enum GlobalAdjustFlags Enable region adjustment for all controls. If AJ_DisableRegionAdjust and AJ_AlwaysRegionAdjust are both specified, - current implemetation will ignore AJ_DisableRegionAdjust. + current implementation will ignore AJ_DisableRegionAdjust. */ AJ_AlwaysRegionAdjust = 1 << 1, @@ -189,9 +189,9 @@ enum AdjustFlags the code is short, quite readable and well commented, please read the codes before any modification. - If you need the class to do something sepcial for you, consider introducing + If you need the class to do something special for you, consider introducing a new flag and implement it in them. For an operation performed on multiple - controls, implemente its logic in CaptureAll(), otherwise in the private + controls, implement its logic in CaptureAll(), otherwise in the private member Capture(). @subsection tag_yield_issue wxYield Issues @@ -222,7 +222,7 @@ public: It's one of or a combination of GlobalAdjustFlags, to disable / enable some auto-adjustment for all controls. @param margin - It's the margin around every control in the sreenshots. + It's the margin around every control in the screenshots. */ AutoCaptureMechanism(wxNotebook *notebook, int flag = AJ_NormalAll, @@ -231,7 +231,7 @@ public: ~AutoCaptureMechanism() { } /** - Register a control and perform specifid auto adjustments. + Register a control and perform specified auto adjustments. @param ctrl The pointer to the control to be taken a screenshot. @@ -243,7 +243,7 @@ public: If you end up with an a smaller or deflected screenshot, use AJ_RegionAdjust. - If you want to caputure the "drop-down" state of a "drop-down" + If you want to capture the "drop-down" state of a "drop-down" control, use AJ_Dropdown. If you want to present different states of a control in one