From d3acc83ae992bb4bc5bffa6806b737694ad6f038 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Aug 2008 16:30:53 +0000
Subject: [PATCH] fix some (harmless) mingw32 4.3 warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/datavgen.cpp | 2 +-
 src/msw/listctrl.cpp     | 6 +++---
 src/stc/ScintillaWX.cpp  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index f9e574216d..8ab4f85c53 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -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
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index ff4b32b802..6bdf97590d 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -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;
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 3f2b272c81..0ac6b14415 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -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