4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add a RAII wx connect wrapper

Browse source
This commit is contained in:
jp9000 2013-12-13 08:15:50 -07:00
commit fa00c6fa47
2 changed files with 71 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
obs/settings-basic-general.cpp
View file

@ -20,10 +20,12 @@
#include "obs-app.hpp"
#include "settings-basic.hpp"
#include "window-settings-basic.hpp"
#include "wx-wrappers.hpp"
#include "platform.hpp"
class GeneralSettings : public BasicSettingsData {
ConfigFile localeIni;
WXConnector languageBoxConnector;
void LanguageChanged(wxCommandEvent &event);
@ -32,7 +34,6 @@ class GeneralSettings : public BasicSettingsData {
public:
GeneralSettings(OBSBasicSettings *window);
virtual ~GeneralSettings();
virtual void Apply();
};
@ -86,16 +87,8 @@ GeneralSettings::GeneralSettings(OBSBasicSettings *window)
"General", "Language");
FillLanguageList(currentLang);
window->languageList->Connect(
wxEVT_COMBOBOX,
wxCommandEventHandler(GeneralSettings::LanguageChanged),
NULL,
this);
}
GeneralSettings::~GeneralSettings()
{
window->languageList->Disconnect(
languageBoxConnector.Connect(
window->languageList,
wxEVT_COMBOBOX,
wxCommandEventHandler(GeneralSettings::LanguageChanged),
NULL,