-(YarTour)replaced deprecated GTK_SIGNAL_FUNC() with G_CALLBACK(). (Patch #8258).

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

7 files changed, 43 insertions, 43 deletions

diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index c6111207..3d3b89b7 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -179,7 +179,7 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
 	xml = glade_get_widget_tree(MainWindow);
 
 	widget = glade_xml_get_widget(xml, "cddev_comboboxentry");
-	strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(GTK_BIN(widget)->child)), 255);
+	strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)))), 255);
 	CdromDev[255] = '\0';
 
 	widget = glade_xml_get_widget(xml, "readmode_combobox");
@@ -220,15 +220,15 @@ long CDRconfigure() {
 
 	widget = glade_xml_get_widget(xml, "CfgWnd");
 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "cfg_closebutton");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "cddev_comboboxentry");
 	fill_drives_list(widget);
-	gtk_entry_set_text(GTK_ENTRY(GTK_BIN(widget)->child), CdromDev);
+	gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget))), CdromDev);
 
 	widget = glade_xml_get_widget(xml, "readmode_combobox");
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), ReadMode);
diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c
index 54d8b482..fba94719 100644
--- a/plugins/dfinput/cfg-gtk2.c
+++ b/plugins/dfinput/cfg-gtk2.c
@@ -625,11 +625,11 @@ long PADconfigure() {
 
 	widget = gtk_builder_get_object(xml, "CfgWnd");
 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "btnclose");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
 	PopulateDevList();
 	UpdateKeyList();
@@ -637,47 +637,47 @@ long PADconfigure() {
 	widget = gtk_builder_get_object(xml, "checkmt");
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.Threaded);
 	g_signal_connect_data(GTK_OBJECT(widget), "toggled",
-		GTK_SIGNAL_FUNC(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "combodev1");
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnDeviceChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnDeviceChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "combodev2");
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnDeviceChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnDeviceChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "combotype1");
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
 		g.cfg.PadDef[0].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0);
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnTypeChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnTypeChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "combotype2");
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
 		g.cfg.PadDef[1].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0);
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnTypeChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnTypeChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "btnchange1");
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnChangeClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnChangeClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "btnreset1");
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnResetClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnResetClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "btnchange2");
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnChangeClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnChangeClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "btnreset2");
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnResetClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnResetClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	gtk_widget_show(MainWindow);
 	gtk_main();
diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c
index 181fecb4..b1438995 100644
--- a/plugins/dfnet/gui.c
+++ b/plugins/dfnet/gui.c
@@ -113,7 +113,7 @@ long CFGopen() {
 
 	widget = gtk_builder_get_object(builder, "btnCopyIP");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "tbServerIP");
 	gtk_entry_set_text(GTK_ENTRY(widget), conf.ipAddress);
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index 870e65ca..ce2efbaf 100644
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
 
 		g_signal_connect_data(GTK_OBJECT(widget), "response",
-			GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
 
 		gtk_widget_show (widget);
 		gtk_main();
@@ -223,11 +223,11 @@ int main(int argc, char *argv[])
 
 	widget = glade_xml_get_widget(xml, "CfgWnd");
 	g_signal_connect_data(GTK_OBJECT(widget), "destroy",
-		GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, 0);
+		G_CALLBACK(SaveConfig), xml, NULL, 0);
 
 	widget = glade_xml_get_widget(xml, "btn_close");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
 
     gtk_main();
     return 0;
diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c
index ddc99296..7a0e2327 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/main.c
+++ b/plugins/dfxvideo/gpucfg-0.1df/main.c
@@ -150,7 +150,7 @@ main (int argc, char *argv[])
 		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
 
 	g_signal_connect_data(GTK_OBJECT(widget), "response",
-			GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
 
 		gtk_widget_show (widget);
 		gtk_main();
@@ -312,27 +312,27 @@ main (int argc, char *argv[])
 
 	widget = glade_xml_get_widget(xml, "CfgWnd");
 	g_signal_connect_data(GTK_OBJECT(widget), "destroy",
-			GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, 0);
+			G_CALLBACK(SaveConfig), xml, NULL, 0);
 
 	widget = glade_xml_get_widget(xml, "btn_close");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "checkFullscreen");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_fullscreen_toggled), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fullscreen_toggled), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "checkUseFixes");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_use_fixes_toggled), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_use_fixes_toggled), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "checkSetFPS");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "checkAutoFPSLimit");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
 
 	on_fullscreen_toggled(widget, (gpointer) xml);
 	on_fps_toggled(widget, (gpointer) xml);
diff --git a/plugins/gxvideo/gpucfg/main.c b/plugins/gxvideo/gpucfg/main.c
index 844d6ec5..b224f959 100644
--- a/plugins/gxvideo/gpucfg/main.c
+++ b/plugins/gxvideo/gpucfg/main.c
@@ -172,7 +172,7 @@ int main(int argc, char *argv[]) {
 				"http://pcsx-df.sourceforge.net/");
 
 		g_signal_connect_data(GTK_OBJECT(widget), "response",
-				GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
+				G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
 
 		gtk_widget_show(widget);
 		gtk_main();
@@ -266,22 +266,22 @@ int main(int argc, char *argv[]) {
 	}
 
 	g_signal_connect_data(GTK_OBJECT(w->config_window), "destroy",
-			GTK_SIGNAL_FUNC(on_destroy_window), w, NULL, 0);
+			G_CALLBACK(on_destroy_window), w, NULL, 0);
 	g_signal_connect_data(GTK_OBJECT(w->save_button), "clicked",
-			GTK_SIGNAL_FUNC(on_click_save_button), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_click_save_button), w, NULL, G_CONNECT_AFTER);
 	g_signal_connect_data(GTK_OBJECT(w->cancel_button), "clicked",
-			GTK_SIGNAL_FUNC(on_click_cancel_button), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_click_cancel_button), w, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(w->fullscreen_checkbutton), "clicked",
-			GTK_SIGNAL_FUNC(on_fullscreen_toggled), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fullscreen_toggled), w, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(w->use_game_fixes_checkbutton), "clicked",
-			GTK_SIGNAL_FUNC(on_use_fixes_toggled), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_use_fixes_toggled), w, NULL, G_CONNECT_AFTER);
 	g_signal_connect_data(GTK_OBJECT(w->set_fps_checkbutton), "clicked",
-			GTK_SIGNAL_FUNC(on_fps_toggled), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fps_toggled), w, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(w->auto_fps_limit_checkbutton), "clicked",
-			GTK_SIGNAL_FUNC(on_fps_toggled), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fps_toggled), w, NULL, G_CONNECT_AFTER);
 
 	on_fullscreen_toggled(0, w);
 	on_fps_toggled(0, w);
diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c
index 521d02c4..a5d5163b 100644
--- a/plugins/peopsxgl/gpucfg/main.c
+++ b/plugins/peopsxgl/gpucfg/main.c
@@ -711,15 +711,15 @@ int main( int argc, char **argv ) {
     g_object_unref( G_OBJECT( builder ) );
 
     // Connect callbacks to signals
-    gtk_signal_connect( GTK_OBJECT( window ),            "destroy", GTK_SIGNAL_FUNC( gtk_main_quit ),                NULL );
-    gtk_signal_connect( GTK_OBJECT( btnCancel ),         "clicked", GTK_SIGNAL_FUNC( gtk_main_quit ),                NULL );
-    gtk_signal_connect( GTK_OBJECT( btnSave ),           "clicked", GTK_SIGNAL_FUNC( on_btnSave_clicked ),           NULL );
-    gtk_signal_connect( GTK_OBJECT( chkUseGameFixes ),   "toggled", GTK_SIGNAL_FUNC( on_chkUseGameFixes_toggled ),   NULL );
-    gtk_signal_connect( GTK_OBJECT( chkUseFPSLimit ),    "toggled", GTK_SIGNAL_FUNC( on_chkUseFPSLimit_toggled ),    NULL );
-    gtk_signal_connect( GTK_OBJECT( radFPSLimitManual ), "toggled", GTK_SIGNAL_FUNC( on_radFPSLimitManual_toggled ), NULL );
-    gtk_signal_connect( GTK_OBJECT( chkScanLines ),      "toggled", GTK_SIGNAL_FUNC( on_chkScanLines_toggled ),      NULL );
-    gtk_signal_connect( GTK_OBJECT( btnFast ),           "clicked", GTK_SIGNAL_FUNC( on_btnFast_clicked ),           NULL );
-    gtk_signal_connect( GTK_OBJECT( btnBeautiful ),      "clicked", GTK_SIGNAL_FUNC( on_btnBeautiful_clicked ),      NULL );
+    gtk_signal_connect( GTK_OBJECT( window ),            "destroy", G_CALLBACK( gtk_main_quit ),                NULL );
+    gtk_signal_connect( GTK_OBJECT( btnCancel ),         "clicked", G_CALLBACK( gtk_main_quit ),                NULL );
+    gtk_signal_connect( GTK_OBJECT( btnSave ),           "clicked", G_CALLBACK( on_btnSave_clicked ),           NULL );
+    gtk_signal_connect( GTK_OBJECT( chkUseGameFixes ),   "toggled", G_CALLBACK( on_chkUseGameFixes_toggled ),   NULL );
+    gtk_signal_connect( GTK_OBJECT( chkUseFPSLimit ),    "toggled", G_CALLBACK( on_chkUseFPSLimit_toggled ),    NULL );
+    gtk_signal_connect( GTK_OBJECT( radFPSLimitManual ), "toggled", G_CALLBACK( on_radFPSLimitManual_toggled ), NULL );
+    gtk_signal_connect( GTK_OBJECT( chkScanLines ),      "toggled", G_CALLBACK( on_chkScanLines_toggled ),      NULL );
+    gtk_signal_connect( GTK_OBJECT( btnFast ),           "clicked", G_CALLBACK( on_btnFast_clicked ),           NULL );
+    gtk_signal_connect( GTK_OBJECT( btnBeautiful ),      "clicked", G_CALLBACK( on_btnBeautiful_clicked ),      NULL );
 
     // Call some callbacks to ensure widget state consistency
     on_chkUseGameFixes_toggled(   GTK_OBJECT( chkUseGameFixes   ), NULL );