Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -19,23 +19,23 @@
class SoftwareVideoConfigDialog : public wxDialog
{
public:
SoftwareVideoConfigDialog(wxWindow* parent, const std::string &title, const std::string& ininame);
~SoftwareVideoConfigDialog();
SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title, const std::string& ininame);
~SoftwareVideoConfigDialog();
void Event_Backend(wxCommandEvent &ev)
{
auto& new_backend = g_available_video_backends[ev.GetInt()];
void Event_Backend(wxCommandEvent& ev)
{
auto& new_backend = g_available_video_backends[ev.GetInt()];
if (g_video_backend != new_backend.get())
{
Close();
if (g_video_backend != new_backend.get())
{
Close();
g_video_backend = new_backend.get();
SConfig::GetInstance().m_strVideoBackend = g_video_backend->GetName();
g_video_backend = new_backend.get();
SConfig::GetInstance().m_strVideoBackend = g_video_backend->GetName();
g_video_backend->ShowConfig(GetParent());
}
g_video_backend->ShowConfig(GetParent());
}
ev.Skip();
}
ev.Skip();
}
};