[gimp] Make some GimpCoords* params const
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Subject: [gimp] Make some GimpCoords* params const
- Date: Sun, 17 May 2009 17:14:56 -0400 (EDT)
commit 063a6f03aa701ea5eaad3da0155ff2f481852aed
Author: Michael Natterer <mitch gimp org>
Date: Sun May 17 23:14:19 2009 +0200
Make some GimpCoords* params const
Add const to GimpCoords* params in GimpBrush::select_brush() and
want_null_motio().
---
libgimpwidgets/gimpintcombobox.c | 567 --------------------------------------
1 files changed, 0 insertions(+), 567 deletions(-)
diff --git a/libgimpwidgets/gimpintcombobox.c b/libgimpwidgets/gimpintcombobox.c
deleted file mode 100644
index cac98ac..0000000
--- a/libgimpwidgets/gimpintcombobox.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* LIBGIMP - The GIMP Library
- * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
- *
- * gimpintcombobox.c
- * Copyright (C) 2004 Sven Neumann <sven gimp org>
- *
- * This library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * 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, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <libintl.h>
-
-#include <gtk/gtk.h>
-
-#include "gimpwidgetstypes.h"
-
-#include "gimpintcombobox.h"
-#include "gimpintstore.h"
-
-
-enum
-{
- PROP_0,
- PROP_ELLIPSIZE
-};
-
-
-typedef struct
-{
- GtkCellRenderer *pixbuf_renderer;
- GtkCellRenderer *text_renderer;
-
- GimpIntSensitivityFunc sensitivity_func;
- gpointer sensitivity_data;
- GDestroyNotify sensitivity_destroy;
-} GimpIntComboBoxPrivate;
-
-#define GIMP_INT_COMBO_BOX_GET_PRIVATE(obj) \
- ((GimpIntComboBoxPrivate *) ((GimpIntComboBox *) (obj))->priv)
-
-
-static void gimp_int_combo_box_finalize (GObject *object);
-static void gimp_int_combo_box_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gimp_int_combo_box_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec);
-
-static void gimp_int_combo_box_data_func (GtkCellLayout *layout,
- GtkCellRenderer *cell,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data);
-
-
-G_DEFINE_TYPE (GimpIntComboBox, gimp_int_combo_box, GTK_TYPE_COMBO_BOX)
-
-#define parent_class gimp_int_combo_box_parent_class
-
-
-static void
-gimp_int_combo_box_class_init (GimpIntComboBoxClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- object_class->set_property = gimp_int_combo_box_set_property;
- object_class->get_property = gimp_int_combo_box_get_property;
- object_class->finalize = gimp_int_combo_box_finalize;
-
- /**
- * GimpIntComboBox:ellipsize:
- *
- * Specifies the preferred place to ellipsize text in the combo-box,
- * if the cell renderer does not have enough room to display the
- * entire string.
- *
- * Since: GIMP 2.4
- */
- g_object_class_install_property (object_class,
- PROP_ELLIPSIZE,
- g_param_spec_enum ("ellipsize", NULL, NULL,
- PANGO_TYPE_ELLIPSIZE_MODE,
- PANGO_ELLIPSIZE_NONE,
- GIMP_PARAM_READWRITE));
-
- g_type_class_add_private (object_class, sizeof (GimpIntComboBoxPrivate));
-}
-
-static void
-gimp_int_combo_box_init (GimpIntComboBox *combo_box)
-{
- GimpIntComboBoxPrivate *priv;
- GtkListStore *store;
- GtkCellRenderer *cell;
-
- combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box,
- GIMP_TYPE_INT_COMBO_BOX,
- GimpIntComboBoxPrivate);
-
- priv = GIMP_INT_COMBO_BOX_GET_PRIVATE (combo_box);
-
- store = gimp_int_store_new ();
- gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
- g_object_unref (store);
-
- priv = GIMP_INT_COMBO_BOX_GET_PRIVATE (combo_box);
-
- priv->pixbuf_renderer = cell = gtk_cell_renderer_pixbuf_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, FALSE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
- "stock-id", GIMP_INT_STORE_STOCK_ID,
- "pixbuf", GIMP_INT_STORE_PIXBUF,
- NULL);
-
- priv->text_renderer = cell = gtk_cell_renderer_text_new ();
-
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
- "text", GIMP_INT_STORE_LABEL,
- NULL);
-}
-
-static void
-gimp_int_combo_box_finalize (GObject *object)
-{
- GimpIntComboBoxPrivate *priv = GIMP_INT_COMBO_BOX_GET_PRIVATE (object);
-
- if (priv->sensitivity_destroy)
- {
- GDestroyNotify d = priv->sensitivity_destroy;
-
- priv->sensitivity_destroy = NULL;
- d (priv->sensitivity_data);
- }
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-gimp_int_combo_box_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- GimpIntComboBoxPrivate *priv = GIMP_INT_COMBO_BOX_GET_PRIVATE (object);
-
- switch (property_id)
- {
- case PROP_ELLIPSIZE:
- g_object_set_property (G_OBJECT (priv->text_renderer),
- pspec->name, value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
- break;
- }
-}
-
-static void
-gimp_int_combo_box_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
-{
- GimpIntComboBoxPrivate *priv = GIMP_INT_COMBO_BOX_GET_PRIVATE (object);
-
- switch (property_id)
- {
- case PROP_ELLIPSIZE:
- g_object_get_property (G_OBJECT (priv->text_renderer),
- pspec->name, value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
- break;
- }
-}
-
-
-/**
- * gimp_int_combo_box_new:
- * @first_label: the label of the first item
- * @first_value: the value of the first item
- * @...: a %NULL terminated list of more label, value pairs
- *
- * Creates a GtkComboBox that has integer values associated with each
- * item. The items to fill the combo box with are specified as a %NULL
- * terminated list of label/value pairs.
- *
- * If you need to construct an empty #GimpIntComboBox, it's best to use
- * g_object_new (GIMP_TYPE_INT_COMBO_BOX, NULL).
- *
- * Return value: a new #GimpIntComboBox.
- *
- * Since: GIMP 2.2
- **/
-GtkWidget *
-gimp_int_combo_box_new (const gchar *first_label,
- gint first_value,
- ...)
-{
- GtkWidget *combo_box;
- va_list args;
-
- va_start (args, first_value);
-
- combo_box = gimp_int_combo_box_new_valist (first_label, first_value, args);
-
- va_end (args);
-
- return combo_box;
-}
-
-/**
- * gimp_int_combo_box_new_valist:
- * @first_label: the label of the first item
- * @first_value: the value of the first item
- * @values: a va_list with more values
- *
- * A variant of gimp_int_combo_box_new() that takes a va_list of
- * label/value pairs. Probably only useful for language bindings.
- *
- * Return value: a new #GimpIntComboBox.
- *
- * Since: GIMP 2.2
- **/
-GtkWidget *
-gimp_int_combo_box_new_valist (const gchar *first_label,
- gint first_value,
- va_list values)
-{
- GtkWidget *combo_box;
- GtkListStore *store;
- const gchar *label;
- gint value;
-
- combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, NULL);
-
- store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)));
-
- for (label = first_label, value = first_value;
- label;
- label = va_arg (values, const gchar *), value = va_arg (values, gint))
- {
- GtkTreeIter iter;
-
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
- GIMP_INT_STORE_VALUE, value,
- GIMP_INT_STORE_LABEL, label,
- -1);
- }
-
- return combo_box;
-}
-
-/**
- * gimp_int_combo_box_new_array:
- * @n_values: the number of values
- * @labels: an array of labels (array length must be @n_values)
- *
- * A variant of gimp_int_combo_box_new() that takes an array of labels.
- * The array indices are used as values.
- *
- * Return value: a new #GimpIntComboBox.
- *
- * Since: GIMP 2.2
- **/
-GtkWidget *
-gimp_int_combo_box_new_array (gint n_values,
- const gchar *labels[])
-{
- GtkWidget *combo_box;
- GtkListStore *store;
- gint i;
-
- g_return_val_if_fail (n_values >= 0, NULL);
- g_return_val_if_fail (labels != NULL || n_values == 0, NULL);
-
- combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, NULL);
-
- store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)));
-
- for (i = 0; i < n_values; i++)
- {
- GtkTreeIter iter;
-
- if (labels[i])
- {
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
- GIMP_INT_STORE_VALUE, i,
- GIMP_INT_STORE_LABEL, gettext (labels[i]),
- -1);
- }
- }
-
- return combo_box;
-}
-
-/**
- * gimp_int_combo_box_prepend:
- * @combo_box: a #GimpIntComboBox
- * @...: pairs of column number and value, terminated with -1
- *
- * This function provides a convenient way to prepend items to a
- * #GimpIntComboBox. It prepends a row to the @combo_box's list store
- * and calls gtk_list_store_set() for you.
- *
- * The column number must be taken from the enum #GimpIntStoreColumns.
- *
- * Since: GIMP 2.2
- **/
-void
-gimp_int_combo_box_prepend (GimpIntComboBox *combo_box,
- ...)
-{
- GtkListStore *store;
- GtkTreeIter iter;
- va_list args;
-
- g_return_if_fail (GIMP_IS_INT_COMBO_BOX (combo_box));
-
- store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)));
-
- va_start (args, combo_box);
-
- gtk_list_store_prepend (store, &iter);
- gtk_list_store_set_valist (store, &iter, args);
-
- va_end (args);
-}
-
-/**
- * gimp_int_combo_box_append:
- * @combo_box: a #GimpIntComboBox
- * @...: pairs of column number and value, terminated with -1
- *
- * This function provides a convenient way to append items to a
- * #GimpIntComboBox. It appends a row to the @combo_box's list store
- * and calls gtk_list_store_set() for you.
- *
- * The column number must be taken from the enum #GimpIntStoreColumns.
- *
- * Since: GIMP 2.2
- **/
-void
-gimp_int_combo_box_append (GimpIntComboBox *combo_box,
- ...)
-{
- GtkListStore *store;
- GtkTreeIter iter;
- va_list args;
-
- g_return_if_fail (GIMP_IS_INT_COMBO_BOX (combo_box));
-
- store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)));
-
- va_start (args, combo_box);
-
- gtk_list_store_append (store, &iter);
- gtk_list_store_set_valist (store, &iter, args);
-
- va_end (args);
-}
-
-/**
- * gimp_int_combo_box_set_active:
- * @combo_box: a #GimpIntComboBox
- * @value: an integer value
- *
- * Looks up the item that belongs to the given @value and makes it the
- * selected item in the @combo_box.
- *
- * Return value: %TRUE on success or %FALSE if there was no item for
- * this value.
- *
- * Since: GIMP 2.2
- **/
-gboolean
-gimp_int_combo_box_set_active (GimpIntComboBox *combo_box,
- gint value)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
-
- g_return_val_if_fail (GIMP_IS_INT_COMBO_BOX (combo_box), FALSE);
-
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
-
- if (gimp_int_store_lookup_by_value (model, value, &iter))
- {
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_box), &iter);
- return TRUE;
- }
-
- return FALSE;
-}
-
-/**
- * gimp_int_combo_box_get_active:
- * @combo_box: a #GimpIntComboBox
- * @value: return location for the integer value
- *
- * Retrieves the value of the selected (active) item in the @combo_box.
- *
- * Return value: %TRUE if @value has been set or %FALSE if no item was
- * active.
- *
- * Since: GIMP 2.2
- **/
-gboolean
-gimp_int_combo_box_get_active (GimpIntComboBox *combo_box,
- gint *value)
-{
- GtkTreeIter iter;
-
- g_return_val_if_fail (GIMP_IS_INT_COMBO_BOX (combo_box), FALSE);
- g_return_val_if_fail (value != NULL, FALSE);
-
- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter))
- {
- gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)),
- &iter,
- GIMP_INT_STORE_VALUE, value,
- -1);
- return TRUE;
- }
-
- return FALSE;
-}
-
-/**
- * gimp_int_combo_box_connect:
- * @combo_box: a #GimpIntComboBox
- * @value: the value to set
- * @callback: a callback to connect to the @combo_box's "changed" signal
- * @data: a pointer passed as data to g_signal_connect()
- *
- * A convenience function that sets the inital @value of a
- * #GimpIntComboBox and connects @callback to the "changed"
- * signal.
- *
- * This function also calls the @callback once after setting the
- * initial @value. This is often convenient when working with combo
- * boxes that select a default active item, like for example
- * gimp_drawable_combo_box_new(). If you pass an invalid initial
- * @value, the @callback will be called with the default item active.
- *
- * Return value: the signal handler ID as returned by g_signal_connect()
- *
- * Since: GIMP 2.2
- **/
-gulong
-gimp_int_combo_box_connect (GimpIntComboBox *combo_box,
- gint value,
- GCallback callback,
- gpointer data)
-{
- gulong handler = 0;
-
- g_return_val_if_fail (GIMP_IS_INT_COMBO_BOX (combo_box), 0);
-
- if (callback)
- handler = g_signal_connect (combo_box, "changed", callback, data);
-
- if (! gimp_int_combo_box_set_active (combo_box, value))
- g_signal_emit_by_name (combo_box, "changed", NULL);
-
- return handler;
-}
-
-/**
- * gimp_int_combo_box_set_sensitivity:
- * @combo_box: a #GimpIntComboBox
- * @func: a function that returns a boolean value, or %NULL to unset
- * @data: data to pass to @func
- * @destroy: destroy notification for @data
- *
- * Sets a function that is used to decide about the sensitivity of
- * rows in the @combo_box. Use this if you want to set certain rows
- * insensitive.
- *
- * Calling gtk_widget_queue_draw() on the @combo_box will cause the
- * sensitivity to be updated.
- *
- * Since: GIMP 2.4
- **/
-void
-gimp_int_combo_box_set_sensitivity (GimpIntComboBox *combo_box,
- GimpIntSensitivityFunc func,
- gpointer data,
- GDestroyNotify destroy)
-{
- GimpIntComboBoxPrivate *priv;
-
- g_return_if_fail (GIMP_IS_INT_COMBO_BOX (combo_box));
-
- priv = GIMP_INT_COMBO_BOX_GET_PRIVATE (combo_box);
-
- if (priv->sensitivity_destroy)
- {
- GDestroyNotify d = priv->sensitivity_destroy;
-
- priv->sensitivity_destroy = NULL;
- d (priv->sensitivity_data);
- }
-
- priv->sensitivity_func = func;
- priv->sensitivity_data = data;
- priv->sensitivity_destroy = destroy;
-
- gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo_box),
- priv->pixbuf_renderer,
- func ?
- gimp_int_combo_box_data_func : NULL,
- priv, NULL);
-
- gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo_box),
- priv->text_renderer,
- func ?
- gimp_int_combo_box_data_func : NULL,
- priv, NULL);
-}
-
-
-static void
-gimp_int_combo_box_data_func (GtkCellLayout *layout,
- GtkCellRenderer *cell,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data)
-{
- GimpIntComboBoxPrivate *priv = data;
-
- if (priv->sensitivity_func)
- {
- gint value;
- gboolean sensitive;
-
- gtk_tree_model_get (model, iter,
- GIMP_INT_STORE_VALUE, &value,
- -1);
-
- sensitive = priv->sensitivity_func (value, priv->sensitivity_data);
-
- g_object_set (cell,
- "sensitive", sensitive,
- NULL);
- }
-}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]