From 34621cc5d6eaf8933935fbda55625124429a0ff9 Mon Sep 17 00:00:00 2001 From: Kevin Hock Date: Fri, 22 Oct 2004 19:11:07 +0000 Subject: [PATCH] Documentation patch from Olly Betts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/radiobox.h | 2 +- include/wx/gtk1/radiobox.h | 2 +- include/wx/isql.h | 2 +- include/wx/isqlext.h | 2 +- include/wx/mac/setup0.h | 12 ++++++------ include/wx/string.h | 2 +- include/wx/univ/renderer.h | 2 +- samples/richedit/wxllist.cpp | 4 ++-- samples/toolbar/toolbar.cpp | 2 +- src/generic/listctrl.cpp | 2 +- src/iodbc/isql.h | 2 +- src/iodbc/isqlext.h | 2 +- src/msw/ownerdrw.cpp | 2 +- src/msw/window.cpp | 2 +- wxPython/docs/BUILD.html | 2 +- wxPython/docs/BUILD.txt | 2 +- wxPython/docs/CHANGES.html | 6 +++--- wxPython/docs/CHANGES.txt | 6 +++--- wxPython/docs/xml/wxPython-metadata.xml | 2 +- wxPython/src/_window.i | 4 ++-- wxPython/src/gtk/_core.py | 2 +- wxPython/wx/lib/masked/maskededit.py | 2 +- 22 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index e426de643f..f506a1bbda 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -127,7 +127,7 @@ public: #endif // wxUSE_TOOLTIPS // reposition the radio buttons correctly unless justCalc == true and - // reutrn the total size needed to accomodate them + // return the total size needed to accommodate them wxSize LayoutItems(bool justCalc) const; virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO ); diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h index e426de643f..f506a1bbda 100644 --- a/include/wx/gtk1/radiobox.h +++ b/include/wx/gtk1/radiobox.h @@ -127,7 +127,7 @@ public: #endif // wxUSE_TOOLTIPS // reposition the radio buttons correctly unless justCalc == true and - // reutrn the total size needed to accomodate them + // return the total size needed to accommodate them wxSize LayoutItems(bool justCalc) const; virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO ); diff --git a/include/wx/isql.h b/include/wx/isql.h index 8a5cad8f5d..a86d193f00 100644 --- a/include/wx/isql.h +++ b/include/wx/isql.h @@ -233,7 +233,7 @@ extern "C" RETCODE SQL_API SQLTransact (HENV henv, HDBC hdbc, UWORD fType); /* - * Depreciated ODBC 1.0 function - Use SQLBindParameter + * Deprecated ODBC 1.0 function - Use SQLBindParameter */ RETCODE SQL_API SQLSetParam (HSTMT hstmt, UWORD ipar, SWORD fCType, SWORD fSqlType, UDWORD cbColDef, SWORD ibScale, PTR rgbValue, diff --git a/include/wx/isqlext.h b/include/wx/isqlext.h index 87930354ee..1e96045069 100644 --- a/include/wx/isqlext.h +++ b/include/wx/isqlext.h @@ -1166,7 +1166,7 @@ RETCODE SQL_API SQLBindParameter (HSTMT hstmt, UWORD ipar, SWORD fParamType, SDWORD cbValueMax, SDWORD FAR * pcbValue); /* - * Depreciated - use SQLSetStmtOptions + * Deprecated - use SQLSetStmtOptions */ RETCODE SQL_API SQLSetScrollOptions (HSTMT hstmt, UWORD fConcurrency, SDWORD crowKeyset, UWORD crowRowset); diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index 26cf94018e..818687974b 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -26,25 +26,25 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.0 API: set it to 1 to -// enable it +// This setting determines the compatibility with 2.2 API: set it to 1 to +// enable it. // // Default is 0. // // Recommended setting: 0 (please update your code instead!) #define WXWIN_COMPATIBILITY_2_2 0 -// This setting determines the compatibility with 2.2 API: set it to 0 to +// This setting determines the compatibility with 2.4 API: set it to 0 to // flag all cases of using deprecated functions. // // Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. +// change to 0 in the next version and the deprecated functions will +// completely disappear in the version after that. // // Recommended setting: 0 (please update your code) #define WXWIN_COMPATIBILITY_2_4 1 -// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap, +// In wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap, // but this is very dangerous because you can mistakenly pass an icon instead // of a bitmap to a function taking "const wxBitmap&" - which will *not* work // because an icon is not a valid bitmap diff --git a/include/wx/string.h b/include/wx/string.h index 6804f6792d..a31f122bcc 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -86,7 +86,7 @@ extern const unsigned int wxSTRING_MAXLEN; #else // maximum possible length for a string means "take all string" everywhere -// (as sizeof(StringData) is unknown here, we substract 100) +// (as sizeof(StringData) is unknown here, we subtract 100) const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100; #endif diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index 13b0443197..11c5a02807 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -115,7 +115,7 @@ public: wxRect *rectIn = (wxRect *)NULL) = 0; // draw text control border (I hate to have a separate method for this but - // it is needed to accomodate GTK+) + // it is needed to accommodate GTK+) virtual void DrawTextBorder(wxDC& dc, wxBorder border, const wxRect& rect, diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp index 0025d971b3..60b6b98434 100644 --- a/samples/richedit/wxllist.cpp +++ b/samples/richedit/wxllist.cpp @@ -325,7 +325,7 @@ wxLayoutObjectText::GetOffsetScreen(wxDC &dc, CoordType xpos) const &width, &height, &descent); offs++; } - /* We have to substract 1 to compensate for the offs++, and another + /* We have to subtract 1 to compensate for the offs++, and another one because we don't want to position the cursor behind the object what we clicked on, but before - otherwise it looks funny. */ @@ -2141,7 +2141,7 @@ wxLayoutList::MoveCursorWord(int n, bool untilNext) CoordType moveDelta = p - start - offset; if ( (n < 0) && (offset == tobj->GetLength() - 1) ) { - // because we substracted 1 from offset in this case above, now + // because we subtracted 1 from offset in this case above, now // compensate for it moveDelta--; } diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index ddc516aa7d..b0a791145f 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -279,7 +279,7 @@ void MyFrame::RecreateToolbar() #ifdef __WXWINCE__ // On Windows CE, we should not delete the // previous toolbar in case it contains the menubar. - // We'll try to accomodate this usage in due course. + // We'll try to accommodate this usage in due course. wxToolBar* toolBar = CreateToolBar(); #else // delete and recreate the toolbar diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 3c88613e76..e965866237 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -3868,7 +3868,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) iconSpacing = 0; // Note that we do not call GetClientSize() here but - // GetSize() and substract the border size for sunken + // GetSize() and subtract the border size for sunken // borders manually. This is technically incorrect, // but we need to know the client area's size WITHOUT // scrollbars here. Since we don't know if there are diff --git a/src/iodbc/isql.h b/src/iodbc/isql.h index e8c10d0028..971a0dc037 100644 --- a/src/iodbc/isql.h +++ b/src/iodbc/isql.h @@ -220,7 +220,7 @@ extern "C" RETCODE SQL_API SQLTransact (HENV henv, HDBC hdbc, UWORD fType); /* - * Depreciated ODBC 1.0 function - Use SQLBindParameter + * Deprecated ODBC 1.0 function - Use SQLBindParameter */ RETCODE SQL_API SQLSetParam (HSTMT hstmt, UWORD ipar, SWORD fCType, SWORD fSqlType, UDWORD cbColDef, SWORD ibScale, PTR rgbValue, diff --git a/src/iodbc/isqlext.h b/src/iodbc/isqlext.h index caa8cd0a9b..7a8527a0e6 100644 --- a/src/iodbc/isqlext.h +++ b/src/iodbc/isqlext.h @@ -1165,7 +1165,7 @@ RETCODE SQL_API SQLBindParameter (HSTMT hstmt, UWORD ipar, SWORD fParamType, SDWORD cbValueMax, SDWORD FAR * pcbValue); /* - * Depreciated - use SQLSetStmtOptions + * Deprecated - use SQLSetStmtOptions */ RETCODE SQL_API SQLSetScrollOptions (HSTMT hstmt, UWORD fConcurrency, SDWORD crowKeyset, UWORD crowRowset); diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 785db7f39e..378f66b95d 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -167,7 +167,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) // this will also allow offsetting the accel string from the right edge *pwidth += GetDefaultMarginWidth() + 16; - // increase size to accomodate bigger bitmaps if necessary + // increase size to accommodate bigger bitmaps if necessary if (m_bmpChecked.Ok()) { // Is BMP height larger then text height? diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 9caa2feab5..6f277cec40 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -4420,7 +4420,7 @@ static wxWindowMSW *FindWindowForMouseEvent(wxWindowMSW *win, int *x, int *y) // bool wxWindowMSW::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags) { // the mouse events take consecutive IDs from WM_MOUSEFIRST to - // WM_MOUSELAST, so it's enough to substract WM_MOUSEMOVE == WM_MOUSEFIRST + // WM_MOUSELAST, so it's enough to subtract WM_MOUSEMOVE == WM_MOUSEFIRST // from the message id and take the value in the table to get wxWin event // id static const wxEventType eventsMouse[] = diff --git a/wxPython/docs/BUILD.html b/wxPython/docs/BUILD.html index dbed42016e..423cc6993a 100644 --- a/wxPython/docs/BUILD.html +++ b/wxPython/docs/BUILD.html @@ -239,7 +239,7 @@ compilers) can also be used but I've never done the work to make that happen. If you want to try that then first you'll want to find out if there are any tricks that have to be done to make Python extension modules using that compiler, and then make a few changes to setup.py -to accomodate that. (And send the patches to me.) If you plan on +to accommodate that. (And send the patches to me.) If you plan on using VisualStudio.Net (a.k.a. MSVC 7.1) keep in mind that you'll also have to build Python and any other extension modules that you use with that compiler because a different version of the C runtime library is diff --git a/wxPython/docs/BUILD.txt b/wxPython/docs/BUILD.txt index 3c39147310..85d25f0dda 100644 --- a/wxPython/docs/BUILD.txt +++ b/wxPython/docs/BUILD.txt @@ -254,7 +254,7 @@ compilers) can also be used but I've never done the work to make that happen. If you want to try that then first you'll want to find out if there are any tricks that have to be done to make Python extension modules using that compiler, and then make a few changes to setup.py -to accomodate that. (And send the patches to me.) If you plan on +to accommodate that. (And send the patches to me.) If you plan on using VisualStudio.Net (a.k.a. MSVC 7.1) keep in mind that you'll also have to build Python and any other extension modules that you use with that compiler because a different version of the C runtime library is diff --git a/wxPython/docs/CHANGES.html b/wxPython/docs/CHANGES.html index 06c5334f33..dd3a665131 100644 --- a/wxPython/docs/CHANGES.html +++ b/wxPython/docs/CHANGES.html @@ -1184,7 +1184,7 @@ an EVT_SIZE handler that calls Layout().

Fixed deadlock problem that happened when using threads.

Added new HTML printing classes.

Added wxWindow.GetHandle

-

Apparently wxMouseEvent.Position has been depreciated in wxWindows as +

Apparently wxMouseEvent.Position has been deprecated in wxWindows as it is no longer available by default. You can use GetPositionTuple (returning a tuple with x,y) instead, or GetPosition (returning a wxPoint.)

@@ -1242,7 +1242,7 @@ pages. See the demo for an example.

wxGTK. Added them back in since the methods exist now.

Wrapped the wxHtmlHelpController and related classes.

Wrapped the C++ versions of wxSizer and friends. The Python-only -versions are still in the library, but depreciated. (You will get a +versions are still in the library, but deprecated. (You will get a warning message if you try to use them, but the warning can be disabled.) The usage of the C++ versions is slightly different, and the functionality of wxBorderSizer is now part of wxBoxSizer. I have @@ -1381,7 +1381,7 @@ matches MSW's.

Added wxGrid.GetCells

Added wxSystemSettings static methods as functions with names like wxSystemSettings_GetSystemColour.

-

Removed wxPyMenu since using menu callbacks have been depreciated in +

Removed wxPyMenu since using menu callbacks have been deprecated in wxWindows. Use wxMenu and events instead.

Added alternate wxBitmap constructor (for MSW only) as
diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt index ff9ea43d23..743840162e 100644 --- a/wxPython/docs/CHANGES.txt +++ b/wxPython/docs/CHANGES.txt @@ -1585,7 +1585,7 @@ Added new HTML printing classes. Added wxWindow.GetHandle -Apparently wxMouseEvent.Position has been depreciated in wxWindows as +Apparently wxMouseEvent.Position has been deprecated in wxWindows as it is no longer available by default. You can use GetPositionTuple (returning a tuple with x,y) instead, or GetPosition (returning a wxPoint.) @@ -1667,7 +1667,7 @@ wxGTK. Added them back in since the methods exist now. Wrapped the wxHtmlHelpController and related classes. Wrapped the C++ versions of wxSizer and friends. The Python-only -versions are still in the library, but depreciated. (You will get a +versions are still in the library, but deprecated. (You will get a warning message if you try to use them, but the warning can be disabled.) The usage of the C++ versions is slightly different, and the functionality of wxBorderSizer is now part of wxBoxSizer. I have @@ -1827,7 +1827,7 @@ Added wxGrid.GetCells Added wxSystemSettings static methods as functions with names like wxSystemSettings_GetSystemColour. -Removed wxPyMenu since using menu callbacks have been depreciated in +Removed wxPyMenu since using menu callbacks have been deprecated in wxWindows. Use wxMenu and events instead. Added alternate wxBitmap constructor (for MSW only) as diff --git a/wxPython/docs/xml/wxPython-metadata.xml b/wxPython/docs/xml/wxPython-metadata.xml index 32144cea8b..48ef3ad331 100644 --- a/wxPython/docs/xml/wxPython-metadata.xml +++ b/wxPython/docs/xml/wxPython-metadata.xml @@ -5724,7 +5724,7 @@ value as used by the parent. In addition, if the window overrides ShouldInheritColours to return false, the colours will not be changed no matter what and only the font might. -This rather complicated logic is necessary in order to accomodate the +This rather complicated logic is necessary in order to accommodate the different usage scenarius. The most common one is when all default attributes are used and in this case, nothing should be inherited as in modern GUIs different controls use different fonts (and colours) diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i index e423775d55..2a7c38d513 100644 --- a/wxPython/src/_window.i +++ b/wxPython/src/_window.i @@ -1883,8 +1883,8 @@ value as used by the parent. In addition, if the window overrides ShouldInheritColours to return false, the colours will not be changed no matter what and only the font might. -This rather complicated logic is necessary in order to accomodate the -different usage scenarius. The most common one is when all default +This rather complicated logic is necessary in order to accommodate the +different usage scenarios. The most common one is when all default attributes are used and in this case, nothing should be inherited as in modern GUIs different controls use different fonts (and colours) than their siblings so they can't inherit the same value from the diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 079b910769..2e7d7645a7 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -7678,7 +7678,7 @@ class Window(EvtHandler): ShouldInheritColours to return false, the colours will not be changed no matter what and only the font might. - This rather complicated logic is necessary in order to accomodate the + This rather complicated logic is necessary in order to accommodate the different usage scenarius. The most common one is when all default attributes are used and in this case, nothing should be inherited as in modern GUIs different controls use different fonts (and colours) diff --git a/wxPython/wx/lib/masked/maskededit.py b/wxPython/wx/lib/masked/maskededit.py index 088ec62fc1..561719dc93 100644 --- a/wxPython/wx/lib/masked/maskededit.py +++ b/wxPython/wx/lib/masked/maskededit.py @@ -5622,7 +5622,7 @@ class MaskedEditMixin: and sel_to >= edit_end and not self._GetValue()[edit_start:sel_start].strip() ): # text won't fit within selection, but left of selection is empty; - # check to see if we can expand selection to accomodate the value: + # check to see if we can expand selection to accommodate the value: empty_space = sel_start - edit_start amount_needed = len(paste_text) - (sel_to - sel_start) if amount_needed <= empty_space: -- 2.47.2