entry: Omit useless clip

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

diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index ed67ccfdaa6d47534d81cbc859ee8456fcfa495f..98e7e8cf2052468ed65309e44d224a68abff9d53 100644 (file)
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -18,6 +18,7 @@
  * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 /* Color picker button for GNOME
  *
  * Author: Federico Mena <federico@nuclecu.unam.mx>
@@ -25,9 +26,13 @@
  * Modified by the GTK+ Team and others 2003.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_COLOR_BUTTON_H__
 #define __GTK_COLOR_BUTTON_H__
 
@@ -37,19 +42,12 @@
 G_BEGIN_DECLS
 
 
-/* The GtkColorSelectionButton widget is a simple color picker in a button.  
- * The button displays a sample of the currently selected color.  When 
- * the user clicks on the button, a color selection dialog pops up.  
- * The color picker emits the "color_set" signal when the color is set.
- */
-
 #define GTK_TYPE_COLOR_BUTTON             (gtk_color_button_get_type ())
 #define GTK_COLOR_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_BUTTON, GtkColorButton))
 #define GTK_COLOR_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_BUTTON, GtkColorButtonClass))
 #define GTK_IS_COLOR_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_BUTTON))
 #define GTK_IS_COLOR_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_BUTTON))
 #define GTK_COLOR_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_BUTTON, GtkColorButtonClass))
-#define GTK_COLOR_BUTTON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COLOR_BUTTON, GtkColorButtonPrivate))
 
 typedef struct _GtkColorButton          GtkColorButton;
 typedef struct _GtkColorButtonClass     GtkColorButtonClass;
@@ -59,15 +57,14 @@ struct _GtkColorButton {
   GtkButton button;
 
   /*< private >*/
-
   GtkColorButtonPrivate *priv;
 };
 
 struct _GtkColorButtonClass {
   GtkButtonClass parent_class;
-  
+
   void (* color_set) (GtkColorButton *cp);
-  
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -78,26 +75,27 @@ struct _GtkColorButtonClass {
 
 GType      gtk_color_button_get_type       (void) G_GNUC_CONST;
 GtkWidget *gtk_color_button_new            (void);
-GtkWidget *gtk_color_button_new_with_color (GdkColor       *color);
-void       gtk_color_button_set_color      (GtkColorButton *color_button, 
-                                           GdkColor       *color);
+GtkWidget *gtk_color_button_new_with_color (const GdkColor *color);
+GtkWidget *gtk_color_button_new_with_rgba  (const GdkRGBA  *rgba);
+void       gtk_color_button_set_color      (GtkColorButton *color_button,
+                                            const GdkColor *color);
 void       gtk_color_button_set_alpha      (GtkColorButton *color_button,
-                                           guint16         alpha);
-void       gtk_color_button_get_color      (GtkColorButton *color_button, 
-                                           GdkColor       *color);
+                                            guint16         alpha);
+void       gtk_color_button_get_color      (GtkColorButton *color_button,
+                                            GdkColor       *color);
 guint16    gtk_color_button_get_alpha      (GtkColorButton *color_button);
-void       gtk_color_button_set_use_alpha  (GtkColorButton *color_button, 
-                                           gboolean        use_alpha);
+void       gtk_color_button_set_use_alpha  (GtkColorButton *color_button,
+                                            gboolean        use_alpha);
 gboolean   gtk_color_button_get_use_alpha  (GtkColorButton *color_button);
-void       gtk_color_button_set_title      (GtkColorButton *color_button, 
-                                           const gchar    *title);
+void       gtk_color_button_set_rgba       (GtkColorButton *color_button,
+                                            const GdkRGBA  *rgba);
+void       gtk_color_button_get_rgba       (GtkColorButton *color_button,
+                                            GdkRGBA        *rgba);
+void       gtk_color_button_set_title      (GtkColorButton *color_button,
+                                            const gchar    *title);
 G_CONST_RETURN gchar *gtk_color_button_get_title (GtkColorButton *color_button);
 
 
 G_END_DECLS
 
 #endif  /* __GTK_COLOR_BUTTON_H__ */
-
-
-
-