gtk2 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

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

@@ -101,7 +101,7 @@ GType gtk_file_chooser_get_type (void) G_GNUC_CONST;
  * @GTK_FILE_CHOOSER_ERROR_BAD_FILENAME: Indicates a malformed filename.
  * @GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS: Indicates a duplicate path (e.g. when
  *  adding a bookmark).
- * @GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME:
+ * @GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME: Indicates an incomplete hostname (e.g. "http://foo" without a slash after that).
  *
  * These identify the various errors that can occur while calling
  * #GtkFileChooser functions.

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

@@ -77,7 +77,7 @@ GtkWidget *           gtk_file_chooser_button_new_with_backend (const gchar
 #endif /* GTK_DISABLE_DEPRECATED */
 
 GtkWidget *           gtk_file_chooser_button_new_with_dialog  (GtkWidget            *dialog);
-G_CONST_RETURN gchar *gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
+const gchar *         gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
 void                  gtk_file_chooser_button_set_title        (GtkFileChooserButton *button,
 								const gchar          *title);
 gint                  gtk_file_chooser_button_get_width_chars  (GtkFileChooserButton *button);

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

@@ -61,7 +61,7 @@ GType gtk_file_filter_get_type (void) G_GNUC_CONST;
 GtkFileFilter *       gtk_file_filter_new      (void);
 void                  gtk_file_filter_set_name (GtkFileFilter *filter,
 						const gchar   *name);
-G_CONST_RETURN gchar *gtk_file_filter_get_name (GtkFileFilter *filter);
+const gchar *         gtk_file_filter_get_name (GtkFileFilter *filter);
 
 void gtk_file_filter_add_mime_type      (GtkFileFilter      *filter,
 					 const gchar        *mime_type);

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

@@ -103,7 +103,7 @@ GType      gtk_file_selection_get_type            (void) G_GNUC_CONST;
 GtkWidget* gtk_file_selection_new                 (const gchar      *title);
 void       gtk_file_selection_set_filename        (GtkFileSelection *filesel,
 						   const gchar      *filename);
-G_CONST_RETURN gchar* gtk_file_selection_get_filename        (GtkFileSelection *filesel);
+const gchar* gtk_file_selection_get_filename      (GtkFileSelection *filesel);
 
 void	   gtk_file_selection_complete		  (GtkFileSelection *filesel,
 						   const gchar	    *pattern);

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

@@ -75,7 +75,7 @@ GType                 gtk_font_button_get_type       (void) G_GNUC_CONST;
 GtkWidget            *gtk_font_button_new            (void);
 GtkWidget            *gtk_font_button_new_with_font  (const gchar   *fontname);
 
-G_CONST_RETURN gchar *gtk_font_button_get_title      (GtkFontButton *font_button);
+const gchar *         gtk_font_button_get_title      (GtkFontButton *font_button);
 void                  gtk_font_button_set_title      (GtkFontButton *font_button,
                                                       const gchar   *title);
 gboolean              gtk_font_button_get_use_font   (GtkFontButton *font_button);
@@ -84,7 +84,7 @@ void                  gtk_font_button_set_use_font   (GtkFontButton *font_button
 gboolean              gtk_font_button_get_use_size   (GtkFontButton *font_button);
 void                  gtk_font_button_set_use_size   (GtkFontButton *font_button,
                                                       gboolean       use_size);
-G_CONST_RETURN gchar* gtk_font_button_get_font_name  (GtkFontButton *font_button);
+const gchar *         gtk_font_button_get_font_name  (GtkFontButton *font_button);
 gboolean              gtk_font_button_set_font_name  (GtkFontButton *font_button,
                                                       const gchar   *fontname);
 gboolean              gtk_font_button_get_show_style (GtkFontButton *font_button);

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

@@ -205,7 +205,7 @@ gboolean   gtk_font_selection_dialog_set_font_name     (GtkFontSelectionDialog *
 
 /* This returns the text in the preview entry. You should copy the returned
    text if you need it. */
-G_CONST_RETURN gchar* 
+const gchar*
           gtk_font_selection_dialog_get_preview_text   (GtkFontSelectionDialog *fsd);
 
 /* This sets the text in the preview entry. It will be copied by the entry,

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

@@ -74,7 +74,7 @@ GtkWidget* gtk_frame_new              (const gchar   *label);
 
 void                  gtk_frame_set_label (GtkFrame    *frame,
 					   const gchar *label);
-G_CONST_RETURN gchar *gtk_frame_get_label (GtkFrame    *frame);
+const gchar *gtk_frame_get_label      (GtkFrame    *frame);
 
 void       gtk_frame_set_label_widget (GtkFrame      *frame,
 				       GtkWidget     *label_widget);

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/gtkiconfactory.h

@@ -112,7 +112,7 @@ GtkIconSize           gtk_icon_size_register       (const gchar *name,
 void                  gtk_icon_size_register_alias (const gchar *alias,
                                                     GtkIconSize  target);
 GtkIconSize           gtk_icon_size_from_name      (const gchar *name);
-G_CONST_RETURN gchar* gtk_icon_size_get_name       (GtkIconSize  size);
+const gchar *         gtk_icon_size_get_name       (GtkIconSize  size);
 
 /* Icon sets */
 
@@ -155,8 +155,8 @@ void           gtk_icon_source_set_icon_name            (GtkIconSource       *so
 void           gtk_icon_source_set_pixbuf               (GtkIconSource       *source,
                                                          GdkPixbuf           *pixbuf);
 
-G_CONST_RETURN gchar* gtk_icon_source_get_filename  (const GtkIconSource *source);
-G_CONST_RETURN gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source);
+const gchar* gtk_icon_source_get_filename  (const GtkIconSource *source);
+const gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source);
 GdkPixbuf*            gtk_icon_source_get_pixbuf    (const GtkIconSource *source);
 
 void             gtk_icon_source_set_direction_wildcarded (GtkIconSource       *source,

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

@@ -175,7 +175,7 @@ GtkIconInfo *         gtk_icon_info_new_for_pixbuf     (GtkIconTheme  *icon_them
                                                         GdkPixbuf     *pixbuf);
 
 gint                  gtk_icon_info_get_base_size      (GtkIconInfo   *icon_info);
-G_CONST_RETURN gchar *gtk_icon_info_get_filename       (GtkIconInfo   *icon_info);
+const gchar *         gtk_icon_info_get_filename       (GtkIconInfo   *icon_info);
 GdkPixbuf *           gtk_icon_info_get_builtin_pixbuf (GtkIconInfo   *icon_info);
 GdkPixbuf *           gtk_icon_info_load_icon          (GtkIconInfo   *icon_info,
 							GError       **error);
@@ -187,7 +187,7 @@ gboolean              gtk_icon_info_get_embedded_rect (GtkIconInfo    *icon_info
 gboolean              gtk_icon_info_get_attach_points (GtkIconInfo    *icon_info,
 						       GdkPoint      **points,
 						       gint           *n_points);
-G_CONST_RETURN gchar *gtk_icon_info_get_display_name  (GtkIconInfo    *icon_info);
+const gchar *         gtk_icon_info_get_display_name  (GtkIconInfo    *icon_info);
 
 /* Non-public methods */
 void _gtk_icon_theme_check_reload                     (GdkDisplay *display);

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

@@ -251,7 +251,7 @@ void       gtk_image_get_icon_set (GtkImage         *image,
                                    GtkIconSize      *size);
 GdkPixbufAnimation* gtk_image_get_animation (GtkImage *image);
 void       gtk_image_get_icon_name (GtkImage              *image,
-				    G_CONST_RETURN gchar **icon_name,
+				    const gchar          **icon_name,
 				    GtkIconSize           *size);
 void       gtk_image_get_gicon     (GtkImage              *image,
 				    GIcon                **gicon,

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

@@ -151,7 +151,7 @@ void		gtk_item_factory_add_foreign        (GtkWidget	    *accel_widget,
 						     GdkModifierType modifiers);
      
 GtkItemFactory*       gtk_item_factory_from_widget      (GtkWidget *widget);
-G_CONST_RETURN gchar* gtk_item_factory_path_from_widget (GtkWidget *widget);
+const gchar *         gtk_item_factory_path_from_widget (GtkWidget *widget);
 
 GtkWidget*	gtk_item_factory_get_item	      (GtkItemFactory *ifactory,
 						       const gchar    *path);

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

@@ -111,13 +111,13 @@ GtkWidget*            gtk_label_new               (const gchar   *str);
 GtkWidget*            gtk_label_new_with_mnemonic (const gchar   *str);
 void                  gtk_label_set_text          (GtkLabel      *label,
 						   const gchar   *str);
-G_CONST_RETURN gchar* gtk_label_get_text          (GtkLabel      *label);
+const gchar *         gtk_label_get_text          (GtkLabel      *label);
 void                  gtk_label_set_attributes    (GtkLabel      *label,
 						   PangoAttrList *attrs);
 PangoAttrList        *gtk_label_get_attributes    (GtkLabel      *label);
 void                  gtk_label_set_label         (GtkLabel      *label,
 						   const gchar   *str);
-G_CONST_RETURN gchar *gtk_label_get_label         (GtkLabel      *label);
+const gchar *         gtk_label_get_label         (GtkLabel      *label);
 void                  gtk_label_set_markup        (GtkLabel      *label,
 						   const gchar   *str);
 void                  gtk_label_set_use_markup    (GtkLabel      *label,
@@ -177,7 +177,7 @@ void         gtk_label_set_single_line_mode  (GtkLabel *label,
                                               gboolean single_line_mode);
 gboolean     gtk_label_get_single_line_mode  (GtkLabel *label);
 
-G_CONST_RETURN gchar *gtk_label_get_current_uri (GtkLabel *label);
+const gchar *gtk_label_get_current_uri          (GtkLabel *label);
 void         gtk_label_set_track_visited_links  (GtkLabel *label,
                                                  gboolean  track_links);
 gboolean     gtk_label_get_track_visited_links  (GtkLabel *label);

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

@@ -71,13 +71,15 @@ GtkWidget *           gtk_link_button_new               (const gchar   *uri);
 GtkWidget *           gtk_link_button_new_with_label    (const gchar   *uri,
 						         const gchar   *label);
 
-G_CONST_RETURN gchar *gtk_link_button_get_uri           (GtkLinkButton *link_button);
+const gchar *         gtk_link_button_get_uri           (GtkLinkButton *link_button);
 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);
@@ -225,6 +225,9 @@ gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
 
 gchar *_gtk_get_lc_ctype (void);
 
+gboolean _gtk_module_has_mixed_deps (GModule *module);
+
+
 G_END_DECLS
 
 #endif /* __GTK_MAIN_H__ */

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

@@ -182,7 +182,7 @@ gboolean   gtk_menu_get_tearoff_state     (GtkMenu             *menu);
  */
 void       gtk_menu_set_title             (GtkMenu             *menu,
 					   const gchar         *title);
-G_CONST_RETURN gchar *gtk_menu_get_title  (GtkMenu             *menu);
+const gchar *gtk_menu_get_title           (GtkMenu             *menu);
 
 void       gtk_menu_reorder_child         (GtkMenu             *menu,
                                            GtkWidget           *child,

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

@@ -88,7 +88,7 @@ struct _GtkMenuItemClass
 				 gint         allocation);
   void (* set_label)            (GtkMenuItem *menu_item,
 				 const gchar *label);
-  G_CONST_RETURN gchar *(* get_label) (GtkMenuItem *menu_item);
+  const gchar *(* get_label) (GtkMenuItem *menu_item);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -115,11 +115,11 @@ void       gtk_menu_item_set_right_justified  (GtkMenuItem         *menu_item,
 gboolean   gtk_menu_item_get_right_justified  (GtkMenuItem         *menu_item);
 void	   gtk_menu_item_set_accel_path	      (GtkMenuItem	   *menu_item,
 					       const gchar	   *accel_path);
-G_CONST_RETURN gchar* gtk_menu_item_get_accel_path (GtkMenuItem    *menu_item);
+const gchar* gtk_menu_item_get_accel_path     (GtkMenuItem    *menu_item);
 
 void       gtk_menu_item_set_label            (GtkMenuItem         *menu_item,
  					       const gchar         *label);
-G_CONST_RETURN gchar *gtk_menu_item_get_label (GtkMenuItem         *menu_item);
+const gchar *gtk_menu_item_get_label          (GtkMenuItem         *menu_item);
 
 void       gtk_menu_item_set_use_underline    (GtkMenuItem         *menu_item,
  					       gboolean             setting);

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);
 
 
 /***********************************************************
@@ -261,8 +263,8 @@ void gtk_notebook_set_tab_label           (GtkNotebook *notebook,
 void gtk_notebook_set_tab_label_text      (GtkNotebook *notebook,
 					   GtkWidget   *child,
 					   const gchar *tab_text);
-G_CONST_RETURN gchar *gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
-						       GtkWidget   *child);
+const gchar *gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
+                                              GtkWidget   *child);
 GtkWidget * gtk_notebook_get_menu_label   (GtkNotebook *notebook,
 					   GtkWidget   *child);
 void gtk_notebook_set_menu_label          (GtkNotebook *notebook,
@@ -271,8 +273,8 @@ void gtk_notebook_set_menu_label          (GtkNotebook *notebook,
 void gtk_notebook_set_menu_label_text     (GtkNotebook *notebook,
 					   GtkWidget   *child,
 					   const gchar *menu_text);
-G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
-							GtkWidget   *child);
+const gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
+                                               GtkWidget   *child);
 #ifndef GTK_DISABLE_DEPRECATED
 void gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,
 					   GtkWidget   *child,

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

@@ -64,9 +64,9 @@ gboolean      gtk_paper_size_is_equal     (GtkPaperSize *size1,
 GList        *gtk_paper_size_get_paper_sizes (gboolean include_custom);
 
 /* The width is always the shortest side, measure in mm */
-G_CONST_RETURN gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
 
 gdouble  gtk_paper_size_get_width        (GtkPaperSize *size, GtkUnit unit);
 gdouble  gtk_paper_size_get_height       (GtkPaperSize *size, GtkUnit unit);
@@ -87,7 +87,7 @@ gdouble gtk_paper_size_get_default_left_margin   (GtkPaperSize *size,
 gdouble gtk_paper_size_get_default_right_margin  (GtkPaperSize *size,
 						  GtkUnit       unit);
 
-G_CONST_RETURN gchar *gtk_paper_size_get_default (void);
+const gchar *gtk_paper_size_get_default (void);
 
 GtkPaperSize *gtk_paper_size_new_from_key_file (GKeyFile    *key_file,
 					        const gchar *group_name,

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

@@ -173,7 +173,7 @@ GtkPrintOperationResult gtk_print_operation_run                    (GtkPrintOper
 void                    gtk_print_operation_get_error              (GtkPrintOperation  *op,
 								    GError            **error);
 GtkPrintStatus          gtk_print_operation_get_status             (GtkPrintOperation  *op);
-G_CONST_RETURN gchar *  gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
+const gchar *           gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
 gboolean                gtk_print_operation_is_finished            (GtkPrintOperation  *op);
 void                    gtk_print_operation_cancel                 (GtkPrintOperation  *op);
 void                    gtk_print_operation_draw_page_finish       (GtkPrintOperation  *op);

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

@@ -71,7 +71,7 @@ void              gtk_print_settings_to_key_file             (GtkPrintSettings
 							      const gchar          *group_name);
 gboolean          gtk_print_settings_has_key                 (GtkPrintSettings     *settings,
 							      const gchar          *key);
-G_CONST_RETURN gchar *gtk_print_settings_get                 (GtkPrintSettings     *settings,
+const gchar *     gtk_print_settings_get                 (GtkPrintSettings     *settings,
 							      const gchar          *key);
 void              gtk_print_settings_set                     (GtkPrintSettings     *settings,
 							      const gchar          *key,
@@ -145,7 +145,7 @@ void              gtk_print_settings_set_int                 (GtkPrintSettings
 
 /* Helpers: */
 
-G_CONST_RETURN gchar *gtk_print_settings_get_printer           (GtkPrintSettings   *settings);
+const gchar *gtk_print_settings_get_printer           (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_printer           (GtkPrintSettings   *settings,
 								const gchar        *printer);
 GtkPageOrientation    gtk_print_settings_get_orientation       (GtkPrintSettings   *settings);
@@ -213,19 +213,19 @@ void                  gtk_print_settings_set_page_ranges       (GtkPrintSettings
 GtkPageSet            gtk_print_settings_get_page_set          (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_page_set          (GtkPrintSettings   *settings,
 								GtkPageSet          page_set);
-G_CONST_RETURN gchar *gtk_print_settings_get_default_source    (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_default_source    (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_default_source    (GtkPrintSettings   *settings,
 								const gchar        *default_source);
-G_CONST_RETURN gchar *gtk_print_settings_get_media_type        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_media_type        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_media_type        (GtkPrintSettings   *settings,
 								const gchar        *media_type);
-G_CONST_RETURN gchar *gtk_print_settings_get_dither            (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_dither            (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_dither            (GtkPrintSettings   *settings,
 								const gchar        *dither);
-G_CONST_RETURN gchar *gtk_print_settings_get_finishings        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_finishings        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_finishings        (GtkPrintSettings   *settings,
 								const gchar        *finishings);
-G_CONST_RETURN gchar *gtk_print_settings_get_output_bin        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_output_bin        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_output_bin        (GtkPrintSettings   *settings,
 								const gchar        *output_bin);
 

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

@@ -74,7 +74,8 @@ typedef enum
 #define GTK_PRIVATE_SET_FLAG(wid,flag)    G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END
 #define GTK_PRIVATE_UNSET_FLAG(wid,flag)  G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END
 
-#ifdef G_OS_WIN32
+#if defined G_OS_WIN32 \
+  || (defined GDK_WINDOWING_QUARTZ && defined QUARTZ_RELOCATION)
 
 const gchar *_gtk_get_datadir ();
 const gchar *_gtk_get_libdir ();
@@ -108,10 +109,32 @@ gboolean _gtk_fnmatch (const char *pattern,
  * Copy, Paste). This symbol is for those simple cases. */
 #ifndef GDK_WINDOWING_QUARTZ
 #define GTK_DEFAULT_ACCEL_MOD_MASK GDK_CONTROL_MASK
+#define GTK_DEFAULT_ACCEL_MOD_MASK_VIRTUAL GDK_CONTROL_MASK
 #else
-#define GTK_DEFAULT_ACCEL_MOD_MASK GDK_META_MASK
+#define GTK_DEFAULT_ACCEL_MOD_MASK GDK_MOD2_MASK
+#define GTK_DEFAULT_ACCEL_MOD_MASK_VIRTUAL GDK_META_MASK
 #endif
 
+/* When any of these modifiers are active, a key
+ * event cannot produce a symbol, so should be
+ * skipped when handling text input
+ */
+#ifndef GDK_WINDOWING_QUARTZ
+#define GTK_NO_TEXT_INPUT_MOD_MASK (GDK_MOD1_MASK | GDK_CONTROL_MASK)
+#else
+#define GTK_NO_TEXT_INPUT_MOD_MASK (GDK_MOD2_MASK | GDK_CONTROL_MASK)
+#endif
+
+#ifndef GDK_WINDOWING_QUARTZ
+#define GTK_EXTEND_SELECTION_MOD_MASK GDK_SHIFT_MASK
+#define GTK_MODIFY_SELECTION_MOD_MASK GDK_CONTROL_MASK
+#else
+#define GTK_EXTEND_SELECTION_MOD_MASK GDK_SHIFT_MASK
+#define GTK_MODIFY_SELECTION_MOD_MASK GDK_MOD2_MASK
+#endif
+
+gboolean _gtk_button_event_triggers_context_menu (GdkEventButton *event);
+
 G_END_DECLS
 
 #endif /* __GTK_PRIVATE_H__ */

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

@@ -136,7 +136,7 @@ void       gtk_progress_bar_set_pulse_step       (GtkProgressBar *pbar,
 void       gtk_progress_bar_set_orientation      (GtkProgressBar *pbar,
 						  GtkProgressBarOrientation orientation);
 
-G_CONST_RETURN gchar* gtk_progress_bar_get_text       (GtkProgressBar *pbar);
+const gchar*          gtk_progress_bar_get_text       (GtkProgressBar *pbar);
 gdouble               gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
 gdouble               gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
 

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,