[ 1357527 ] Cast to void to silence GCC's warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1214,7 +1214,7 @@ void wxListCtrl::SetImageList(wxImageList *imageList, int which)
|
||||
m_imageListState = imageList;
|
||||
m_ownsImageListState = false;
|
||||
}
|
||||
ListView_SetImageList(GetHwnd(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);
|
||||
(void) ListView_SetImageList(GetHwnd(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);
|
||||
}
|
||||
|
||||
void wxListCtrl::AssignImageList(wxImageList *imageList, int which)
|
||||
@@ -2766,7 +2766,7 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
|
||||
// pszText is not const, hence the cast
|
||||
lvItem.pszText = (wxChar *)info.m_text.c_str();
|
||||
if ( lvItem.pszText )
|
||||
lvItem.cchTextMax = info.m_text.Length();
|
||||
lvItem.cchTextMax = info.m_text.length();
|
||||
else
|
||||
lvItem.cchTextMax = 0;
|
||||
}
|
||||
@@ -2835,4 +2835,3 @@ static void wxConvertToMSWListCol(int WXUNUSED(col), const wxListItem& item,
|
||||
}
|
||||
|
||||
#endif // wxUSE_LISTCTRL
|
||||
|
||||
|
@@ -497,7 +497,7 @@ void wxNotebook::SetImageList(wxImageList* imageList)
|
||||
|
||||
if ( imageList )
|
||||
{
|
||||
TabCtrl_SetImageList(GetHwnd(), (HIMAGELIST)imageList->GetHIMAGELIST());
|
||||
(void) TabCtrl_SetImageList(GetHwnd(), (HIMAGELIST)imageList->GetHIMAGELIST());
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: tabctrl.cpp
|
||||
// Name: src/msw/tabctrl.cpp
|
||||
// Purpose: wxTabCtrl
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
@@ -315,7 +315,7 @@ int wxTabCtrl::SetSelection(int item)
|
||||
void wxTabCtrl::SetImageList(wxImageList* imageList)
|
||||
{
|
||||
m_imageList = imageList;
|
||||
TabCtrl_SetImageList( (HWND) GetHWND(), (HIMAGELIST) imageList->GetHIMAGELIST() );
|
||||
(void) TabCtrl_SetImageList( (HWND) GetHWND(), (HIMAGELIST) imageList->GetHIMAGELIST() );
|
||||
}
|
||||
|
||||
// Set the text for an item
|
||||
@@ -430,5 +430,4 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height)
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
// __WIN95__
|
||||
#endif // __WIN95__
|
||||
|
@@ -835,7 +835,7 @@ void wxTreeCtrl::SetIndent(unsigned int indent)
|
||||
void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
|
||||
{
|
||||
// no error return
|
||||
TreeView_SetImageList(GetHwnd(),
|
||||
(void) TreeView_SetImageList(GetHwnd(),
|
||||
imageList ? imageList->GetHIMAGELIST() : 0,
|
||||
which);
|
||||
}
|
||||
@@ -2020,7 +2020,7 @@ wxTreeItemId wxTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags)
|
||||
hitTestInfo.pt.x = (int)point.x;
|
||||
hitTestInfo.pt.y = (int)point.y;
|
||||
|
||||
TreeView_HitTest(GetHwnd(), &hitTestInfo);
|
||||
(void) TreeView_HitTest(GetHwnd(), &hitTestInfo);
|
||||
|
||||
flags = 0;
|
||||
|
||||
@@ -2215,7 +2215,7 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
|
||||
tvht.pt.x = x;
|
||||
tvht.pt.y = y;
|
||||
|
||||
TreeView_HitTest(GetHwnd(), &tvht);
|
||||
(void) TreeView_HitTest(GetHwnd(), &tvht);
|
||||
|
||||
switch ( nMsg )
|
||||
{
|
||||
@@ -3152,4 +3152,3 @@ int wxTreeCtrl::GetState(const wxTreeItemId& node)
|
||||
}
|
||||
|
||||
#endif // wxUSE_TREECTRL
|
||||
|
||||
|
Reference in New Issue
Block a user