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

fix some (harmless) mingw32 4.3 warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-08-30 16:30:53 +00:00
parent 58bd9838c5
commit d3acc83ae9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/datavgen.cpp
View File

@ -1364,7 +1364,7 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
}
m_imageList = new wxImageList( 16, 16 );
Header_SetImageList( (HWND) m_hWnd, m_imageList->GetHIMAGELIST() );
(void)Header_SetImageList((HWND) m_hWnd, m_imageList->GetHIMAGELIST());
// we need to subclass the m_hWnd to force wxWindow::HandleNotify
// to call wxDataViewHeaderWindow::MSWOnNotify

6
src/msw/listctrl.cpp
View File

@ -2831,10 +2831,10 @@ WXLPARAM wxListCtrl::OnCustomDraw(WXLPARAM lParam)
// Necessary for drawing hrules and vrules, if specified
void wxListCtrl::OnPaint(wxPaintEvent& event)
{
bool drawHRules = HasFlag(wxLC_HRULES);
bool drawVRules = HasFlag(wxLC_VRULES);
const bool drawHRules = HasFlag(wxLC_HRULES);
const bool drawVRules = HasFlag(wxLC_VRULES);
if (!InReportView() || !drawHRules && !drawVRules)
if (!InReportView() || !(drawHRules || drawVRules))
{
event.Skip();
return;

4
src/stc/ScintillaWX.cpp
View File

@ -617,8 +617,8 @@ void ScintillaWX::UpdateSystemCaret() {
bool ScintillaWX::HasCaretSizeChanged() {
#ifdef __WXMSW__
if (( (0 != vs.caretWidth) && (sysCaretWidth != vs.caretWidth) )
|| (0 != vs.lineHeight) && (sysCaretHeight != vs.lineHeight)) {
if ( (vs.caretWidth && (sysCaretWidth != vs.caretWidth))
|| (vs.lineHeight && (sysCaretHeight != vs.lineHeight)) ) {
return true;
}
#endif