[Emacs-diffs] /srv/bzr/emacs/trunk r109565: Use GtkFontChooser on Gtk+ 3.2 and up.

[Jan D.]

------------------------------------------------------------
revno: 109565
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2012-08-11 10:54:35 +0200
message:
  Use GtkFontChooser on Gtk+ 3.2 and up.
  
  * src/gtkutil.c (gtk_font_chooser_dialog_new, GTK_FONT_CHOOSER)
  (gtk_font_chooser_set_font, gtk_font_chooser_get_font): Define
  for Gtk+ versions less than 3.2.
  (xg_get_font_name): Use those functions/macros here.
  Reported by Frans Oilinki <address@hidden>.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-11 04:46:38 +0000
+++ b/src/ChangeLog     2012-08-11 08:54:35 +0000
@@ -1,3 +1,11 @@
+2012-08-11  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (gtk_font_chooser_dialog_new, GTK_FONT_CHOOSER)
+       (gtk_font_chooser_set_font, gtk_font_chooser_get_font): Define
+       for Gtk+ versions less than 3.2.
+       (xg_get_font_name): Use those functions/macros here.
+       Reported by Frans Oilinki <address@hidden>.
+
 2012-08-11  YAMAMOTO Mitsuharu  <address@hidden>
 
        * unexmacosx.c (copy_data_segment): Copy initialized data in

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2012-08-07 05:29:25 +0000
+++ b/src/gtkutil.c     2012-08-11 08:54:35 +0000
@@ -75,6 +75,18 @@
 #define remove_submenu(w) gtk_menu_item_remove_submenu ((w))
 #endif
 
+#if GTK_MAJOR_VERSION < 3 || \
+  (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 2)
+#define gtk_font_chooser_dialog_new(x, y) \
+  gtk_font_selection_dialog_new (x)
+#undef GTK_FONT_CHOOSER
+#define GTK_FONT_CHOOSER(x) GTK_FONT_SELECTION_DIALOG (x)
+#define  gtk_font_chooser_set_font(x, y) \
+  gtk_font_selection_dialog_set_font_name (x, y)
+#define gtk_font_chooser_get_font(x) \
+  gtk_font_selection_dialog_get_font_name (x)
+#endif
+
 #ifndef HAVE_GTK3
 #ifdef USE_GTK_TOOLTIP
 #define gdk_window_get_screen(w) gdk_drawable_get_screen (w)
@@ -2000,12 +2012,13 @@
   sigblock (sigmask (__SIGRTMIN));
 #endif /* HAVE_PTHREAD */
 
-  w = gtk_font_selection_dialog_new ("Pick a font");
+  w = gtk_font_chooser_dialog_new
+    ("Pick a font", GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
+
   if (!default_name)
     default_name = "Monospace 10";
-  gtk_font_selection_dialog_set_font_name (GTK_FONT_SELECTION_DIALOG (w),
-                                           default_name);
 
+  gtk_font_chooser_set_font (GTK_FONT_CHOOSER (w), default_name);
   gtk_widget_set_name (w, "emacs-fontdialog");
 
   done = xg_dialog_run (f, w);
@@ -2015,8 +2028,7 @@
 #endif
 
   if (done == GTK_RESPONSE_OK)
-    fontname = gtk_font_selection_dialog_get_font_name
-      (GTK_FONT_SELECTION_DIALOG (w));
+    fontname = gtk_font_chooser_get_font (GTK_FONT_CHOOSER (w));
 
   gtk_widget_destroy (w);
   return fontname;