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

Avoid warnings from VC++ 5.0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-08-16 12:17:05 +00:00
parent 77f15ffe92
commit ac55e0a1a8
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/defs.h
View File

@@ -77,6 +77,12 @@
/* is buggy, and occurs for code that does actually get executed */ /* is buggy, and occurs for code that does actually get executed */
# if !defined __WXDEBUG__ && __VISUALC__ <= 1100 # if !defined __WXDEBUG__ && __VISUALC__ <= 1100
# pragma warning(disable:4702) /* unreachable code */ # 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 # endif
/* /*

4
include/wx/stopwatch.h
View File

@@ -32,7 +32,7 @@ public:
// pause the stop watch // pause the stop watch
void Pause() void Pause()
{ {
if ( !m_pauseCount++ ) if ( m_pauseCount++ == 0 )
m_pause = GetElapsedTime(); m_pause = GetElapsedTime();
} }
@@ -42,7 +42,7 @@ public:
wxASSERT_MSG( m_pauseCount > 0, wxASSERT_MSG( m_pauseCount > 0,
_T("Resuming stop watch which is not paused") ); _T("Resuming stop watch which is not paused") );
if ( !--m_pauseCount ) if ( --m_pauseCount == 0 )
Start(m_pause); Start(m_pause);
} }

2
src/generic/vscroll.cpp
View File

@@ -307,7 +307,7 @@ bool wxVScrolledWindow::Layout()
// adjust the sizer dimensions/position taking into account the // adjust the sizer dimensions/position taking into account the
// virtual size and scrolled position of the window. // virtual size and scrolled position of the window.
int w, h; int w = 0, h = 0;
GetVirtualSize(&w, &h); GetVirtualSize(&w, &h);
// x is always 0 so no variable needed // x is always 0 so no variable needed