From ac55e0a1a8c344626a94bc055e018630ed77b004 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Wed, 16 Aug 2006 12:17:05 +0000 Subject: [PATCH] Avoid warnings from VC++ 5.0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 6 ++++++ include/wx/stopwatch.h | 4 ++-- src/generic/vscroll.cpp | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 64fcabb534..d7f1cb4977 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -77,6 +77,12 @@ /* is buggy, and occurs for code that does actually get executed */ # if !defined __WXDEBUG__ && __VISUALC__ <= 1100 # pragma warning(disable:4702) /* unreachable code */ +# endif + /* The VC++ 5.0 warning 'C4003: not enough actual parameters for macro' + * is incompatible with the wxWidgets headers since it is given when + * parameters are empty but not missing. */ +# if __VISUALC__ <= 1100 +# pragma warning(disable:4003) /* not enough actual parameters for macro */ # endif /* diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h index dcb5542f20..dec4fa2905 100644 --- a/include/wx/stopwatch.h +++ b/include/wx/stopwatch.h @@ -32,7 +32,7 @@ public: // pause the stop watch void Pause() { - if ( !m_pauseCount++ ) + if ( m_pauseCount++ == 0 ) m_pause = GetElapsedTime(); } @@ -42,7 +42,7 @@ public: wxASSERT_MSG( m_pauseCount > 0, _T("Resuming stop watch which is not paused") ); - if ( !--m_pauseCount ) + if ( --m_pauseCount == 0 ) Start(m_pause); } diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp index 59a65f856e..a7d388a9bf 100644 --- a/src/generic/vscroll.cpp +++ b/src/generic/vscroll.cpp @@ -307,7 +307,7 @@ bool wxVScrolledWindow::Layout() // adjust the sizer dimensions/position taking into account the // virtual size and scrolled position of the window. - int w, h; + int w = 0, h = 0; GetVirtualSize(&w, &h); // x is always 0 so no variable needed -- 2.45.2