From f3ab0fc3f880c95c697afb60fb9b1c5d17476b28 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 2 Apr 2017 08:27:31 -0400 Subject: [PATCH] TASInputDlg: Use an enum for ID constants These are all related constants (and it doesn't make sense to allow taking the address of them). --- Source/Core/DolphinWX/TASInputDlg.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/TASInputDlg.h b/Source/Core/DolphinWX/TASInputDlg.h index 8696a5a1be..e371259301 100644 --- a/Source/Core/DolphinWX/TASInputDlg.h +++ b/Source/Core/DolphinWX/TASInputDlg.h @@ -39,10 +39,17 @@ public: void CreateWiiLayout(int num); private: - static constexpr int ID_C_STICK = 1001; - static constexpr int ID_MAIN_STICK = 1002; - static constexpr int ID_CC_L_STICK = 1003; - static constexpr int ID_CC_R_STICK = 1004; + enum : int + { + ID_C_STICK = 1001, + ID_MAIN_STICK = 1002, + ID_CC_L_STICK = 1003, + ID_CC_R_STICK = 1004 + }; + + // Used in the context of creating controls on the fly + // This is greater than the last stick enum constant to + // prevent ID clashing in wx's event system. int m_eleID = 1005; struct Control