From 070d639118b3483c2328f9e5f56fa71e0ef80229 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 23 Jan 2013 11:44:26 +0000 Subject: [PATCH] No real changes, just fix some typos in comments in wxMSW code. Closes #14994. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/checklst.cpp | 2 +- src/msw/dialup.cpp | 2 +- src/msw/mediactrl_am.cpp | 4 ++-- src/msw/mediactrl_wmp10.cpp | 6 +++--- src/msw/ole/activex.cpp | 2 +- src/msw/ole/dataobj.cpp | 4 ++-- src/msw/printdlg.cpp | 2 +- src/msw/regconf.cpp | 2 +- src/msw/sockmsw.cpp | 2 +- src/msw/webview_ie.cpp | 2 +- src/msw/wince/clean_vcp.py | 2 +- src/msw/window.cpp | 4 ++-- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 726bccff52..235019ca17 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -61,7 +61,7 @@ namespace // space around check mark bitmap in pixels static const int CHECKMARK_EXTRA_SPACE = 1; - // space betwen check bitmap and text label + // space between check bitmap and text label static const int CHECKMARK_LABEL_SPACE = 2; } // anonymous namespace diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index 6cc5040544..4831acbc0f 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -1284,7 +1284,7 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data) } // we don't need it any more now and if this thread ran, it is our - // responsability to free the data + // responsibility to free the data delete data; return 0; diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index edcb971d6a..227df16d5d 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -1540,14 +1540,14 @@ wxString wxAMMediaBackend::GetErrorString(HRESULT hrdsv) { return wxString::Format(wxT("DirectShow error \"%s\" \n") wxT("(numeric %X)\n") - wxT("occured"), + wxT("occurred"), szError, (int)hrdsv); } else { return wxString::Format(wxT("Unknown error \n") wxT("(numeric %X)\n") - wxT("occured"), + wxT("occurred"), (int)hrdsv); } } diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp index 2cfdb85e26..818ae20f2d 100644 --- a/src/msw/mediactrl_wmp10.cpp +++ b/src/msw/mediactrl_wmp10.cpp @@ -28,7 +28,7 @@ // is about to be played - and if the user didn't change the state of the // media (m_bWasStateChanged), when set it back to the stop state. // -// The ActiveX control itself is particularily stubborn, calling +// The ActiveX control itself is particularly stubborn, calling // IOleInPlaceSite::OnPosRectChange every file change trying to set itself // to something different then what we told it to before. // @@ -861,7 +861,7 @@ bool wxWMP10MediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent, IWMPPlayer2* pWMPPlayer2; // Only 2 has windowless video and stretchtofit if(m_pWMPPlayer->QueryInterface(IID_IWMPPlayer2, (void**)&pWMPPlayer2) == 0) { - // We don't check errors here as these arn't particularily important + // We don't check errors here as these arn't particularly important // and may not be implemented (i.e. stretchToFit on CE) pWMPPlayer2->put_windowlessVideo(VARIANT_TRUE); pWMPPlayer2->put_stretchToFit(VARIANT_TRUE); @@ -1472,7 +1472,7 @@ wxFORCE_LINK_THIS_MODULE(wxmediabackend_wmp10) // you playing a file through WMP. // // Here are those hacks. They do indeed "work" as expected - just call -// SendMessage with one of those myterious values layed out in +// SendMessage with one of those myterious values laid out in // Peter Foot's Friday, May 21, 2004 Blog Post on the issue. // (He says they are in a registery section entitled "Pendant Bus") // diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index d0652d4bcc..8baad0bf01 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -1269,7 +1269,7 @@ void wxActiveXContainer::OnKillFocus(wxFocusEvent& event) // wxActiveXContainer::MSWTranslateMessage // // Called for every message that needs to be translated. -// Some controls might need more keyboard keys to process (CTRL-C, CTRL-A ect), +// Some controls might need more keyboard keys to process (CTRL-C, CTRL-A etc), // In that case TranslateAccelerator should always be called first. //--------------------------------------------------------------------------- bool wxActiveXContainer::MSWTranslateMessage(WXMSG* pMsg) diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index a523c1c6e7..2c2c44603f 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -930,7 +930,7 @@ void wxDataObject::SetAutoDelete() ((wxIDataObject *)m_pIDataObject)->SetDeleteFlag(); m_pIDataObject->Release(); - // so that the dtor doesnt' crash + // so that the dtor doesn't crash m_pIDataObject = NULL; } @@ -1316,7 +1316,7 @@ size_t wxFileDataObject::GetDataSize() const static const size_t sizeOfChar = sizeof(wxChar); #endif // wxUSE_UNICODE_MSLU/!wxUSE_UNICODE_MSLU - // inital size of DROPFILES struct + null byte + // initial size of DROPFILES struct + null byte size_t sz = sizeof(DROPFILES) + sizeOfChar; const size_t count = m_filenames.size(); diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index 7cf410702c..a3da80615a 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -396,7 +396,7 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi // From MSDN: How To Modify Printer Settings with the DocumentProperties() Function // The purpose of this is to fill the DEVMODE with privdata from printer driver. - // If we have a printer name and OpenPrinter sucessfully returns + // If we have a printer name and OpenPrinter successfully returns // this replaces the PrintDlg function which creates the DEVMODE filled only with data from default printer. if ( !m_devMode && !printerName.IsEmpty() ) { diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp index b8198a80e0..9954bc4503 100644 --- a/src/msw/regconf.cpp +++ b/src/msw/regconf.cpp @@ -79,7 +79,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName, bool bDoUseGlobal = (style & wxCONFIG_USE_GLOBAL_FILE) != 0; // the convention is to put the programs keys under \ - // (but it can be overridden by specifying the pathes explicitly in strLocal + // (but it can be overridden by specifying the paths explicitly in strLocal // and/or strGlobal) if ( strLocal.empty() || (strGlobal.empty() && bDoUseGlobal) ) { diff --git a/src/msw/sockmsw.cpp b/src/msw/sockmsw.cpp index ae92c8873b..57f6b91199 100644 --- a/src/msw/sockmsw.cpp +++ b/src/msw/sockmsw.cpp @@ -120,7 +120,7 @@ typedef struct thread_data{ #ifdef __WXWINCE__ /* This thread handles socket events on WinCE using WSAEventSelect() as * WSAAsyncSelect is not supported. When an event occurs for the socket, it is - * checked what kind of event happend and the correct message gets posted so + * checked what kind of event happened and the correct message gets posted so * that the hidden window can handle it as it would in other MSW builds. */ DWORD WINAPI SocketThread(LPVOID data) diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index a5e3c130ae..b1c12209b6 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -1486,7 +1486,7 @@ HRESULT STDMETHODCALLTYPE VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRe } else { - //Dummy return to surpress a compiler warning + //Dummy return to suppress a compiler warning wxFAIL; return INET_E_DOWNLOAD_FAILURE; } diff --git a/src/msw/wince/clean_vcp.py b/src/msw/wince/clean_vcp.py index 782c42ffab..215fc56b7b 100644 --- a/src/msw/wince/clean_vcp.py +++ b/src/msw/wince/clean_vcp.py @@ -1,7 +1,7 @@ ''' This script will delete dependences from *.vcp files. After using this script, next time when you will try to save project, -you will have wait untill 'Visual Tools' will rebuild all dependencies +you will have wait until 'Visual Tools' will rebuild all dependencies and this process might take HUGE amount of time Author : Viktor Voroshylo diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 1289c4fcb8..4b07cbdf1d 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1430,7 +1430,7 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const // it doesn't seem useful to use WS_CLIPSIBLINGS here as we officially // don't support overlapping windows and it only makes sense for them and, // presumably, gives the system some extra work (to manage more clipping - // regions), so avoid it alltogether + // regions), so avoid it altogether if ( flags & wxVSCROLL ) @@ -5451,7 +5451,7 @@ bool wxWindowMSW::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags) }; #ifdef wxHAS_XBUTTON - // the same messages are used for both auxillary mouse buttons so we need + // the same messages are used for both auxiliary mouse buttons so we need // to adjust the index manually switch ( msg ) { -- 2.45.2