1 files changed, 8 insertions, 7 deletions
diff --git a/StarsEx/MapView.cpp b/StarsEx/MapView.cpp
index dee3152..930a762 100644
--- a/StarsEx/MapView.cpp
+++ b/StarsEx/MapView.cpp
@@ -35,7 +35,8 @@
 
 #include "Game.h"
 #include "ContentBundle.h"
-#include "EventDispatch.h"
+#include "UIEventDispatch.h"
+#include "UIEventTarget.h"
 #include "Video.h"
 #include "Button.h"
 #include "Bitmap.h"
@@ -599,7 +600,7 @@ MapView::ProcessMenuItem(int action)
 bool
 MapView::SetCapture()
 {
-    EventDispatch* dispatch = EventDispatch::GetInstance();
+    UIEventDispatch* dispatch = UIEventDispatch::GetInstance();
     if (dispatch)
     return dispatch->CaptureMouse(this) ? true : false;
 
@@ -611,7 +612,7 @@ MapView::SetCapture()
 bool
 MapView::ReleaseCapture()
 {
-    EventDispatch* dispatch = EventDispatch::GetInstance();
+    UIEventDispatch* dispatch = UIEventDispatch::GetInstance();
     if (dispatch)
     return dispatch->ReleaseMouse(this) ? true : false;
 
@@ -3211,7 +3212,7 @@ MapView::ZoomOut()
 void
 MapView::OnShow()
 {
-    EventDispatch* dispatch = EventDispatch::GetInstance();
+    UIEventDispatch* dispatch = UIEventDispatch::GetInstance();
     if (dispatch)
     dispatch->Register(this);
 }
@@ -3219,7 +3220,7 @@ MapView::OnShow()
 void
 MapView::OnHide()
 {
-    EventDispatch* dispatch = EventDispatch::GetInstance();
+    UIEventDispatch* dispatch = UIEventDispatch::GetInstance();
     if (dispatch)
     dispatch->Unregister(this);
 
@@ -3276,8 +3277,8 @@ int
 MapView::OnMouseMove(int x, int y)
 {
     if (captured) {
-        EventTarget*   test     = 0;
-        EventDispatch* dispatch = EventDispatch::GetInstance();
+        UIEventTarget*   test     = 0;
+        UIEventDispatch* dispatch = UIEventDispatch::GetInstance();
         if (dispatch)
         test = dispatch->GetCapture();