From 1a5b20c3e38ff75ef4ea2c23a7536e9cc86f0132 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 23 Aug 2010 01:56:08 +0000
Subject: [PATCH] Minor code simplifications.

---
 src/gtk/glmapview.cpp | 22 +++++++++-------------
 src/gtk/glmapview.h   |  4 ++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/gtk/glmapview.cpp b/src/gtk/glmapview.cpp
index 17249b76..fdb909e9 100644
--- a/src/gtk/glmapview.cpp
+++ b/src/gtk/glmapview.cpp
@@ -141,17 +141,15 @@ gboolean GlMapView::Draw(GdkEventExpose *e)
     return TRUE;
 }
 
-gboolean GlMapView::Scroll(double dx, double dy)
+void GlMapView::Scroll(double dx, double dy)
 {
     gtk_adjustment_set_value(hadj, gtk_adjustment_get_value(hadj) + dx);
     gtk_adjustment_set_value(vadj, gtk_adjustment_get_value(vadj) + dy);
 
     UpdateAdjustments();
-
-    return TRUE;
 }
 
-gboolean GlMapView::UpdateAdjustments()
+void GlMapView::UpdateAdjustments()
 {
     float w = mapviewer ? mapviewer->GetWidth() : glarea->allocation.width;
     float h = mapviewer ? mapviewer->GetHeight() : glarea->allocation.height;
@@ -179,8 +177,6 @@ gboolean GlMapView::UpdateAdjustments()
             gtk_adjustment_value_changed(s[i].adj);
         }
     }
-
-    return TRUE;
 }
 
 gboolean GlMapView::MouseButton(GdkEventButton *e)
@@ -212,23 +208,23 @@ gboolean GlMapView::MouseMotion(GdkEventMotion *e)
         Scroll(xpan - e->x, ypan - e->y);
         xpan = e->x;
         ypan = e->y;
+        return TRUE;
     }
 
-    return TRUE;
+    return FALSE;
 }
 
 gboolean GlMapView::KeyPress(GdkEventKey *e)
 {
     switch (e->keyval)
     {
-    case GDK_Up:    Scroll(  0.0, -10.0); break;
-    case GDK_Down:  Scroll(  0.0,  10.0); break;
-    case GDK_Left:  Scroll(-10.0,  0.0); break;
-    case GDK_Right: Scroll( 10.0,  0.0); break;
-    default: return FALSE;
+    case GDK_Up:    Scroll(  0.0, -10.0); return TRUE;
+    case GDK_Down:  Scroll(  0.0,  10.0); return TRUE;
+    case GDK_Left:  Scroll(-10.0,   0.0); return TRUE;
+    case GDK_Right: Scroll( 10.0,   0.0); return TRUE;
     }
 
-    return TRUE;
+    return FALSE;
 }
 
 /* Private signal slots */
diff --git a/src/gtk/glmapview.h b/src/gtk/glmapview.h
index 49346796..cfe12515 100644
--- a/src/gtk/glmapview.h
+++ b/src/gtk/glmapview.h
@@ -21,8 +21,8 @@ private:
     gboolean Setup();
     gboolean Destroy();
     gboolean Draw(GdkEventExpose *e);
-    gboolean Scroll(double dx, double dy);
-    gboolean UpdateAdjustments();
+    void Scroll(double dx, double dy);
+    void UpdateAdjustments();
     gboolean MouseButton(GdkEventButton *e);
     gboolean MouseMotion(GdkEventMotion *e);
     gboolean KeyPress(GdkEventKey *e);