From 37424888b883ba2434066cfa559d3d96a5ac8723 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 7 May 2012 13:12:27 +0000
Subject: [PATCH] No real changes, just fix some typos in comments.
Closes #14276.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/common/combocmn.cpp | 2 +-
src/common/datetimefmt.cpp | 2 +-
src/common/dcbase.cpp | 2 +-
src/common/filename.cpp | 2 +-
src/common/imagtiff.cpp | 2 +-
src/common/mediactrlcmn.cpp | 2 +-
src/common/rgncmn.cpp | 2 +-
src/common/translation.cpp | 2 +-
src/common/uri.cpp | 2 +-
src/common/xti.cpp | 2 +-
src/common/xtistrm.cpp | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 814dbd9a49..2136fbd1cc 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1375,7 +1375,7 @@ wxSize wxComboCtrlBase::DoGetBestSize() const
else
fhei = sizeText.y + 4;
- // Need to force height to accomodate bitmap?
+ // Need to force height to accommodate bitmap?
int btnSizeY = m_btnSize.y;
if ( m_bmpNormal.IsOk() && fhei < btnSizeY )
fhei = btnSizeY;
diff --git a/src/common/datetimefmt.cpp b/src/common/datetimefmt.cpp
index 698749f2c9..3e51672eee 100644
--- a/src/common/datetimefmt.cpp
+++ b/src/common/datetimefmt.cpp
@@ -293,7 +293,7 @@ ParseFormatAt(wxString::const_iterator& p,
wxDateTime dt;
// Use a default date outside of the DST period to avoid problems with
- // parsing the time differently depending on the todays date (which is used
+ // parsing the time differently depending on the today's date (which is used
// as the fall back date if none is explicitly specified).
static const wxDateTime dtDef(1, wxDateTime::Jan, 2012);
diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 87e60977c6..822c772dee 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -1292,7 +1292,7 @@ void wxDC::DrawLabel(const wxString& text,
{
if ( pc - text.begin() == indexAccel )
{
- // remeber to draw underscore here
+ // remember to draw underscore here
GetTextExtent(curLine, &startUnderscore, NULL);
curLine += *pc;
GetTextExtent(curLine, &endUnderscore, NULL);
diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index bc4b31b23f..fb092de343 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -1798,7 +1798,7 @@ bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const
/* static */
bool wxFileName::IsCaseSensitive( wxPathFormat format )
{
- // only Unix filenames are truely case-sensitive
+ // only Unix filenames are truly case-sensitive
return GetFormat(format) == wxPATH_UNIX;
}
diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index b8fed7f83c..1c3e22632d 100644
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -552,7 +552,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
/*
Set the image resolution if it's available. Resolution tag is not
- dependant on RESOLUTIONUNIT != RESUNIT_NONE (according to TIFF spec).
+ dependent on RESOLUTIONUNIT != RESUNIT_NONE (according to TIFF spec).
*/
float resX, resY;
diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp
index 555c6e71e3..903e47a3f7 100644
--- a/src/common/mediactrlcmn.cpp
+++ b/src/common/mediactrlcmn.cpp
@@ -544,7 +544,7 @@ void wxMediaBackendCommonBase::QueueStopEvent()
//
#include "wx/html/forcelnk.h"
-#ifdef __WXMSW__ // MSW has huge backends so we do it seperately
+#ifdef __WXMSW__ // MSW has huge backends so we do it separately
FORCE_LINK(wxmediabackend_am)
FORCE_LINK(wxmediabackend_wmp10)
#elif !defined(__WXOSX_COCOA__)
diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index 93de0d48f8..f70b680303 100644
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -33,7 +33,7 @@
// ============================================================================
// ----------------------------------------------------------------------------
-// region comparision
+// region comparison
// ----------------------------------------------------------------------------
bool wxRegionBase::IsEqual(const wxRegion& region) const
diff --git a/src/common/translation.cpp b/src/common/translation.cpp
index 417588526d..379eccc45c 100644
--- a/src/common/translation.cpp
+++ b/src/common/translation.cpp
@@ -885,7 +885,7 @@ private:
};
// ----------------------------------------------------------------------------
-// wxMsgCatalogFile clas
+// wxMsgCatalogFile class
// ----------------------------------------------------------------------------
wxMsgCatalogFile::wxMsgCatalogFile()
diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index 86faa7a62f..88930c9ab9 100644
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -817,7 +817,7 @@ bool wxURI::ParseH16(const char*& uri)
//
// Parses a certain version of an IP address and moves the input string past
// it. Returns true if the input string contains the proper version of an ip
-// address. It is the caller's responsability to move the input string back
+// address. It is the caller's responsibility to move the input string back
// to its original position on failure.
// ---------------------------------------------------------------------------
diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index 31c2282f13..ab4796ff3f 100644
--- a/src/common/xti.cpp
+++ b/src/common/xti.cpp
@@ -393,7 +393,7 @@ void wxTypeInfo::Unregister()
ms_typeTable->erase(m_name);
}
-// removing header dependancy on string tokenizer
+// removing header dependency on string tokenizer
void wxSetStringToArray( const wxString &s, wxArrayString &array )
{
diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index de182f0ef0..ed4a7a557c 100644
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -478,7 +478,7 @@ struct wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallbackInternal
return NULL;
if ( m_objects.find(objectID) == m_objects.end() )
{
- wxLogError( _("Passing an unkown object to GetObject") );
+ wxLogError( _("Passing an unknown object to GetObject") );
return NULL;
}
--
2.47.2