Merge pull request #2925 from lioncash/wx-mem

MemcardManager: Header cleanup

Source/Core/DolphinWX/MemcardManager.cpp

@@ -26,6 +26,7 @@
 #include "DolphinWX/MemcardManager.h"
 #include "DolphinWX/WxUtils.h"
 
+#define FIRSTPAGE 0
 #define ARROWS slot ? "" : ARROW[slot], slot ? ARROW[slot] : ""
 
 const u8 hdr[] = {
@@ -102,8 +103,9 @@ BEGIN_EVENT_TABLE(CMemcardManager, wxDialog)
 	EVT_MENU_RANGE(COLUMN_BANNER, NUMBER_OF_COLUMN, CMemcardManager::OnMenuChange)
 END_EVENT_TABLE()
 
-CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
+CMemcardManager::CMemcardManager(wxWindow* parent)
-	: wxDialog(parent, id, title, position, size, style)
+	: wxDialog(parent, wxID_ANY, _("Memory Card Manager"), wxDefaultPosition, wxDefaultSize,
+	           wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX)
 {
 	memoryCard[SLOT_A] = nullptr;
 	memoryCard[SLOT_B] = nullptr;

Source/Core/DolphinWX/MemcardManager.h

@@ -17,131 +17,123 @@ class wxFileDirPickerEvent;
 class wxFilePickerCtrl;
 class wxStaticText;
 
-#undef MEMCARD_MANAGER_STYLE
+class CMemcardManager final : public wxDialog
-#define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX
-#define MEMCARDMAN_TITLE _trans("Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!")
-
-#define FIRSTPAGE 0
-
-class CMemcardManager : public wxDialog
 {
+public:
+	CMemcardManager(wxWindow* parent);
+	~CMemcardManager();
+
+private:
+	DECLARE_EVENT_TABLE();
+
+	int page[2];
+	int itemsPerPage;
+	int maxPages;
+	std::string DefaultMemcard[2];
+	std::string DefaultIOPath;
+	IniFile MemcardManagerIni;
+	IniFile::Section* iniMemcardSection;
+
+	wxButton* m_CopyFrom[2];
+	wxButton* m_SaveImport[2];
+	wxButton* m_SaveExport[2];
+	wxButton* m_Delete[2];
+	wxButton* m_NextPage[2];
+	wxButton* m_PrevPage[2];
+	wxButton* m_ConvertToGci;
+	wxFilePickerCtrl *m_MemcardPath[2];
+	wxStaticText *t_Status[2];
+
+	enum
+	{
+		ID_COPYFROM_A = 1000, // Do not rearrange these items,
+		ID_COPYFROM_B,        // ID_..._B must be 1 more than ID_..._A
+		ID_FIXCHECKSUM_A,
+		ID_FIXCHECKSUM_B,
+		ID_DELETE_A,
+		ID_DELETE_B,
+		ID_SAVEEXPORT_A,
+		ID_SAVEEXPORT_B,
+		ID_SAVEIMPORT_A,
+		ID_SAVEIMPORT_B,
+		ID_EXPORTALL_A,
+		ID_EXPORTALL_B,
+		ID_CONVERTTOGCI,
+		ID_NEXTPAGE_A,
+		ID_NEXTPAGE_B,
+		ID_PREVPAGE_A,
+		ID_PREVPAGE_B,
+		ID_MEMCARDLIST_A,
+		ID_MEMCARDLIST_B,
+		ID_MEMCARDPATH_A,
+		ID_MEMCARDPATH_B,
+		ID_USEPAGES,
+		ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
+	};
+
+	enum
+	{
+		COLUMN_BANNER = 0,
+		COLUMN_TITLE,
+		COLUMN_COMMENT,
+		COLUMN_ICON,
+		COLUMN_BLOCKS,
+		COLUMN_FIRSTBLOCK,
+		COLUMN_GAMECODE,
+		COLUMN_MAKERCODE,
+		COLUMN_FILENAME,
+		COLUMN_BIFLAGS,
+		COLUMN_MODTIME,
+		COLUMN_IMAGEADD,
+		COLUMN_ICONFMT,
+		COLUMN_ANIMSPEED,
+		COLUMN_PERMISSIONS,
+		COLUMN_COPYCOUNTER,
+		COLUMN_COMMENTSADDRESS,
+		NUMBER_OF_COLUMN
+	};
+
+	GCMemcard *memoryCard[2];
+
+	void CreateGUIControls();
+	void CopyDeleteClick(wxCommandEvent& event);
+	bool ReloadMemcard(const std::string& fileName, int card);
+	void OnMenuChange(wxCommandEvent& event);
+	void OnPageChange(wxCommandEvent& event);
+	void OnPathChange(wxFileDirPickerEvent& event);
+	void ChangePath(int id);
+	bool CopyDeleteSwitch(u32 error, int slot);
+	bool LoadSettings();
+	bool SaveSettings();
+
+	struct _mcmSettings
+	{
+		bool twoCardsLoaded;
+		bool usePages;
+		bool column[NUMBER_OF_COLUMN + 1];
+	} mcmSettings;
+
+	class CMemcardListCtrl : public wxListCtrl
+	{
 	public:
-
+		CMemcardListCtrl(wxWindow* parent, const wxWindowID id,
-		CMemcardManager(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString& title = wxGetTranslation(MEMCARDMAN_TITLE),
+			const wxPoint& pos, const wxSize& size,
-			const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = MEMCARD_MANAGER_STYLE);
+			long style, _mcmSettings& _mcmSetngs)
-		virtual ~CMemcardManager();
+			: wxListCtrl(parent, id, pos, size, style)
-
+			, __mcmSettings(_mcmSetngs)
+		{
+			Bind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this);
+		}
+		~CMemcardListCtrl()
+		{
+			Unbind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this);
+		}
+		_mcmSettings & __mcmSettings;
+		bool prevPage;
+		bool nextPage;
 	private:
-		DECLARE_EVENT_TABLE();
+		void OnRightClick(wxMouseEvent& event);
+	};
 
-		int page[2];
+	CMemcardListCtrl *m_MemcardList[2];
-		int itemsPerPage;
-		int maxPages;
-		std::string DefaultMemcard[2];
-		std::string DefaultIOPath;
-		IniFile MemcardManagerIni;
-		IniFile::Section* iniMemcardSection;
-
-		wxButton* m_CopyFrom[2];
-		wxButton* m_SaveImport[2];
-		wxButton* m_SaveExport[2];
-		wxButton* m_Delete[2];
-		wxButton* m_NextPage[2];
-		wxButton* m_PrevPage[2];
-		wxButton* m_ConvertToGci;
-		wxFilePickerCtrl *m_MemcardPath[2];
-		wxStaticText *t_Status[2];
-
-		enum
-		{
-			ID_COPYFROM_A = 1000, // Do not rearrange these items,
-			ID_COPYFROM_B,        // ID_..._B must be 1 more than ID_..._A
-			ID_FIXCHECKSUM_A,
-			ID_FIXCHECKSUM_B,
-			ID_DELETE_A,
-			ID_DELETE_B,
-			ID_SAVEEXPORT_A,
-			ID_SAVEEXPORT_B,
-			ID_SAVEIMPORT_A,
-			ID_SAVEIMPORT_B,
-			ID_EXPORTALL_A,
-			ID_EXPORTALL_B,
-			ID_CONVERTTOGCI,
-			ID_NEXTPAGE_A,
-			ID_NEXTPAGE_B,
-			ID_PREVPAGE_A,
-			ID_PREVPAGE_B,
-			ID_MEMCARDLIST_A,
-			ID_MEMCARDLIST_B,
-			ID_MEMCARDPATH_A,
-			ID_MEMCARDPATH_B,
-			ID_USEPAGES,
-			ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
-		};
-
-		enum
-		{
-			COLUMN_BANNER = 0,
-			COLUMN_TITLE,
-			COLUMN_COMMENT,
-			COLUMN_ICON,
-			COLUMN_BLOCKS,
-			COLUMN_FIRSTBLOCK,
-			COLUMN_GAMECODE,
-			COLUMN_MAKERCODE,
-			COLUMN_FILENAME,
-			COLUMN_BIFLAGS,
-			COLUMN_MODTIME,
-			COLUMN_IMAGEADD,
-			COLUMN_ICONFMT,
-			COLUMN_ANIMSPEED,
-			COLUMN_PERMISSIONS,
-			COLUMN_COPYCOUNTER,
-			COLUMN_COMMENTSADDRESS,
-			NUMBER_OF_COLUMN
-		};
-
-		GCMemcard *memoryCard[2];
-
-		void CreateGUIControls();
-		void CopyDeleteClick(wxCommandEvent& event);
-		bool ReloadMemcard(const std::string& fileName, int card);
-		void OnMenuChange(wxCommandEvent& event);
-		void OnPageChange(wxCommandEvent& event);
-		void OnPathChange(wxFileDirPickerEvent& event);
-		void ChangePath(int id);
-		bool CopyDeleteSwitch(u32 error, int slot);
-		bool LoadSettings();
-		bool SaveSettings();
-
-		struct _mcmSettings
-		{
-			bool twoCardsLoaded;
-			bool usePages;
-			bool column[NUMBER_OF_COLUMN + 1];
-		} mcmSettings;
-
-		class CMemcardListCtrl : public wxListCtrl
-		{
-		public:
-			CMemcardListCtrl(wxWindow* parent, const wxWindowID id,
-				const wxPoint& pos, const wxSize& size,
-				long style, _mcmSettings& _mcmSetngs)
-				: wxListCtrl(parent, id, pos, size, style)
-				, __mcmSettings(_mcmSetngs)
-			{
-				Bind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this);
-			}
-			~CMemcardListCtrl()
-			{
-				Unbind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this);
-			}
-			_mcmSettings & __mcmSettings;
-			bool prevPage;
-			bool nextPage;
-		private:
-			void OnRightClick(wxMouseEvent& event);
-		};
-
-		CMemcardListCtrl *m_MemcardList[2];
 };