From d58550e874fa25187c1376efc9671a6f411c0a3b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 29 Aug 2015 05:17:33 -0400 Subject: [PATCH] MemcardManager: Minor cleanup of header code --- Source/Core/DolphinWX/MemcardManager.cpp | 6 ++++-- Source/Core/DolphinWX/MemcardManager.h | 14 +++----------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Source/Core/DolphinWX/MemcardManager.cpp b/Source/Core/DolphinWX/MemcardManager.cpp index 8d64a51cdb..e0c1347d1d 100644 --- a/Source/Core/DolphinWX/MemcardManager.cpp +++ b/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) - : wxDialog(parent, id, title, position, size, style) +CMemcardManager::CMemcardManager(wxWindow* parent) + : 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; diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h index e94584a1ec..0f83699384 100644 --- a/Source/Core/DolphinWX/MemcardManager.h +++ b/Source/Core/DolphinWX/MemcardManager.h @@ -17,19 +17,11 @@ class wxFileDirPickerEvent; class wxFilePickerCtrl; class wxStaticText; -#undef MEMCARD_MANAGER_STYLE -#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 +class CMemcardManager final : public wxDialog { public: - - CMemcardManager(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString& title = wxGetTranslation(MEMCARDMAN_TITLE), - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = MEMCARD_MANAGER_STYLE); - virtual ~CMemcardManager(); + CMemcardManager(wxWindow* parent); + ~CMemcardManager(); private: DECLARE_EVENT_TABLE();