From a3f227025baef651c9dd73f3fe9d2af8f5607b84 Mon Sep 17 00:00:00 2001
From: victorlevasseur <victorlevasseur52@gmail.com>
Date: Thu, 21 Aug 2014 21:37:26 +0200
Subject: [PATCH] Make some changes to events handler in TileMapPanel

---
 Extensions/TileMapObject/TileMapPanel.cpp | 42 +++++------------------
 Extensions/TileMapObject/TileMapPanel.h   |  4 +--
 2 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/Extensions/TileMapObject/TileMapPanel.cpp b/Extensions/TileMapObject/TileMapPanel.cpp
index ef940ae3a8..7dcddd415d 100644
--- a/Extensions/TileMapObject/TileMapPanel.cpp
+++ b/Extensions/TileMapObject/TileMapPanel.cpp
@@ -16,9 +16,9 @@ TileMapPanel::TileMapPanel(wxWindow* parent, wxWindowID id, const wxPoint &pos,
     SetBackgroundStyle(wxBG_STYLE_PAINT);
 
     Connect(wxEVT_PAINT, wxPaintEventHandler(TileMapPanel::OnPaint), NULL, this);
-    Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TileMapPanel::OnLeftButtonPressed), NULL, this);
-    Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TileMapPanel::OnRightButtonPressed), NULL, this);
-    Connect(wxEVT_MOTION, wxMouseEventHandler(TileMapPanel::OnMouseMoved), NULL, this);
+    Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TileMapPanel::OnMouseEvent), NULL, this);
+    Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TileMapPanel::OnMouseEvent), NULL, this);
+    Connect(wxEVT_MOTION, wxMouseEventHandler(TileMapPanel::OnMouseEvent), NULL, this);
 }
 
 TileMapPanel::~TileMapPanel()
@@ -115,7 +115,7 @@ void TileMapPanel::OnPaint(wxPaintEvent& event)
     }
 }
 
-void TileMapPanel::OnLeftButtonPressed(wxMouseEvent &event)
+void TileMapPanel::OnMouseEvent(wxMouseEvent &event)
 {
     if(!m_tilemap || !m_tileset)
         return;
@@ -128,43 +128,17 @@ void TileMapPanel::OnLeftButtonPressed(wxMouseEvent &event)
     if(currentColumn >= m_tilemap->GetColumnsCount() || currentRow >= m_tilemap->GetRowsCount())
         return; //Stop if the position is out of range
 
-    //Add a tile to the current position
-    m_tilemap->SetTile(m_mapCurrentLayer, currentColumn, currentRow, m_tileToBeInserted);
-    Refresh();
-}
-
-void TileMapPanel::OnRightButtonPressed(wxMouseEvent &event)
-{
-    if(!m_tilemap || !m_tileset)
-        return;
-
-    //Get the current tile position (column and row)
-    int currentColumn, currentRow;
-    wxPoint mousePos = CalcUnscrolledPosition(event.GetPosition());
-    GetTileAt(mousePos, currentColumn, currentRow);
-
-    if(currentColumn >= m_tilemap->GetColumnsCount() || currentRow >= m_tilemap->GetRowsCount())
-        return; //Stop if the position is out of range
-
-    //Remove the tile
-    m_tilemap->SetTile(m_mapCurrentLayer, currentColumn, currentRow, -1);
-    Refresh();
-}
-
-void TileMapPanel::OnMouseMoved(wxMouseEvent &event)
-{
-    if(!m_tilemap || !m_tileset)
-        return;
-
     if(event.LeftIsDown()) //Left mouse button pressed
     {
         //Add a tile to the current position
-        OnLeftButtonPressed(event);
+        m_tilemap->SetTile(m_mapCurrentLayer, currentColumn, currentRow, m_tileToBeInserted);
+        Refresh();
     }
     else if(event.RightIsDown())
     {
         //Remove the tile
-        OnRightButtonPressed(event);
+        m_tilemap->SetTile(m_mapCurrentLayer, currentColumn, currentRow, -1);
+        Refresh();
     }
 }
 
diff --git a/Extensions/TileMapObject/TileMapPanel.h b/Extensions/TileMapObject/TileMapPanel.h
index 059543cc5e..abac8350f5 100644
--- a/Extensions/TileMapObject/TileMapPanel.h
+++ b/Extensions/TileMapObject/TileMapPanel.h
@@ -57,9 +57,7 @@ public:
 
 protected:
     void OnPaint(wxPaintEvent &event);
-    void OnLeftButtonPressed(wxMouseEvent &event);
-    void OnRightButtonPressed(wxMouseEvent &event);
-    void OnMouseMoved(wxMouseEvent &event);
+    void OnMouseEvent(wxMouseEvent &event);
 
 private:
     wxPoint GetPositionOfTile(int column, int row);