Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant checks from conditional statements.

Browse Source 
It is not necessary to test for the condition which is already known to be
true or false because the code is inside the if statement checking it.

See #15893.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-01-20 14:45:35 +00:00
parent 3637808c39
commit 8cca19809b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/dlgcmn.cpp
View File

@@ -667,7 +667,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog)
wxScrolledWindow* scrolledWindow = wxDynamicCast(page, wxScrolledWindow); wxScrolledWindow* scrolledWindow = wxDynamicCast(page, wxScrolledWindow);
if (scrolledWindow) if (scrolledWindow)
windows.Append(scrolledWindow); windows.Append(scrolledWindow);
else if (!scrolledWindow && page->GetSizer()) else if (page->GetSizer())
{ {
// Create a scrolled window and reparent // Create a scrolled window and reparent
scrolledWindow = CreateScrolledWindow(page); scrolledWindow = CreateScrolledWindow(page);

4
src/richtext/richtextbuffer.cpp
View File

@@ -10184,10 +10184,10 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const
percentageColWidths[i] = percentageCellWidth; percentageColWidths[i] = percentageCellWidth;
} }
if (colSpan == 1 && cell->GetMinSize().x && cell->GetMinSize().x > minColWidths[i]) if (cell->GetMinSize().x && cell->GetMinSize().x > minColWidths[i])
minColWidths[i] = cell->GetMinSize().x; minColWidths[i] = cell->GetMinSize().x;
if (colSpan == 1 && cell->GetMaxSize().x && cell->GetMaxSize().x > maxColWidths[i]) if (cell->GetMaxSize().x && cell->GetMaxSize().x > maxColWidths[i])
maxColWidths[i] = cell->GetMaxSize().x; maxColWidths[i] = cell->GetMaxSize().x;
if (cell->GetAttributes().GetTextBoxAttr().HasWhitespaceMode() && if (cell->GetAttributes().GetTextBoxAttr().HasWhitespaceMode() &&