From 388f25db057d4028ab4d4ed027957fb84ed3df91 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Sat, 9 Nov 2013 21:56:31 -0700
Subject: [PATCH] remove absolute paths from formbuilder file

---
 obs/OBSWindows.fbp | 28 ++++++++++++++--------------
 obs/obs.cpp        |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/obs/OBSWindows.fbp b/obs/OBSWindows.fbp
index 37eba4c57..8c86b73f4 100644
--- a/obs/OBSWindows.fbp
+++ b/obs/OBSWindows.fbp
@@ -778,7 +778,7 @@
                                                                                 <event name="OnSize"></event>
                                                                                 <event name="OnUpdateUI"></event>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\list_add.png</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\list_add.png</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SCENE_ADD</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -799,7 +799,7 @@
                                                                                     <event name="OnUpdateUI"></event>
                                                                                 </object>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\delete.ico</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\delete.ico</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SCENE_DELETE</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -820,7 +820,7 @@
                                                                                     <event name="OnUpdateUI"></event>
                                                                                 </object>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\htmledit_icon22_properties.gif</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\htmledit_icon22_properties.gif</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SCENE_PROPERTIES</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -844,7 +844,7 @@
                                                                                     <property name="permission">protected</property>
                                                                                 </object>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\up.ico</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\up.ico</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SCENE_MOVEUP</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -865,7 +865,7 @@
                                                                                     <event name="OnUpdateUI"></event>
                                                                                 </object>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\down.ico</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\down.ico</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SCENE_MOVEDOWN</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -1240,7 +1240,7 @@
                                                                                 <event name="OnSize"></event>
                                                                                 <event name="OnUpdateUI"></event>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\list_add.png</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\list_add.png</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SOURCE_ADD</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -1261,7 +1261,7 @@
                                                                                     <event name="OnUpdateUI"></event>
                                                                                 </object>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\delete.ico</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\delete.ico</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SOURCE_DELETE</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -1282,7 +1282,7 @@
                                                                                     <event name="OnUpdateUI"></event>
                                                                                 </object>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\htmledit_icon22_properties.gif</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\htmledit_icon22_properties.gif</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SOURCE_PROPERTIES</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -1306,7 +1306,7 @@
                                                                                     <property name="permission">protected</property>
                                                                                 </object>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\up.ico</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\up.ico</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SOURCE_MOVEUP</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -1327,7 +1327,7 @@
                                                                                     <event name="OnUpdateUI"></event>
                                                                                 </object>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\down.ico</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\down.ico</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SOURCE_MOVEDOWN</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -3176,7 +3176,7 @@
                                                                         <event name="OnSize"></event>
                                                                         <event name="OnUpdateUI"></event>
                                                                         <object class="tool" expanded="0">
-                                                                            <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\list_add.png</property>
+                                                                            <property name="bitmap">Load From Embedded File; images\list_add.png</property>
                                                                             <property name="context_menu">0</property>
                                                                             <property name="id">wxID_ANY</property>
                                                                             <property name="kind">wxITEM_NORMAL</property>
@@ -3221,7 +3221,7 @@
                                                                             <property name="permission">protected</property>
                                                                         </object>
                                                                         <object class="tool" expanded="0">
-                                                                            <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\up.ico</property>
+                                                                            <property name="bitmap">Load From Embedded File; images\up.ico</property>
                                                                             <property name="context_menu">0</property>
                                                                             <property name="id">wxID_ANY</property>
                                                                             <property name="kind">wxITEM_NORMAL</property>
@@ -4075,7 +4075,7 @@
                                                                             <event name="OnUpdateUI"></event>
                                                                         </object>
                                                                         <object class="tool" expanded="0">
-                                                                            <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\htmledit_icon22_properties.gif</property>
+                                                                            <property name="bitmap">Load From Embedded File; images\htmledit_icon22_properties.gif</property>
                                                                             <property name="context_menu">0</property>
                                                                             <property name="id">wxID_ANY</property>
                                                                             <property name="kind">wxITEM_NORMAL</property>
@@ -4099,7 +4099,7 @@
                                                                             <property name="permission">protected</property>
                                                                         </object>
                                                                         <object class="tool" expanded="0">
-                                                                            <property name="bitmap">Load From Embedded File; D:\OBS2\obs\images\up.ico</property>
+                                                                            <property name="bitmap">Load From Embedded File; images\up.ico</property>
                                                                             <property name="context_menu">0</property>
                                                                             <property name="id">wxID_ANY</property>
                                                                             <property name="kind">wxITEM_NORMAL</property>
diff --git a/obs/obs.cpp b/obs/obs.cpp
index 3fee5f859..aa47dc8ca 100644
--- a/obs/obs.cpp
+++ b/obs/obs.cpp
@@ -27,7 +27,7 @@ bool OBSApp::OnInit()
 
 	wxInitAllImageHandlers();
 
-	OBSStudioBase *mainWindow = new OBSStudioBase(NULL);
+	OBSBasicBase *mainWindow = new OBSBasicBase(NULL);
 	mainWindow->Show();
 	return true;
 }