From 158f83dc96f8f84389d1eda5b2101cae20b5ea00 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Wed, 18 Dec 2013 12:06:13 -0700
Subject: [PATCH] make OK/cancel/apply buttons accessible on the settings form

---
 obs/forms/OBSWindows.cpp | 2 ++
 obs/forms/OBSWindows.fbp | 8 ++++----
 obs/forms/OBSWindows.h   | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp
index f4f83395a..2bd8eb8da 100644
--- a/obs/forms/OBSWindows.cpp
+++ b/obs/forms/OBSWindows.cpp
@@ -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 );
 	
 	
diff --git a/obs/forms/OBSWindows.fbp b/obs/forms/OBSWindows.fbp
index d7083cb94..bc71bf1d4 100644
--- a/obs/forms/OBSWindows.fbp
+++ b/obs/forms/OBSWindows.fbp
@@ -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>
diff --git a/obs/forms/OBSWindows.h b/obs/forms/OBSWindows.h
index ca8a991b0..285c6aaea 100644
--- a/obs/forms/OBSWindows.h
+++ b/obs/forms/OBSWindows.h
@@ -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();