X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcolorchooser.h;h=192189544f3079261f6676a1b0189ebed9f0f55b;hb=2cfc56ced81d801669deb3a429a00e25769e5a70;hp=3d38c0fb3707744b1497efa4fa2d7a0024d904cd;hpb=3a35895a0086162a922cc6f20140bd95f0942368;p=~andy%2Fgtk

diff --git a/gtk/gtkcolorchooser.h b/gtk/gtkcolorchooser.h
index 3d38c0fb3..192189544 100644
--- a/gtk/gtkcolorchooser.h
+++ b/gtk/gtkcolorchooser.h
@@ -13,18 +13,16 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_COLOR_CHOOSER_H__
+#define __GTK_COLOR_CHOOSER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_CHOOSER_H__
-#define __GTK_COLOR_CHOOSER_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
@@ -42,10 +40,16 @@ struct _GtkColorChooserInterface
   GTypeInterface base_interface;
 
   /* Methods */
-  void (* get_color) (GtkColorChooser *chooser,
-                      GdkRGBA         *color);
-  void (* set_color) (GtkColorChooser *chooser,
-                      const GdkRGBA   *color);
+  void (* get_rgba)    (GtkColorChooser *chooser,
+                        GdkRGBA         *color);
+  void (* set_rgba)    (GtkColorChooser *chooser,
+                        const GdkRGBA   *color);
+
+  void (* add_palette) (GtkColorChooser *chooser,
+                        GtkOrientation   orientation,
+                        gint             colors_per_line,
+                        gint             n_colors,
+                        GdkRGBA         *colors);
 
   /* Signals */
   void (* color_activated) (GtkColorChooser *chooser,
@@ -55,15 +59,28 @@ struct _GtkColorChooserInterface
   gpointer padding[12];
 };
 
+GDK_AVAILABLE_IN_3_4
 GType    gtk_color_chooser_get_type        (void) G_GNUC_CONST;
 
-void     gtk_color_chooser_get_color       (GtkColorChooser *chooser,
-                                            GdkRGBA         *color);
-void     gtk_color_chooser_set_color       (GtkColorChooser *chooser,
-                                            const GdkRGBA   *color);
-gboolean gtk_color_chooser_get_show_alpha  (GtkColorChooser *chooser);
-void     gtk_color_chooser_set_show_alpha  (GtkColorChooser *chooser,
-                                            gboolean         show_alpha);
+GDK_AVAILABLE_IN_3_4
+void     gtk_color_chooser_get_rgba       (GtkColorChooser *chooser,
+                                           GdkRGBA         *color);
+GDK_AVAILABLE_IN_3_4
+void     gtk_color_chooser_set_rgba       (GtkColorChooser *chooser,
+                                           const GdkRGBA   *color);
+GDK_AVAILABLE_IN_3_4
+gboolean gtk_color_chooser_get_use_alpha  (GtkColorChooser *chooser);
+
+GDK_AVAILABLE_IN_3_4
+void     gtk_color_chooser_set_use_alpha  (GtkColorChooser *chooser,
+                                           gboolean         use_alpha);
+
+GDK_AVAILABLE_IN_3_4
+void     gtk_color_chooser_add_palette    (GtkColorChooser *chooser,
+                                           GtkOrientation   orientation,
+                                           gint             colors_per_line,
+                                           gint             n_colors,
+                                           GdkRGBA         *colors);
 
 G_END_DECLS