VC warning fixes.

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index e393c8081566bb7b66527f3e2d4a58a0606179e4..76b9064c08f6597f6c925f3893092d742509848b 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -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__

     }
 }
 
     }
 }
 

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 50e27bae8dbb4b8bec190469b0eb0d8130e968bb..21fb1fd4f4ffddc4844c978138116bec23368949 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -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
     // we are a top level window)
 
     // if our parent had prepared a defer window handle for us, use it (unless
     // 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;
 #else
     HDWP hdwp = 0;
     HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
 #else
     HDWP hdwp = 0;

-#endif    
+#endif

 
     wxMoveWindowDeferred(hdwp, this, GetHwnd(), xx, yy, width, height);
 
 
     wxMoveWindowDeferred(hdwp, this, GetHwnd(), xx, yy, width, height);
 

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 606772143fa4cb414f81def6786d8d61d2dd4a31..39960aed328749fe6025ebc65d313b2b25e38528 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -394,7 +394,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // associate the text window with the spin button
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
 
     // associate the text window with the spin button
     (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;
     if ( (wxSscanf(val, wxT("%lu"), &n) != 1) )
         n = INT_MIN;
     long n;
     if ( (wxSscanf(val, wxT("%lu"), &n) != 1) )
         n = INT_MIN;

-        
+

     if (n < m_min) n = m_min;
     if (n > m_max) n = m_max;
 
     if (n < m_min) n = m_min;
     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
     // we are a top level window)
     wxWindowMSW *parent = GetParent();
     // if our parent had prepared a defer window handle for us, use it (unless
     // we are a top level window)
     wxWindowMSW *parent = GetParent();

-    int originalX = x;

 
 #if USE_DEFERRED_SIZING
     HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
 #else
     HDWP hdwp = 0;
 
 #if USE_DEFERRED_SIZING
     HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
 #else
     HDWP hdwp = 0;

-#endif    
+#endif

 
     // 1) The buddy window
     wxMoveWindowDeferred(hdwp, this, GetBuddyHwnd(),
 
     // 1) The buddy window
     wxMoveWindowDeferred(hdwp, this, GetBuddyHwnd(),