gtk2 0.90.8-x86-mingw32 → 0.90.9-x86-mingw32

data/vendor/local/include/gtk-2.0/gtk/gtk.h

@@ -71,6 +71,7 @@
 #include <gtk/gtkcolorseldialog.h>
 #include <gtk/gtkcombobox.h>
 #include <gtk/gtkcomboboxentry.h>
+#include <gtk/gtkcomboboxtext.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkdebug.h>
 #include <gtk/gtkdialog.h>

data/vendor/local/include/gtk-2.0/gtk/gtkaboutdialog.h

@@ -61,11 +61,13 @@ struct _GtkAboutDialogClass
 {
   GtkDialogClass parent_class;
 
+  gboolean (*activate_link) (GtkAboutDialog *dialog,
+                             const gchar    *uri);
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
 };
 
 GType                  gtk_about_dialog_get_type               (void) G_GNUC_CONST;
@@ -139,12 +141,14 @@ typedef void (* GtkAboutDialogActivateLinkFunc) (GtkAboutDialog *about,
 						 const gchar    *link_,
 						 gpointer        data);
 
+#ifndef GTK_DISABLE_DEPRECATED
 GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_email_hook (GtkAboutDialogActivateLinkFunc func,
 								gpointer                       data,
 								GDestroyNotify                 destroy);
 GtkAboutDialogActivateLinkFunc gtk_about_dialog_set_url_hook   (GtkAboutDialogActivateLinkFunc func,
 								gpointer                       data,
 								GDestroyNotify                 destroy);
+#endif
 
 G_END_DECLS
 

data/vendor/local/include/gtk-2.0/gtk/gtkcombobox.h

@@ -67,9 +67,11 @@ struct _GtkComboBoxClass
 
 
 /* construction */
-GType         gtk_combo_box_get_type         (void) G_GNUC_CONST;
-GtkWidget    *gtk_combo_box_new              (void);
-GtkWidget    *gtk_combo_box_new_with_model   (GtkTreeModel    *model);
+GType         gtk_combo_box_get_type                 (void) G_GNUC_CONST;
+GtkWidget    *gtk_combo_box_new                      (void);
+GtkWidget    *gtk_combo_box_new_with_entry           (void);
+GtkWidget    *gtk_combo_box_new_with_model           (GtkTreeModel *model);
+GtkWidget    *gtk_combo_box_new_with_model_and_entry (GtkTreeModel *model);
 
 /* grids */
 gint          gtk_combo_box_get_wrap_width         (GtkComboBox *combo_box);
@@ -118,6 +120,13 @@ void               gtk_combo_box_set_button_sensitivity (GtkComboBox        *com
 							 GtkSensitivityType  sensitivity);
 GtkSensitivityType gtk_combo_box_get_button_sensitivity (GtkComboBox        *combo_box);
 
+gboolean           gtk_combo_box_get_has_entry          (GtkComboBox        *combo_box);
+void               gtk_combo_box_set_entry_text_column  (GtkComboBox        *combo_box,
+							 gint                text_column);
+gint               gtk_combo_box_get_entry_text_column  (GtkComboBox        *combo_box);
+
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+
 /* convenience -- text */
 GtkWidget    *gtk_combo_box_new_text         (void);
 void          gtk_combo_box_append_text      (GtkComboBox     *combo_box,
@@ -131,6 +140,8 @@ void          gtk_combo_box_remove_text      (GtkComboBox     *combo_box,
                                               gint             position);
 gchar        *gtk_combo_box_get_active_text  (GtkComboBox     *combo_box);
 
+#endif
+
 /* programmatic control */
 void          gtk_combo_box_popup            (GtkComboBox     *combo_box);
 void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);

data/vendor/local/include/gtk-2.0/gtk/gtkcomboboxentry.h

@@ -29,6 +29,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #define GTK_TYPE_COMBO_BOX_ENTRY             (gtk_combo_box_entry_get_type ())
 #define GTK_COMBO_BOX_ENTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntry))
 #define GTK_COMBO_BOX_ENTRY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryClass))
@@ -72,6 +74,7 @@ gint        gtk_combo_box_entry_get_text_column (GtkComboBoxEntry *entry_box);
 /* convenience -- text */
 GtkWidget  *gtk_combo_box_entry_new_text        (void);
 
+#endif
 
 G_END_DECLS
 

data/vendor/local/include/gtk-2.0/gtk/gtkcomboboxtext.h

@@ -0,0 +1,77 @@
+/* GTK - The GIMP Toolkit
+ *
+ * Copyright (C) 2010 Christian Dywan
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_COMBO_BOX_TEXT_H__
+#define __GTK_COMBO_BOX_TEXT_H__
+
+#include <gtk/gtkcombobox.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_COMBO_BOX_TEXT                 (gtk_combo_box_text_get_type ())
+#define GTK_COMBO_BOX_TEXT(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX_TEXT, GtkComboBoxText))
+#define GTK_COMBO_BOX_TEXT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COMBO_BOX_TEXT, GtkComboBoxTextClass))
+#define GTK_IS_COMBO_BOX_TEXT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX_TEXT))
+#define GTK_IS_COMBO_BOX_TEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COMBO_BOX_TEXT))
+#define GTK_COMBO_BOX_TEXT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COMBO_BOX_TEXT, GtkComboBoxTextClass))
+
+typedef struct _GtkComboBoxText             GtkComboBoxText;
+typedef struct _GtkComboBoxTextPrivate      GtkComboBoxTextPrivate;
+typedef struct _GtkComboBoxTextClass        GtkComboBoxTextClass;
+
+struct _GtkComboBoxText
+{
+  /* <private> */
+  GtkComboBox parent_instance;
+
+  GtkComboBoxTextPrivate *priv;
+};
+
+struct _GtkComboBoxTextClass
+{
+  GtkComboBoxClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+GType         gtk_combo_box_text_get_type        (void) G_GNUC_CONST;
+GtkWidget*    gtk_combo_box_text_new             (void);
+GtkWidget*    gtk_combo_box_text_new_with_entry  (void);
+void          gtk_combo_box_text_append_text     (GtkComboBoxText     *combo_box,
+                                                  const gchar         *text);
+void          gtk_combo_box_text_insert_text     (GtkComboBoxText     *combo_box,
+                                                  gint                 position,
+                                                  const gchar         *text);
+void          gtk_combo_box_text_prepend_text    (GtkComboBoxText     *combo_box,
+                                                  const gchar         *text);
+void          gtk_combo_box_text_remove          (GtkComboBoxText     *combo_box,
+                                                  gint                 position);
+gchar        *gtk_combo_box_text_get_active_text (GtkComboBoxText     *combo_box);
+
+
+G_END_DECLS
+
+#endif /* __GTK_COMBO_BOX_TEXT_H__ */

data/vendor/local/include/gtk-2.0/gtk/gtkhruler.h

@@ -38,6 +38,8 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_HRULER_H__
 #define __GTK_HRULER_H__
 
@@ -78,3 +80,5 @@ G_END_DECLS
 
 
 #endif /* __GTK_HRULER_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */

data/vendor/local/include/gtk-2.0/gtk/gtklinkbutton.h

@@ -75,9 +75,11 @@ G_CONST_RETURN gchar *gtk_link_button_get_uri           (GtkLinkButton *link_but
 void                  gtk_link_button_set_uri           (GtkLinkButton *link_button,
 						         const gchar   *uri);
 
+#ifndef GTK_DISABLE_DEPRECATED
 GtkLinkButtonUriFunc  gtk_link_button_set_uri_hook      (GtkLinkButtonUriFunc func,
 							 gpointer             data,
 							 GDestroyNotify       destroy);
+#endif
 
 gboolean              gtk_link_button_get_visited       (GtkLinkButton *link_button);
 void                  gtk_link_button_set_visited       (GtkLinkButton *link_button,

data/vendor/local/include/gtk-2.0/gtk/gtkmain.h

@@ -129,10 +129,10 @@ gboolean gtk_init_check_abi_check (int	  *argc,
 
 #ifndef GTK_DISABLE_DEPRECATED
 void     gtk_exit                 (gint    error_code);
+gchar *        gtk_set_locale           (void);
 #endif /* GTK_DISABLE_DEPRECATED */
 
 void           gtk_disable_setlocale    (void);
-gchar *        gtk_set_locale           (void);
 PangoLanguage *gtk_get_default_language (void);
 gboolean       gtk_events_pending       (void);
 
@@ -156,6 +156,7 @@ void	   gtk_grab_add		   (GtkWidget	       *widget);
 GtkWidget* gtk_grab_get_current	   (void);
 void	   gtk_grab_remove	   (GtkWidget	       *widget);
 
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 void	   gtk_init_add		   (GtkFunction	       function,
 				    gpointer	       data);
 void	   gtk_quit_add_destroy	   (guint	       main_level,
@@ -170,7 +171,6 @@ guint	   gtk_quit_add_full	   (guint	       main_level,
 				    GDestroyNotify     destroy);
 void	   gtk_quit_remove	   (guint	       quit_handler_id);
 void	   gtk_quit_remove_by_data (gpointer	       data);
-#ifndef GTK_DISABLE_DEPRECATED
 guint	   gtk_timeout_add	   (guint32	       interval,
 				    GtkFunction	       function,
 				    gpointer	       data);

data/vendor/local/include/gtk-2.0/gtk/gtknotebook.h

@@ -180,20 +180,22 @@ void gtk_notebook_remove_page       (GtkNotebook *notebook,
  *           Tabs drag and drop                            *
  ***********************************************************/
 
+#ifndef GTK_DISABLE_DEPRECATED
 void gtk_notebook_set_window_creation_hook (GtkNotebookWindowCreationFunc  func,
 					    gpointer                       data,
                                             GDestroyNotify                 destroy);
-#ifndef GTK_DISABLE_DEPRECATED
 void gtk_notebook_set_group_id             (GtkNotebook *notebook,
 					    gint         group_id);
 gint gtk_notebook_get_group_id             (GtkNotebook *notebook);
 
-#endif /* GTK_DISABLE_DEPRECATED */
-
 void gtk_notebook_set_group                (GtkNotebook *notebook,
 					    gpointer     group);
 gpointer gtk_notebook_get_group            (GtkNotebook *notebook);
+#endif /* GTK_DISABLE_DEPRECATED */
 
+void         gtk_notebook_set_group_name   (GtkNotebook *notebook,
+                                            const gchar *group_name);
+const gchar *gtk_notebook_get_group_name   (GtkNotebook *notebook);
 
 
 /***********************************************************

data/vendor/local/include/gtk-2.0/gtk/gtkrange.h

@@ -135,9 +135,11 @@ struct _GtkRangeClass
 
 GType              gtk_range_get_type                      (void) G_GNUC_CONST;
 
+#ifndef GTK_DISABLE_DEPRECATED
 void               gtk_range_set_update_policy             (GtkRange      *range,
                                                             GtkUpdateType  policy);
 GtkUpdateType      gtk_range_get_update_policy             (GtkRange      *range);
+#endif /* GTK_DISABLE_DEPRECATED */
 
 void               gtk_range_set_adjustment                (GtkRange      *range,
                                                             GtkAdjustment *adjustment);
@@ -191,6 +193,10 @@ gboolean           gtk_range_get_restrict_to_fill_level    (GtkRange      *range
 void               gtk_range_set_fill_level                (GtkRange      *range,
                                                             gdouble        fill_level);
 gdouble            gtk_range_get_fill_level                (GtkRange      *range);
+void               gtk_range_set_round_digits              (GtkRange      *range,
+                                                            gint           round_digits);
+gint                gtk_range_get_round_digits             (GtkRange      *range);
+
 
 /* internal API */
 gdouble            _gtk_range_get_wheel_delta              (GtkRange      *range,

data/vendor/local/include/gtk-2.0/gtk/gtkruler.h

@@ -38,6 +38,8 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_RULER_H__
 #define __GTK_RULER_H__
 
@@ -130,3 +132,5 @@ void            gtk_ruler_draw_pos   (GtkRuler       *ruler);
 G_END_DECLS
 
 #endif /* __GTK_RULER_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */

data/vendor/local/include/gtk-2.0/gtk/gtktypeutils.h

@@ -47,11 +47,13 @@ GType gtk_identifier_get_type (void) G_GNUC_CONST;
  */
 typedef struct _GtkArg	       	     GtkArg;
 typedef struct _GtkObject   	     GtkObject; /* object forward declaration */
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 typedef gboolean (*GtkFunction)	    (gpointer      data);
 typedef void (*GtkCallbackMarshal)  (GtkObject    *object,
 				     gpointer      data,
 				     guint         n_args,
 				     GtkArg       *args);
+#endif
 
 /* This used to be defined in gtkitemfactory.h, but moved over here after
  * the complete deprecation of that header

data/vendor/local/include/gtk-2.0/gtk/gtkversion.h

@@ -34,10 +34,10 @@
 /* compile time version
  */
 #define GTK_MAJOR_VERSION				(2)
-#define GTK_MINOR_VERSION				(22)
-#define GTK_MICRO_VERSION				(1)
-#define GTK_BINARY_AGE					(2201)
-#define GTK_INTERFACE_AGE				(1)
+#define GTK_MINOR_VERSION				(24)
+#define GTK_MICRO_VERSION				(0)
+#define GTK_BINARY_AGE					(2400)
+#define GTK_INTERFACE_AGE				(0)
 
 /* check whether a Gtk+ version equal to or greater than
  * major.minor.micro is present.

data/vendor/local/include/gtk-2.0/gtk/gtkvruler.h

@@ -38,6 +38,8 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_VRULER_H__
 #define __GTK_VRULER_H__
 
@@ -78,3 +80,5 @@ G_END_DECLS
 
 
 #endif /* __GTK_VRULER_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */

data/vendor/local/include/gtk-2.0/gtk/gtkwidget.h

@@ -844,12 +844,14 @@ void	   gtk_widget_set		  (GtkWidget	       *widget,
 					   const gchar         *first_property_name,
 					   ...) G_GNUC_NULL_TERMINATED;
 #endif /* GTK_DISABLE_DEPRECATED */
+#if !defined(GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+void       gtk_widget_hide_all            (GtkWidget           *widget);
+#endif
 void	   gtk_widget_unparent		  (GtkWidget	       *widget);
 void	   gtk_widget_show		  (GtkWidget	       *widget);
 void       gtk_widget_show_now            (GtkWidget           *widget);
 void	   gtk_widget_hide		  (GtkWidget	       *widget);
 void	   gtk_widget_show_all		  (GtkWidget	       *widget);
-void	   gtk_widget_hide_all		  (GtkWidget	       *widget);
 void       gtk_widget_set_no_show_all     (GtkWidget           *widget,
 					   gboolean             no_show_all);
 gboolean   gtk_widget_get_no_show_all     (GtkWidget           *widget);
@@ -1266,8 +1268,10 @@ void	     gtk_widget_input_shape_combine_mask (GtkWidget *widget,
 						  gint       offset_x,
 						  gint       offset_y);
 
+#if !defined(GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 /* internal function */
 void	     gtk_widget_reset_shapes	   (GtkWidget *widget);
+#endif
 
 /* Compute a widget's path in the form "GtkWindow.MyLabel", and
  * return newly alocated strings.

data/vendor/local/include/gtk-2.0/gtk/gtkwindow.h

@@ -256,7 +256,7 @@ gboolean   gtk_window_is_active                (GtkWindow           *window);
 gboolean   gtk_window_has_toplevel_focus       (GtkWindow           *window);
 
 
-
+#ifndef GTK_DISABLE_DEPRECATED
 /* gtk_window_set_has_frame () must be called before realizing the window_*/
 void       gtk_window_set_has_frame            (GtkWindow *window, 
 						gboolean   setting);
@@ -271,6 +271,7 @@ void       gtk_window_get_frame_dimensions     (GtkWindow *window,
 						gint      *top,
 						gint      *right,
 						gint      *bottom);
+#endif
 void       gtk_window_set_decorated            (GtkWindow *window,
                                                 gboolean   setting);
 gboolean   gtk_window_get_decorated            (GtkWindow *window);

data/vendor/local/lib/pkgconfig/gail.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Gail
 Description: GNOME Accessibility Implementation Library
-Version: 2.22.1
+Version: 2.24.0
 Requires: atk gtk+-2.0
 Libs: -L${libdir} -lgailutil
 Cflags: -I${includedir}/gail-1.0

data/vendor/local/lib/pkgconfig/gdk-2.0.pc

@@ -6,7 +6,7 @@ target=win32
 
 Name: GDK
 Description: GTK+ Drawing Kit (${target} target)
-Version: 2.22.1
+Version: 2.24.0
 Requires: pangowin32 pangocairo gdk-pixbuf-2.0
 Libs: -L${libdir} -lgdk-${target}-2.0 
 Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include 

data/vendor/local/lib/pkgconfig/gdk-win32-2.0.pc

@@ -6,7 +6,7 @@ target=win32
 
 Name: GDK
 Description: GTK+ Drawing Kit (${target} target)
-Version: 2.22.1
+Version: 2.24.0
 Requires: pangowin32 pangocairo gdk-pixbuf-2.0
 Libs: -L${libdir} -lgdk-${target}-2.0 
 Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include 

data/vendor/local/lib/pkgconfig/gtk+-2.0.pc

@@ -9,7 +9,7 @@ gtk_host=i686-pc-mingw32
 
 Name: GTK+
 Description: GTK+ Graphical UI Library (${target} target)
-Version: 2.22.1
+Version: 2.24.0
 Requires: gdk-${target}-2.0 atk cairo gdk-pixbuf-2.0 gio-2.0
 Libs: -L${libdir} -lgtk-${target}-2.0 
 Cflags: -I${includedir}/gtk-2.0 -mms-bitfields

data/vendor/local/lib/pkgconfig/gtk+-win32-2.0.pc

@@ -9,7 +9,7 @@ gtk_host=i686-pc-mingw32
 
 Name: GTK+
 Description: GTK+ Graphical UI Library (${target} target)
-Version: 2.22.1
+Version: 2.24.0
 Requires: gdk-${target}-2.0 atk cairo gdk-pixbuf-2.0 gio-2.0
 Libs: -L${libdir} -lgtk-${target}-2.0 
 Cflags: -I${includedir}/gtk-2.0 -mms-bitfields