From 7e79663dcebc49f5085ae9dafd48b76086a28b10 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Sat, 26 Dec 2020 17:30:32 +0100
Subject: [PATCH] include/Spectre/Input/Mouse.h rename Button1,Button2 to
 XButton1 and XButton2

Button1 and Button2 are defined by Xlib. So lets change our ones to avoid headache.
---
 include/Spectre/Input/Mouse.h        | 4 ++--
 source/Input/Mouse.cpp               | 4 ++--
 source/Platform/Win32/Win32Mouse.cpp | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/Spectre/Input/Mouse.h b/include/Spectre/Input/Mouse.h
index 9140b7a..949638e 100644
--- a/include/Spectre/Input/Mouse.h
+++ b/include/Spectre/Input/Mouse.h
@@ -16,8 +16,8 @@ public :
 		Left,
 		Right,
 		Middle,
-		Button1,
-		Button2,
+		XButton1,
+		XButton2,
 		NUM_MBUTTONS
 	};
 
diff --git a/source/Input/Mouse.cpp b/source/Input/Mouse.cpp
index 3b58f0e..e939583 100644
--- a/source/Input/Mouse.cpp
+++ b/source/Input/Mouse.cpp
@@ -10,8 +10,8 @@ Mouse::~Mouse()
 std::string Mouse::getButtonName(Button button)
 {
 	switch(button) {
-	case Button::Button1 : return "Button1";
-	case Button::Button2 : return "Button2";
+	case Button::XButton1 : return "XButton1";
+	case Button::XButton2 : return "XButton2";
 	case Button::Left : return "Left";
 	case Button::Right : return "Right";
 	case Button::Middle : return "Middle";
diff --git a/source/Platform/Win32/Win32Mouse.cpp b/source/Platform/Win32/Win32Mouse.cpp
index 3ad6a41..61a49da 100644
--- a/source/Platform/Win32/Win32Mouse.cpp
+++ b/source/Platform/Win32/Win32Mouse.cpp
@@ -46,8 +46,8 @@ bool Win32Mouse::isButtonDown(Mouse::Button button) const
 	case Mouse::Left : 		btn = GetSystemMetrics(SM_SWAPBUTTON) ? VK_RBUTTON : VK_LBUTTON; 	break;
 	case Mouse::Right : 	btn = GetSystemMetrics(SM_SWAPBUTTON) ? VK_LBUTTON : VK_RBUTTON; 	break;
 	case Mouse::Middle : 	btn = VK_MBUTTON; 	break;
-	case Mouse::Button1 : 	btn = VK_XBUTTON1; 	break;
-	case Mouse::Button2 : 	btn = VK_XBUTTON2; 	break;
+	case Mouse::XButton1 : 	btn = VK_XBUTTON1; 	break;
+	case Mouse::XButton2 : 	btn = VK_XBUTTON2; 	break;
 	default: btn = 0;
 	}
 
@@ -109,7 +109,7 @@ bool Win32Mouse::handleMessage(MSG msg, Event& event)
 	case WM_XBUTTONUP :
 	case WM_XBUTTONDOWN :
 		event.mouseButton.button = GET_XBUTTON_WPARAM(msg.wParam) == XBUTTON1
-			? Mouse::Button::Button1 : Mouse::Button::Button2;
+			? Mouse::Button::XButton1 : Mouse::Button::XButton2;
 		event.mouseButton.pressed = msg.message == WM_XBUTTONDOWN;
 		return true;