MemcardManager: Minor cleanup of header code

This commit is contained in:
Lioncash 2015-08-29 05:17:33 -04:00
parent 0f3e4c50e1
commit d58550e874
2 changed files with 7 additions and 13 deletions

View File

@ -26,6 +26,7 @@
#include "DolphinWX/MemcardManager.h" #include "DolphinWX/MemcardManager.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
#define FIRSTPAGE 0
#define ARROWS slot ? "" : ARROW[slot], slot ? ARROW[slot] : "" #define ARROWS slot ? "" : ARROW[slot], slot ? ARROW[slot] : ""
const u8 hdr[] = { const u8 hdr[] = {
@ -102,8 +103,9 @@ BEGIN_EVENT_TABLE(CMemcardManager, wxDialog)
EVT_MENU_RANGE(COLUMN_BANNER, NUMBER_OF_COLUMN, CMemcardManager::OnMenuChange) EVT_MENU_RANGE(COLUMN_BANNER, NUMBER_OF_COLUMN, CMemcardManager::OnMenuChange)
END_EVENT_TABLE() 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_A] = nullptr;
memoryCard[SLOT_B] = nullptr; memoryCard[SLOT_B] = nullptr;

View File

@ -17,19 +17,11 @@ class wxFileDirPickerEvent;
class wxFilePickerCtrl; class wxFilePickerCtrl;
class wxStaticText; 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: public:
CMemcardManager(wxWindow* parent);
CMemcardManager(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString& title = wxGetTranslation(MEMCARDMAN_TITLE), ~CMemcardManager();
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = MEMCARD_MANAGER_STYLE);
virtual ~CMemcardManager();
private: private:
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();