X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfontchooser.h;h=1c1bbf09b17ba602eb7ce9b2efbec22226293b28;hb=ca2368dba958d6fecf2fce417307bb9cbbe6eb6b;hp=39c503ce48811b7a9952033f4de6d0115aeb2200;hpb=eb9efc9fd2f23217cb4f1053737d27c8b0e22f6a;p=~andy%2Fgtk

diff --git a/gtk/gtkfontchooser.h b/gtk/gtkfontchooser.h
index 39c503ce4..1c1bbf09b 100644
--- a/gtk/gtkfontchooser.h
+++ b/gtk/gtkfontchooser.h
@@ -15,18 +15,16 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_FONT_CHOOSER_H__
+#define __GTK_FONT_CHOOSER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FONT_CHOOSER_H__
-#define __GTK_FONT_CHOOSER_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
@@ -59,40 +57,57 @@ struct _GtkFontChooserIface
   GTypeInterface base_iface;
 
   /* Methods */
-  gchar *           (* get_font)                (GtkFontChooser *chooser);
-  gboolean          (* set_font)                (GtkFontChooser *chooser,
-                                                 const gchar    *fontname);
-  PangoFontFamily * (* get_font_family)         (GtkFontChooser  *chooser);
-  PangoFontFace *   (* get_font_face)           (GtkFontChooser  *chooser);
-  gint              (* get_font_size)           (GtkFontChooser  *chooser);
-  void              (* set_filter_func)         (GtkFontChooser   *chooser,
+  PangoFontFamily * (* get_font_family)         (GtkFontChooser  *fontchooser);
+  PangoFontFace *   (* get_font_face)           (GtkFontChooser  *fontchooser);
+  gint              (* get_font_size)           (GtkFontChooser  *fontchooser);
+
+  void              (* set_filter_func)         (GtkFontChooser   *fontchooser,
                                                  GtkFontFilterFunc filter,
-                                                 gpointer          data,
+                                                 gpointer          user_data,
                                                  GDestroyNotify    destroy);
 
   /* Signals */
   void (* font_activated) (GtkFontChooser *chooser,
                            const gchar    *fontname);
 
-  /* Paddig */
+   /* Padding */
   gpointer padding[12];
 };
 
+GDK_AVAILABLE_IN_3_2
 GType            gtk_font_chooser_get_type                 (void) G_GNUC_CONST;
 
-PangoFontFamily *gtk_font_chooser_get_family               (GtkFontChooser   *fontchooser);
-PangoFontFace   *gtk_font_chooser_get_face                 (GtkFontChooser   *fontchooser);
-gint             gtk_font_chooser_get_size                 (GtkFontChooser   *fontchooser);
+GDK_AVAILABLE_IN_3_2
+PangoFontFamily *gtk_font_chooser_get_font_family          (GtkFontChooser   *fontchooser);
+GDK_AVAILABLE_IN_3_2
+PangoFontFace   *gtk_font_chooser_get_font_face            (GtkFontChooser   *fontchooser);
+GDK_AVAILABLE_IN_3_2
+gint             gtk_font_chooser_get_font_size            (GtkFontChooser   *fontchooser);
+
+GDK_AVAILABLE_IN_3_2
+PangoFontDescription *
+                 gtk_font_chooser_get_font_desc            (GtkFontChooser             *fontchooser);
+GDK_AVAILABLE_IN_3_2
+void             gtk_font_chooser_set_font_desc            (GtkFontChooser             *fontchooser,
+                                                            const PangoFontDescription *font_desc);
+
+GDK_AVAILABLE_IN_3_2
 gchar*           gtk_font_chooser_get_font                 (GtkFontChooser   *fontchooser);
 
-gboolean         gtk_font_chooser_set_font                 (GtkFontChooser   *fontchooser,
-                                                            const gchar      *font_name);
+GDK_AVAILABLE_IN_3_2
+void             gtk_font_chooser_set_font                 (GtkFontChooser   *fontchooser,
+                                                            const gchar      *fontname);
+GDK_AVAILABLE_IN_3_2
 gchar*           gtk_font_chooser_get_preview_text         (GtkFontChooser   *fontchooser);
+GDK_AVAILABLE_IN_3_2
 void             gtk_font_chooser_set_preview_text         (GtkFontChooser   *fontchooser,
                                                             const gchar      *text);
+GDK_AVAILABLE_IN_3_2
 gboolean         gtk_font_chooser_get_show_preview_entry   (GtkFontChooser   *fontchooser);
+GDK_AVAILABLE_IN_3_2
 void             gtk_font_chooser_set_show_preview_entry   (GtkFontChooser   *fontchooser,
                                                             gboolean          show_preview_entry);
+GDK_AVAILABLE_IN_3_2
 void             gtk_font_chooser_set_filter_func          (GtkFontChooser   *fontchooser,
                                                             GtkFontFilterFunc filter,
                                                             gpointer          user_data,