#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 );
#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 );
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,
SDWORD cbValueMax, SDWORD FAR * pcbValue);
/*
- * Depreciated - use SQLSetStmtOptions
+ * Deprecated - use SQLSetStmtOptions
*/
RETCODE SQL_API SQLSetScrollOptions (HSTMT hstmt, UWORD fConcurrency,
SDWORD crowKeyset, UWORD crowRowset);
// 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
#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
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,
&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. */
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--;
}
#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
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
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,
SDWORD cbValueMax, SDWORD FAR * pcbValue);
/*
- * Depreciated - use SQLSetStmtOptions
+ * Deprecated - use SQLSetStmtOptions
*/
RETCODE SQL_API SQLSetScrollOptions (HSTMT hstmt, UWORD fConcurrency,
SDWORD crowKeyset, UWORD crowRowset);
// 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?
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[] =
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
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
<p>Fixed deadlock problem that happened when using threads.</p>
<p>Added new HTML printing classes.</p>
<p>Added wxWindow.GetHandle</p>
-<p>Apparently wxMouseEvent.Position has been depreciated in wxWindows as
+<p>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.)</p>
wxGTK. Added them back in since the methods exist now.</p>
<p>Wrapped the wxHtmlHelpController and related classes.</p>
<p>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
<p>Added wxGrid.GetCells</p>
<p>Added wxSystemSettings static methods as functions with names like
wxSystemSettings_GetSystemColour.</p>
-<p>Removed wxPyMenu since using menu callbacks have been depreciated in
+<p>Removed wxPyMenu since using menu callbacks have been deprecated in
wxWindows. Use wxMenu and events instead.</p>
<dl>
<dt>Added alternate wxBitmap constructor (for MSW only) as</dt>
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.)
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
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
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)
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
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)
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:
projects / wxWidgets.git / commitdiff
