Spelling fixed for comments and a wxASSERT_MSG. Fixes #14022.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -419,7 +419,7 @@ void wxGridCellAttr::SetSize(int num_rows, int num_cols)
|
|||||||
wxASSERT_MSG( (!((num_rows > 0) && (num_cols <= 0)) ||
|
wxASSERT_MSG( (!((num_rows > 0) && (num_cols <= 0)) ||
|
||||||
!((num_rows <= 0) && (num_cols > 0)) ||
|
!((num_rows <= 0) && (num_cols > 0)) ||
|
||||||
!((num_rows == 0) && (num_cols == 0))),
|
!((num_rows == 0) && (num_cols == 0))),
|
||||||
wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values"));
|
wxT("wxGridCellAttr::SetSize only takes two positive values or negative/zero values"));
|
||||||
|
|
||||||
m_sizeRows = num_rows;
|
m_sizeRows = num_rows;
|
||||||
m_sizeCols = num_cols;
|
m_sizeCols = num_cols;
|
||||||
|
@@ -375,7 +375,7 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar
|
|||||||
|
|
||||||
// The m_combo->SetValue() call above sets m_value to the index of this
|
// The m_combo->SetValue() call above sets m_value to the index of this
|
||||||
// string. But if there are more identical string, the index is of the
|
// string. But if there are more identical string, the index is of the
|
||||||
// first occurence, which may be wrong, so set the index explicitly here,
|
// first occurrence, which may be wrong, so set the index explicitly here,
|
||||||
// _after_ the SetValue() call.
|
// _after_ the SetValue() call.
|
||||||
m_value = value;
|
m_value = value;
|
||||||
|
|
||||||
|
@@ -1645,7 +1645,7 @@ miSubtractO (
|
|||||||
else if (r2->x1 <= x1)
|
else if (r2->x1 <= x1)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Subtrahend preceeds minuend: nuke left edge of minuend.
|
* Subtrahend precedes minuend: nuke left edge of minuend.
|
||||||
*/
|
*/
|
||||||
x1 = r2->x2;
|
x1 = r2->x2;
|
||||||
if (x1 >= r1->x2)
|
if (x1 >= r1->x2)
|
||||||
|
@@ -275,7 +275,7 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight)
|
|||||||
GetFieldRect(i, rect);
|
GetFieldRect(i, rect);
|
||||||
|
|
||||||
if (rect.GetWidth() <= 0)
|
if (rect.GetWidth() <= 0)
|
||||||
return; // happens when the status bar is shrinked in a very small area!
|
return; // happens when the status bar is shrunk in a very small area!
|
||||||
|
|
||||||
int style = m_panes[i].GetStyle();
|
int style = m_panes[i].GetStyle();
|
||||||
if (style != wxSB_FLAT)
|
if (style != wxSB_FLAT)
|
||||||
|
@@ -2879,7 +2879,7 @@ wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item,
|
|||||||
yOrigin = abs(yOrigin);
|
yOrigin = abs(yOrigin);
|
||||||
GetClientSize(&width, &height);
|
GetClientSize(&width, &height);
|
||||||
|
|
||||||
// Move end points to the begining/end of the view?
|
// Move end points to the beginning/end of the view?
|
||||||
if (y_mid < yOrigin)
|
if (y_mid < yOrigin)
|
||||||
y_mid = yOrigin;
|
y_mid = yOrigin;
|
||||||
if (oldY > yOrigin + height)
|
if (oldY > yOrigin + height)
|
||||||
|
@@ -396,7 +396,7 @@ void wxWizard::AddButtonRow(wxBoxSizer *mainColumn)
|
|||||||
// to activate the 'next' button first (create the next button before the back button).
|
// to activate the 'next' button first (create the next button before the back button).
|
||||||
// The reason is: The user will repeatedly enter information in the wizard pages and then wants to
|
// The reason is: The user will repeatedly enter information in the wizard pages and then wants to
|
||||||
// press 'next'. If a user uses mostly the keyboard, he would have to skip the 'back' button
|
// press 'next'. If a user uses mostly the keyboard, he would have to skip the 'back' button
|
||||||
// everytime. This is annoying. There is a second reason: RETURN acts as TAB. If the 'next'
|
// every time. This is annoying. There is a second reason: RETURN acts as TAB. If the 'next'
|
||||||
// button comes first in the TAB order, the user can enter information very fast using the RETURN
|
// button comes first in the TAB order, the user can enter information very fast using the RETURN
|
||||||
// key to TAB to the next entry field and page. This would not be possible, if the 'back' button
|
// key to TAB to the next entry field and page. This would not be possible, if the 'back' button
|
||||||
// was created before the 'next' button.
|
// was created before the 'next' button.
|
||||||
@@ -782,7 +782,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event)
|
|||||||
wxCHECK_RET( m_page, wxT("should have a valid current page") );
|
wxCHECK_RET( m_page, wxT("should have a valid current page") );
|
||||||
|
|
||||||
// ask the current page first: notice that we do it before calling
|
// ask the current page first: notice that we do it before calling
|
||||||
// GetNext/Prev() because the data transfered from the controls of the page
|
// GetNext/Prev() because the data transferred from the controls of the page
|
||||||
// may change the value returned by these methods
|
// may change the value returned by these methods
|
||||||
if ( !m_page->Validate() || !m_page->TransferDataFromWindow() )
|
if ( !m_page->Validate() || !m_page->TransferDataFromWindow() )
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user