From ba5a0a3878435c56e41d4b5b681b89c71ae04c8f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 14 Apr 2016 16:08:28 +0200 Subject: [PATCH] Fix more typos in comments and wxFAIL messages Closes https://github.com/wxWidgets/wxWidgets/pull/270 --- interface/wx/aui/dockart.h | 4 ++-- interface/wx/propgrid/manager.h | 6 +++--- interface/wx/propgrid/property.h | 4 ++-- interface/wx/xrc/xmlres.h | 2 +- tests/streams/bstream.h | 12 ++++++------ tests/strings/vsnprintf.cpp | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/interface/wx/aui/dockart.h b/interface/wx/aui/dockart.h index 921275c2fe..cf23c1693f 100644 --- a/interface/wx/aui/dockart.h +++ b/interface/wx/aui/dockart.h @@ -78,7 +78,7 @@ enum wxAuiPaneDockArtGradients /// No gradient on the captions, in other words a solid colour wxAUI_GRADIENT_NONE = 0, - /// Vertical gradient on the captions, in other words a gradal change in colours from top to bottom + /// Vertical gradient on the captions, in other words a gradual change in colours from top to bottom wxAUI_GRADIENT_VERTICAL = 1, /// Horizontal gradient on the captions, in other words a gradual change in colours from left to right @@ -182,7 +182,7 @@ enum wxAuiButtonId See also @ref overview_aui. wxAuiDockArt is the art provider: provides all drawing functionality to the - wxAui dock manager. This allows the dock manager to have a plugable look-and-feel. + wxAui dock manager. This allows the dock manager to have a pluggable look-and-feel. By default, a wxAuiManager uses an instance of this class called wxAuiDefaultDockArt which provides bitmap art and a colour scheme that is diff --git a/interface/wx/propgrid/manager.h b/interface/wx/propgrid/manager.h index 2d51a48c4c..982e502748 100644 --- a/interface/wx/propgrid/manager.h +++ b/interface/wx/propgrid/manager.h @@ -132,8 +132,8 @@ public: wxPropertyGridManager inherits from wxPropertyGridInterface, and as such it has most property manipulation functions. However, only some of them affect - properties on all pages (eg. GetPropertyByName() and ExpandAll()), while some - (eg. Append()) only apply to the currently selected page. + properties on all pages (e.g. GetPropertyByName() and ExpandAll()), while some + (e.g. Append()) only apply to the currently selected page. To operate explicitly on properties on specific page, use wxPropertyGridManager::GetPage() to obtain pointer to page's @@ -405,7 +405,7 @@ public: Select and displays a given page. @param index - Index of page being seleced. Can be -1 to select nothing. + Index of page being selected. Can be -1 to select nothing. */ void SelectPage( int index ); diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h index 6b982e3d9a..65cfae059c 100644 --- a/interface/wx/propgrid/property.h +++ b/interface/wx/propgrid/property.h @@ -304,11 +304,11 @@ wxPG_PROP_USES_COMMON_VALUE = 0x00020000, */ wxPG_PROP_AUTO_UNSPECIFIED = 0x00040000, -/** Indicates the bit useable by derived properties. +/** Indicates the bit usable by derived properties. */ wxPG_PROP_CLASS_SPECIFIC_1 = 0x00080000, -/** Indicates the bit useable by derived properties. +/** Indicates the bit usable by derived properties. */ wxPG_PROP_CLASS_SPECIFIC_2 = 0x00100000, diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h index 42217ed965..363081bcd3 100644 --- a/interface/wx/xrc/xmlres.h +++ b/interface/wx/xrc/xmlres.h @@ -89,7 +89,7 @@ public: void AddHandler(wxXmlResourceHandler* handler); /** - Add a new handler at the begining of the handler list. + Add a new handler at the beginning of the handler list. */ void InsertHandler(wxXmlResourceHandler *handler); diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h index ac618142de..b1fe8aa326 100644 --- a/tests/streams/bstream.h +++ b/tests/streams/bstream.h @@ -112,7 +112,7 @@ protected: CPPUNIT_ASSERT(!stream_in.Eof()); CPPUNIT_ASSERT(stream_in.IsOk()); - // Test the stream version aswell. + // Test the stream version as well. TStreamOut &stream_out = CreateOutStream(); (void)stream_in.Read(stream_out); @@ -142,10 +142,10 @@ protected: // EOF behaviour is different in streams, disabled (for now?) if (m_bEofAtLastRead) - // EOF should only occure after the last successful get. + // EOF should only occur after the last successful get. CPPUNIT_ASSERT_MESSAGE("Eof is detected too late.", !(stream_in.LastRead() != 1 && stream_in.Eof())); else - // EOF should only occure after a failed get. + // EOF should only occur after a failed get. CPPUNIT_ASSERT_MESSAGE("Eof is detected too soon.", !(stream_in.LastRead() == 1 && stream_in.Eof())); #endif } @@ -386,14 +386,14 @@ protected: // Default false. bool m_bSeekInvalidBeyondEnd; // if true a SeekI|O beyond the end of the stream should return wxInvalidOffset // Default true. - bool m_bEofAtLastRead; // Does EOF occure at the moment the last byte is read or when read past the last byte. + bool m_bEofAtLastRead; // Does EOF occur at the moment the last byte is read or when read past the last byte. // Default true. protected: TStreamIn &CreateInStream() { if (m_pCurrentIn) { - wxFAIL_MSG(wxT("Error in test case, the previouse input stream needs to be delete first!")); + wxFAIL_MSG(wxT("Error in test case, the previous input stream needs to be delete first!")); } m_pCurrentIn = DoCreateInStream(); @@ -404,7 +404,7 @@ protected: { if (m_pCurrentOut) { - wxFAIL_MSG(wxT("Error in test case, the previouse output stream needs to be delete first!")); + wxFAIL_MSG(wxT("Error in test case, the previous output stream needs to be delete first!")); } m_pCurrentOut = DoCreateOutStream(); diff --git a/tests/strings/vsnprintf.cpp b/tests/strings/vsnprintf.cpp index 14d2144272..f1ae32e8cd 100644 --- a/tests/strings/vsnprintf.cpp +++ b/tests/strings/vsnprintf.cpp @@ -173,7 +173,7 @@ private: void WrongFormatStrings(); // compares the expectedString and the result of wxVsnprintf() char by char - // for all its lenght (not only for first expectedLen chars) and also + // for all its length (not only for first expectedLen chars) and also // checks the return value void DoMisc(int expectedLen, const wxString& expectedString, size_t max, const wxChar *format, ...);