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

Remove redundant condtional/unreachable code

Browse Source
This commit is contained in:
Paul Cornett
2019-02-17 22:55:56 -08:00
parent ff5d764b63
commit 34a3f0512d
2 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/msw/headerctrl.cpp
View File

@@ -317,35 +317,28 @@ void wxHeaderCtrl::DoInsertItem(const wxHeaderColumn& col, unsigned int idx)
if ( HasFlag(wxHD_BITMAP_ON_RIGHT) ) if ( HasFlag(wxHD_BITMAP_ON_RIGHT) )
hdi.fmt |= HDF_BITMAP_ON_RIGHT; hdi.fmt |= HDF_BITMAP_ON_RIGHT;
if ( bmp.IsOk() ) const int bmpWidth = bmp.GetWidth(),
bmpHeight = bmp.GetHeight();
if ( !m_imageList )
{ {
const int bmpWidth = bmp.GetWidth(), m_imageList = new wxImageList(bmpWidth, bmpHeight);
bmpHeight = bmp.GetHeight(); (void) // suppress mingw32 warning about unused computed value
Header_SetImageList(GetHwnd(), GetHimagelistOf(m_imageList));
if ( !m_imageList )
{
m_imageList = new wxImageList(bmpWidth, bmpHeight);
(void) // suppress mingw32 warning about unused computed value
Header_SetImageList(GetHwnd(), GetHimagelistOf(m_imageList));
}
else // already have an image list
{
// check that all bitmaps we use have the same size
int imageWidth,
imageHeight;
m_imageList->GetSize(0, imageWidth, imageHeight);
wxASSERT_MSG( imageWidth == bmpWidth && imageHeight == bmpHeight,
"all column bitmaps must have the same size" );
}
m_imageList->Add(bmp);
hdi.iImage = m_imageList->GetImageCount() - 1;
} }
else // no bitmap but we still need to update the item else // already have an image list
{ {
hdi.iImage = I_IMAGENONE; // check that all bitmaps we use have the same size
int imageWidth,
imageHeight;
m_imageList->GetSize(0, imageWidth, imageHeight);
wxASSERT_MSG( imageWidth == bmpWidth && imageHeight == bmpHeight,
"all column bitmaps must have the same size" );
} }
m_imageList->Add(bmp);
hdi.iImage = m_imageList->GetImageCount() - 1;
} }
if ( col.GetAlignment() != wxALIGN_NOT ) if ( col.GetAlignment() != wxALIGN_NOT )

8
src/unix/joystick.cpp
View File

@@ -141,14 +141,6 @@ void* wxJoystickThread::Entry()
if ((j_evt.type & JS_EVENT_AXIS) && (j_evt.number < wxJS_MAX_AXES)) if ((j_evt.type & JS_EVENT_AXIS) && (j_evt.number < wxJS_MAX_AXES))
{ {
// Ignore invalid axis.
if ( j_evt.number >= wxJS_MAX_AXES )
{
wxLogDebug(wxS("Invalid axis index %d in joystick message."),
j_evt.number);
continue;
}
if ( (m_axe[j_evt.number] + m_threshold < j_evt.value) if ( (m_axe[j_evt.number] + m_threshold < j_evt.value)
|| (m_axe[j_evt.number] - m_threshold > j_evt.value) ) || (m_axe[j_evt.number] - m_threshold > j_evt.value) )
{ {