jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make OK/cancel/apply buttons accessible on the settings form

Browse Source
This commit is contained in:
jp9000
2013-12-18 12:06:13 -07:00
parent 0decd607c1
commit 158f83dc96
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
obs/forms/OBSWindows.cpp
View File

@@ -705,6 +705,8 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
bSizer37->Add( cancelButton, 0, wxALL, 5 );
applyButton = new wxButton( this, ID_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 );
applyButton->Enable( false );
bSizer37->Add( applyButton, 0, wxALL, 5 );

8
obs/forms/OBSWindows.fbp
View File

@@ -6743,7 +6743,7 @@
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="permission">public</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
@@ -6831,7 +6831,7 @@
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="permission">public</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
@@ -6900,7 +6900,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="enabled">0</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
@@ -6919,7 +6919,7 @@
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="permission">public</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>

6
obs/forms/OBSWindows.h
View File

@@ -219,9 +219,6 @@ class OBSBasicSettingsBase : public DialogSubclass
wxStaticText* m_staticText241;
wxStaticText* m_staticText242;
wxStaticText* m_staticText243;
wxButton* okButton;
wxButton* cancelButton;
wxButton* applyButton;
// Virtual event handlers, overide them in your derived class
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
@@ -256,6 +253,9 @@ class OBSBasicSettingsBase : public DialogSubclass
wxComboBox* auxAudioDeviceList2;
wxComboBox* auxAudioDeviceList3;
wxComboBox* auxAudioDeviceList4;
wxButton* okButton;
wxButton* cancelButton;
wxButton* applyButton;
OBSBasicSettingsBase( wxWindow* parent, wxWindowID id = ID_OBS_BASIC_SETTINGS, const wxString& title = _("Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 872,686 ), long style = wxDEFAULT_DIALOG_STYLE );
~OBSBasicSettingsBase();