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

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

3 files changed, 15 insertions, 18 deletions

diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
index 7f50844e..2cbd3552 100755
--- a/plugins/dfsound/Makefile.am
+++ b/plugins/dfsound/Makefile.am
@@ -48,9 +48,9 @@ endif
 bin_PROGRAMS = cfgDFSound
 cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(AM_CPPFLAGS)
+	$(GTK3_CFLAGS) $(AM_CPPFLAGS)
 cfgDFSound_SOURCES = spucfg-0.1df/main.c
-cfgDFSound_LDADD = $(GTK2_LIBS)
+cfgDFSound_LDADD = $(GTK3_LIBS)
 
 glade_DATA = spucfg-0.1df/dfsound.ui
 gladedir = $(datadir)/psemu/
diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.ui b/plugins/dfsound/spucfg-0.1df/dfsound.ui
index 7c27b275..9714f0a7 100755
--- a/plugins/dfsound/spucfg-0.1df/dfsound.ui
+++ b/plugins/dfsound/spucfg-0.1df/dfsound.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="CfgWnd">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -167,12 +166,12 @@
                     <child>
                       <object class="GtkCheckButton" id="chkXASpeed">
                         <property name="label" translatable="yes">Adjust XA speed</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Choose this if XA music is played too quickly.</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -210,12 +209,12 @@
                     <child>
                       <object class="GtkCheckButton" id="chkHiCompat">
                         <property name="label" translatable="yes">High compatibility mode</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Use the asynchronous SPU interface.</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -227,12 +226,12 @@
                     <child>
                       <object class="GtkCheckButton" id="chkIRQWait">
                         <property name="label" translatable="yes">SPU IRQ Wait</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Wait for CPU; only useful for some games.</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -244,12 +243,12 @@
                     <child>
                       <object class="GtkCheckButton" id="chkDisStereo">
                         <property name="label" translatable="yes">Single channel sound</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Play only one channel for a performance boost.</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -261,10 +260,10 @@
                     <child>
                       <object class="GtkCheckButton" id="chkFreqResponse">
                         <property name="label" translatable="yes">Frequency Response - Output Filter</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -293,7 +292,6 @@
             <child>
               <object class="GtkButton" id="btn_close">
                 <property name="label">gtk-close</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index 1a677a25..c18fc724 100755
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -48,7 +48,7 @@ void on_about_clicked (GtkWidget *widget, gpointer user_data)
 void OnConfigClose(GtkWidget *widget, gpointer user_data)
 {
 	gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd"));
-	gtk_exit(0);
+	exit(0);
 }
 
 int main(int argc, char *argv[])
@@ -76,18 +76,17 @@ int main(int argc, char *argv[])
 		return 0;
     }
 
-    gtk_set_locale();
     gtk_init(&argc, &argv);
 
     if (strcmp(argv[1], "ABOUT") == 0) {
 		const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};
 		widget = gtk_about_dialog_new ();
-		gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin");
+		gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin");
 		gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.6");
 		gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);
 		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
 
-		g_signal_connect_data(GTK_OBJECT(widget), "response",
+		g_signal_connect_data(G_OBJECT(widget), "response",
 			G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
 
 		gtk_widget_show (widget);
@@ -223,11 +222,11 @@ int main(int argc, char *argv[])
 		free(pB);
 
 	widget = gtk_builder_get_object(builder, "CfgWnd");
-	g_signal_connect_data(GTK_OBJECT(widget), "destroy",
+	g_signal_connect_data(G_OBJECT(widget), "destroy",
 		G_CALLBACK(SaveConfig), builder, NULL, 0);
 
 	widget = gtk_builder_get_object(builder, "btn_close");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
 		G_CALLBACK(OnConfigClose), builder, NULL, G_CONNECT_AFTER);
 
     gtk_main();
@@ -242,7 +241,7 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
 	fp = fopen(CONFIG_FILENAME, WRITEBINARY);
 	if (fp == NULL) {
 		fprintf(stderr, "Unable to write to configuration file %s!\n", CONFIG_FILENAME);
-		gtk_exit(0);
+		exit(0);
 	}
 
 	val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbVolume2")));
@@ -270,5 +269,5 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
 	fprintf(fp, "\nUseReverb = %d\n", val);
 
 	fclose(fp);
-	gtk_exit(0);
+	exit(0);
 }