Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
9b766511
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,发现更多精彩内容 >>
提交
9b766511
编写于
11月 23, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
updated obs basic window form (needed an ID and needed a OnClose callback)
上级
fcf7e508
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
32 addition
and
28 deletion
+32
-28
obs/OBSWindows.cpp
obs/OBSWindows.cpp
+2
-0
obs/OBSWindows.fbp
obs/OBSWindows.fbp
+2
-2
obs/OBSWindows.h
obs/OBSWindows.h
+28
-26
未找到文件。
obs/OBSWindows.cpp
浏览文件 @
9b766511
...
...
@@ -230,6 +230,7 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit
this
->
Centre
(
wxBOTH
);
// Connect Events
this
->
Connect
(
wxEVT_CLOSE_WINDOW
,
wxCloseEventHandler
(
OBSBasicBase
::
OnClose
)
);
this
->
Connect
(
file_new
->
GetId
(),
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_newOnMenuSelection
)
);
this
->
Connect
(
file_open
->
GetId
(),
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_openOnMenuSelection
)
);
this
->
Connect
(
file_save
->
GetId
(),
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_saveOnMenuSelection
)
);
...
...
@@ -251,6 +252,7 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit
OBSBasicBase
::~
OBSBasicBase
()
{
// Disconnect Events
this
->
Disconnect
(
wxEVT_CLOSE_WINDOW
,
wxCloseEventHandler
(
OBSBasicBase
::
OnClose
)
);
this
->
Disconnect
(
ID_FILE_NEW
,
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_newOnMenuSelection
)
);
this
->
Disconnect
(
IF_FILE_OPEN
,
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_openOnMenuSelection
)
);
this
->
Disconnect
(
IF_FILE_SAVE
,
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_saveOnMenuSelection
)
);
...
...
obs/OBSWindows.fbp
浏览文件 @
9b766511
...
...
@@ -39,7 +39,7 @@
<property
name=
"fg"
></property>
<property
name=
"font"
></property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"id"
>
ID_OBS_BASIC
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
OBSBasicBase
</property>
...
...
@@ -62,7 +62,7 @@
<event
name=
"OnAuiPaneRestore"
></event>
<event
name=
"OnAuiRender"
></event>
<event
name=
"OnChar"
></event>
<event
name=
"OnClose"
></event>
<event
name=
"OnClose"
>
OnClose
</event>
<event
name=
"OnEnterWindow"
></event>
<event
name=
"OnEraseBackground"
></event>
<event
name=
"OnHibernate"
></event>
...
...
obs/OBSWindows.h
浏览文件 @
9b766511
...
...
@@ -36,31 +36,32 @@ class WindowSubclass;
///////////////////////////////////////////////////////////////////////////
#define ID_FILE_NEW 1000
#define IF_FILE_OPEN 1001
#define IF_FILE_SAVE 1002
#define ID_FILE_EXIT 1003
#define ID_PROGRAM 1004
#define ID_SCENES 1005
#define ID_SCENE_ADD 1006
#define ID_SCENE_DELETE 1007
#define ID_SCENE_PROPERTIES 1008
#define ID_SCENE_MOVEUP 1009
#define ID_SCENE_MOVEDOWN 1010
#define ID_SOURCES 1011
#define ID_SOURCE_ADD 1012
#define ID_SOURCE_DELETE 1013
#define ID_SOURCE_PROPERTIES 1014
#define ID_SOURCE_MOVEUP 1015
#define ID_SOURCE_MOVEDOWN 1016
#define ID_SETPOSSIZE 1017
#define ID_CROP 1018
#define ID_LOCK 1019
#define ID_PREVIEW 1020
#define ID_STARTSTREAM 1021
#define ID_RECORD 1022
#define ID_SETTINGS 1023
#define ID_EXIT 1024
#define ID_OBS_BASIC 1000
#define ID_FILE_NEW 1001
#define IF_FILE_OPEN 1002
#define IF_FILE_SAVE 1003
#define ID_FILE_EXIT 1004
#define ID_PROGRAM 1005
#define ID_SCENES 1006
#define ID_SCENE_ADD 1007
#define ID_SCENE_DELETE 1008
#define ID_SCENE_PROPERTIES 1009
#define ID_SCENE_MOVEUP 1010
#define ID_SCENE_MOVEDOWN 1011
#define ID_SOURCES 1012
#define ID_SOURCE_ADD 1013
#define ID_SOURCE_DELETE 1014
#define ID_SOURCE_PROPERTIES 1015
#define ID_SOURCE_MOVEUP 1016
#define ID_SOURCE_MOVEDOWN 1017
#define ID_SETPOSSIZE 1018
#define ID_CROP 1019
#define ID_LOCK 1020
#define ID_PREVIEW 1021
#define ID_STARTSTREAM 1022
#define ID_RECORD 1023
#define ID_SETTINGS 1024
#define ID_EXIT 1025
///////////////////////////////////////////////////////////////////////////////
/// Class OBSBasicBase
...
...
@@ -93,6 +94,7 @@ class OBSBasicBase : public WindowSubclass
wxStatusBar
*
statusBar
;
// Virtual event handlers, overide them in your derived class
virtual
void
OnClose
(
wxCloseEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
file_newOnMenuSelection
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
file_openOnMenuSelection
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
file_saveOnMenuSelection
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
...
...
@@ -113,7 +115,7 @@ class OBSBasicBase : public WindowSubclass
public:
OBSBasicBase
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
".mainwindow"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
1117
,
783
),
long
style
=
wxDEFAULT_FRAME_STYLE
|
wxTAB_TRAVERSAL
);
OBSBasicBase
(
wxWindow
*
parent
,
wxWindowID
id
=
ID_OBS_BASIC
,
const
wxString
&
title
=
_
(
".mainwindow"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
1117
,
783
),
long
style
=
wxDEFAULT_FRAME_STYLE
|
wxTAB_TRAVERSAL
);
~
OBSBasicBase
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录