Warning cleaning.

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 93d17db76e4c89f8080c863a972119aad0fc4e93..8492fd3ec03f83479aea1d382a7da10b3fe4b91d 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -417,23 +417,23 @@ bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win)
 
     if (sm_updateInterval == -1)
         return false;
 
     if (sm_updateInterval == -1)
         return false;

-    else if (sm_updateInterval == 0)
+
+    if (sm_updateInterval == 0)

         return true;
         return true;

-    else
-    {
+

 #if wxUSE_STOPWATCH && wxUSE_LONGLONG
 #if wxUSE_STOPWATCH && wxUSE_LONGLONG

-        wxLongLong now = wxGetLocalTimeMillis();
-        if (now > (sm_lastUpdate + sm_updateInterval))
-        {
-            return true;
-        }
-#else
-        // If we don't have wxStopWatch or wxLongLong, we
-        // should err on the safe side and update now anyway.
+    wxLongLong now = wxGetLocalTimeMillis();
+    if (now > (sm_lastUpdate + sm_updateInterval))
+    {

         return true;
         return true;

-#endif

     }
     }

+

     return false;
     return false;

+#else
+    // If we don't have wxStopWatch or wxLongLong, we
+    // should err on the safe side and update now anyway.
+    return true;
+#endif

 }
 
 // Reset the update time to provide a delay until the next
 }
 
 // Reset the update time to provide a delay until the next

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 2eaa60e6cede63565e60306e458688ea73a22788..785629edb5fa137088b1bf2cf746ab482eff5587 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -1145,6 +1145,8 @@ void wxScrollHelper::HandleOnMouseLeave(wxMouseEvent& event)
                                     orient
                                 );
         m_timerAutoScroll->Start(50); // FIXME: make configurable
                                     orient
                                 );
         m_timerAutoScroll->Start(50); // FIXME: make configurable

+#else
+        wxUnusedVar(pos);

 #endif
     }
 }
 #endif
     }
 }