diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-12-02 12:01:29 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-12-02 12:01:29 -0500 |
| commit | 734aac54a8551b87da325c40530886a875519082 (patch) | |
| tree | f1dcf7ebeebf7686aad3135e5facbc91e6769634 /Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp | |
| parent | 54f1e3a3c148d36e694d8bb08d282225bdcb3440 (diff) | |
| parent | 10bfbebc780fb3693741a72f258a5da2c3daffa1 (diff) | |
Merge pull request #1631 from lioncash/id
DolphinWX: Specify wxID_ANY where -1 is used in controls
Diffstat (limited to 'Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp index 60cea18ac4..982813f90c 100644 --- a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp +++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp @@ -22,7 +22,7 @@ template <typename T> IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal, int maxVal, long style) : - wxSpinCtrl(parent, -1, label, wxDefaultPosition, wxDefaultSize, style), + wxSpinCtrl(parent, wxID_ANY, label, wxDefaultPosition, wxDefaultSize, style), m_setting(setting) { SetRange(minVal, maxVal); @@ -32,18 +32,18 @@ IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& se SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title, const std::string& _ininame) : - wxDialog(parent, -1, + wxDialog(parent, wxID_ANY, wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title))), vconfig(g_SWVideoConfig), ininame(_ininame) { vconfig.Load((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str()); - wxNotebook* const notebook = new wxNotebook(this, -1); + wxNotebook* const notebook = new wxNotebook(this, wxID_ANY); // -- GENERAL -- { - wxPanel* const page_general= new wxPanel(notebook, -1); + wxPanel* const page_general= new wxPanel(notebook); notebook->AddPage(page_general, _("General")); wxBoxSizer* const szr_general = new wxBoxSizer(wxVERTICAL); |
