Typo fix. (#388123, Murray Cumming)

[~andy/gtk] / gtk / gtkclipboard.h

diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index 52c3978bf9261b508498cb98dba247ac447da1cd..1825cf767050cf8238a8bea25dbebc345ef7f18e 100644 (file)
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -22,22 +22,32 @@
 #ifndef __GTK_CLIPBOARD_H__
 #define __GTK_CLIPBOARD_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <gtk/gtkselection.h>
 
-#define GTK_TYPE_CLIPBOARD            (gtk_clipboard_get_type ())
-#define GTK_CLIPBOARD(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard))
-#define GTK_IS_CLIPBOARD(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_CLIPBOARD))
+G_BEGIN_DECLS
 
-typedef void (* GtkClipboardReceivedFunc)        (GtkClipboard     *clipboard,
-                                                 GtkSelectionData *selection_data,
-                                                 gpointer          data);
-typedef void (* GtkClipboardTextReceivedFunc)    (GtkClipboard     *clipboard,
-                                                 const gchar      *text,
-                                                 gpointer          data);
+#define GTK_TYPE_CLIPBOARD            (gtk_clipboard_get_type ())
+#define GTK_CLIPBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard))
+#define GTK_IS_CLIPBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD))
+
+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 (* GtkClipboardTargetsReceivedFunc)  (GtkClipboard     *clipboard,
+                                                  GdkAtom          *atoms,
+                                                  gint              n_atoms,
+                                                  gpointer          data);
 
 /* Should these functions have GtkClipboard *clipboard as the first argument?
  * right now for ClearFunc, you may have trouble determining _which_ clipboard
@@ -50,7 +60,7 @@ typedef void (* GtkClipboardGetFunc)          (GtkClipboard     *clipboard,
 typedef void (* GtkClipboardClearFunc)        (GtkClipboard     *clipboard,
                                               gpointer          user_data_or_owner);
 
-GType         gtk_clipboard_get_type (void);
+GType         gtk_clipboard_get_type (void) G_GNUC_CONST;
 
 GtkClipboard *gtk_clipboard_get_for_display (GdkDisplay   *display,
                                             GdkAtom       selection);
@@ -78,23 +88,58 @@ void     gtk_clipboard_clear          (GtkClipboard          *clipboard);
 void     gtk_clipboard_set_text       (GtkClipboard          *clipboard,
                                       const gchar           *text,
                                       gint                   len);
-
-void gtk_clipboard_request_contents (GtkClipboard                    *clipboard,
-                                    GdkAtom                          target,
-                                    GtkClipboardReceivedFunc         callback,
-                                    gpointer                         user_data);
-void gtk_clipboard_request_text     (GtkClipboard                    *clipboard,
-                                    GtkClipboardTextReceivedFunc     callback,
-                                    gpointer                         user_data);
-
-GtkSelectionData *gtk_clipboard_wait_for_contents (GtkClipboard *clipboard,
-                                                  GdkAtom       target);
-gchar *           gtk_clipboard_wait_for_text     (GtkClipboard *clipboard);
-
-gboolean gtk_clipboard_wait_is_text_available   (GtkClipboard         *clipboard);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+void     gtk_clipboard_set_image      (GtkClipboard          *clipboard,
+                                      GdkPixbuf             *pixbuf);
+
+void gtk_clipboard_request_contents  (GtkClipboard                     *clipboard,
+                                      GdkAtom                           target,
+                                      GtkClipboardReceivedFunc          callback,
+                                      gpointer                          user_data);
+void gtk_clipboard_request_text      (GtkClipboard                     *clipboard,
+                                      GtkClipboardTextReceivedFunc      callback,
+                                      gpointer                          user_data);
+void gtk_clipboard_request_rich_text (GtkClipboard                     *clipboard,
+                                      GtkTextBuffer                    *buffer,
+                                      GtkClipboardRichTextReceivedFunc  callback,
+                                      gpointer                          user_data);
+void gtk_clipboard_request_image     (GtkClipboard                     *clipboard,
+                                      GtkClipboardImageReceivedFunc     callback,
+                                      gpointer                          user_data);
+void gtk_clipboard_request_targets   (GtkClipboard                     *clipboard,
+                                      GtkClipboardTargetsReceivedFunc   callback,
+                                      gpointer                          user_data);
+
+GtkSelectionData *gtk_clipboard_wait_for_contents  (GtkClipboard  *clipboard,
+                                                    GdkAtom        target);
+gchar *           gtk_clipboard_wait_for_text      (GtkClipboard  *clipboard);
+guint8 *          gtk_clipboard_wait_for_rich_text (GtkClipboard  *clipboard,
+                                                    GtkTextBuffer *buffer,
+                                                    GdkAtom       *format,
+                                                    gsize         *length);
+GdkPixbuf *       gtk_clipboard_wait_for_image     (GtkClipboard  *clipboard);
+gboolean          gtk_clipboard_wait_for_targets   (GtkClipboard  *clipboard,
+                                                    GdkAtom      **targets,
+                                                    gint          *n_targets);
+
+gboolean gtk_clipboard_wait_is_text_available      (GtkClipboard  *clipboard);
+gboolean gtk_clipboard_wait_is_rich_text_available (GtkClipboard  *clipboard,
+                                                    GtkTextBuffer *buffer);
+gboolean gtk_clipboard_wait_is_image_available     (GtkClipboard  *clipboard);
+gboolean gtk_clipboard_wait_is_target_available    (GtkClipboard  *clipboard,
+                                                    GdkAtom        target);
+
+
+void gtk_clipboard_set_can_store (GtkClipboard         *clipboard,
+                                 const GtkTargetEntry *targets,
+                                 gint                  n_targets);
+
+void gtk_clipboard_store         (GtkClipboard   *clipboard);
+  
+/* private */
+void     _gtk_clipboard_handle_event    (GdkEventOwnerChange *event);
+
+void     _gtk_clipboard_store_all       (void);
+  
+G_END_DECLS
 
 #endif /* __GTK_CLIPBOARD_H__ */