diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/ARCodeAddEdit.cpp index 7c90b726b8..7825ec20ef 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/ARCodeAddEdit.cpp @@ -57,10 +57,10 @@ CARCodeAddEdit::CARCodeAddEdit(int _selection, wxWindow* parent, wxWindowID id, wxStaticBoxSizer* sbEntry = new wxStaticBoxSizer(wxVERTICAL, this, _("Cheat Code")); wxGridBagSizer* sgEntry = new wxGridBagSizer(0, 0); - wxStaticText* EditCheatNameText = new wxStaticText(this, ID_EDITCHEAT_NAME_TEXT, _("Name:"), wxDefaultPosition, wxDefaultSize); - EditCheatName = new wxTextCtrl(this, ID_EDITCHEAT_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); + wxStaticText* EditCheatNameText = new wxStaticText(this, ID_EDITCHEAT_NAME_TEXT, _("Name:")); + EditCheatName = new wxTextCtrl(this, ID_EDITCHEAT_NAME, wxEmptyString); EditCheatName->SetValue(currentName); - EntrySelection = new wxSpinButton(this, ID_ENTRY_SELECT, wxDefaultPosition, wxDefaultSize, wxVERTICAL); + EntrySelection = new wxSpinButton(this, ID_ENTRY_SELECT); EntrySelection->SetRange(1, ((int)arCodes.size()) > 0 ? (int)arCodes.size() : 1); EntrySelection->SetValue((int)(arCodes.size() - selection)); EditCheatCode = new wxTextCtrl(this, ID_EDITCHEAT_CODE, wxEmptyString, wxDefaultPosition, wxSize(300, 100), wxTE_MULTILINE); diff --git a/Source/Core/DolphinWX/CheatsWindow.cpp b/Source/Core/DolphinWX/CheatsWindow.cpp index 79325d7b3c..0285b5d8e4 100644 --- a/Source/Core/DolphinWX/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/CheatsWindow.cpp @@ -81,20 +81,20 @@ void wxCheatsWindow::Init_ChildControls() wxPanel* const panel = new wxPanel(this); // Main Notebook - m_Notebook_Main = new wxNotebook(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_Notebook_Main = new wxNotebook(panel, wxID_ANY); // --- Tabs --- // $ Cheats List Tab - m_Tab_Cheats = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_Tab_Cheats = new wxPanel(m_Notebook_Main, wxID_ANY); m_CheckListBox_CheatsList = new wxCheckListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(300, 0), m_CheatStringList, wxLB_HSCROLL, wxDefaultValidator); m_CheckListBox_CheatsList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &wxCheatsWindow::OnEvent_CheatsList_ItemSelected, this); m_CheckListBox_CheatsList->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &wxCheatsWindow::OnEvent_CheatsList_ItemToggled, this); - m_Label_Codename = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Name: "), wxDefaultPosition, wxDefaultSize); - m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _("Code Info"), wxDefaultPosition, wxDefaultSize); + m_Label_Codename = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Name: ")); + m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _("Code Info")); - m_Label_NumCodes = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Number Of Codes: "), wxDefaultPosition, wxDefaultSize); + m_Label_NumCodes = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Number Of Codes: ")); m_ListBox_CodesList = new wxListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(120, 150), 0, 0, wxLB_HSCROLL); wxStaticBoxSizer* sGroupBoxInfo = new wxStaticBoxSizer(m_GroupBox_Info, wxVERTICAL); @@ -112,7 +112,7 @@ void wxCheatsWindow::Init_ChildControls() wxPanel* const tab_cheat_search = new CheatSearchTab(m_Notebook_Main); // $ Log Tab - m_Tab_Log = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_Tab_Log = new wxPanel(m_Notebook_Main, wxID_ANY); wxButton* const button_updatelog = new wxButton(m_Tab_Log, wxID_ANY, _("Update")); button_updatelog->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, this); @@ -141,9 +141,9 @@ void wxCheatsWindow::Init_ChildControls() m_Notebook_Main->AddPage(m_Tab_Log, _("Logging")); // Button Strip - button_apply = new wxButton(panel, wxID_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize); + button_apply = new wxButton(panel, wxID_APPLY, _("Apply")); button_apply->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ApplyChanges_Press, this); - wxButton* const button_cancel = new wxButton(panel, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize); + wxButton* const button_cancel = new wxButton(panel, wxID_CANCEL, _("Cancel")); button_cancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonClose_Press, this); Bind(wxEVT_CLOSE_WINDOW, &wxCheatsWindow::OnEvent_Close, this); @@ -164,7 +164,7 @@ void wxCheatsWindow::Init_ChildControls() } CheatSearchTab::CheatSearchTab(wxWindow* const parent) - : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize) + : wxPanel(parent, -1) { // first scan button btnInitScan = new wxButton(this, -1, _("New Scan")); @@ -188,7 +188,7 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) sizer_cheat_new_search->Add(size_radiobtn.rad_32, 0, wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5); // result controls - lbox_search_results = new wxListBox(this, -1, wxDefaultPosition, wxDefaultSize); + lbox_search_results = new wxListBox(this, -1); label_results_count = new wxStaticText(this, -1, _("Count:")); // create AR code button @@ -599,7 +599,7 @@ void CheatSearchTab::CreateARCode(wxCommandEvent&) } CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address) - : wxDialog(parent, -1, _("Create AR Code"), wxDefaultPosition) + : wxDialog(parent, -1, _("Create AR Code")) , code_address(address) { wxStaticText* const label_name = new wxStaticText(this, -1, _("Name: ")); diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 04c740cb55..c4afb6ba87 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -51,7 +51,7 @@ #include "VideoCommon/VideoBackendBase.h" -#define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize) +#define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text) struct CPUCore { @@ -544,13 +544,13 @@ void CConfigMain::CreateGUIControls() InitializeGUILists(); // Create the notebook and pages - Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize); - wxPanel* const GeneralPage = new wxPanel(Notebook, ID_GENERALPAGE, wxDefaultPosition, wxDefaultSize); - wxPanel* const DisplayPage = new wxPanel(Notebook, ID_DISPLAYPAGE, wxDefaultPosition, wxDefaultSize); - wxPanel* const AudioPage = new wxPanel(Notebook, ID_AUDIOPAGE, wxDefaultPosition, wxDefaultSize); - wxPanel* const GamecubePage = new wxPanel(Notebook, ID_GAMECUBEPAGE, wxDefaultPosition, wxDefaultSize); - wxPanel* const WiiPage = new wxPanel(Notebook, ID_WIIPAGE, wxDefaultPosition, wxDefaultSize); - PathsPage = new wxPanel(Notebook, ID_PATHSPAGE, wxDefaultPosition, wxDefaultSize); + Notebook = new wxNotebook(this, ID_NOTEBOOK); + wxPanel* const GeneralPage = new wxPanel(Notebook, ID_GENERALPAGE); + wxPanel* const DisplayPage = new wxPanel(Notebook, ID_DISPLAYPAGE); + wxPanel* const AudioPage = new wxPanel(Notebook, ID_AUDIOPAGE); + wxPanel* const GamecubePage = new wxPanel(Notebook, ID_GAMECUBEPAGE); + wxPanel* const WiiPage = new wxPanel(Notebook, ID_WIIPAGE); + PathsPage = new wxPanel(Notebook, ID_PATHSPAGE); Notebook->AddPage(GeneralPage, _("General")); Notebook->AddPage(DisplayPage, _("Interface")); @@ -561,14 +561,14 @@ void CConfigMain::CreateGUIControls() // General page // Core Settings - Basic - CPUThread = new wxCheckBox(GeneralPage, ID_CPUTHREAD, _("Enable Dual Core (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - SkipIdle = new wxCheckBox(GeneralPage, ID_IDLESKIP, _("Enable Idle Skipping (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - EnableCheats = new wxCheckBox(GeneralPage, ID_ENABLECHEATS, _("Enable Cheats"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + CPUThread = new wxCheckBox(GeneralPage, ID_CPUTHREAD, _("Enable Dual Core (speedup)")); + SkipIdle = new wxCheckBox(GeneralPage, ID_IDLESKIP, _("Enable Idle Skipping (speedup)")); + EnableCheats = new wxCheckBox(GeneralPage, ID_ENABLECHEATS, _("Enable Cheats")); // Framelimit - Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit, 0, wxDefaultValidator); + Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit); // Core Settings - Advanced CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS); - _NTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + _NTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J")); // Populate the General settings wxBoxSizer* sFramelimit = new wxBoxSizer(wxHORIZONTAL); @@ -590,18 +590,13 @@ void CConfigMain::CreateGUIControls() GeneralPage->SetSizer(sGeneralPage); // Interface Language - InterfaceLang = new wxChoice(DisplayPage, ID_INTERFACE_LANG, wxDefaultPosition, - wxDefaultSize, arrayStringFor_InterfaceLang, 0, wxDefaultValidator); + InterfaceLang = new wxChoice(DisplayPage, ID_INTERFACE_LANG, wxDefaultPosition, wxDefaultSize, arrayStringFor_InterfaceLang); // Hotkey configuration - HotkeyConfig = new wxButton(DisplayPage, ID_HOTKEY_CONFIG, _("Hotkeys"), - wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator); + HotkeyConfig = new wxButton(DisplayPage, ID_HOTKEY_CONFIG, _("Hotkeys"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); // Interface settings - ConfirmStop = new wxCheckBox(DisplayPage, ID_INTERFACE_CONFIRMSTOP, _("Confirm on Stop"), - wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - UsePanicHandlers = new wxCheckBox(DisplayPage, ID_INTERFACE_USEPANICHANDLERS, - _("Use Panic Handlers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - OnScreenDisplayMessages = new wxCheckBox(DisplayPage, ID_INTERFACE_ONSCREENDISPLAYMESSAGES, - _("On-Screen Display Messages"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + ConfirmStop = new wxCheckBox(DisplayPage, ID_INTERFACE_CONFIRMSTOP, _("Confirm on Stop")); + UsePanicHandlers = new wxCheckBox(DisplayPage, ID_INTERFACE_USEPANICHANDLERS, _("Use Panic Handlers")); + OnScreenDisplayMessages = new wxCheckBox(DisplayPage, ID_INTERFACE_ONSCREENDISPLAYMESSAGES, _("On-Screen Display Messages")); wxBoxSizer* sInterface = new wxBoxSizer(wxHORIZONTAL); sInterface->Add(TEXT_BOX(DisplayPage, _("Language:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); @@ -656,20 +651,14 @@ void CConfigMain::CreateGUIControls() // Audio page - DSPEngine = new wxRadioBox(AudioPage, ID_DSPENGINE, _("DSP Emulator Engine"), - wxDefaultPosition, wxDefaultSize, arrayStringFor_DSPEngine, 0, wxRA_SPECIFY_ROWS); + DSPEngine = new wxRadioBox(AudioPage, ID_DSPENGINE, _("DSP Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_DSPEngine, 0, wxRA_SPECIFY_ROWS); DSPThread = new wxCheckBox(AudioPage, ID_DSPTHREAD, _("DSPLLE on Separate Thread")); - DumpAudio = new wxCheckBox(AudioPage, ID_DUMP_AUDIO, _("Dump Audio"), - wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + DumpAudio = new wxCheckBox(AudioPage, ID_DUMP_AUDIO, _("Dump Audio")); DPL2Decoder = new wxCheckBox(AudioPage, ID_DPL2DECODER, _("Dolby Pro Logic II decoder")); - VolumeSlider = new wxSlider(AudioPage, ID_VOLUME, 0, 1, 100, - wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_INVERSE); - VolumeText = new wxStaticText(AudioPage, wxID_ANY, wxT(""), - wxDefaultPosition, wxDefaultSize, 0); - BackendSelection = new wxChoice(AudioPage, ID_BACKEND, wxDefaultPosition, - wxDefaultSize, wxArrayBackends, 0, wxDefaultValidator, wxEmptyString); - Latency = new wxSpinCtrl(AudioPage, ID_LATENCY, "", wxDefaultPosition, wxDefaultSize, - wxSP_ARROW_KEYS, 0, 30); + VolumeSlider = new wxSlider(AudioPage, ID_VOLUME, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_INVERSE); + VolumeText = new wxStaticText(AudioPage, wxID_ANY, wxT("")); + BackendSelection = new wxChoice(AudioPage, ID_BACKEND, wxDefaultPosition, wxDefaultSize, wxArrayBackends, 0, wxDefaultValidator, wxEmptyString); + Latency = new wxSpinCtrl(AudioPage, ID_LATENCY, "", wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 30); Latency->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &CConfigMain::AudioSettingsChanged, this); @@ -711,9 +700,8 @@ void CConfigMain::CreateGUIControls() // Gamecube page // IPL settings - GCSystemLang = new wxChoice(GamecubePage, ID_GC_SRAM_LNG, wxDefaultPosition, - wxDefaultSize, arrayStringFor_GCSystemLang, 0, wxDefaultValidator); - GCAlwaysHLE_BS2 = new wxCheckBox(GamecubePage, ID_GC_ALWAYS_HLE_BS2, _("Skip BIOS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + GCSystemLang = new wxChoice(GamecubePage, ID_GC_SRAM_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_GCSystemLang); + GCAlwaysHLE_BS2 = new wxCheckBox(GamecubePage, ID_GC_ALWAYS_HLE_BS2, _("Skip BIOS")); // Device settings // EXI Devices wxStaticText* GCEXIDeviceText[3]; @@ -724,9 +712,9 @@ void CConfigMain::CreateGUIControls() GCEXIDevice[1] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SLOTB); GCEXIDevice[2] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SP1); GCMemcardPath[0] = new wxButton(GamecubePage, ID_GC_EXIDEVICE_SLOTA_PATH, wxT("..."), - wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator); + wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); GCMemcardPath[1] = new wxButton(GamecubePage, ID_GC_EXIDEVICE_SLOTB_PATH, wxT("..."), - wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator); + wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); //SI Devices wxStaticText* GCSIDeviceText[4]; @@ -780,14 +768,14 @@ void CConfigMain::CreateGUIControls() // Wii page // Misc Settings - WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, _("Enable Screen Saver"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, _("Use EuRGB60 Mode (PAL60)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - WiiAspectRatio = new wxChoice(WiiPage, ID_WII_IPL_AR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiAspectRatio, 0, wxDefaultValidator); - WiiSystemLang = new wxChoice(WiiPage, ID_WII_IPL_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSystemLang, 0, wxDefaultValidator); + WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, _("Enable Screen Saver")); + WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, _("Use EuRGB60 Mode (PAL60)")); + WiiAspectRatio = new wxChoice(WiiPage, ID_WII_IPL_AR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiAspectRatio); + WiiSystemLang = new wxChoice(WiiPage, ID_WII_IPL_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSystemLang); // Device Settings - WiiSDCard = new wxCheckBox(WiiPage, ID_WII_SD_CARD, _("Insert SD Card"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - WiiKeyboard = new wxCheckBox(WiiPage, ID_WII_KEYBOARD, _("Connect USB Keyboard"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + WiiSDCard = new wxCheckBox(WiiPage, ID_WII_SD_CARD, _("Insert SD Card")); + WiiKeyboard = new wxCheckBox(WiiPage, ID_WII_KEYBOARD, _("Connect USB Keyboard")); // Populate the Wii Page sWiiIPLSettings = new wxGridBagSizer(); @@ -813,10 +801,10 @@ void CConfigMain::CreateGUIControls() // Paths page - ISOPaths = new wxListBox(PathsPage, ID_ISOPATHS, wxDefaultPosition, wxDefaultSize, arrayStringFor_ISOPaths, wxLB_SINGLE, wxDefaultValidator); - RecursiveISOPath = new wxCheckBox(PathsPage, ID_RECURSIVEISOPATH, _("Search Subfolders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, _("Add..."), wxDefaultPosition, wxDefaultSize, 0); - RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, _("Remove"), wxDefaultPosition, wxDefaultSize, 0); + ISOPaths = new wxListBox(PathsPage, ID_ISOPATHS, wxDefaultPosition, wxDefaultSize, arrayStringFor_ISOPaths, wxLB_SINGLE); + RecursiveISOPath = new wxCheckBox(PathsPage, ID_RECURSIVEISOPATH, _("Search Subfolders")); + AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, _("Add...")); + RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, _("Remove")); RemoveISOPath->Enable(false); DefaultISO = new wxFilePickerCtrl(PathsPage, ID_DEFAULTISO, wxEmptyString, _("Choose a default ISO:"), diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp index 120bb76359..87a2a3a32a 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp @@ -25,7 +25,7 @@ BEGIN_EVENT_TABLE(BreakPointDlg, wxDialog) END_EVENT_TABLE() BreakPointDlg::BreakPointDlg(CBreakPointWindow *_Parent) - : wxDialog(_Parent, wxID_ANY, wxT("BreakPoint"), wxDefaultPosition, wxDefaultSize) + : wxDialog(_Parent, wxID_ANY, wxT("BreakPoint")) , Parent(_Parent) { m_pEditAddress = new wxTextCtrl(this, wxID_ANY, wxT("80000000")); diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp index 5408be8884..8c5deb93ac 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp @@ -23,14 +23,14 @@ #include "DolphinWX/Debugger/BreakpointWindow.h" #include "DolphinWX/Debugger/MemoryCheckDlg.h" -#define TEXT_BOX(text) new wxStaticText(this, wxID_ANY, wxT(text), wxDefaultPosition, wxDefaultSize) +#define TEXT_BOX(text) new wxStaticText(this, wxID_ANY, wxT(text)) BEGIN_EVENT_TABLE(MemoryCheckDlg, wxDialog) EVT_BUTTON(wxID_OK, MemoryCheckDlg::OnOK) END_EVENT_TABLE() MemoryCheckDlg::MemoryCheckDlg(CBreakPointWindow *parent) - : wxDialog(parent, wxID_ANY, _("Memory Check"), wxDefaultPosition, wxDefaultSize) + : wxDialog(parent, wxID_ANY, _("Memory Check")) , m_parent(parent) { m_pEditStartAddress = new wxTextCtrl(this, wxID_ANY, wxT("")); diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index fb234743bf..862d186c52 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -55,7 +55,7 @@ BEGIN_EVENT_TABLE(CMemoryView, wxControl) END_EVENT_TABLE() CMemoryView::CMemoryView(DebugInterface* debuginterface, wxWindow* parent) - : wxControl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) + : wxControl(parent, wxID_ANY) , curAddress(debuginterface->GetPC()) , debugger(debuginterface) , align(debuginterface->GetInstructionSize(0)) diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/FifoPlayerDlg.cpp index 9dbced73c7..aac02d4005 100644 --- a/Source/Core/DolphinWX/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/FifoPlayerDlg.cpp @@ -56,7 +56,7 @@ std::recursive_mutex sMutex; wxEvtHandler *volatile FifoPlayerDlg::m_EvtHandler = NULL; FifoPlayerDlg::FifoPlayerDlg(wxWindow * const parent) : - wxDialog(parent, wxID_ANY, _("FIFO Player"), wxDefaultPosition, wxDefaultSize), + wxDialog(parent, wxID_ANY, _("FIFO Player")), m_search_result_idx(0), m_FramesToRecord(1) { CreateGUIControls(); @@ -102,7 +102,7 @@ void FifoPlayerDlg::CreateGUIControls() wxBoxSizer* sMain; sMain = new wxBoxSizer(wxVERTICAL); - m_Notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0); + m_Notebook = new wxNotebook(this, wxID_ANY); { m_PlayPage = new wxPanel(m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); @@ -112,15 +112,15 @@ void FifoPlayerDlg::CreateGUIControls() wxStaticBoxSizer* sPlayInfo; sPlayInfo = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("File Info")), wxVERTICAL); - m_NumFramesLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); + m_NumFramesLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString); m_NumFramesLabel->Wrap(-1); sPlayInfo->Add(m_NumFramesLabel, 0, wxALL, 5); - m_CurrentFrameLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); + m_CurrentFrameLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString); m_CurrentFrameLabel->Wrap(-1); sPlayInfo->Add(m_CurrentFrameLabel, 0, wxALL, 5); - m_NumObjectsLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); + m_NumObjectsLabel = new wxStaticText(m_PlayPage, wxID_ANY, wxEmptyString); m_NumObjectsLabel->Wrap(-1); sPlayInfo->Add(m_NumObjectsLabel, 0, wxALL, 5); @@ -129,14 +129,14 @@ void FifoPlayerDlg::CreateGUIControls() wxStaticBoxSizer* sFrameRange; sFrameRange = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("Frame Range")), wxHORIZONTAL); - m_FrameFromLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("From"), wxDefaultPosition, wxDefaultSize, 0); + m_FrameFromLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("From")); m_FrameFromLabel->Wrap(-1); sFrameRange->Add(m_FrameFromLabel, 0, wxALL, 5); m_FrameFromCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10, 0); sFrameRange->Add(m_FrameFromCtrl, 0, wxALL, 5); - m_FrameToLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("To"), wxDefaultPosition, wxDefaultSize, 0); + m_FrameToLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("To")); m_FrameToLabel->Wrap(-1); sFrameRange->Add(m_FrameToLabel, 0, wxALL, 5); @@ -148,14 +148,14 @@ void FifoPlayerDlg::CreateGUIControls() wxStaticBoxSizer* sObjectRange; sObjectRange = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("Object Range")), wxHORIZONTAL); - m_ObjectFromLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("From"), wxDefaultPosition, wxDefaultSize, 0); + m_ObjectFromLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("From")); m_ObjectFromLabel->Wrap(-1); sObjectRange->Add(m_ObjectFromLabel, 0, wxALL, 5); m_ObjectFromCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 0); sObjectRange->Add(m_ObjectFromCtrl, 0, wxALL, 5); - m_ObjectToLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("To"), wxDefaultPosition, wxDefaultSize, 0); + m_ObjectToLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("To")); m_ObjectToLabel->Wrap(-1); sObjectRange->Add(m_ObjectToLabel, 0, wxALL, 5); @@ -167,7 +167,7 @@ void FifoPlayerDlg::CreateGUIControls() wxStaticBoxSizer* sPlayOptions; sPlayOptions = new wxStaticBoxSizer(new wxStaticBox(m_PlayPage, wxID_ANY, _("Playback Options")), wxVERTICAL); - m_EarlyMemoryUpdates = new wxCheckBox(m_PlayPage, wxID_ANY, _("Early Memory Updates"), wxDefaultPosition, wxDefaultSize, 0); + m_EarlyMemoryUpdates = new wxCheckBox(m_PlayPage, wxID_ANY, _("Early Memory Updates")); sPlayOptions->Add(m_EarlyMemoryUpdates, 0, wxALL, 5); sPlayPage->Add(sPlayOptions, 0, wxEXPAND, 5); @@ -187,15 +187,15 @@ void FifoPlayerDlg::CreateGUIControls() wxStaticBoxSizer* sRecordInfo; sRecordInfo = new wxStaticBoxSizer(new wxStaticBox(m_RecordPage, wxID_ANY, _("Recording Info")), wxVERTICAL); - m_RecordingFifoSizeLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); + m_RecordingFifoSizeLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString); m_RecordingFifoSizeLabel->Wrap(-1); sRecordInfo->Add(m_RecordingFifoSizeLabel, 0, wxALL, 5); - m_RecordingMemSizeLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); + m_RecordingMemSizeLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString); m_RecordingMemSizeLabel->Wrap(-1); sRecordInfo->Add(m_RecordingMemSizeLabel, 0, wxALL, 5); - m_RecordingFramesLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); + m_RecordingFramesLabel = new wxStaticText(m_RecordPage, wxID_ANY, wxEmptyString); m_RecordingFramesLabel->Wrap(-1); sRecordInfo->Add(m_RecordingFramesLabel, 0, wxALL, 5); @@ -204,10 +204,10 @@ void FifoPlayerDlg::CreateGUIControls() wxBoxSizer* sRecordButtons; sRecordButtons = new wxBoxSizer(wxHORIZONTAL); - m_RecordStop = new wxButton(m_RecordPage, wxID_ANY, _("Record"), wxDefaultPosition, wxDefaultSize, 0); + m_RecordStop = new wxButton(m_RecordPage, wxID_ANY, _("Record")); sRecordButtons->Add(m_RecordStop, 0, wxALL, 5); - m_Save = new wxButton(m_RecordPage, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, 0); + m_Save = new wxButton(m_RecordPage, wxID_ANY, _("Save")); sRecordButtons->Add(m_Save, 0, wxALL, 5); sRecordPage->Add(sRecordButtons, 0, wxEXPAND, 5); @@ -215,7 +215,7 @@ void FifoPlayerDlg::CreateGUIControls() wxStaticBoxSizer* sRecordingOptions; sRecordingOptions = new wxStaticBoxSizer(new wxStaticBox(m_RecordPage, wxID_ANY, _("Recording Options")), wxHORIZONTAL); - m_FramesToRecordLabel = new wxStaticText(m_RecordPage, wxID_ANY, _("Frames To Record"), wxDefaultPosition, wxDefaultSize, 0); + m_FramesToRecordLabel = new wxStaticText(m_RecordPage, wxID_ANY, _("Frames To Record")); m_FramesToRecordLabel->Wrap(-1); sRecordingOptions->Add(m_FramesToRecordLabel, 0, wxALL, 5); @@ -308,7 +308,7 @@ void FifoPlayerDlg::CreateGUIControls() sButtons->Add(sCloseButtonExpander, 1, wxEXPAND, 5); - m_Close = new wxButton(this, wxID_ANY, _("Close"), wxDefaultPosition, wxDefaultSize, 0); + m_Close = new wxButton(this, wxID_ANY, _("Close")); sButtons->Add(m_Close, 0, wxALL, 5); sMain->Add(sButtons, 0, wxEXPAND, 5); diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp index 55190dd51b..66d47d4ecc 100644 --- a/Source/Core/DolphinWX/FrameAui.cpp +++ b/Source/Core/DolphinWX/FrameAui.cpp @@ -1080,15 +1080,13 @@ wxWindow * CFrame::GetNotebookPageFromId(wxWindowID Id) return NULL; } -wxFrame * CFrame::CreateParentFrame(wxWindowID Id, const wxString& Title, - wxWindow * Child) +wxFrame* CFrame::CreateParentFrame(wxWindowID Id, const wxString& Title, wxWindow* Child) { - wxFrame * Frame = new wxFrame(this, Id, Title, - wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE); + wxFrame* Frame = new wxFrame(this, Id, Title); Child->Reparent(Frame); - wxBoxSizer * m_MainSizer = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* m_MainSizer = new wxBoxSizer(wxHORIZONTAL); m_MainSizer->Add(Child, 1, wxEXPAND); diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 6029c741a4..305855dbcd 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -231,48 +231,29 @@ void CGameListCtrl::InitBitmaps() SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL); m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = - m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm), wxNullBitmap); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = - m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm), wxNullBitmap); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = - m_imageListSmall->Add(wxBitmap(Flag_France_xpm), wxNullBitmap); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = - m_imageListSmall->Add(wxBitmap(Flag_USA_xpm), wxNullBitmap); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN] = - m_imageListSmall->Add(wxBitmap(Flag_Japan_xpm), wxNullBitmap); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = - m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm), wxNullBitmap); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = - m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm), wxNullBitmap); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = - m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm), wxNullBitmap); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = - m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm), wxNullBitmap); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = - m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm)); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm)); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm)); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = m_imageListSmall->Add(wxBitmap(Flag_USA_xpm)); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN] = m_imageListSmall->Add(wxBitmap(Flag_Japan_xpm)); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm)); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm)); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm)); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm)); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm)); m_PlatformImageIndex.resize(3); - m_PlatformImageIndex[0] = - m_imageListSmall->Add(wxBitmap(Platform_Gamecube_xpm), wxNullBitmap); - m_PlatformImageIndex[1] = - m_imageListSmall->Add(wxBitmap(Platform_Wii_xpm), wxNullBitmap); - m_PlatformImageIndex[2] = - m_imageListSmall->Add(wxBitmap(Platform_Wad_xpm), wxNullBitmap); + m_PlatformImageIndex[0] = m_imageListSmall->Add(wxBitmap(Platform_Gamecube_xpm)); + m_PlatformImageIndex[1] = m_imageListSmall->Add(wxBitmap(Platform_Wii_xpm)); + m_PlatformImageIndex[2] = m_imageListSmall->Add(wxBitmap(Platform_Wad_xpm)); m_EmuStateImageIndex.resize(6); - m_EmuStateImageIndex[0] = - m_imageListSmall->Add(wxBitmap(rating_0), wxNullBitmap); - m_EmuStateImageIndex[1] = - m_imageListSmall->Add(wxBitmap(rating_1), wxNullBitmap); - m_EmuStateImageIndex[2] = - m_imageListSmall->Add(wxBitmap(rating_2), wxNullBitmap); - m_EmuStateImageIndex[3] = - m_imageListSmall->Add(wxBitmap(rating_3), wxNullBitmap); - m_EmuStateImageIndex[4] = - m_imageListSmall->Add(wxBitmap(rating_4), wxNullBitmap); - m_EmuStateImageIndex[5] = - m_imageListSmall->Add(wxBitmap(rating_5), wxNullBitmap); + m_EmuStateImageIndex[0] = m_imageListSmall->Add(wxBitmap(rating_0)); + m_EmuStateImageIndex[1] = m_imageListSmall->Add(wxBitmap(rating_1)); + m_EmuStateImageIndex[2] = m_imageListSmall->Add(wxBitmap(rating_2)); + m_EmuStateImageIndex[3] = m_imageListSmall->Add(wxBitmap(rating_3)); + m_EmuStateImageIndex[4] = m_imageListSmall->Add(wxBitmap(rating_4)); + m_EmuStateImageIndex[5] = m_imageListSmall->Add(wxBitmap(rating_5)); } void CGameListCtrl::BrowseForDirectory() diff --git a/Source/Core/DolphinWX/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/GeckoCodeDiag.cpp index cbdb19e0f5..345fa9143d 100644 --- a/Source/Core/DolphinWX/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/GeckoCodeDiag.cpp @@ -39,9 +39,9 @@ static const wxString wxstr_name(wxTRANSLATE("Name: ")), wxstr_creator(wxTRANSLATE("Creator: ")); CodeConfigPanel::CodeConfigPanel(wxWindow* const parent) - : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize) + : wxPanel(parent, -1) { - m_listbox_gcodes = new wxCheckListBox(this, -1, wxDefaultPosition, wxDefaultSize); + m_listbox_gcodes = new wxCheckListBox(this, -1); m_listbox_gcodes->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &CodeConfigPanel::UpdateInfoBox, this); m_listbox_gcodes->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &CodeConfigPanel::ToggleCode, this); diff --git a/Source/Core/DolphinWX/HotkeyDlg.cpp b/Source/Core/DolphinWX/HotkeyDlg.cpp index 07369c772a..dae616fd7a 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.cpp +++ b/Source/Core/DolphinWX/HotkeyDlg.cpp @@ -281,11 +281,11 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void) // A small type font wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); - wxNotebook *Notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize); + wxNotebook *Notebook = new wxNotebook(this, wxID_ANY); for (int j = 0; j < 2; j++) { - wxPanel *Page = new wxPanel(Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize); + wxPanel *Page = new wxPanel(Notebook, wxID_ANY); Notebook->AddPage(Page, pageNames[j]); wxGridBagSizer *sHotkeys = new wxGridBagSizer(); @@ -309,8 +309,7 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void) wxStaticText *stHotkeys = new wxStaticText(Page, wxID_ANY, hkText[i]); // Key selection button - m_Button_Hotkeys[i] = new wxButton(Page, i, wxEmptyString, - wxDefaultPosition, size); + m_Button_Hotkeys[i] = new wxButton(Page, i, wxEmptyString, wxDefaultPosition, size); m_Button_Hotkeys[i]->SetFont(m_SmallFont); m_Button_Hotkeys[i]->SetToolTip(_("Left click to detect hotkeys.\nEnter space to clear.")); SetButtonText(i, diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 9300412729..9a46cf8de2 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -362,82 +362,73 @@ long CISOProperties::GetElementStyle(const char* section, const char* key) void CISOProperties::CreateGUIControls(bool IsWad) { - wxButton * const EditConfig = - new wxButton(this, ID_EDITCONFIG, _("Edit Config"), wxDefaultPosition, wxDefaultSize); + wxButton* const EditConfig = new wxButton(this, ID_EDITCONFIG, _("Edit Config")); EditConfig->SetToolTip(_("This will let you Manually Edit the INI config file")); - wxButton * const EditConfigDefault = - new wxButton(this, ID_SHOWDEFAULTCONFIG, _("Show Defaults"), wxDefaultPosition, wxDefaultSize); + wxButton* const EditConfigDefault = new wxButton(this, ID_SHOWDEFAULTCONFIG, _("Show Defaults")); EditConfigDefault->SetToolTip(_("Opens the default (read-only) configuration for this game in an external text editor.")); // Notebook - wxNotebook * const m_Notebook = - new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize); - wxPanel * const m_GameConfig = - new wxPanel(m_Notebook, ID_GAMECONFIG, wxDefaultPosition, wxDefaultSize); + wxNotebook* const m_Notebook = new wxNotebook(this, ID_NOTEBOOK); + wxPanel* const m_GameConfig = new wxPanel(m_Notebook, ID_GAMECONFIG); m_Notebook->AddPage(m_GameConfig, _("GameConfig")); - wxPanel * const m_PatchPage = - new wxPanel(m_Notebook, ID_PATCH_PAGE, wxDefaultPosition, wxDefaultSize); + wxPanel* const m_PatchPage = new wxPanel(m_Notebook, ID_PATCH_PAGE); m_Notebook->AddPage(m_PatchPage, _("Patches")); - wxPanel * const m_CheatPage = - new wxPanel(m_Notebook, ID_ARCODE_PAGE, wxDefaultPosition, wxDefaultSize); + wxPanel* const m_CheatPage = new wxPanel(m_Notebook, ID_ARCODE_PAGE); m_Notebook->AddPage(m_CheatPage, _("AR Codes")); m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook); m_Notebook->AddPage(m_geckocode_panel, _("Gecko Codes")); - wxPanel * const m_Information = - new wxPanel(m_Notebook, ID_INFORMATION, wxDefaultPosition, wxDefaultSize); + wxPanel* const m_Information = new wxPanel(m_Notebook, ID_INFORMATION); m_Notebook->AddPage(m_Information, _("Info")); // GameConfig editing - Overrides and emulation state - wxStaticText * const OverrideText = new wxStaticText(m_GameConfig, wxID_ANY, _("These settings override core Dolphin settings.\nUndetermined means the game uses Dolphin's setting.")); + wxStaticText* const OverrideText = new wxStaticText(m_GameConfig, wxID_ANY, _("These settings override core Dolphin settings.\nUndetermined means the game uses Dolphin's setting.")); // Core - CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "CPUThread"), wxDefaultValidator); - SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SkipIdle"), wxDefaultValidator); - MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "MMU"), wxDefaultValidator); + CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "CPUThread")); + SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SkipIdle")); + MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "MMU")); MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)")); - TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "TLBHack"), wxDefaultValidator); + TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "TLBHack")); TLBHack->SetToolTip(_("Fast version of the MMU. Does not work for every game.")); - DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DCBZ"), wxDefaultValidator); + DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DCBZ")); DCBZOFF->SetToolTip(_("Bypass the clearing of the data cache by the DCBZ instruction. Usually leave this option disabled.")); - VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "VBeam"), wxDefaultValidator); + VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "VBeam")); VBeam->SetToolTip(_("Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF = Compatible)")); - SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SyncGPU"), wxDefaultValidator); + SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SyncGPU")); SyncGPU->SetToolTip(_("Synchronizes the GPU and CPU threads to help prevent random freezes in Dual Core mode. (ON = Compatible, OFF = Fast)")); - FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FastDiscSpeed"), wxDefaultValidator); + FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FastDiscSpeed")); FastDiscSpeed->SetToolTip(_("Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)")); - BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "BlockMerging"), wxDefaultValidator); - DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DSPHLE"), wxDefaultValidator); + BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "BlockMerging")); + DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DSPHLE")); // Wii Console - EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Wii", "Widescreen"), wxDefaultValidator); + EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Wii", "Widescreen")); // Video UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video", "UseBBox")); UseBBox->SetToolTip(_("If checked, the bounding box registers will be updated. Used by the Paper Mario games.")); // Hack - wxFlexGridSizer * const szrPHackSettings = new wxFlexGridSizer(0); + wxFlexGridSizer* const szrPHackSettings = new wxFlexGridSizer(0); PHackEnable = new wxCheckBox(m_GameConfig, ID_PHACKENABLE, _("Custom Projection Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE); PHackEnable->SetToolTip(_("Enables Custom Projection Hack")); PHSettings = new wxButton(m_GameConfig, ID_PHSETTINGS, _("Settings...")); PHSettings->SetToolTip(_("Customize some Orthographic Projection parameters.")); - wxBoxSizer * const sEmuState = new wxBoxSizer(wxHORIZONTAL); - wxStaticText * const EmuStateText = - new wxStaticText(m_GameConfig, wxID_ANY, _("Emulation State: ")); + wxBoxSizer* const sEmuState = new wxBoxSizer(wxHORIZONTAL); + wxStaticText* const EmuStateText = new wxStaticText(m_GameConfig, wxID_ANY, _("Emulation State: ")); arrayStringFor_EmuState.Add(_("Not Set")); arrayStringFor_EmuState.Add(_("Broken")); arrayStringFor_EmuState.Add(_("Intro")); arrayStringFor_EmuState.Add(_("In Game")); arrayStringFor_EmuState.Add(_("Playable")); arrayStringFor_EmuState.Add(_("Perfect")); - EmuState = new wxChoice(m_GameConfig, ID_EMUSTATE, - wxDefaultPosition, wxDefaultSize, arrayStringFor_EmuState); + EmuState = new wxChoice(m_GameConfig, ID_EMUSTATE, wxDefaultPosition, wxDefaultSize, arrayStringFor_EmuState); EmuIssues = new wxTextCtrl(m_GameConfig, ID_EMU_ISSUES, wxEmptyString); - wxBoxSizer * const sConfigPage = new wxBoxSizer(wxVERTICAL); - wxStaticBoxSizer * const sbCoreOverrides = + wxBoxSizer* const sConfigPage = new wxBoxSizer(wxVERTICAL); + wxStaticBoxSizer* const sbCoreOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Core")); sbCoreOverrides->Add(CPUThread, 0, wxLEFT, 5); sbCoreOverrides->Add(SkipIdle, 0, wxLEFT, 5); @@ -450,8 +441,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) sbCoreOverrides->Add(BlockMerging, 0, wxLEFT, 5); sbCoreOverrides->Add(DSPHLE, 0, wxLEFT, 5); - wxStaticBoxSizer * const sbWiiOverrides = - new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Wii Console")); + wxStaticBoxSizer * const sbWiiOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Wii Console")); if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO)) { sbWiiOverrides->ShowItems(false); @@ -459,15 +449,13 @@ void CISOProperties::CreateGUIControls(bool IsWad) } sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5); - wxStaticBoxSizer * const sbVideoOverrides = - new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video")); + wxStaticBoxSizer * const sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video")); sbVideoOverrides->Add(UseBBox, 0, wxLEFT, 5); szrPHackSettings->Add(PHackEnable, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5); szrPHackSettings->Add(PHSettings, 0, wxLEFT, 5); sbVideoOverrides->Add(szrPHackSettings, 0, wxEXPAND); - wxStaticBoxSizer * const sbGameConfig = - new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings")); + wxStaticBoxSizer * const sbGameConfig = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings")); sbGameConfig->Add(OverrideText, 0, wxEXPAND|wxALL, 5); sbGameConfig->Add(sbCoreOverrides, 0, wxEXPAND); sbGameConfig->Add(sbWiiOverrides, 0, wxEXPAND); @@ -481,12 +469,11 @@ void CISOProperties::CreateGUIControls(bool IsWad) // Patches - wxBoxSizer * const sPatches = new wxBoxSizer(wxVERTICAL); - Patches = new wxCheckListBox(m_PatchPage, ID_PATCHES_LIST, wxDefaultPosition, - wxDefaultSize, arrayStringFor_Patches, wxLB_HSCROLL); - wxBoxSizer * const sPatchButtons = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* const sPatches = new wxBoxSizer(wxVERTICAL); + Patches = new wxCheckListBox(m_PatchPage, ID_PATCHES_LIST, wxDefaultPosition, wxDefaultSize, arrayStringFor_Patches, wxLB_HSCROLL); + wxBoxSizer* const sPatchButtons = new wxBoxSizer(wxHORIZONTAL); EditPatch = new wxButton(m_PatchPage, ID_EDITPATCH, _("Edit...")); - wxButton * const AddPatch = new wxButton(m_PatchPage, ID_ADDPATCH, _("Add...")); + wxButton* const AddPatch = new wxButton(m_PatchPage, ID_ADDPATCH, _("Add...")); RemovePatch = new wxButton(m_PatchPage, ID_REMOVEPATCH, _("Remove")); EditPatch->Enable(false); RemovePatch->Enable(false); @@ -504,13 +491,11 @@ void CISOProperties::CreateGUIControls(bool IsWad) // Action Replay Cheats wxBoxSizer * const sCheats = new wxBoxSizer(wxVERTICAL); - Cheats = new wxCheckListBox(m_CheatPage, ID_CHEATS_LIST, wxDefaultPosition, - wxDefaultSize, arrayStringFor_Cheats, wxLB_HSCROLL); + Cheats = new wxCheckListBox(m_CheatPage, ID_CHEATS_LIST, wxDefaultPosition, wxDefaultSize, arrayStringFor_Cheats, wxLB_HSCROLL); wxBoxSizer * const sCheatButtons = new wxBoxSizer(wxHORIZONTAL); EditCheat = new wxButton(m_CheatPage, ID_EDITCHEAT, _("Edit...")); wxButton * const AddCheat = new wxButton(m_CheatPage, ID_ADDCHEAT, _("Add...")); - RemoveCheat = new wxButton(m_CheatPage, ID_REMOVECHEAT, _("Remove"), - wxDefaultPosition, wxDefaultSize, 0); + RemoveCheat = new wxButton(m_CheatPage, ID_REMOVECHEAT, _("Remove")); EditCheat->Enable(false); RemoveCheat->Enable(false); @@ -525,36 +510,22 @@ void CISOProperties::CreateGUIControls(bool IsWad) m_CheatPage->SetSizer(sCheatPage); - wxStaticText * const m_NameText = - new wxStaticText(m_Information, wxID_ANY, _("Name:")); - m_Name = new wxTextCtrl(m_Information, ID_NAME, wxEmptyString, - wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxStaticText * const m_GameIDText = - new wxStaticText(m_Information, wxID_ANY, _("Game ID:")); - m_GameID = new wxTextCtrl(m_Information, ID_GAMEID, wxEmptyString, - wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxStaticText * const m_CountryText = - new wxStaticText(m_Information, wxID_ANY, _("Country:")); - m_Country = new wxTextCtrl(m_Information, ID_COUNTRY, wxEmptyString, - wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxStaticText * const m_MakerIDText = - new wxStaticText(m_Information, wxID_ANY, _("Maker ID:")); - m_MakerID = new wxTextCtrl(m_Information, ID_MAKERID, wxEmptyString, - wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxStaticText * const m_RevisionText = - new wxStaticText(m_Information, wxID_ANY, _("Revision:")); - m_Revision = new wxTextCtrl(m_Information, ID_REVISION, wxEmptyString, - wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxStaticText * const m_DateText = - new wxStaticText(m_Information, wxID_ANY, _("Date:")); - m_Date = new wxTextCtrl(m_Information, ID_DATE, wxEmptyString, - wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxStaticText * const m_FSTText = - new wxStaticText(m_Information, wxID_ANY, _("FST Size:")); - m_FST = new wxTextCtrl(m_Information, ID_FST, wxEmptyString, - wxDefaultPosition, wxDefaultSize, wxTE_READONLY); + wxStaticText* const m_NameText = new wxStaticText(m_Information, wxID_ANY, _("Name:")); + m_Name = new wxTextCtrl(m_Information, ID_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); + wxStaticText* const m_GameIDText = new wxStaticText(m_Information, wxID_ANY, _("Game ID:")); + m_GameID = new wxTextCtrl(m_Information, ID_GAMEID, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); + wxStaticText* const m_CountryText = new wxStaticText(m_Information, wxID_ANY, _("Country:")); + m_Country = new wxTextCtrl(m_Information, ID_COUNTRY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); + wxStaticText* const m_MakerIDText = new wxStaticText(m_Information, wxID_ANY, _("Maker ID:")); + m_MakerID = new wxTextCtrl(m_Information, ID_MAKERID, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); + wxStaticText* const m_RevisionText = new wxStaticText(m_Information, wxID_ANY, _("Revision:")); + m_Revision = new wxTextCtrl(m_Information, ID_REVISION, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); + wxStaticText* const m_DateText = new wxStaticText(m_Information, wxID_ANY, _("Date:")); + m_Date = new wxTextCtrl(m_Information, ID_DATE, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); + wxStaticText* const m_FSTText = new wxStaticText(m_Information, wxID_ANY, _("FST Size:")); + m_FST = new wxTextCtrl(m_Information, ID_FST, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxStaticText * const m_LangText = new wxStaticText(m_Information, wxID_ANY, _("Show Language:")); + wxStaticText* const m_LangText = new wxStaticText(m_Information, wxID_ANY, _("Show Language:")); arrayStringFor_Lang.Add(_("English")); arrayStringFor_Lang.Add(_("German")); arrayStringFor_Lang.Add(_("French")); @@ -574,17 +545,17 @@ void CISOProperties::CreateGUIControls(bool IsWad) m_Lang = new wxChoice(m_Information, ID_LANG, wxDefaultPosition, wxDefaultSize, arrayStringFor_Lang); m_Lang->SetSelection(language); - wxStaticText * const m_ShortText = new wxStaticText(m_Information, wxID_ANY, _("Short Name:")); + wxStaticText* const m_ShortText = new wxStaticText(m_Information, wxID_ANY, _("Short Name:")); m_ShortName = new wxTextCtrl(m_Information, ID_SHORTNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxStaticText * const m_MakerText = new wxStaticText(m_Information, wxID_ANY, _("Maker:")); + wxStaticText* const m_MakerText = new wxStaticText(m_Information, wxID_ANY, _("Maker:")); m_Maker = new wxTextCtrl(m_Information, ID_MAKER, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - wxStaticText * const m_CommentText = new wxStaticText(m_Information, wxID_ANY, _("Comment:")); + wxStaticText* const m_CommentText = new wxStaticText(m_Information, wxID_ANY, _("Comment:")); m_Comment = new wxTextCtrl(m_Information, ID_COMMENT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY); - wxStaticText * const m_BannerText = new wxStaticText(m_Information, wxID_ANY, _("Banner:")); - m_Banner = new wxStaticBitmap(m_Information, ID_BANNER, wxNullBitmap, wxDefaultPosition, wxSize(96, 32), 0); + wxStaticText* const m_BannerText = new wxStaticText(m_Information, wxID_ANY, _("Banner:")); + m_Banner = new wxStaticBitmap(m_Information, ID_BANNER, wxNullBitmap, wxDefaultPosition, wxSize(96, 32)); // ISO Details - wxGridBagSizer * const sISODetails = new wxGridBagSizer(0, 0); + wxGridBagSizer* const sISODetails = new wxGridBagSizer(0, 0); sISODetails->Add(m_NameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sISODetails->Add(m_Name, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5); sISODetails->Add(m_GameIDText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -600,12 +571,12 @@ void CISOProperties::CreateGUIControls(bool IsWad) sISODetails->Add(m_FSTText, wxGBPosition(6, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sISODetails->Add(m_FST, wxGBPosition(6, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5); sISODetails->AddGrowableCol(1); - wxStaticBoxSizer * const sbISODetails = + wxStaticBoxSizer* const sbISODetails = new wxStaticBoxSizer(wxVERTICAL, m_Information, _("ISO Details")); sbISODetails->Add(sISODetails, 0, wxEXPAND, 5); // Banner Details - wxGridBagSizer * const sBannerDetails = new wxGridBagSizer(0, 0); + wxGridBagSizer* const sBannerDetails = new wxGridBagSizer(0, 0); sBannerDetails->Add(m_LangText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sBannerDetails->Add(m_Lang, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5); sBannerDetails->Add(m_ShortText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -617,30 +588,28 @@ void CISOProperties::CreateGUIControls(bool IsWad) sBannerDetails->Add(m_BannerText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALL, 5); sBannerDetails->Add(m_Banner, wxGBPosition(4, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5); sBannerDetails->AddGrowableCol(1); - wxStaticBoxSizer * const sbBannerDetails = + wxStaticBoxSizer* const sbBannerDetails = new wxStaticBoxSizer(wxVERTICAL, m_Information, _("Banner Details")); sbBannerDetails->Add(sBannerDetails, 0, wxEXPAND, 5); - wxBoxSizer * const sInfoPage = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* const sInfoPage = new wxBoxSizer(wxVERTICAL); sInfoPage->Add(sbISODetails, 0, wxEXPAND|wxALL, 5); sInfoPage->Add(sbBannerDetails, 0, wxEXPAND|wxALL, 5); m_Information->SetSizer(sInfoPage); if (!IsWad) { - wxPanel * const m_Filesystem = - new wxPanel(m_Notebook, ID_FILESYSTEM, wxDefaultPosition, wxDefaultSize); + wxPanel* const m_Filesystem = new wxPanel(m_Notebook, ID_FILESYSTEM); m_Notebook->AddPage(m_Filesystem, _("Filesystem")); // Filesystem icons - wxImageList * const m_iconList = new wxImageList(16, 16); + wxImageList* const m_iconList = new wxImageList(16, 16); m_iconList->Add(wxBitmap(disc_xpm), wxNullBitmap); // 0 m_iconList->Add(wxBitmap(folder_xpm), wxNullBitmap); // 1 m_iconList->Add(wxBitmap(file_xpm), wxNullBitmap); // 2 // Filesystem tree - m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL, - wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE); + m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL); m_Treectrl->AssignImageList(m_iconList); RootId = m_Treectrl->AddRoot(_("Disc"), 0, 0, 0); @@ -659,8 +628,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) EditConfigDefault->Disable(); // Add notebook and buttons to the dialog - wxBoxSizer* sMain; - sMain = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* sMain = new wxBoxSizer(wxVERTICAL); sMain->Add(m_Notebook, 1, wxEXPAND|wxALL, 5); sMain->Add(sButtons, 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5); sMain->SetMinSize(wxSize(500, -1)); @@ -697,7 +665,7 @@ void CISOProperties::OnBannerImageSave(wxCommandEvent& WXUNUSED (event)) wxString dirHome; wxFileDialog dialog(this, _("Save as..."), wxGetHomeDir(&dirHome), wxString::Format(wxT("%s.png"), m_GameID->GetLabel().c_str()), - wxALL_FILES_PATTERN, wxFD_SAVE|wxFD_OVERWRITE_PROMPT, wxDefaultPosition, wxDefaultSize); + wxALL_FILES_PATTERN, wxFD_SAVE|wxFD_OVERWRITE_PROMPT); if (dialog.ShowModal() == wxID_OK) { m_Banner->GetBitmap().ConvertToImage().SaveFile(dialog.GetPath()); @@ -716,9 +684,13 @@ void CISOProperties::OnRightClickOnTree(wxTreeEvent& event) popupMenu->Append(IDM_EXTRACTDIR, _("Extract Partition...")); } else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 1) + { popupMenu->Append(IDM_EXTRACTDIR, _("Extract Directory...")); + } else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 2) + { popupMenu->Append(IDM_EXTRACTFILE, _("Extract File...")); + } popupMenu->Append(IDM_EXTRACTALL, _("Extract All Files...")); @@ -739,12 +711,9 @@ void CISOProperties::OnRightClickOnTree(wxTreeEvent& event) void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event)) { - wxString Path; - wxString File; + wxString File = m_Treectrl->GetItemText(m_Treectrl->GetSelection()); - File = m_Treectrl->GetItemText(m_Treectrl->GetSelection()); - - Path = wxFileSelector( + wxString Path = wxFileSelector( _("Export File"), wxEmptyString, File, wxEmptyString, wxGetTranslation(wxALL_FILES), @@ -756,8 +725,7 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event)) while (m_Treectrl->GetItemParent(m_Treectrl->GetSelection()) != m_Treectrl->GetRootItem()) { - wxString temp; - temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection())); + wxString temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection())); File = temp + wxT(DIR_SEP_CHR) + File; m_Treectrl->SelectItem(m_Treectrl->GetItemParent(m_Treectrl->GetSelection())); diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index 2675d3c801..fff544d2dd 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -73,8 +73,7 @@ void GamepadPage::ConfigExtension(wxCommandEvent& event) if (ex->switch_extension) { wxDialog dlg(this, -1, - wxGetTranslation(StrToWxStr(ex->attachments[ex->switch_extension]->GetName())), - wxDefaultPosition, wxDefaultSize); + wxGetTranslation(StrToWxStr(ex->attachments[ex->switch_extension]->GetName()))); wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL); const std::size_t orig_size = control_groups.size(); @@ -115,7 +114,7 @@ void PadSettingExtension::UpdateValue() } PadSettingCheckBox::PadSettingCheckBox(wxWindow* const parent, ControlState& _value, const char* const label) - : PadSetting(new wxCheckBox(parent, -1, wxGetTranslation(StrToWxStr(label)), wxDefaultPosition)) + : PadSetting(new wxCheckBox(parent, -1, wxGetTranslation(StrToWxStr(label)))) , value(_value) { UpdateGUI(); @@ -573,10 +572,10 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent) wxButton* const select_button = new wxButton(this, -1, _("Select")); select_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::SetSelectedControl, this); - wxButton* const not_button = new wxButton(this, -1, _("! NOT"), wxDefaultPosition); + wxButton* const not_button = new wxButton(this, -1, _("! NOT")); not_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); - wxButton* const or_button = new wxButton(this, -1, _("| OR"), wxDefaultPosition); + wxButton* const or_button = new wxButton(this, -1, _("| OR")); or_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); control_lbox = new wxListBox(this, -1, wxDefaultPosition, wxSize(-1, 64)); @@ -589,8 +588,8 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent) if (control_reference->is_input) { // TODO: check if && is good on other OS - wxButton* const and_button = new wxButton(this, -1, _("&& AND"), wxDefaultPosition); - wxButton* const add_button = new wxButton(this, -1, _("+ ADD"), wxDefaultPosition); + wxButton* const and_button = new wxButton(this, -1, _("&& AND")); + wxButton* const add_button = new wxButton(this, -1, _("+ ADD")); and_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); add_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); @@ -950,7 +949,7 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow } GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned int pad_num, InputConfigDialog* const config_dialog) - : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) + : wxPanel(parent, wxID_ANY) ,controller(plugin.controllers[pad_num]) , m_config_dialog(config_dialog) , m_plugin(plugin) @@ -1019,7 +1018,7 @@ GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned i InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin, const std::string& name, const int tab_num) - : wxDialog(parent, wxID_ANY, wxGetTranslation(StrToWxStr(name)), wxPoint(128,-1), wxDefaultSize) + : wxDialog(parent, wxID_ANY, wxGetTranslation(StrToWxStr(name)), wxPoint(128,-1)) , m_plugin(plugin) { m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT); diff --git a/Source/Core/DolphinWX/LogConfigWindow.cpp b/Source/Core/DolphinWX/LogConfigWindow.cpp index 389acb81f9..89779b2032 100644 --- a/Source/Core/DolphinWX/LogConfigWindow.cpp +++ b/Source/Core/DolphinWX/LogConfigWindow.cpp @@ -56,8 +56,7 @@ void LogConfigWindow::CreateGUIControls() for (int i = 0; i < MAX_LOGLEVEL; ++i) wxLevelsUse.Add(wxLevels[i]); m_verbosity = new wxRadioBox(this, wxID_ANY, _("Verbosity"), - wxDefaultPosition, wxDefaultSize, wxLevelsUse, 0, - wxRA_SPECIFY_ROWS, wxDefaultValidator); + wxDefaultPosition, wxDefaultSize, wxLevelsUse, 0, wxRA_SPECIFY_ROWS); m_verbosity->Bind(wxEVT_COMMAND_RADIOBOX_SELECTED, &LogConfigWindow::OnVerbosityChange, this); // Options diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp index 0f752feb28..8468bff90a 100644 --- a/Source/Core/DolphinWX/LogWindow.cpp +++ b/Source/Core/DolphinWX/LogWindow.cpp @@ -129,8 +129,7 @@ void CLogWindow::CreateGUIControls() } // Font - m_FontChoice = new wxChoice(this, IDM_FONT, - wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator); + m_FontChoice = new wxChoice(this, IDM_FONT); m_FontChoice->Append(_("Default font")); m_FontChoice->Append(_("Monospaced font")); m_FontChoice->Append(_("Selected font")); @@ -161,8 +160,7 @@ void CLogWindow::CreateGUIControls() // Sizers wxBoxSizer *sTop = new wxBoxSizer(wxHORIZONTAL); - sTop->Add(new wxButton(this, IDM_CLEARLOG, _("Clear"), - wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT)); + sTop->Add(new wxButton(this, IDM_CLEARLOG, _("Clear"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT)); sTop->Add(m_FontChoice, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 3); sTop->Add(m_WrapLine, 0, wxALIGN_CENTER_VERTICAL); diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp index 9812aee08d..de7e24ca77 100644 --- a/Source/Core/DolphinWX/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetWindow.cpp @@ -81,7 +81,7 @@ void FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_list) } NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* const game_list) - : wxFrame(parent, wxID_ANY, wxT(NETPLAY_TITLEBAR), wxDefaultPosition, wxDefaultSize) + : wxFrame(parent, wxID_ANY, wxT(NETPLAY_TITLEBAR)) , m_game_list(game_list) { IniFile inifile; @@ -91,8 +91,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* wxPanel* const panel = new wxPanel(this); // top row - wxStaticText* const nick_lbl = new wxStaticText(panel, wxID_ANY, _("Nickname :"), - wxDefaultPosition, wxDefaultSize); + wxStaticText* const nick_lbl = new wxStaticText(panel, wxID_ANY, _("Nickname :")); std::string nickname; netplay_section.Get("Nickname", &nickname, "Player"); @@ -104,24 +103,22 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* // tabs - wxNotebook* const notebook = new wxNotebook(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - wxPanel* const connect_tab = new wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize); + wxNotebook* const notebook = new wxNotebook(panel, wxID_ANY); + wxPanel* const connect_tab = new wxPanel(notebook, wxID_ANY); notebook->AddPage(connect_tab, _("Connect")); - wxPanel* const host_tab = new wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize); + wxPanel* const host_tab = new wxPanel(notebook, wxID_ANY); notebook->AddPage(host_tab, _("Host")); // connect tab { - wxStaticText* const ip_lbl = new wxStaticText(connect_tab, wxID_ANY, _("Address :"), - wxDefaultPosition, wxDefaultSize); + wxStaticText* const ip_lbl = new wxStaticText(connect_tab, wxID_ANY, _("Address :")); std::string address; netplay_section.Get("Address", &address, "localhost"); m_connect_ip_text = new wxTextCtrl(connect_tab, wxID_ANY, StrToWxStr(address)); - wxStaticText* const port_lbl = new wxStaticText(connect_tab, wxID_ANY, _("Port :"), - wxDefaultPosition, wxDefaultSize); + wxStaticText* const port_lbl = new wxStaticText(connect_tab, wxID_ANY, _("Port :")); // string? w/e std::string port; @@ -144,8 +141,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* "All memory cards must be identical between players or disabled.\n" "Wiimote support is probably terrible. Don't use it.\n" "\n" - "The host must have the chosen TCP port open/forwarded!\n"), - wxDefaultPosition, wxDefaultSize); + "The host must have the chosen TCP port open/forwarded!\n")); wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL); top_szr->Add(ip_lbl, 0, wxCENTER | wxRIGHT, 5); @@ -165,8 +161,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* // host tab { - wxStaticText* const port_lbl = new wxStaticText(host_tab, wxID_ANY, _("Port :"), - wxDefaultPosition, wxDefaultSize); + wxStaticText* const port_lbl = new wxStaticText(host_tab, wxID_ANY, _("Port :")); // string? w/e std::string port; @@ -314,7 +309,7 @@ void NetPlaySetupDiag::OnQuit(wxCommandEvent&) NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game_list, const std::string& game, const bool is_hosting) - : wxFrame(parent, wxID_ANY, wxT(NETPLAY_TITLEBAR), wxDefaultPosition, wxDefaultSize) + : wxFrame(parent, wxID_ANY, wxT(NETPLAY_TITLEBAR)) , m_selected_game(game) , m_start_btn(NULL) , m_game_list(game_list) @@ -617,7 +612,7 @@ bool NetPlayDiag::IsRecording() } ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* const game_list, wxString& game_name) - : wxDialog(parent, wxID_ANY, _("Change Game"), wxDefaultPosition, wxDefaultSize) + : wxDialog(parent, wxID_ANY, _("Change Game")) , m_game_name(game_name) { m_game_lbox = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_SORT); @@ -644,7 +639,7 @@ void ChangeGameDiag::OnPick(wxCommandEvent& event) } PadMapDiag::PadMapDiag(wxWindow* const parent, PadMapping map[], PadMapping wiimotemap[], std::vector& player_list) - : wxDialog(parent, wxID_ANY, _("Configure Pads"), wxDefaultPosition, wxDefaultSize) + : wxDialog(parent, wxID_ANY, _("Configure Pads")) , m_mapping(map) , m_wiimapping (wiimotemap) , m_player_list(player_list) diff --git a/Source/Core/DolphinWX/PatchAddEdit.cpp b/Source/Core/DolphinWX/PatchAddEdit.cpp index ac72e67453..c7e8e0677b 100644 --- a/Source/Core/DolphinWX/PatchAddEdit.cpp +++ b/Source/Core/DolphinWX/PatchAddEdit.cpp @@ -73,7 +73,7 @@ void CPatchAddEdit::CreateGUIControls(int _selection) wxStaticText* EditPatchOffsetText = new wxStaticText(this, ID_EDITPATCH_OFFSET_TEXT, _("Offset:")); EditPatchOffset = new wxTextCtrl(this, ID_EDITPATCH_OFFSET); EditPatchOffset->SetValue(wxString::Format(wxT("%08X"), tempEntries.at(0).address)); - EntrySelection = new wxSpinButton(this, ID_ENTRY_SELECT, wxDefaultPosition, wxDefaultSize, wxVERTICAL); + EntrySelection = new wxSpinButton(this, ID_ENTRY_SELECT); EntrySelection->SetRange(0, (int)tempEntries.size()-1); EntrySelection->SetValue((int)tempEntries.size()-1); wxArrayString wxArrayStringFor_EditPatchType; diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp index 06ea4907be..b0ff86d971 100644 --- a/Source/Core/DolphinWX/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/TASInputDlg.cpp @@ -61,11 +61,11 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxBoxSizer* const main_yslider_box = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const main_stick_box = new wxBoxSizer(wxVERTICAL); - static_bitmap_main = new wxStaticBitmap(this, ID_MAIN_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize); + static_bitmap_main = new wxStaticBitmap(this, ID_MAIN_STICK, TASInputDlg::CreateStickBitmap(128,128)); static_bitmap_main->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::OnMouseDownL, this); static_bitmap_main->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseDownL, this); static_bitmap_main->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this); - wx_mainX_s = new wxSlider(this, ID_MAIN_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL); + wx_mainX_s = new wxSlider(this, ID_MAIN_X_SLIDER, 128, 0, 255); wx_mainX_s->SetMinSize(wxSize(120,-1)); wx_mainX_t = new wxTextCtrl(this, ID_MAIN_X_TEXT, wxT("128"), wxDefaultPosition, wxSize(40, 20)); wx_mainX_t->SetMaxLength(3); @@ -88,11 +88,11 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxBoxSizer* const c_yslider_box = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const c_stick_box = new wxBoxSizer(wxVERTICAL); - static_bitmap_c = new wxStaticBitmap(this, ID_C_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize); + static_bitmap_c = new wxStaticBitmap(this, ID_C_STICK, TASInputDlg::CreateStickBitmap(128,128)); static_bitmap_c->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::OnMouseDownL, this); static_bitmap_c->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseDownL, this); static_bitmap_c->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this); - wx_cX_s = new wxSlider(this, ID_C_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL); + wx_cX_s = new wxSlider(this, ID_C_X_SLIDER, 128, 0, 255); wx_cX_s->SetMinSize(wxSize(120,-1)); wx_cX_t = new wxTextCtrl(this, ID_C_X_TEXT, wxT("128"), wxDefaultPosition, wxSize(40, 20)); wx_cX_t->SetMaxLength(3); @@ -129,28 +129,28 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxStaticBoxSizer* const buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons")); wxGridSizer* const buttons_grid = new wxGridSizer(4); - wx_a_button = new wxCheckBox(this,ID_A,_T("A"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_a_button = new wxCheckBox(this,ID_A,_T("A")); wx_a_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_a_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); - wx_b_button = new wxCheckBox(this,ID_B,_T("B"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_b_button = new wxCheckBox(this,ID_B,_T("B")); wx_b_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_b_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); - wx_x_button = new wxCheckBox(this,ID_X,_T("X"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_x_button = new wxCheckBox(this,ID_X,_T("X")); wx_x_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_x_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); - wx_y_button = new wxCheckBox(this,ID_Y,_T("Y"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_y_button = new wxCheckBox(this,ID_Y,_T("Y")); wx_y_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_y_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); - wx_l_button = new wxCheckBox(this,ID_L,_T("L"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_l_button = new wxCheckBox(this,ID_L,_T("L")); wx_l_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_l_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); - wx_r_button = new wxCheckBox(this,ID_R,_T("R"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_r_button = new wxCheckBox(this,ID_R,_T("R")); wx_r_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_r_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); - wx_z_button = new wxCheckBox(this,ID_Z,_T("Z"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_z_button = new wxCheckBox(this,ID_Z,_T("Z")); wx_z_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_z_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); - wx_start_button = new wxCheckBox(this,ID_START,_T("Start"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_start_button = new wxCheckBox(this,ID_START,_T("Start")); wx_start_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_start_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); @@ -166,16 +166,16 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxGridSizer* const buttons_dpad = new wxGridSizer(3); - wx_up_button = new wxCheckBox(this,ID_UP,_T("Up"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_up_button = new wxCheckBox(this,ID_UP,_T("Up")); wx_up_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_up_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); - wx_right_button = new wxCheckBox(this,ID_RIGHT,_T("Right"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_right_button = new wxCheckBox(this,ID_RIGHT,_T("Right")); wx_right_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_right_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); - wx_down_button = new wxCheckBox(this,ID_DOWN,_T("Down"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_down_button = new wxCheckBox(this,ID_DOWN,_T("Down")); wx_down_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_down_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); - wx_left_button = new wxCheckBox(this,ID_LEFT,_T("Left"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); + wx_left_button = new wxCheckBox(this,ID_LEFT,_T("Left")); wx_left_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); wx_left_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); diff --git a/Source/Core/DolphinWX/UDPConfigDiag.cpp b/Source/Core/DolphinWX/UDPConfigDiag.cpp index 0887fd8649..2ac63a711d 100644 --- a/Source/Core/DolphinWX/UDPConfigDiag.cpp +++ b/Source/Core/DolphinWX/UDPConfigDiag.cpp @@ -16,7 +16,7 @@ class wxWindow; UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) : - wxDialog(parent, -1, _("UDP Wiimote"), wxDefaultPosition, wxDefaultSize), + wxDialog(parent, -1, _("UDP Wiimote")), wrp(_wrp) { wxBoxSizer *const outer_sizer = new wxBoxSizer(wxVERTICAL); diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index 6a87fc3ae3..eb1ee09fcd 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -209,8 +209,7 @@ wxArrayString GetListOfResolutions() VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, const std::string& _ininame) : wxDialog(parent, -1, - wxString::Format(_("Dolphin %s Graphics Configuration"), wxGetTranslation(StrToWxStr(title))), - wxDefaultPosition, wxDefaultSize) + wxString::Format(_("Dolphin %s Graphics Configuration"), wxGetTranslation(StrToWxStr(title)))) , vconfig(g_Config) , ininame(_ininame) { @@ -218,11 +217,11 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con Bind(wxEVT_UPDATE_UI, &VideoConfigDiag::OnUpdateUI, this); - wxNotebook* const notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize); + wxNotebook* const notebook = new wxNotebook(this, -1); // -- GENERAL -- { - wxPanel* const page_general = new wxPanel(notebook, -1, wxDefaultPosition); + wxPanel* const page_general = new wxPanel(notebook, -1); notebook->AddPage(page_general, _("General")); wxBoxSizer* const szr_general = new wxBoxSizer(wxVERTICAL); @@ -233,7 +232,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con // backend { wxStaticText* const label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:")); - choice_backend = new wxChoice(page_general, wxID_ANY, wxDefaultPosition); + choice_backend = new wxChoice(page_general, wxID_ANY); RegisterControl(choice_backend, wxGetTranslation(backend_desc)); std::vector::const_iterator @@ -357,7 +356,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con // -- ENHANCEMENTS -- { - wxPanel* const page_enh = new wxPanel(notebook, -1, wxDefaultPosition); + wxPanel* const page_enh = new wxPanel(notebook, -1); notebook->AddPage(page_enh, _("Enhancements")); wxBoxSizer* const szr_enh_main = new wxBoxSizer(wxVERTICAL); @@ -403,7 +402,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con // postproc shader if (vconfig.backend_info.PPShaders.size()) { - wxChoice *const choice_ppshader = new wxChoice(page_enh, -1, wxDefaultPosition); + wxChoice *const choice_ppshader = new wxChoice(page_enh, -1); RegisterControl(choice_ppshader, wxGetTranslation(ppshader_desc)); choice_ppshader->AppendString(_("(off)")); @@ -451,7 +450,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con // -- SPEED HACKS -- { - wxPanel* const page_hacks = new wxPanel(notebook, -1, wxDefaultPosition); + wxPanel* const page_hacks = new wxPanel(notebook, -1); notebook->AddPage(page_hacks, _("Hacks")); wxBoxSizer* const szr_hacks = new wxBoxSizer(wxVERTICAL); @@ -536,7 +535,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con // -- ADVANCED -- { - wxPanel* const page_advanced = new wxPanel(notebook, -1, wxDefaultPosition); + wxPanel* const page_advanced = new wxPanel(notebook, -1); notebook->AddPage(page_advanced, _("Advanced")); wxBoxSizer* const szr_advanced = new wxBoxSizer(wxVERTICAL); @@ -604,7 +603,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con page_advanced->SetSizerAndFit(szr_advanced); } - wxButton* const btn_close = new wxButton(this, wxID_OK, _("Close"), wxDefaultPosition); + wxButton* const btn_close = new wxButton(this, wxID_OK, _("Close")); btn_close->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &VideoConfigDiag::Event_ClickClose, this); Bind(wxEVT_CLOSE_WINDOW, &VideoConfigDiag::Event_Close, this); diff --git a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp index e366567a35..b5eabd678e 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp @@ -31,7 +31,7 @@ class InputPlugin; WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin) - : wxDialog(parent, -1, _("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize) + : wxDialog(parent, -1, _("Dolphin Wiimote Configuration")) , m_plugin(plugin) { wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); @@ -100,7 +100,7 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin // "Real wiimotes" controls - wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"), wxDefaultPosition); + wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh")); refresh_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::RefreshRealWiimotes, this); wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxVERTICAL, this, _("Real Wiimotes")); @@ -129,7 +129,7 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin // "General Settings" controls const wxString str[] = { _("Bottom"), _("Top") }; wxChoice* const WiiSensBarPos = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, str); - wxSlider* const WiiSensBarSens = new wxSlider(this, wxID_ANY, 0, 0, 4, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL); + wxSlider* const WiiSensBarSens = new wxSlider(this, wxID_ANY, 0, 0, 4); wxSlider* const WiimoteSpkVolume = new wxSlider(this, wxID_ANY, 0, 0, 127); wxCheckBox* const WiimoteMotor = new wxCheckBox(this, wxID_ANY, _("Wiimote Motor"));