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

VC warning fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-06 06:09:24 +00:00
parent bbc916e23c
commit 3d104ec357
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/msw/main.cpp
View File

@@ -219,8 +219,11 @@ int wxEntry(int& argc, wxChar **argv)
{ {
wxFatalExit(); wxFatalExit();
// this code is unreachable but put it here to suppress warnings #ifndef __VISUALC__
// this code is unreachable but put it here to suppress warnings in some compilers
// and disable for others to supress warnings too
return -1; return -1;
#endif // !__VISUALC__
} }
} }

4
src/msw/radiobox.cpp
View File

@@ -552,13 +552,13 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
// if our parent had prepared a defer window handle for us, use it (unless // if our parent had prepared a defer window handle for us, use it (unless
// we are a top level window) // we are a top level window)
wxWindowMSW *parent = GetParent();
#if USE_DEFERRED_SIZING #if USE_DEFERRED_SIZING
wxWindowMSW *parent = GetParent();
HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL; HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
#else #else
HDWP hdwp = 0; HDWP hdwp = 0;
#endif #endif
wxMoveWindowDeferred(hdwp, this, GetHwnd(), xx, yy, width, height); wxMoveWindowDeferred(hdwp, this, GetHwnd(), xx, yy, width, height);

7
src/msw/spinctrl.cpp
View File

@@ -394,7 +394,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
// associate the text window with the spin button // associate the text window with the spin button
(void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0); (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
if ( !value.IsEmpty() ) if ( !value.empty() )
{ {
SetValue(value); SetValue(value);
} }
@@ -438,7 +438,7 @@ int wxSpinCtrl::GetValue() const
long n; long n;
if ( (wxSscanf(val, wxT("%lu"), &n) != 1) ) if ( (wxSscanf(val, wxT("%lu"), &n) != 1) )
n = INT_MIN; n = INT_MIN;
if (n < m_min) n = m_min; if (n < m_min) n = m_min;
if (n > m_max) n = m_max; if (n > m_max) n = m_max;
@@ -573,13 +573,12 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
// if our parent had prepared a defer window handle for us, use it (unless // if our parent had prepared a defer window handle for us, use it (unless
// we are a top level window) // we are a top level window)
wxWindowMSW *parent = GetParent(); wxWindowMSW *parent = GetParent();
int originalX = x;
#if USE_DEFERRED_SIZING #if USE_DEFERRED_SIZING
HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL; HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
#else #else
HDWP hdwp = 0; HDWP hdwp = 0;
#endif #endif
// 1) The buddy window // 1) The buddy window
wxMoveWindowDeferred(hdwp, this, GetBuddyHwnd(), wxMoveWindowDeferred(hdwp, this, GetBuddyHwnd(),