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

Replace a chain of "if"s with a "switch" in wxMSW wxListCtrl

Browse Source 
Also return false from GetSubItemRect() if an invalid code is passed in,
instead of silently using wxLIST_RECT_BOUNDS instead of it.
This commit is contained in:
Vadim Zeitlin
2019-08-27 16:37:48 +02:00
parent eba26cf35e
commit ba787af932
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/msw/listctrl.cpp
View File

@@ -1223,16 +1223,23 @@ bool wxListCtrl::GetSubItemRect(long item, long subItem, wxRect& rect, int code)
wxT("invalid item in GetSubItemRect") ); wxT("invalid item in GetSubItemRect") );
int codeWin; int codeWin;
if ( code == wxLIST_RECT_BOUNDS ) switch ( code )
codeWin = LVIR_BOUNDS;
else if ( code == wxLIST_RECT_ICON )
codeWin = LVIR_ICON;
else if ( code == wxLIST_RECT_LABEL )
codeWin = LVIR_LABEL;
else
{ {
wxFAIL_MSG( wxT("incorrect code in GetItemRect() / GetSubItemRect()") ); case wxLIST_RECT_BOUNDS:
codeWin = LVIR_BOUNDS; codeWin = LVIR_BOUNDS;
break;
case wxLIST_RECT_ICON:
codeWin = LVIR_ICON;
break;
case wxLIST_RECT_LABEL:
codeWin = LVIR_LABEL;
break;
default:
wxFAIL_MSG( wxT("incorrect code in GetItemRect() / GetSubItemRect()") );
return false;
} }
RECT rectWin; RECT rectWin;