[Lsb-messages] /var/www/bzr/lsb/devel/lsbspec r3991: fix up a bunch of gtk3 funcptrs, enums, other types (bug 3932)

Mats Wichmann mats at linuxfoundation.org
Sun Mar 2 16:01:03 UTC 2014


------------------------------------------------------------
revno: 3991
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: lsbspec
timestamp: Sun 2014-03-02 09:01:03 -0700
message:
  fix up a bunch of gtk3 funcptrs, enums, other types (bug 3932)
modified:
  Toolkit_Gtk/generic/GTK/GTK.sgml
  Toolkit_Gtk/generic/GTK/libGdk_3.sgml
  Toolkit_Gtk/generic/GTK/libGtk_3.sgml
-------------- next part --------------
=== modified file 'Toolkit_Gtk/generic/GTK/GTK.sgml'
--- a/Toolkit_Gtk/generic/GTK/GTK.sgml	2014-02-28 23:51:53 +0000
+++ b/Toolkit_Gtk/generic/GTK/GTK.sgml	2014-03-02 16:01:03 +0000
@@ -33956,7 +33956,7 @@
 typedef struct _GdkEventMotion GdkEventMotion;
 typedef struct _GdkEventSequence GdkEventSequence;
 typedef union _GdkEvent GdkEvent;
-typedef void (*GdkEventFunc) (GdkEvent * filter_info, gpointer data);
+typedef void (*GdkEventFunc) (GdkEvent * event, gpointer data);
 typedef void GdkXEvent;
 typedef enum {
     GDK_FILTER_CONTINUE,
@@ -56942,7 +56942,9 @@
 typedef struct _GtkTextBuffer GtkTextBuffer;
 typedef gboolean(*GtkTextCharPredicate) (void);
 typedef struct _GtkPrintSettings GtkPrintSettings;
-typedef void (*GtkPrintSettingsFunc) (void);
+typedef void (*GtkPrintSettingsFunc) (const gchar * key,
+				      const gchar * value,
+				      gpointer user_data);
 typedef struct _GtkPageRange GtkPageRange;
 typedef struct _GtkEventBox GtkEventBox;
 typedef struct _GtkActivatable GtkActivatable;
@@ -56974,7 +56976,8 @@
 typedef struct _GtkIMContextSimple GtkIMContextSimple;
 typedef struct _GtkRadioButton GtkRadioButton;
 typedef struct _GtkPageSetup GtkPageSetup;
-typedef gint(*GtkKeySnoopFunc) (void);
+typedef gint(*GtkKeySnoopFunc) (GtkWidget * grab_widget,
+				GdkEventKey * event, gpointer func_data);
 typedef struct _GtkLinkButton GtkLinkButton;
 typedef struct _GtkAdjustment GtkAdjustment;
 typedef struct _GtkClipboard GtkClipboard;
@@ -56992,15 +56995,25 @@
 typedef gboolean(*GtkRcPropertyParser) (void);
 typedef struct _GtkRange GtkRange;
 typedef struct _GtkTextMark GtkTextMark;
-typedef gboolean(*GtkTreeSelectionFunc) (void);
-typedef void (*GtkTreeSelectionForeachFunc) (void);
+typedef gboolean(*GtkTreeSelectionFunc) (GtkTreeSelection * selection,
+					 GtkTreeModel * model,
+					 GtkTreePath * path,
+					 gboolean path_currently_selected,
+					 gpointer data);
+typedef void (*GtkTreeSelectionForeachFunc) (GtkTreeModel * model,
+					     GtkTreePath * path,
+					     GtkTreeIter * iter,
+					     gpointer data);
 typedef struct _GtkTreeViewColumn GtkTreeViewColumn;
 typedef enum {
     GTK_TREE_VIEW_COLUMN_GROW_ONLY,
     GTK_TREE_VIEW_COLUMN_AUTOSIZE,
     GTK_TREE_VIEW_COLUMN_FIXED
 } GtkTreeViewColumnSizing;
-typedef void (*GtkTreeCellDataFunc) (void);
+typedef void (*GtkTreeCellDataFunc) (GtkTreeViewColumn * tree_column,
+				     GtkCellRenderer * cell,
+				     GtkTreeModel * tree_model,
+				     GtkTreeIter * iter, gpointer data);
 typedef struct _GtkTreeModelSort GtkTreeModelSort;
 typedef struct _GtkViewport GtkViewport;
 typedef struct _GtkStatusIcon GtkStatusIcon;
@@ -57013,7 +57026,9 @@
     GTK_CALENDAR_SHOW_WEEK_NUMBERS,
     GTK_CALENDAR_SHOW_DETAILS
 } GtkCalendarDisplayOptions;
-typedef gchar *(*GtkCalendarDetailFunc) (void);
+typedef gchar *(*GtkCalendarDetailFunc) (GtkCalendar * calendar,
+					 guint year, guint month,
+					 guint day, gpointer user_data);
 typedef enum {
     GTK_DIALOG_MODAL,
     GTK_DIALOG_DESTROY_WITH_PARENT
@@ -57021,21 +57036,44 @@
 typedef struct _GtkDialog GtkDialog;
 typedef struct _GtkActionable GtkActionable;
 typedef struct _GtkListStore GtkListStore;
-typedef enum
-    GtkRecentSortType;
-typedef gint(*GtkRecentSortFunc) (void);
+typedef enum {
+    GTK_RECENT_SORT_NONE = 0,
+    GTK_RECENT_SORT_MRU = 1,
+    GTK_RECENT_SORT_LRU = 2,
+    GTK_RECENT_SORT_CUSTOM = 3
+} GtkRecentSortType;
+typedef gint(*GtkRecentSortFunc) (GtkRecentInfo * a, GtkRecentInfo * b,
+				  gpointer user_data);
 typedef struct _GtkRecentChooser GtkRecentChooser;
 typedef struct _GtkScrollable GtkScrollable;
 typedef struct _GtkRadioAction GtkRadioAction;
 typedef struct _GtkPlug GtkPlug;
-typedef void (*GtkClipboardReceivedFunc) (void);
-typedef void (*GtkClipboardTextReceivedFunc) (void);
-typedef void (*GtkClipboardRichTextReceivedFunc) (void);
-typedef void (*GtkClipboardImageReceivedFunc) (void);
-typedef void (*GtkClipboardURIReceivedFunc) (void);
-typedef void (*GtkClipboardTargetsReceivedFunc) (void);
-typedef void (*GtkClipboardGetFunc) (void);
-typedef void (*GtkClipboardClearFunc) (void);
+typedef void (*GtkClipboardReceivedFunc) (GtkClipboard * clipboard,
+					  GtkSelectionData *
+					  selection_data, gpointer data);
+typedef void (*GtkClipboardTextReceivedFunc) (GtkClipboard * clipboard,
+					      const gchar * text,
+					      gpointer data);
+typedef void (*GtkClipboardRichTextReceivedFunc) (GtkClipboard * clipboard,
+						  GdkAtom format,
+						  const guint8 * text,
+						  gsize length,
+						  gpointer data);
+typedef void (*GtkClipboardImageReceivedFunc) (GtkClipboard * clipboard,
+					       GdkPixbuf * pixbuf,
+					       gpointer data);
+typedef void (*GtkClipboardURIReceivedFunc) (GtkClipboard * clipboard,
+					     gchar * *uris, gpointer data);
+typedef void (*GtkClipboardTargetsReceivedFunc) (GtkClipboard * clipboard,
+						 GdkAtom * atoms,
+						 gint n_atoms,
+						 gpointer data);
+typedef void (*GtkClipboardGetFunc) (GtkClipboard * clipboard,
+				     GtkSelectionData * selection_data,
+				     guint info,
+				     gpointer user_data_or_owner);
+typedef void (*GtkClipboardClearFunc) (GtkClipboard * clipboard,
+				       gpointer user_data_or_owner);
 typedef struct _GtkNotebook GtkNotebook;
 typedef struct _GtkLockButton GtkLockButton;
 typedef struct _GtkTreeDragSource GtkTreeDragSource;
@@ -57065,7 +57103,7 @@
 typedef struct _cairo_rectangle_int GtkAllocation;
 typedef void (*GtkCallback) (void);
 typedef struct _GtkTreeStore GtkTreeStore;
-typedef gchar *(*GtkTranslateFunc) (void);
+typedef gchar *(*GtkTranslateFunc) (const char *path, gpointer func_data);
 typedef struct _GtkStockItem GtkStockItem;
 typedef enum {
     GTK_ENTRY_ICON_PRIMARY,
@@ -57110,8 +57148,14 @@
 typedef void (*GtkTextTagTableForeach) (void);
 typedef struct _GtkRecentFilter GtkRecentFilter;
 typedef struct _GtkRecentFilterInfo GtkRecentFilterInfo;
-typedef enum
-    GtkRecentFilterFlags;
+typedef enum {
+    GTK_RECENT_FILTER_URI = 0,
+    GTK_RECENT_FILTER_DISPLAY_NAME = 1,
+    GTK_RECENT_FILTER_MIME_TYPE = 2,
+    GTK_RECENT_FILTER_APPLICATION = 3,
+    GTK_RECENT_FILTER_GROUP = 4,
+    GTK_RECENT_FILTER_AGE = 5
+} GtkRecentFilterFlags;
 typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *
 					filter_info, gpointer user_data);
 typedef struct _GtkSwitch GtkSwitch;
@@ -57130,10 +57174,15 @@
 typedef struct _GtkTargetEntry GtkTargetEntry;
 typedef struct _GtkMenuBar GtkMenuBar;
 typedef struct _GtkFrame GtkFrame;
-typedef enum
-    GtkAssistantPageType;
+typedef enum {
+    GTK_ASSISTANT_PAGE_CONTENT = 0,
+    GTK_ASSISTANT_PAGE_INTRO = 1,
+    GTK_ASSISTANT_PAGE_CONFIRM = 2,
+    GTK_ASSISTANT_PAGE_SUMMARY = 3,
+    GTK_ASSISTANT_PAGE_PROGRESS = 4
+} GtkAssistantPageType;
 typedef struct _GtkAssistant GtkAssistant;
-typedef gint(*GtkAssistantPageFunc) (void);
+typedef gint(*GtkAssistantPageFunc) (gint current_page, gpointer data);
 typedef struct _GtkBorder GtkBorder;
 typedef struct _GtkToolItem GtkToolItem;
 typedef struct _GtkTextAttributes GtkTextAttributes;
@@ -57142,8 +57191,13 @@
 typedef struct _GtkPrintOperationPreview GtkPrintOperationPreview;
 typedef struct _GtkToggleAction GtkToggleAction;
 typedef struct _GtkCssProvider GtkCssProvider;
-typedef gboolean(*GtkTreeModelFilterVisibleFunc) (void);
-typedef void (*GtkTreeModelFilterModifyFunc) (void);
+typedef gboolean(*GtkTreeModelFilterVisibleFunc) (GtkTreeModel * model,
+						  GtkTreeIter * iter,
+						  gpointer data);
+typedef void (*GtkTreeModelFilterModifyFunc) (GtkTreeModel * model,
+					      GtkTreeIter * iter,
+					      GValue * value, gint column,
+					      gpointer data);
 typedef struct _GtkTreeModelFilter GtkTreeModelFilter;
 typedef struct _GtkSizeGroup GtkSizeGroup;
 typedef enum {
@@ -57231,7 +57285,11 @@
 typedef struct _GtkStyleProvider GtkStyleProvider;
 typedef struct _GtkApplicationWindow GtkApplicationWindow;
 typedef struct _GtkEntryCompletion GtkEntryCompletion;
-typedef gboolean(*GtkEntryCompletionMatchFunc) (void);
+typedef gboolean(*GtkEntryCompletionMatchFunc) (GtkEntryCompletion *
+						completion,
+						const gchar * key,
+						GtkTreeIter * iter,
+						gpointer user_data);
 typedef struct _GtkCellEditable GtkCellEditable;
 typedef struct _GtkCheckMenuItem GtkCheckMenuItem;
 typedef struct _GtkFontButton GtkFontButton;
@@ -57240,16 +57298,44 @@
 typedef struct _GtkFixed GtkFixed;
 typedef struct _GtkBuildable GtkBuildable;
 typedef struct _GtkButton GtkButton;
-typedef enum
-    GtkAlign;
-typedef enum
-    GtkArrowType;
-typedef enum
-    GtkButtonBoxStyle;
-typedef enum
-    GtkDirectionType;
-typedef enum
-    GtkIconSize;
+typedef enum {
+    GTK_RECENT_FILTER_URI = 1 &lt;&lt; 0,
+    GTK_RECENT_FILTER_DISPLAY_NAME = 1 &lt;&lt; 1,
+    GTK_RECENT_FILTER_MIME_TYPE = 1 &lt;&lt; 2,
+    GTK_RECENT_FILTER_APPLICATION = 1 &lt;&lt; 3,
+    GTK_RECENT_FILTER_GROUP = 1 &lt;&lt; 4,
+    GTK_RECENT_FILTER_AGE = 1 &lt;&lt; 5
+} GtkAlign;
+typedef enum {
+    GTK_ARROW_UP = 0,
+    GTK_ARROW_DOWN = 1,
+    GTK_ARROW_LEFT = 2,
+    GTK_ARROW_RIGHT = 3
+} GtkArrowType;
+typedef enum {
+    GTK_BUTTONBOX_DEFAULT_STYLE = 0,
+    GTK_BUTTONBOX_SPREAD = 1,
+    GTK_BUTTONBOX_EDGE = 2,
+    GTK_BUTTONBOX_START = 3,
+    GTK_BUTTONBOX_END = 4
+} GtkButtonBoxStyle;
+typedef enum {
+    GTK_DIR_TAB_FORWARD = 0,
+    GTK_DIR_TAB_BACKWARD = 1,
+    GTK_DIR_UP = 2,
+    GTK_DIR_DOWN = 3,
+    GTK_DIR_LEFT = 4,
+    GTK_DIR_RIGHT = 5
+} GtkDirectionType;
+typedef enum {
+    GTK_ICON_SIZE_INVALID = 0,
+    GTK_ICON_SIZE_MENU = 1,
+    GTK_ICON_SIZE_SMALL_TOOLBAR = 2,
+    GTK_ICON_SIZE_LARGE_TOOLBAR = 3,
+    GTK_ICON_SIZE_BUTTON = 4,
+    GTK_ICON_SIZE_DND = 5,
+    GTK_ICON_SIZE_DIALOG = 6
+} GtkIconSize;
 typedef enum {
     GTK_SENSITIVITY_AUTO,
     GTK_SENSITIVITY_ON,
@@ -57499,7 +57585,9 @@
 typedef struct _GtkAccelGroup GtkAccelGroup;
 typedef struct _GtkAccelKey GtkAccelKey;
 typedef struct _GtkAccelGroupEntry GtkAccelGroupEntry;
-typedef gboolean(*GtkAccelGroupFindFunc) (void);
+typedef gboolean(*GtkAccelGroupFindFunc) (GtkAccelKey * key,
+					  GClosure * closure,
+					  gpointer data);
 typedef struct _GtkIconFactory GtkIconFactory;
 typedef struct _GtkAppChooserWidget GtkAppChooserWidget;
 typedef struct _GtkButtonBox GtkButtonBox;
@@ -57509,15 +57597,55 @@
 typedef gboolean(*GtkCellCallback) (void);
 typedef gboolean(*GtkCellAllocCallback) (void);
 typedef struct _GtkPrintOperation GtkPrintOperation;
-typedef enum
-    GtkPrintStatus;
-typedef enum
-    GtkPrintOperationResult;
-typedef enum
-    GtkPrintOperationAction;
-typedef void (*GtkPageSetupDoneFunc) (void);
-typedef guint8 *(*GtkTextBufferSerializeFunc) (void);
-typedef gboolean(*GtkTextBufferDeserializeFunc) (void);
+typedef enum {
+    GTK_PRINT_STATUS_INITIAL,
+    GTK_PRINT_STATUS_PREPARING,
+    GTK_PRINT_STATUS_GENERATING_DATA,
+    GTK_PRINT_STATUS_SENDING_DATA,
+    GTK_PRINT_STATUS_PENDING,
+    GTK_PRINT_STATUS_PENDING_ISSUE,
+    GTK_PRINT_STATUS_PRINTING,
+    GTK_PRINT_STATUS_FINISHED,
+    GTK_PRINT_STATUS_FINISHED_ABORTED
+} GtkPrintStatus;
+typedef enum {
+    GTK_PRINT_OPERATION_RESULT_ERROR,
+    GTK_PRINT_OPERATION_RESULT_APPLY,
+    GTK_PRINT_OPERATION_RESULT_CANCEL,
+    GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
+} GtkPrintOperationResult;
+typedef enum {
+    GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+    GTK_PRINT_OPERATION_ACTION_PRINT,
+    GTK_PRINT_OPERATION_ACTION_PREVIEW,
+    GTK_PRINT_OPERATION_ACTION_EXPORT
+} GtkPrintOperationAction;
+typedef enum {
+    GTK_PRINT_ERROR_GENERAL,
+    GTK_PRINT_ERROR_INTERNAL_ERROR,
+    GTK_PRINT_ERROR_NOMEM,
+    GTK_PRINT_ERROR_INVALID_FILE
+} GtkPrintError;
+typedef void (*GtkPageSetupDoneFunc) (GtkPageSetup * page_setup,
+				      gpointer data);
+typedef guint8 *(*GtkTextBufferSerializeFunc) (GtkTextBuffer *
+					       register_buffer,
+					       GtkTextBuffer *
+					       content_buffer,
+					       GtkTextIter * start,
+					       GtkTextIter * end,
+					       gsize * length,
+					       gpointer user_data);
+typedef gboolean(*GtkTextBufferDeserializeFunc) (GtkTextBuffer *
+						 register_buffer,
+						 GtkTextBuffer *
+						 content_buffer,
+						 GtkTextIter * iter,
+						 const guint8 * data,
+						 gsize length,
+						 gboolean create_tags,
+						 gpointer user_data,
+						 GError * *error);
 typedef struct _GtkAlignment GtkAlignment;
 typedef enum {
     GTK_TREE_VIEW_DROP_BEFORE,
@@ -57527,12 +57655,29 @@
 } GtkTreeViewDropPosition;
 typedef struct _GtkTreeView GtkTreeView;
 typedef struct _GtkTreeSelection GtkTreeSelection;
-typedef gboolean(*GtkTreeViewColumnDropFunc) (void);
-typedef void (*GtkTreeViewMappingFunc) (void);
-typedef gboolean(*GtkTreeViewSearchEqualFunc) (void);
-typedef gboolean(*GtkTreeViewRowSeparatorFunc) (void);
-typedef void (*GtkTreeViewSearchPositionFunc) (void);
-typedef void (*GtkTreeDestroyCountFunc) (void);
+typedef gboolean(*GtkTreeViewColumnDropFunc) (GtkTreeView * tree_view,
+					      GtkTreeViewColumn * column,
+					      GtkTreeViewColumn *
+					      prev_column,
+					      GtkTreeViewColumn *
+					      next_column, gpointer data);
+typedef void (*GtkTreeViewMappingFunc) (GtkTreeView * tree_view,
+					GtkTreePath * path,
+					gpointer user_data);
+typedef gboolean(*GtkTreeViewSearchEqualFunc) (GtkTreeModel * model,
+					       gint column,
+					       const gchar * key,
+					       GtkTreeIter * iter,
+					       gpointer search_data);
+typedef gboolean(*GtkTreeViewRowSeparatorFunc) (GtkTreeModel * model,
+						GtkTreeIter * iter,
+						gpointer data);
+typedef void (*GtkTreeViewSearchPositionFunc) (GtkTreeView * tree_view,
+					       GtkWidget * search_dialog,
+					       gpointer user_data);
+typedef void (*GtkTreeDestroyCountFunc) (GtkTreeView * tree_view,
+					 GtkTreePath * path, gint children,
+					 gpointer user_data);
 typedef struct _GtkPaperSize GtkPaperSize;
 typedef struct _GtkOrientable GtkOrientable;
 typedef struct _GtkCellRendererToggle GtkCellRendererToggle;
@@ -57552,7 +57697,10 @@
 typedef struct _GtkTreePath GtkTreePath;
 typedef struct _GtkTreeRowReference GtkTreeRowReference;
 typedef struct _GtkTreeModel GtkTreeModel;
-typedef gboolean(*GtkTreeModelForeachFunc) (void);
+typedef gboolean(*GtkTreeModelForeachFunc) (GtkTreeModel * model,
+					    GtkTreePath * path,
+					    GtkTreeIter * iter,
+					    gpointer data);
 typedef enum {
     GTK_TREE_MODEL_ITERS_PERSIST,
     GTK_TREE_MODEL_LIST_ONLY
@@ -57560,8 +57708,11 @@
 typedef struct _GtkCheckButton GtkCheckButton;
 typedef struct _GtkWindowGroup GtkWindowGroup;
 typedef struct _GtkMenu GtkMenu;
-typedef void (*GtkMenuPositionFunc) (void);
-typedef void (*GtkMenuDetachFunc) (void);
+typedef void (*GtkMenuPositionFunc) (GtkMenu * menu, gint * x, gint * y,
+				     gboolean * push_in,
+				     gpointer user_data);
+typedef void (*GtkMenuDetachFunc) (GtkWidget * attach_widget,
+				   GtkMenu * menu);
 typedef struct _GtkLevelBar GtkLevelBar;
 typedef struct _GtkComboBox GtkComboBox;
 typedef struct _GtkSpinner GtkSpinner;
@@ -57571,7 +57722,13 @@
     GTK_TOOL_PALETTE_DRAG_GROUPS
 } GtkToolPaletteDragTargets;
 typedef struct _GtkBuilder GtkBuilder;
-typedef void (*GtkBuilderConnectFunc) (void);
+typedef void (*GtkBuilderConnectFunc) (GtkBuilder * builder,
+				       GObject * object,
+				       const gchar * signal_name,
+				       const gchar * handler_name,
+				       GObject * connect_object,
+				       GConnectFlags flags,
+				       gpointer user_data);
 typedef struct _GtkTextBTree GtkTextBTree;
 typedef struct _GtkIconInfo GtkIconInfo;
 typedef struct _GtkIconTheme GtkIconTheme;
@@ -57584,7 +57741,10 @@
 } GtkIconLookupFlags;
 typedef struct _GtkBindingSet GtkBindingSet;
 typedef struct _GtkCellLayout GtkCellLayout;
-typedef void (*GtkCellLayoutDataFunc) (void);
+typedef void (*GtkCellLayoutDataFunc) (GtkClipboard * cell_layout,
+				       GtkCellRenderer * cell,
+				       GtkTreeModel * tree_model,
+				       GtkTreeIter * iter, gpointer data);
 typedef struct _GtkToolbar GtkToolbar;
 typedef struct _GtkMenuToolButton GtkMenuToolButton;
 typedef struct _GtkStatusbar GtkStatusbar;
@@ -57595,7 +57755,9 @@
 typedef struct _GtkAspectFrame GtkAspectFrame;
 typedef struct _GtkLabel GtkLabel;
 typedef struct _GtkTreeSortable GtkTreeSortable;
-typedef gint(*GtkTreeIterCompareFunc) (void);
+typedef gint(*GtkTreeIterCompareFunc) (GtkTreeModel * model,
+				       GtkTreeIter * a, GtkTreeIter * b,
+				       gpointer user_data);
 typedef struct _GtkFileChooserButton GtkFileChooserButton;
 typedef struct _GtkAccelMap GtkAccelMap;
 typedef void (*GtkAccelMapForeach) (void);
@@ -57603,7 +57765,8 @@
 typedef struct _GtkContainer GtkContainer;
 typedef struct _GtkContainerClass GtkContainerClass;
 typedef struct _GtkIconView GtkIconView;
-typedef void (*GtkIconViewForeachFunc) (void);
+typedef void (*GtkIconViewForeachFunc) (GtkIconView * icon_view,
+					GtkTreePath * path, gpointer data);
 typedef enum {
     GTK_ICON_VIEW_NO_DROP,
     GTK_ICON_VIEW_DROP_INTO,

=== modified file 'Toolkit_Gtk/generic/GTK/libGdk_3.sgml'
--- a/Toolkit_Gtk/generic/GTK/libGdk_3.sgml	2014-02-28 23:51:53 +0000
+++ b/Toolkit_Gtk/generic/GTK/libGdk_3.sgml	2014-03-02 16:01:03 +0000
@@ -396,7 +396,7 @@
 typedef struct _GdkEventMotion GdkEventMotion;
 typedef struct _GdkEventSequence GdkEventSequence;
 typedef union _GdkEvent GdkEvent;
-typedef void (*GdkEventFunc) (GdkEvent * filter_info, gpointer data);
+typedef void (*GdkEventFunc) (GdkEvent * event, gpointer data);
 typedef void GdkXEvent;
 typedef enum {
     GDK_FILTER_CONTINUE,

=== modified file 'Toolkit_Gtk/generic/GTK/libGtk_3.sgml'
--- a/Toolkit_Gtk/generic/GTK/libGtk_3.sgml	2014-02-22 13:38:08 +0000
+++ b/Toolkit_Gtk/generic/GTK/libGtk_3.sgml	2014-03-02 16:01:03 +0000
@@ -692,7 +692,9 @@
 typedef struct _GtkTextBuffer GtkTextBuffer;
 typedef gboolean(*GtkTextCharPredicate) (void);
 typedef struct _GtkPrintSettings GtkPrintSettings;
-typedef void (*GtkPrintSettingsFunc) (void);
+typedef void (*GtkPrintSettingsFunc) (const gchar * key,
+				      const gchar * value,
+				      gpointer user_data);
 typedef struct _GtkPageRange GtkPageRange;
 typedef struct _GtkEventBox GtkEventBox;
 typedef struct _GtkActivatable GtkActivatable;
@@ -724,7 +726,8 @@
 typedef struct _GtkIMContextSimple GtkIMContextSimple;
 typedef struct _GtkRadioButton GtkRadioButton;
 typedef struct _GtkPageSetup GtkPageSetup;
-typedef gint(*GtkKeySnoopFunc) (void);
+typedef gint(*GtkKeySnoopFunc) (GtkWidget * grab_widget,
+				GdkEventKey * event, gpointer func_data);
 typedef struct _GtkLinkButton GtkLinkButton;
 typedef struct _GtkAdjustment GtkAdjustment;
 typedef struct _GtkClipboard GtkClipboard;
@@ -742,15 +745,25 @@
 typedef gboolean(*GtkRcPropertyParser) (void);
 typedef struct _GtkRange GtkRange;
 typedef struct _GtkTextMark GtkTextMark;
-typedef gboolean(*GtkTreeSelectionFunc) (void);
-typedef void (*GtkTreeSelectionForeachFunc) (void);
+typedef gboolean(*GtkTreeSelectionFunc) (GtkTreeSelection * selection,
+					 GtkTreeModel * model,
+					 GtkTreePath * path,
+					 gboolean path_currently_selected,
+					 gpointer data);
+typedef void (*GtkTreeSelectionForeachFunc) (GtkTreeModel * model,
+					     GtkTreePath * path,
+					     GtkTreeIter * iter,
+					     gpointer data);
 typedef struct _GtkTreeViewColumn GtkTreeViewColumn;
 typedef enum {
     GTK_TREE_VIEW_COLUMN_GROW_ONLY,
     GTK_TREE_VIEW_COLUMN_AUTOSIZE,
     GTK_TREE_VIEW_COLUMN_FIXED
 } GtkTreeViewColumnSizing;
-typedef void (*GtkTreeCellDataFunc) (void);
+typedef void (*GtkTreeCellDataFunc) (GtkTreeViewColumn * tree_column,
+				     GtkCellRenderer * cell,
+				     GtkTreeModel * tree_model,
+				     GtkTreeIter * iter, gpointer data);
 typedef struct _GtkTreeModelSort GtkTreeModelSort;
 typedef struct _GtkViewport GtkViewport;
 typedef struct _GtkStatusIcon GtkStatusIcon;
@@ -763,7 +776,9 @@
     GTK_CALENDAR_SHOW_WEEK_NUMBERS,
     GTK_CALENDAR_SHOW_DETAILS
 } GtkCalendarDisplayOptions;
-typedef gchar *(*GtkCalendarDetailFunc) (void);
+typedef gchar *(*GtkCalendarDetailFunc) (GtkCalendar * calendar,
+					 guint year, guint month,
+					 guint day, gpointer user_data);
 typedef enum {
     GTK_DIALOG_MODAL,
     GTK_DIALOG_DESTROY_WITH_PARENT
@@ -771,21 +786,44 @@
 typedef struct _GtkDialog GtkDialog;
 typedef struct _GtkActionable GtkActionable;
 typedef struct _GtkListStore GtkListStore;
-typedef enum
-    GtkRecentSortType;
-typedef gint(*GtkRecentSortFunc) (void);
+typedef enum {
+    GTK_RECENT_SORT_NONE = 0,
+    GTK_RECENT_SORT_MRU = 1,
+    GTK_RECENT_SORT_LRU = 2,
+    GTK_RECENT_SORT_CUSTOM = 3
+} GtkRecentSortType;
+typedef gint(*GtkRecentSortFunc) (GtkRecentInfo * a, GtkRecentInfo * b,
+				  gpointer user_data);
 typedef struct _GtkRecentChooser GtkRecentChooser;
 typedef struct _GtkScrollable GtkScrollable;
 typedef struct _GtkRadioAction GtkRadioAction;
 typedef struct _GtkPlug GtkPlug;
-typedef void (*GtkClipboardReceivedFunc) (void);
-typedef void (*GtkClipboardTextReceivedFunc) (void);
-typedef void (*GtkClipboardRichTextReceivedFunc) (void);
-typedef void (*GtkClipboardImageReceivedFunc) (void);
-typedef void (*GtkClipboardURIReceivedFunc) (void);
-typedef void (*GtkClipboardTargetsReceivedFunc) (void);
-typedef void (*GtkClipboardGetFunc) (void);
-typedef void (*GtkClipboardClearFunc) (void);
+typedef void (*GtkClipboardReceivedFunc) (GtkClipboard * clipboard,
+					  GtkSelectionData *
+					  selection_data, gpointer data);
+typedef void (*GtkClipboardTextReceivedFunc) (GtkClipboard * clipboard,
+					      const gchar * text,
+					      gpointer data);
+typedef void (*GtkClipboardRichTextReceivedFunc) (GtkClipboard * clipboard,
+						  GdkAtom format,
+						  const guint8 * text,
+						  gsize length,
+						  gpointer data);
+typedef void (*GtkClipboardImageReceivedFunc) (GtkClipboard * clipboard,
+					       GdkPixbuf * pixbuf,
+					       gpointer data);
+typedef void (*GtkClipboardURIReceivedFunc) (GtkClipboard * clipboard,
+					     gchar * *uris, gpointer data);
+typedef void (*GtkClipboardTargetsReceivedFunc) (GtkClipboard * clipboard,
+						 GdkAtom * atoms,
+						 gint n_atoms,
+						 gpointer data);
+typedef void (*GtkClipboardGetFunc) (GtkClipboard * clipboard,
+				     GtkSelectionData * selection_data,
+				     guint info,
+				     gpointer user_data_or_owner);
+typedef void (*GtkClipboardClearFunc) (GtkClipboard * clipboard,
+				       gpointer user_data_or_owner);
 typedef struct _GtkNotebook GtkNotebook;
 typedef struct _GtkLockButton GtkLockButton;
 typedef struct _GtkTreeDragSource GtkTreeDragSource;
@@ -815,7 +853,7 @@
 typedef struct _cairo_rectangle_int GtkAllocation;
 typedef void (*GtkCallback) (void);
 typedef struct _GtkTreeStore GtkTreeStore;
-typedef gchar *(*GtkTranslateFunc) (void);
+typedef gchar *(*GtkTranslateFunc) (const char *path, gpointer func_data);
 typedef struct _GtkStockItem GtkStockItem;
 typedef enum {
     GTK_ENTRY_ICON_PRIMARY,
@@ -860,8 +898,14 @@
 typedef void (*GtkTextTagTableForeach) (void);
 typedef struct _GtkRecentFilter GtkRecentFilter;
 typedef struct _GtkRecentFilterInfo GtkRecentFilterInfo;
-typedef enum
-    GtkRecentFilterFlags;
+typedef enum {
+    GTK_RECENT_FILTER_URI = 0,
+    GTK_RECENT_FILTER_DISPLAY_NAME = 1,
+    GTK_RECENT_FILTER_MIME_TYPE = 2,
+    GTK_RECENT_FILTER_APPLICATION = 3,
+    GTK_RECENT_FILTER_GROUP = 4,
+    GTK_RECENT_FILTER_AGE = 5
+} GtkRecentFilterFlags;
 typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *
 					filter_info, gpointer user_data);
 typedef struct _GtkSwitch GtkSwitch;
@@ -880,10 +924,15 @@
 typedef struct _GtkTargetEntry GtkTargetEntry;
 typedef struct _GtkMenuBar GtkMenuBar;
 typedef struct _GtkFrame GtkFrame;
-typedef enum
-    GtkAssistantPageType;
+typedef enum {
+    GTK_ASSISTANT_PAGE_CONTENT = 0,
+    GTK_ASSISTANT_PAGE_INTRO = 1,
+    GTK_ASSISTANT_PAGE_CONFIRM = 2,
+    GTK_ASSISTANT_PAGE_SUMMARY = 3,
+    GTK_ASSISTANT_PAGE_PROGRESS = 4
+} GtkAssistantPageType;
 typedef struct _GtkAssistant GtkAssistant;
-typedef gint(*GtkAssistantPageFunc) (void);
+typedef gint(*GtkAssistantPageFunc) (gint current_page, gpointer data);
 typedef struct _GtkBorder GtkBorder;
 typedef struct _GtkToolItem GtkToolItem;
 typedef struct _GtkTextAttributes GtkTextAttributes;
@@ -892,8 +941,13 @@
 typedef struct _GtkPrintOperationPreview GtkPrintOperationPreview;
 typedef struct _GtkToggleAction GtkToggleAction;
 typedef struct _GtkCssProvider GtkCssProvider;
-typedef gboolean(*GtkTreeModelFilterVisibleFunc) (void);
-typedef void (*GtkTreeModelFilterModifyFunc) (void);
+typedef gboolean(*GtkTreeModelFilterVisibleFunc) (GtkTreeModel * model,
+						  GtkTreeIter * iter,
+						  gpointer data);
+typedef void (*GtkTreeModelFilterModifyFunc) (GtkTreeModel * model,
+					      GtkTreeIter * iter,
+					      GValue * value, gint column,
+					      gpointer data);
 typedef struct _GtkTreeModelFilter GtkTreeModelFilter;
 typedef struct _GtkSizeGroup GtkSizeGroup;
 typedef enum {
@@ -981,7 +1035,11 @@
 typedef struct _GtkStyleProvider GtkStyleProvider;
 typedef struct _GtkApplicationWindow GtkApplicationWindow;
 typedef struct _GtkEntryCompletion GtkEntryCompletion;
-typedef gboolean(*GtkEntryCompletionMatchFunc) (void);
+typedef gboolean(*GtkEntryCompletionMatchFunc) (GtkEntryCompletion *
+						completion,
+						const gchar * key,
+						GtkTreeIter * iter,
+						gpointer user_data);
 typedef struct _GtkCellEditable GtkCellEditable;
 typedef struct _GtkCheckMenuItem GtkCheckMenuItem;
 typedef struct _GtkFontButton GtkFontButton;
@@ -990,16 +1048,44 @@
 typedef struct _GtkFixed GtkFixed;
 typedef struct _GtkBuildable GtkBuildable;
 typedef struct _GtkButton GtkButton;
-typedef enum
-    GtkAlign;
-typedef enum
-    GtkArrowType;
-typedef enum
-    GtkButtonBoxStyle;
-typedef enum
-    GtkDirectionType;
-typedef enum
-    GtkIconSize;
+typedef enum {
+    GTK_RECENT_FILTER_URI = 1 &lt;&lt; 0,
+    GTK_RECENT_FILTER_DISPLAY_NAME = 1 &lt;&lt; 1,
+    GTK_RECENT_FILTER_MIME_TYPE = 1 &lt;&lt; 2,
+    GTK_RECENT_FILTER_APPLICATION = 1 &lt;&lt; 3,
+    GTK_RECENT_FILTER_GROUP = 1 &lt;&lt; 4,
+    GTK_RECENT_FILTER_AGE = 1 &lt;&lt; 5
+} GtkAlign;
+typedef enum {
+    GTK_ARROW_UP = 0,
+    GTK_ARROW_DOWN = 1,
+    GTK_ARROW_LEFT = 2,
+    GTK_ARROW_RIGHT = 3
+} GtkArrowType;
+typedef enum {
+    GTK_BUTTONBOX_DEFAULT_STYLE = 0,
+    GTK_BUTTONBOX_SPREAD = 1,
+    GTK_BUTTONBOX_EDGE = 2,
+    GTK_BUTTONBOX_START = 3,
+    GTK_BUTTONBOX_END = 4
+} GtkButtonBoxStyle;
+typedef enum {
+    GTK_DIR_TAB_FORWARD = 0,
+    GTK_DIR_TAB_BACKWARD = 1,
+    GTK_DIR_UP = 2,
+    GTK_DIR_DOWN = 3,
+    GTK_DIR_LEFT = 4,
+    GTK_DIR_RIGHT = 5
+} GtkDirectionType;
+typedef enum {
+    GTK_ICON_SIZE_INVALID = 0,
+    GTK_ICON_SIZE_MENU = 1,
+    GTK_ICON_SIZE_SMALL_TOOLBAR = 2,
+    GTK_ICON_SIZE_LARGE_TOOLBAR = 3,
+    GTK_ICON_SIZE_BUTTON = 4,
+    GTK_ICON_SIZE_DND = 5,
+    GTK_ICON_SIZE_DIALOG = 6
+} GtkIconSize;
 typedef enum {
     GTK_SENSITIVITY_AUTO,
     GTK_SENSITIVITY_ON,
@@ -1249,7 +1335,9 @@
 typedef struct _GtkAccelGroup GtkAccelGroup;
 typedef struct _GtkAccelKey GtkAccelKey;
 typedef struct _GtkAccelGroupEntry GtkAccelGroupEntry;
-typedef gboolean(*GtkAccelGroupFindFunc) (void);
+typedef gboolean(*GtkAccelGroupFindFunc) (GtkAccelKey * key,
+					  GClosure * closure,
+					  gpointer data);
 typedef struct _GtkIconFactory GtkIconFactory;
 typedef struct _GtkAppChooserWidget GtkAppChooserWidget;
 typedef struct _GtkButtonBox GtkButtonBox;
@@ -1259,15 +1347,55 @@
 typedef gboolean(*GtkCellCallback) (void);
 typedef gboolean(*GtkCellAllocCallback) (void);
 typedef struct _GtkPrintOperation GtkPrintOperation;
-typedef enum
-    GtkPrintStatus;
-typedef enum
-    GtkPrintOperationResult;
-typedef enum
-    GtkPrintOperationAction;
-typedef void (*GtkPageSetupDoneFunc) (void);
-typedef guint8 *(*GtkTextBufferSerializeFunc) (void);
-typedef gboolean(*GtkTextBufferDeserializeFunc) (void);
+typedef enum {
+    GTK_PRINT_STATUS_INITIAL,
+    GTK_PRINT_STATUS_PREPARING,
+    GTK_PRINT_STATUS_GENERATING_DATA,
+    GTK_PRINT_STATUS_SENDING_DATA,
+    GTK_PRINT_STATUS_PENDING,
+    GTK_PRINT_STATUS_PENDING_ISSUE,
+    GTK_PRINT_STATUS_PRINTING,
+    GTK_PRINT_STATUS_FINISHED,
+    GTK_PRINT_STATUS_FINISHED_ABORTED
+} GtkPrintStatus;
+typedef enum {
+    GTK_PRINT_OPERATION_RESULT_ERROR,
+    GTK_PRINT_OPERATION_RESULT_APPLY,
+    GTK_PRINT_OPERATION_RESULT_CANCEL,
+    GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
+} GtkPrintOperationResult;
+typedef enum {
+    GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+    GTK_PRINT_OPERATION_ACTION_PRINT,
+    GTK_PRINT_OPERATION_ACTION_PREVIEW,
+    GTK_PRINT_OPERATION_ACTION_EXPORT
+} GtkPrintOperationAction;
+typedef enum {
+    GTK_PRINT_ERROR_GENERAL,
+    GTK_PRINT_ERROR_INTERNAL_ERROR,
+    GTK_PRINT_ERROR_NOMEM,
+    GTK_PRINT_ERROR_INVALID_FILE
+} GtkPrintError;
+typedef void (*GtkPageSetupDoneFunc) (GtkPageSetup * page_setup,
+				      gpointer data);
+typedef guint8 *(*GtkTextBufferSerializeFunc) (GtkTextBuffer *
+					       register_buffer,
+					       GtkTextBuffer *
+					       content_buffer,
+					       GtkTextIter * start,
+					       GtkTextIter * end,
+					       gsize * length,
+					       gpointer user_data);
+typedef gboolean(*GtkTextBufferDeserializeFunc) (GtkTextBuffer *
+						 register_buffer,
+						 GtkTextBuffer *
+						 content_buffer,
+						 GtkTextIter * iter,
+						 const guint8 * data,
+						 gsize length,
+						 gboolean create_tags,
+						 gpointer user_data,
+						 GError * *error);
 typedef struct _GtkAlignment GtkAlignment;
 typedef enum {
     GTK_TREE_VIEW_DROP_BEFORE,
@@ -1277,12 +1405,29 @@
 } GtkTreeViewDropPosition;
 typedef struct _GtkTreeView GtkTreeView;
 typedef struct _GtkTreeSelection GtkTreeSelection;
-typedef gboolean(*GtkTreeViewColumnDropFunc) (void);
-typedef void (*GtkTreeViewMappingFunc) (void);
-typedef gboolean(*GtkTreeViewSearchEqualFunc) (void);
-typedef gboolean(*GtkTreeViewRowSeparatorFunc) (void);
-typedef void (*GtkTreeViewSearchPositionFunc) (void);
-typedef void (*GtkTreeDestroyCountFunc) (void);
+typedef gboolean(*GtkTreeViewColumnDropFunc) (GtkTreeView * tree_view,
+					      GtkTreeViewColumn * column,
+					      GtkTreeViewColumn *
+					      prev_column,
+					      GtkTreeViewColumn *
+					      next_column, gpointer data);
+typedef void (*GtkTreeViewMappingFunc) (GtkTreeView * tree_view,
+					GtkTreePath * path,
+					gpointer user_data);
+typedef gboolean(*GtkTreeViewSearchEqualFunc) (GtkTreeModel * model,
+					       gint column,
+					       const gchar * key,
+					       GtkTreeIter * iter,
+					       gpointer search_data);
+typedef gboolean(*GtkTreeViewRowSeparatorFunc) (GtkTreeModel * model,
+						GtkTreeIter * iter,
+						gpointer data);
+typedef void (*GtkTreeViewSearchPositionFunc) (GtkTreeView * tree_view,
+					       GtkWidget * search_dialog,
+					       gpointer user_data);
+typedef void (*GtkTreeDestroyCountFunc) (GtkTreeView * tree_view,
+					 GtkTreePath * path, gint children,
+					 gpointer user_data);
 typedef struct _GtkPaperSize GtkPaperSize;
 typedef struct _GtkOrientable GtkOrientable;
 typedef struct _GtkCellRendererToggle GtkCellRendererToggle;
@@ -1302,7 +1447,10 @@
 typedef struct _GtkTreePath GtkTreePath;
 typedef struct _GtkTreeRowReference GtkTreeRowReference;
 typedef struct _GtkTreeModel GtkTreeModel;
-typedef gboolean(*GtkTreeModelForeachFunc) (void);
+typedef gboolean(*GtkTreeModelForeachFunc) (GtkTreeModel * model,
+					    GtkTreePath * path,
+					    GtkTreeIter * iter,
+					    gpointer data);
 typedef enum {
     GTK_TREE_MODEL_ITERS_PERSIST,
     GTK_TREE_MODEL_LIST_ONLY
@@ -1310,8 +1458,11 @@
 typedef struct _GtkCheckButton GtkCheckButton;
 typedef struct _GtkWindowGroup GtkWindowGroup;
 typedef struct _GtkMenu GtkMenu;
-typedef void (*GtkMenuPositionFunc) (void);
-typedef void (*GtkMenuDetachFunc) (void);
+typedef void (*GtkMenuPositionFunc) (GtkMenu * menu, gint * x, gint * y,
+				     gboolean * push_in,
+				     gpointer user_data);
+typedef void (*GtkMenuDetachFunc) (GtkWidget * attach_widget,
+				   GtkMenu * menu);
 typedef struct _GtkLevelBar GtkLevelBar;
 typedef struct _GtkComboBox GtkComboBox;
 typedef struct _GtkSpinner GtkSpinner;
@@ -1321,7 +1472,13 @@
     GTK_TOOL_PALETTE_DRAG_GROUPS
 } GtkToolPaletteDragTargets;
 typedef struct _GtkBuilder GtkBuilder;
-typedef void (*GtkBuilderConnectFunc) (void);
+typedef void (*GtkBuilderConnectFunc) (GtkBuilder * builder,
+				       GObject * object,
+				       const gchar * signal_name,
+				       const gchar * handler_name,
+				       GObject * connect_object,
+				       GConnectFlags flags,
+				       gpointer user_data);
 typedef struct _GtkTextBTree GtkTextBTree;
 typedef struct _GtkIconInfo GtkIconInfo;
 typedef struct _GtkIconTheme GtkIconTheme;
@@ -1334,7 +1491,10 @@
 } GtkIconLookupFlags;
 typedef struct _GtkBindingSet GtkBindingSet;
 typedef struct _GtkCellLayout GtkCellLayout;
-typedef void (*GtkCellLayoutDataFunc) (void);
+typedef void (*GtkCellLayoutDataFunc) (GtkClipboard * cell_layout,
+				       GtkCellRenderer * cell,
+				       GtkTreeModel * tree_model,
+				       GtkTreeIter * iter, gpointer data);
 typedef struct _GtkToolbar GtkToolbar;
 typedef struct _GtkMenuToolButton GtkMenuToolButton;
 typedef struct _GtkStatusbar GtkStatusbar;
@@ -1345,7 +1505,9 @@
 typedef struct _GtkAspectFrame GtkAspectFrame;
 typedef struct _GtkLabel GtkLabel;
 typedef struct _GtkTreeSortable GtkTreeSortable;
-typedef gint(*GtkTreeIterCompareFunc) (void);
+typedef gint(*GtkTreeIterCompareFunc) (GtkTreeModel * model,
+				       GtkTreeIter * a, GtkTreeIter * b,
+				       gpointer user_data);
 typedef struct _GtkFileChooserButton GtkFileChooserButton;
 typedef struct _GtkAccelMap GtkAccelMap;
 typedef void (*GtkAccelMapForeach) (void);
@@ -1353,7 +1515,8 @@
 typedef struct _GtkContainer GtkContainer;
 typedef struct _GtkContainerClass GtkContainerClass;
 typedef struct _GtkIconView GtkIconView;
-typedef void (*GtkIconViewForeachFunc) (void);
+typedef void (*GtkIconViewForeachFunc) (GtkIconView * icon_view,
+					GtkTreePath * path, gpointer data);
 typedef enum {
     GTK_ICON_VIEW_NO_DROP,
     GTK_ICON_VIEW_DROP_INTO,



More information about the lsb-messages mailing list