gtk3 (thanks to Rafał Mużyło);

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81326 e17a0e51-4ae3-4d35-97c3-1a29b211df97

8 files changed, 108 insertions, 108 deletions

diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c
index 43c9851c..d01dd291 100755
--- a/gui/AboutDlg.c
+++ b/gui/AboutDlg.c
@@ -88,6 +88,7 @@ void RunAboutDialog(void) {
 		"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.");
 
 	AboutDlg = gtk_about_dialog_new();
+	gtk_window_set_resizable(GTK_WINDOW(AboutDlg), TRUE);
 	gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(AboutDlg), "PCSX-Reloaded");
 	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(AboutDlg), ABOUT_VERSION);
 	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(AboutDlg), "http://pcsxr.codeplex.com/");
diff --git a/gui/Cheat.c b/gui/Cheat.c
index 037192df..01aab2b1 100644
--- a/gui/Cheat.c
+++ b/gui/Cheat.c
@@ -413,27 +413,27 @@ void RunCheatListDialog() {
 						  NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "addbutton1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnCheatListDlg_AddClicked), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "editbutton1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnCheatListDlg_EditClicked), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "delbutton1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnCheatListDlg_DelClicked), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "loadbutton1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnCheatListDlg_OpenClicked), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "savebutton1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnCheatListDlg_SaveClicked), builder, NULL, G_CONNECT_AFTER);
 
 	// Setup a handler for when Close or Cancel is clicked
-	g_signal_connect_data(GTK_OBJECT(CheatListDlg), "response",
+	g_signal_connect_data(G_OBJECT(CheatListDlg), "response",
 			G_CALLBACK(OnCheatListDlg_CloseClicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
 	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "savebutton1")), NumCheats);
@@ -1116,33 +1116,33 @@ void RunCheatSearchDialog() {
 	UpdateCheatSearchDialog();
 
 	widget = gtk_builder_get_object(builder, "btn_freeze");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(OnCheatSearchDlg_FreezeClicked), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_modify");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(OnCheatSearchDlg_ModifyClicked), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_copy");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(OnCheatSearchDlg_CopyClicked), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_start");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(OnCheatSearchDlg_SearchClicked), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_restart");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(OnCheatSearchDlg_RestartClicked), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "combo_searchfor");
-	g_signal_connect_data(GTK_OBJECT(widget), "changed",
+	g_signal_connect_data(G_OBJECT(widget), "changed",
 		G_CALLBACK(OnCheatSearchDlg_SearchForChanged), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "combo_database");
-	g_signal_connect_data(GTK_OBJECT(widget), "changed",
+	g_signal_connect_data(G_OBJECT(widget), "changed",
 		G_CALLBACK(OnCheatSearchDlg_DataBaseChanged), builder, NULL, G_CONNECT_AFTER);
 
-	g_signal_connect_data(GTK_OBJECT(CheatSearchDlg), "response",
+	g_signal_connect_data(G_OBJECT(CheatSearchDlg), "response",
 		G_CALLBACK(OnCheatSearchDlg_CloseClicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c
index b732f693..d71d829e 100755
--- a/gui/ConfDlg.c
+++ b/gui/ConfDlg.c
@@ -125,55 +125,55 @@ void ConfigurePlugins() {
 	}
 
 	widget = gtk_builder_get_object(builder, "btn_ConfGpu");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_ConfSpu");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER);
 
 	/* ADB TODO Does pad 1 and 2 need to be different? */
 	widget = gtk_builder_get_object(builder, "btn_ConfPad1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 						  G_CALLBACK(OnConfConf_Pad1Conf), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_ConfPad2");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConfConf_Pad2Conf), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_ConfCdr");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_AboutGpu");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_AboutSpu");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_AboutPad1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConfConf_Pad1About), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_AboutPad2");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConfConf_Pad2About), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_AboutCdr");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "GtkFileChooser_Bios");
-	g_signal_connect_data(GTK_OBJECT(widget), "current_folder_changed",
+	g_signal_connect_data(G_OBJECT(widget), "current_folder_changed",
 			G_CALLBACK(OnBiosPath_Changed), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "GtkFileChooser_Plugin");
-	g_signal_connect_data(GTK_OBJECT(widget), "current_folder_changed",
+	g_signal_connect_data(G_OBJECT(widget), "current_folder_changed",
 			G_CALLBACK(OnPluginPath_Changed), builder, NULL, G_CONNECT_AFTER);
 
-	g_signal_connect_data(GTK_OBJECT(ConfDlg), "response",
+	g_signal_connect_data(G_OBJECT(ConfDlg), "response",
 			G_CALLBACK(OnConf_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
 
@@ -205,15 +205,15 @@ void OnConf_Net() {
 	FindNetPlugin(builder);
 
 	/* Setup a handler for when Close or Cancel is clicked */
-	g_signal_connect_data(GTK_OBJECT(NetDlg), "response",
+	g_signal_connect_data(G_OBJECT(NetDlg), "response",
 			G_CALLBACK(OnNet_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_ConfNet");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnNet_Conf), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_AboutNet");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnNet_About), builder, NULL, G_CONNECT_AFTER);
 }
 
@@ -861,13 +861,13 @@ void OnConf_Cpu() {
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SlowBoot")), Config.SlowBoot);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")), Config.PsxAuto);
 
-	g_signal_connect_data(GTK_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")), "toggled",
+	g_signal_connect_data(G_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")), "toggled",
 			G_CALLBACK(OnCpu_PsxAutoClicked), builder, NULL, G_CONNECT_AFTER);
 
 #ifdef PSXREC
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), Config.Cpu);
 
-	g_signal_connect_data(GTK_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), "toggled",
+	g_signal_connect_data(G_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), "toggled",
 			G_CALLBACK(OnCpu_CpuClicked), builder, NULL, G_CONNECT_AFTER);
 #else
 	Config.Cpu = CPU_INTERPRETER;
@@ -886,6 +886,6 @@ void OnConf_Cpu() {
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen")), Config.Widescreen);
 
 	// Setup a handler for when Close or Cancel is clicked
-	g_signal_connect_data(GTK_OBJECT(CpuDlg), "response",
+	g_signal_connect_data(G_OBJECT(CpuDlg), "response",
 			G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c
index a40f3cbb..27dcf8bd 100755
--- a/gui/DebugMemory.c
+++ b/gui/DebugMemory.c
@@ -108,7 +108,8 @@ static void MemView_Dump() {
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);
 	gtk_widget_show(label);
 
-	start_edit = gtk_entry_new_with_max_length(8);
+	start_edit = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(start_edit), 8);
 	sprintf(buf, "%.8X", MemViewAddress | 0x80000000);
 	gtk_entry_set_text(GTK_ENTRY(start_edit), buf);
 	gtk_table_attach(GTK_TABLE(table), start_edit, 1, 2, 0, 1, 0, 0, 5, 5);
@@ -185,7 +186,8 @@ static void MemView_Patch() {
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);
 	gtk_widget_show(label);
 
-	addr_edit = gtk_entry_new_with_max_length(8);
+	addr_edit = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(addr_edit), 8);
 	sprintf(buf, "%.8X", MemViewAddress | 0x80000000);
 	gtk_entry_set_text(GTK_ENTRY(addr_edit), buf);
 	gtk_table_attach(GTK_TABLE(table), addr_edit, 1, 2, 0, 1, 0, 0, 5, 5);
@@ -298,17 +300,17 @@ void RunDebugMemoryDialog() {
 	UpdateMemViewDlg();
 
 	widget = gtk_builder_get_object(builder, "btn_dump");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(MemView_Dump), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_patch");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(MemView_Patch), builder, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "btn_go");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(MemView_Go), builder, NULL, G_CONNECT_AFTER);
 
-	g_signal_connect_data(GTK_OBJECT(MemViewDlg), "response",
+	g_signal_connect_data(G_OBJECT(MemViewDlg), "response",
 		G_CALLBACK(MemView_Close), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index a0d3b3fc..15913b68 100755
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -253,184 +253,184 @@ void StartGui() {
 	ResetMenuSlots();
 
 	// Set up callbacks
-	g_signal_connect_data(GTK_OBJECT(Window), "delete-event",
+	g_signal_connect_data(G_OBJECT(Window), "delete-event",
 			G_CALLBACK(OnDestroy), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
 	// File menu
 	widget = gtk_builder_get_object(builder, "RunCd");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "RunBios");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnFile_RunBios), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "RunExe");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnFile_RunExe), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "RunImage");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "exit2");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnFile_Exit), NULL, NULL, G_CONNECT_AFTER);
 
 	// States
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 0, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot2");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 1, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot3");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 2, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot4");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 3, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot5");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 4, NULL, G_CONNECT_AFTER);	
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot6");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 5, NULL, G_CONNECT_AFTER);	
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot7");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 6, NULL, G_CONNECT_AFTER);	
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot8");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 7, NULL, G_CONNECT_AFTER);	
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot9");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 8, NULL, G_CONNECT_AFTER);	
 	widget = gtk_builder_get_object(builder, "other1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load_other), NULL, NULL, G_CONNECT_AFTER);			
 
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 0, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot2");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 1, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot3");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 2, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot4");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 3, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot5");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 4, NULL, G_CONNECT_AFTER);	
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot6");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 5, NULL, G_CONNECT_AFTER);	
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot7");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 6, NULL, G_CONNECT_AFTER);	
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot8");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 7, NULL, G_CONNECT_AFTER);	
 	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot9");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 8, NULL, G_CONNECT_AFTER);	
 	widget = gtk_builder_get_object(builder, "other2");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save_other), NULL, NULL, G_CONNECT_AFTER);
 
 	// Emulation menu
 	widget = gtk_builder_get_object(builder, "run1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "reset1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnEmu_Reset), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "shutdown1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnEmu_Shutdown), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "SwitchImage");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
 
 	// Configuration menu
 	widget = gtk_builder_get_object(builder, "plugins_bios");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(ConfigurePlugins), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "graphics1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "sound1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "cdrom1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "pad1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "cpu1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "memory_cards1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "net1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Net), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "memorydump1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(RunDebugMemoryDialog), NULL, NULL, G_CONNECT_AFTER);
 
 	// Cheat menu
 	widget = gtk_builder_get_object(builder, "browse1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(RunCheatListDialog), NULL, NULL, G_CONNECT_AFTER);
 	widget = gtk_builder_get_object(builder, "search1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(RunCheatSearchDialog), NULL, NULL, G_CONNECT_AFTER);
 
 	// Help menu
 	widget = gtk_builder_get_object(builder, "about_pcsxr1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+	g_signal_connect_data(G_OBJECT(widget), "activate",
 			G_CALLBACK(OnHelp_About), NULL, NULL, G_CONNECT_AFTER);
 
 	// Toolbar
 	widget = gtk_builder_get_object(builder, "toolbutton_runcd");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "toolbutton_runimage");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "toolbutton_run");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "toolbutton_switchimage");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "toolbutton_memcards");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "toolbutton_graphics");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "toolbutton_sound");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "toolbutton_cdrom");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "toolbutton_controllers");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
 
 	gtk_main();
@@ -816,10 +816,7 @@ void OnFile_Exit() {
 	if (UseGui)
 		gtk_main_quit();
 	SysClose();
-	if (UseGui)
-		gtk_exit (0);
-	else
-		exit(0);
+	exit(0);
 }
 
 void state_load(gchar *state_filename) {
diff --git a/gui/Makefile.am b/gui/Makefile.am
index ce7c16c4..07823a5b 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
 	-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
 	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	$(GTK2_CFLAGS) \
+	$(GTK3_CFLAGS) \
 	-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
 	-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
 	-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
@@ -29,4 +29,4 @@ pcsxr_SOURCES = \
 
 pcsxr_LDADD = \
 	../libpcsxcore/libpcsxcore.a \
-	$(GTK2_LIBS) -lpthread -lz -lm -lXext -lXtst
+	$(GTK3_LIBS) -lpthread -lz -lm -lXext -lXtst
diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c
index eecb29fc..3fcceb50 100755
--- a/gui/MemcardDlg.c
+++ b/gui/MemcardDlg.c
@@ -717,50 +717,50 @@ void OnConf_Mcds() {
 	LoadMcdDlg(dialog);
 
 	// Setup a handler for when Close or Cancel is clicked
-	g_signal_connect_data(GTK_OBJECT(dialog), "response",
+	g_signal_connect_data(G_OBJECT(dialog), "response",
 			G_CALLBACK(OnMcd_Close), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "GtkButton_Format1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_Format), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "GtkButton_Format2");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_Format), (gpointer)2, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "Mcd1Button");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_FileChange), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "Mcd2Button");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_FileChange), (gpointer)2, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "GtkButton_New1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_New), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "GtkButton_New2");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_New), (gpointer)2, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "GtkButton_CopyTo1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_CopyTo), (gpointer)1, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
 	widget = gtk_builder_get_object(builder, "GtkButton_CopyTo2");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_CopyTo), (gpointer)2, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
 	widget = gtk_builder_get_object(builder, "GtkButton_Delete1");
-	g_signal_connect_data (GTK_OBJECT (widget), "clicked",
+	g_signal_connect_data (G_OBJECT (widget), "clicked",
 			G_CALLBACK(OnMemcardDelete), (gpointer)1, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
 	widget = gtk_builder_get_object(builder, "GtkButton_Delete2");
-	g_signal_connect_data (GTK_OBJECT (widget), "clicked",
+	g_signal_connect_data (G_OBJECT (widget), "clicked",
 			G_CALLBACK(OnMemcardDelete), (gpointer)2, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
diff --git a/gui/Plugin.c b/gui/Plugin.c
index fa685d82..2677677b 100755
--- a/gui/Plugin.c
+++ b/gui/Plugin.c
@@ -31,7 +31,7 @@
 
 #include "nopic.h"
 
-#define MAX_SLOTS 9	/* ADB TODO Same as Gtk2Gui.c */
+#define MAX_SLOTS 9	/* ADB TODO Same as GtkGui.c */
 
 void OnFile_Exit();