Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
fa00c6fa
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fa00c6fa
编写于
12月 13, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add a RAII wx connect wrapper
上级
40f922ca
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
71 addition
and
12 deletion
+71
-12
obs/settings-basic-general.cpp
obs/settings-basic-general.cpp
+4
-11
obs/wx-wrappers.hpp
obs/wx-wrappers.hpp
+67
-1
未找到文件。
obs/settings-basic-general.cpp
浏览文件 @
fa00c6fa
...
...
@@ -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
,
...
...
obs/wx-wrappers.hpp
浏览文件 @
fa00c6fa
...
...
@@ -17,8 +17,74 @@
#pragma once
#include <wx/window.h>
#include <wx/event.h>
struct
gs_window
;
class
wxWindow
;
gs_window
WxToGSWindow
(
const
wxWindow
*
window
);
void
OBSErrorBox
(
wxWindow
*
parent
,
const
char
*
message
,
...);
/*
* RAII wx connection wrapper
*
* Automatically disconnects events on destruction rather than having to
* manually call Disconnect for every Connect.
*/
class
WXConnector
{
wxEvtHandler
*
obj
;
wxEventType
eventType
;
wxObjectEventFunction
func
;
wxObject
*
userData
;
wxEvtHandler
*
eventSink
;
public:
inline
WXConnector
()
:
obj
(
NULL
),
eventType
(
0
),
func
(
NULL
),
userData
(
NULL
),
eventSink
(
NULL
)
{
}
inline
WXConnector
(
wxEvtHandler
*
obj
,
wxEventType
eventType
,
wxObjectEventFunction
func
,
wxObject
*
userData
,
wxEvtHandler
*
eventSink
)
:
obj
(
obj
),
eventType
(
eventType
),
func
(
func
),
userData
(
userData
),
eventSink
(
eventSink
)
{
obj
->
Connect
(
eventType
,
func
,
userData
,
eventSink
);
}
inline
~
WXConnector
()
{
Disconnect
();
}
inline
void
Connect
(
wxEvtHandler
*
obj
,
wxEventType
eventType
,
wxObjectEventFunction
func
,
wxObject
*
userData
,
wxEvtHandler
*
eventSink
)
{
Disconnect
();
this
->
obj
=
obj
;
this
->
eventType
=
eventType
;
this
->
func
=
func
;
this
->
userData
=
userData
;
this
->
eventSink
=
eventSink
;
obj
->
Connect
(
eventType
,
func
,
userData
,
eventSink
);
}
inline
void
Disconnect
()
{
if
(
obj
)
obj
->
Disconnect
(
eventType
,
func
,
userData
,
eventSink
);
obj
=
NULL
;
}
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录