gtk2 1.0.0-x86-mingw32 → 1.0.1-x86-mingw32

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

@@ -103,10 +103,6 @@ GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable    *drawable,
 						  gchar         **data);
 #endif
 
-void          gdk_pixmap_get_size                (GdkPixmap      *pixmap,
-                                                  gint	         *width,
-                                                  gint  	 *height);
-
 /* Functions to create/lookup pixmaps from their native equivalents
  */
 #ifndef GDK_MULTIHEAD_SAFE

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

@@ -67,12 +67,16 @@ void     gdk_property_change (GdkWindow     *window,
 void     gdk_property_delete (GdkWindow     *window,
 			      GdkAtom        property);
 #ifndef GDK_MULTIHEAD_SAFE
-#ifndef GDK_DISABLE_DEPRECATED
 gint gdk_text_property_to_text_list (GdkAtom        encoding,
 				     gint           format,
 				     const guchar  *text,
 				     gint           length,
 				     gchar       ***list);
+gint gdk_text_property_to_utf8_list (GdkAtom        encoding,
+				     gint           format,
+				     const guchar  *text,
+				     gint           length,
+				     gchar       ***list);
 gboolean gdk_utf8_to_compound_text (const gchar *str,
 				    GdkAtom     *encoding,
 				    gint        *format,
@@ -83,29 +87,22 @@ gint gdk_string_to_compound_text    (const gchar   *str,
 				     gint          *format,
 				     guchar       **ctext,
 				     gint          *length);
-gint gdk_text_property_to_utf8_list (GdkAtom        encoding,
-				     gint           format,
-				     const guchar  *text,
-				     gint           length,
-				     gchar       ***list);
-#endif
 #endif
 
-gint gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
+gint gdk_text_property_to_text_list_for_display (GdkDisplay     *display,
 						 GdkAtom         encoding,
 						 gint            format,
 						 const guchar   *text,
 						 gint            length,
 						 gchar        ***list);
-
-gchar   *gdk_utf8_to_string_target   (const gchar *str);
-#ifndef GDK_DISABLE_DEPRECATED
-gint gdk_text_property_to_text_list_for_display (GdkDisplay     *display,
+gint gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
 						 GdkAtom         encoding,
 						 gint            format,
 						 const guchar   *text,
 						 gint            length,
 						 gchar        ***list);
+  
+gchar   *gdk_utf8_to_string_target   (const gchar *str);
 gint     gdk_string_to_compound_text_for_display (GdkDisplay   *display,
 						  const gchar  *str,
 						  GdkAtom      *encoding,
@@ -121,7 +118,6 @@ gboolean gdk_utf8_to_compound_text_for_display   (GdkDisplay   *display,
 
 void gdk_free_text_list             (gchar        **list);
 void gdk_free_compound_text         (guchar        *ctext);
-#endif
 
 G_END_DECLS
 

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

@@ -30,7 +30,6 @@
 
 G_BEGIN_DECLS
 
-#ifndef GDK_DISABLE_DEPRECATED
 gboolean gdk_spawn_on_screen              (GdkScreen             *screen,
 					   const gchar           *working_directory,
 					   gchar                **argv,
@@ -57,7 +56,6 @@ gboolean gdk_spawn_on_screen_with_pipes   (GdkScreen             *screen,
 gboolean gdk_spawn_command_line_on_screen (GdkScreen             *screen,
 					   const gchar           *command_line,
 					   GError               **error);
-#endif
 
 G_END_DECLS
 

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

@@ -117,11 +117,6 @@ GdkDrawable  *gdk_win32_begin_direct_draw_libgtk_only (GdkDrawable *drawable,
 						       gint *y_offset_out);
 void          gdk_win32_end_direct_draw_libgtk_only (gpointer priv_data);
 
-GdkWindow *   gdk_win32_window_foreign_new_for_display (GdkDisplay *display,
-                                                        GdkNativeWindow anid);
-GdkWindow *   gdk_win32_window_lookup_for_display (GdkDisplay *display,
-                                                   GdkNativeWindow anid);
-
 
 G_END_DECLS
 

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

@@ -335,13 +335,6 @@ GdkWindow*    gdk_window_new                   (GdkWindow     *parent,
 void          gdk_window_destroy               (GdkWindow     *window);
 GdkWindowType gdk_window_get_window_type       (GdkWindow     *window);
 gboolean      gdk_window_is_destroyed          (GdkWindow     *window);
-
-GdkScreen*    gdk_window_get_screen            (GdkWindow     *window);
-GdkDisplay*   gdk_window_get_display           (GdkWindow     *window);
-GdkVisual*    gdk_window_get_visual            (GdkWindow     *window);
-int           gdk_window_get_width             (GdkWindow     *window);
-int           gdk_window_get_height            (GdkWindow     *window);
-
 GdkWindow*    gdk_window_at_pointer            (gint          *win_x,
                                                 gint          *win_y);
 void          gdk_window_show                  (GdkWindow     *window);
@@ -475,7 +468,6 @@ gboolean gdk_window_set_static_gravities (GdkWindow *window,
 					  gboolean   use_static);   
 
 /* Functions to create/lookup windows from their native equivalents */ 
-#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)
 #ifndef GDK_MULTIHEAD_SAFE
 GdkWindow*    gdk_window_foreign_new (GdkNativeWindow anid);
 GdkWindow*    gdk_window_lookup      (GdkNativeWindow anid);
@@ -484,7 +476,6 @@ GdkWindow    *gdk_window_foreign_new_for_display (GdkDisplay      *display,
 						  GdkNativeWindow  anid);
 GdkWindow*    gdk_window_lookup_for_display (GdkDisplay      *display,
 					     GdkNativeWindow  anid);
-#endif
 
 
 /* GdkWindow */
@@ -518,9 +509,7 @@ void gdk_window_set_urgency_hint      (GdkWindow *window,
 void          gdk_window_set_geometry_hints (GdkWindow          *window,
 					     const GdkGeometry  *geometry,
 					     GdkWindowHints      geom_mask);
-#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)
 void          gdk_set_sm_client_id          (const gchar        *sm_client_id);
-#endif
 
 void	      gdk_window_begin_paint_rect   (GdkWindow          *window,
 					     const GdkRectangle *rectangle);
@@ -577,7 +566,7 @@ void       gdk_window_coords_from_parent (GdkWindow       *window,
                                           gdouble         *x,
                                           gdouble         *y);
 
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
+#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) || defined (GDK_COMPILATION)
 /* Used by gtk_handle_box_button_changed () */
 gboolean      gdk_window_get_deskrelative_origin (GdkWindow	  *window,
 					  gint		  *x,
@@ -702,6 +691,10 @@ void gdk_window_get_internal_paint_info (GdkWindow    *window,
 void gdk_window_enable_synchronized_configure (GdkWindow *window);
 void gdk_window_configure_finished            (GdkWindow *window);
 
+#ifndef GDK_MULTIHEAD_SAFE
+GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);   
+#endif /* GDK_MULTIHEAD_SAFE */
+
 GdkWindow *gdk_get_default_root_window (void);
 
 /* Offscreen redirection */
@@ -722,15 +715,12 @@ void       gdk_window_redirect_to_drawable   (GdkWindow     *window,
 void       gdk_window_remove_redirection     (GdkWindow     *window);
 
 #ifndef GDK_DISABLE_DEPRECATED
-#ifndef GDK_MULTIHEAD_SAFE
-GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);   
-#endif /* GDK_MULTIHEAD_SAFE */
-
 #define GDK_ROOT_PARENT()             (gdk_get_default_root_window ())
 #define gdk_window_get_size            gdk_drawable_get_size
 #define gdk_window_get_type            gdk_window_get_window_type
 #define gdk_window_get_colormap        gdk_drawable_get_colormap
 #define gdk_window_set_colormap        gdk_drawable_set_colormap
+#define gdk_window_get_visual          gdk_drawable_get_visual
 #define gdk_window_ref                 g_object_ref
 #define gdk_window_unref               g_object_unref
 

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

@@ -71,7 +71,6 @@
 #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,13 +61,11 @@ 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;
@@ -141,14 +139,12 @@ 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,11 +67,9 @@ 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_entry           (void);
-GtkWidget    *gtk_combo_box_new_with_model           (GtkTreeModel *model);
-GtkWidget    *gtk_combo_box_new_with_model_and_entry (GtkTreeModel *model);
+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);
 
 /* grids */
 gint          gtk_combo_box_get_wrap_width         (GtkComboBox *combo_box);
@@ -120,13 +118,6 @@ 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,
@@ -140,8 +131,6 @@ 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,8 +29,6 @@
 
 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))
@@ -74,7 +72,6 @@ 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/gtkhruler.h

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

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

@@ -75,11 +75,9 @@ 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,7 +156,6 @@ 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,
@@ -171,6 +170,7 @@ 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,22 +180,20 @@ 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,11 +135,9 @@ 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);
@@ -193,10 +191,6 @@ 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,8 +38,6 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef GTK_DISABLE_DEPRECATED
-
 #ifndef __GTK_RULER_H__
 #define __GTK_RULER_H__
 
@@ -132,5 +130,3 @@ 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,13 +47,11 @@ 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				(24)
-#define GTK_MICRO_VERSION				(0)
-#define GTK_BINARY_AGE					(2400)
-#define GTK_INTERFACE_AGE				(0)
+#define GTK_MINOR_VERSION				(22)
+#define GTK_MICRO_VERSION				(1)
+#define GTK_BINARY_AGE					(2201)
+#define GTK_INTERFACE_AGE				(1)
 
 /* 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,8 +38,6 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef GTK_DISABLE_DEPRECATED
-
 #ifndef __GTK_VRULER_H__
 #define __GTK_VRULER_H__
 
@@ -80,5 +78,3 @@ G_END_DECLS
 
 
 #endif /* __GTK_VRULER_H__ */
-
-#endif /* GTK_DISABLE_DEPRECATED */

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

@@ -844,14 +844,12 @@ 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);
@@ -1268,10 +1266,8 @@ 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.