From e980178213d91a3f6cd3e4bba517c02acfc20575 Mon Sep 17 00:00:00 2001
From: Thomas Geymayer <tomgey@gmail.com>
Date: Wed, 1 Aug 2012 10:56:07 +0200
Subject: [PATCH] Canvas: Fix warning and rename file.

---
 .../{mouse_event.hxx => MouseEvent.hxx}       | 41 ++++++++++---------
 src/Canvas/canvas.cxx                         |  2 +-
 src/Canvas/gui_mgr.cxx                        |  1 -
 src/Canvas/window.hxx                         |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)
 rename src/Canvas/{mouse_event.hxx => MouseEvent.hxx} (63%)

diff --git a/src/Canvas/mouse_event.hxx b/src/Canvas/MouseEvent.hxx
similarity index 63%
rename from src/Canvas/mouse_event.hxx
rename to src/Canvas/MouseEvent.hxx
index 851f0f65d..0bd5d44a0 100644
--- a/src/Canvas/mouse_event.hxx
+++ b/src/Canvas/MouseEvent.hxx
@@ -24,27 +24,28 @@
 namespace canvas
 {
 
-  struct MouseEvent
+  class MouseEvent
   {
-    typedef osgGA::GUIEventAdapter::EventType EventType;
-    typedef osgGA::GUIEventAdapter::ScrollingMotion Scroll;
-
-    MouseEvent(EventType type):
-      type(type),
-      x(-1), y(-1),
-      dx(0), dy(0),
-      button(-1),
-      state(-1),
-      mod(-1)
-    {}
-
-    EventType   type;
-    int         x, y,
-                dx, dy,
-                button, //<! Button for this event
-                state,  //<! Current button state
-                mod;    //<! Keyboard modifier state
-    Scroll      scroll;
+    public:
+      typedef osgGA::GUIEventAdapter::EventType EventType;
+      typedef osgGA::GUIEventAdapter::ScrollingMotion Scroll;
+
+      MouseEvent(EventType type):
+        type(type),
+        x(-1), y(-1),
+        dx(0), dy(0),
+        button(-1),
+        state(-1),
+        mod(-1)
+      {}
+
+      EventType   type;
+      int         x, y,
+                  dx, dy,
+                  button, //<! Button for this event
+                  state,  //<! Current button state
+                  mod;    //<! Keyboard modifier state
+      Scroll      scroll;
   };
 
 } // namespace canvas
diff --git a/src/Canvas/canvas.cxx b/src/Canvas/canvas.cxx
index 4c6504fbc..d379b644d 100644
--- a/src/Canvas/canvas.cxx
+++ b/src/Canvas/canvas.cxx
@@ -18,8 +18,8 @@
 
 #include "canvas.hxx"
 #include "elements/group.hxx"
-#include "mouse_event.hxx"
 
+#include <Canvas/MouseEvent.hxx>
 #include <Canvas/property_helper.hxx>
 #include <Main/globals.hxx>
 #include <Viewer/CameraGroup.hxx>
diff --git a/src/Canvas/gui_mgr.cxx b/src/Canvas/gui_mgr.cxx
index 208d209c9..6ff2c577b 100644
--- a/src/Canvas/gui_mgr.cxx
+++ b/src/Canvas/gui_mgr.cxx
@@ -17,7 +17,6 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "gui_mgr.hxx"
-#include "mouse_event.hxx"
 #include <Canvas/window.hxx>
 #include <Canvas/canvas.hxx>
 
diff --git a/src/Canvas/window.hxx b/src/Canvas/window.hxx
index afefbe515..4b937f357 100644
--- a/src/Canvas/window.hxx
+++ b/src/Canvas/window.hxx
@@ -19,9 +19,9 @@
 #ifndef CANVAS_WINDOW_HXX_
 #define CANVAS_WINDOW_HXX_
 
-#include "mouse_event.hxx"
 #include "property_based_element.hxx"
 #include "rect.hxx"
+#include <Canvas/MouseEvent.hxx>
 
 #include <simgear/props/propertyObject.hxx>
 
-- 
2.39.5