Avoid warnings from VC++ 5.0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 64fcabb53496da9639de4aafaed8941b695e3a2b..d7f1cb4977bc32e5f9a0517fd3b49c26c2d316b6 100644 (file)
--- 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 dcb5542f20890ee77ba0edaa3ff863bf61ba615a..dec4fa2905bb7d7ae04c320c61dcbe2def3b3213 100644 (file)
--- 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 59a65f856e03ac1c86b0782809873b8b938f67bb..a7d388a9bf4bb4af08507786f1c8db052e3a87b4 100644 (file)
--- 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