From 534b127cacf722be2aa99f86bde969f20e89c1dd Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Fri, 30 Jul 2004 17:44:18 +0000
Subject: [PATCH] Warning cleaning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/event.cpp     | 24 ++++++++++++------------
 src/generic/scrlwing.cpp |  2 ++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 93d17db76e..8492fd3ec0 100644
--- 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;
-    else if (sm_updateInterval == 0)
+
+    if (sm_updateInterval == 0)
         return true;
-    else
-    {
+
 #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;
-#endif
     }
+
     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
diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 2eaa60e6ce..785629edb5 100644
--- 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
+#else
+        wxUnusedVar(pos);
 #endif
     }
 }
-- 
2.45.2