Rename property to be more neutral

[~andy/gtk] / gtk / gtkcolorchooser.c

diff --git a/gtk/gtkcolorchooser.c b/gtk/gtkcolorchooser.c
index 075331ba3b8f5f1b67fb3aa778a1060051346384..cbefdd3b4a855fa008357ea2921c18c8b9995dc6 100644 (file)
--- a/gtk/gtkcolorchooser.c
+++ b/gtk/gtkcolorchooser.c
@@ -13,9 +13,7 @@
  * 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/>.
  */
 
 #include "config.h"
@@ -111,7 +109,7 @@ gtk_color_chooser_default_init (GtkColorChooserInterface *iface)
                   NULL, NULL,
                   NULL,
                   G_TYPE_NONE,
-                  1, G_TYPE_STRING);
+                  1, GDK_TYPE_RGBA);
 }
 
 void
@@ -124,7 +122,7 @@ _gtk_color_chooser_color_activated (GtkColorChooser *chooser,
 /**
  * gtk_color_chooser_get_rgba:
  * @chooser: a #GtkColorChooser
- * @color: return location for the color
+ * @color: (out): a #GdkRGBA to fill in with the current color
  *
  * Gets the currently-selected color.
  *
@@ -145,6 +143,8 @@ gtk_color_chooser_get_rgba (GtkColorChooser *chooser,
  * @color: the new color
  *
  * Sets the color.
+ *
+ * Since: 3.4
  */
 void
 gtk_color_chooser_set_rgba (GtkColorChooser *chooser,
@@ -201,13 +201,13 @@ gtk_color_chooser_set_use_alpha (GtkColorChooser *chooser,
 /**
  * gtk_color_chooser_add_palette:
  * @chooser: a #GtkColorChooser
- * @horizontal: %TRUE if the palette should be displayed in rows,
- *     %FALSE for columns
+ * @orientation: %GTK_ORIENTATION_HORIZONTAL if the palette should
+ *     be displayed in rows, %GTK_ORIENTATION_VERTICAL for columns
  * @colors_per_line: the number of colors to show in each row/column
  * @n_colors: the total number of elements in @colors
- * @colors: (array length=n_colors): the colors of the palette
+ * @colors: (allow-none) (array length=n_colors): the colors of the palette, or %NULL
  *
- * Adds a palette to the color chooser. If @horizontal is %TRUE,
+ * Adds a palette to the color chooser. If @orientation is horizontal,
  * the colors are grouped in rows, with @colors_per_line colors
  * in each row. If @horizontal is %FALSE, the colors are grouped
  * in columns instead.
@@ -219,13 +219,17 @@ gtk_color_chooser_set_use_alpha (GtkColorChooser *chooser,
  * The layout of the color chooser widget works best when the
  * palettes have 9-10 columns.
  *
- * Calling this function is called for the first time has the
+ * Calling this function for the first time has the
  * side effect of removing the default color and gray palettes
  * from the color chooser.
+ *
+ * If @colors is %NULL, removes all previously added palettes.
+ *
+ * Since: 3.4
  */
 void
 gtk_color_chooser_add_palette (GtkColorChooser *chooser,
-                               gboolean         horizontal,
+                               GtkOrientation   orientation,
                                gint             colors_per_line,
                                gint             n_colors,
                                GdkRGBA         *colors)
@@ -233,5 +237,26 @@ gtk_color_chooser_add_palette (GtkColorChooser *chooser,
   g_return_if_fail (GTK_IS_COLOR_CHOOSER (chooser));
 
   if (GTK_COLOR_CHOOSER_GET_IFACE (chooser)->add_palette)
-    GTK_COLOR_CHOOSER_GET_IFACE (chooser)->add_palette (chooser, horizontal, colors_per_line, n_colors, colors);
+    GTK_COLOR_CHOOSER_GET_IFACE (chooser)->add_palette (chooser, orientation, colors_per_line, n_colors, colors);
+}
+
+cairo_pattern_t *
+_gtk_color_chooser_get_checkered_pattern (void)
+{
+  /* need to respect pixman's stride being a multiple of 4 */
+  static unsigned char data[8] = { 0xFF, 0x00, 0x00, 0x00,
+                                   0x00, 0xFF, 0x00, 0x00 };
+  static cairo_surface_t *checkered = NULL;
+  cairo_pattern_t *pattern;
+
+  if (checkered == NULL)
+    checkered = cairo_image_surface_create_for_data (data,
+                                                     CAIRO_FORMAT_A8,
+                                                     2, 2, 4);
+
+  pattern = cairo_pattern_create_for_surface (checkered);
+  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+  cairo_pattern_set_filter (pattern, CAIRO_FILTER_NEAREST);
+
+  return pattern;
 }