diff options
| author | degasus <wickmarkus@web.de> | 2016-01-12 09:35:24 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2016-01-12 23:18:58 +0100 |
| commit | 0c92603fd58219f7b3c8e22eea9233c820c9a0e9 (patch) | |
| tree | ca1d9988da2c31bcdac6b4c81d589a30ee3dbf96 /Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp | |
| parent | 12f745092c48c73740684339bd7436dcc2742d12 (diff) | |
Merge VideoBackendHardware into VideoBackend.
And rename it to VideoBackendBase because of conflicts within the backends itself.
Diffstat (limited to 'Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp index eba84552a2..b09d2b4e90 100644 --- a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp +++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp @@ -61,7 +61,7 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std wxStaticText* const label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:")); wxChoice* const choice_backend = new wxChoice(page_general, wxID_ANY); - for (const VideoBackend* backend : g_available_video_backends) + for (const VideoBackendBase* backend : g_available_video_backends) { choice_backend->AppendString(StrToWxStr(backend->GetDisplayName())); } |