* Copyright (C) 1997 David Mosberger
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * 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.
*/
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000. 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/.
+ */
+
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include "gtkdrawingarea.h"
#include "gtkentry.h"
#include "gtkhbox.h"
+#include "gtkimage.h"
#include "gtklabel.h"
#include "gtkmain.h"
-#include "gtkpixmap.h"
#include "gtkradiobutton.h"
-#include "gtksignal.h"
+#include "gtkstock.h"
#include "gtktable.h"
#include "gtkvbox.h"
#include "gtkwindow.h"
+#include "gtkintl.h"
static GtkVBoxClass *parent_class = NULL;
NUM_XPMS
};
-static char *xpm[][27] =
+static const char *xpm[][27] =
{
/* spline: */
{
}
};
-guint
+GType
gtk_gamma_curve_get_type (void)
{
- static guint gamma_curve_type = 0;
-
+ static GType gamma_curve_type = 0;
+
if (!gamma_curve_type)
{
- GtkTypeInfo gamma_curve_info =
+ static const GTypeInfo gamma_curve_info =
{
- "GtkGammaCurve",
- sizeof (GtkGammaCurve),
sizeof (GtkGammaCurveClass),
- (GtkClassInitFunc) gtk_gamma_curve_class_init,
- (GtkObjectInitFunc) gtk_gamma_curve_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_gamma_curve_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkGammaCurve),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_gamma_curve_init,
};
-
- gamma_curve_type =
- gtk_type_unique (gtk_vbox_get_type (), &gamma_curve_info);
+
+ gamma_curve_type = g_type_register_static (GTK_TYPE_VBOX, "GtkGammaCurve",
+ &gamma_curve_info, 0);
}
return gamma_curve_type;
}
{
GtkObjectClass *object_class;
- parent_class = gtk_type_class (gtk_vbox_get_type ());
+ parent_class = g_type_class_peek_parent (class);
object_class = (GtkObjectClass *) class;
object_class->destroy = gtk_gamma_curve_destroy;
gtk_container_add (GTK_CONTAINER (curve), curve->table);
curve->curve = gtk_curve_new ();
- gtk_signal_connect (GTK_OBJECT (curve->curve), "curve_type_changed",
- (GtkSignalFunc) curve_type_changed_callback, curve);
+ g_signal_connect (curve->curve, "curve_type_changed",
+ G_CALLBACK (curve_type_changed_callback), curve);
gtk_table_attach_defaults (GTK_TABLE (curve->table), curve->curve, 0, 1, 0, 1);
vbox = gtk_vbox_new (/* homogeneous */ FALSE, /* spacing */ 3);
for (i = 0; i < 3; ++i)
{
curve->button[i] = gtk_toggle_button_new ();
- gtk_object_set_data (GTK_OBJECT (curve->button[i]), "_GtkGammaCurveIndex",
- GINT_TO_POINTER (i));
+ g_object_set_data (G_OBJECT (curve->button[i]), "_GtkGammaCurveIndex",
+ GINT_TO_POINTER (i));
gtk_container_add (GTK_CONTAINER (vbox), curve->button[i]);
- gtk_signal_connect (GTK_OBJECT (curve->button[i]), "realize",
- (GtkSignalFunc) button_realize_callback, 0);
- gtk_signal_connect (GTK_OBJECT (curve->button[i]), "toggled",
- (GtkSignalFunc) button_toggled_callback, curve);
+ g_signal_connect (curve->button[i], "realize",
+ G_CALLBACK (button_realize_callback), NULL);
+ g_signal_connect (curve->button[i], "toggled",
+ G_CALLBACK (button_toggled_callback), curve);
gtk_widget_show (curve->button[i]);
}
for (i = 3; i < 5; ++i)
{
curve->button[i] = gtk_button_new ();
- gtk_object_set_data (GTK_OBJECT (curve->button[i]), "_GtkGammaCurveIndex",
- GINT_TO_POINTER (i));
+ g_object_set_data (G_OBJECT (curve->button[i]), "_GtkGammaCurveIndex",
+ GINT_TO_POINTER (i));
gtk_container_add (GTK_CONTAINER (vbox), curve->button[i]);
- gtk_signal_connect (GTK_OBJECT (curve->button[i]), "realize",
- (GtkSignalFunc) button_realize_callback, 0);
- gtk_signal_connect (GTK_OBJECT (curve->button[i]), "clicked",
- (GtkSignalFunc) button_clicked_callback, curve);
+ g_signal_connect (curve->button[i], "realize",
+ G_CALLBACK (button_realize_callback), NULL);
+ g_signal_connect (curve->button[i], "clicked",
+ G_CALLBACK (button_clicked_callback), curve);
gtk_widget_show (curve->button[i]);
}
GdkPixmap *pm;
int i;
- i = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex"));
+ i = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (w), "_GtkGammaCurveIndex"));
pm = gdk_pixmap_create_from_xpm_d (w->window, &mask,
- &w->style->bg[GTK_STATE_NORMAL], xpm[i]);
+ &w->style->bg[GTK_STATE_NORMAL], (gchar **)xpm[i]);
- pixmap = gtk_pixmap_new (pm, mask);
+ pixmap = gtk_image_new_from_pixmap (pm, mask);
gtk_container_add (GTK_CONTAINER (w), pixmap);
gtk_widget_show (pixmap);
- gdk_pixmap_unref (pm);
- gdk_bitmap_unref (mask); /* a bitmap is really just a special pixmap */
+ g_object_unref (pm);
+ g_object_unref (mask);
}
static void
if (!GTK_TOGGLE_BUTTON (w)->active)
return;
- active = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex"));
+ active = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (w), "_GtkGammaCurveIndex"));
for (i = 0; i < 3; ++i)
if ((i != active) && GTK_TOGGLE_BUTTON (c->button[i])->active)
break;
if (i < 3)
- gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (c->button[i]), FALSE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (c->button[i]), FALSE);
switch (active)
{
GtkGammaCurve *c = data;
gtk_widget_destroy (c->gamma_dialog);
- c->gamma_dialog = 0;
}
static void
gamma_ok_callback (GtkWidget *w, gpointer data)
{
GtkGammaCurve *c = data;
- gchar *start, *end;
+ const gchar *start;
+ gchar *end;
gfloat v;
start = gtk_entry_get_text (GTK_ENTRY (c->gamma_text));
GtkGammaCurve *c = data;
int active;
- active = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex"));
+ active = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (w), "_GtkGammaCurveIndex"));
if (active == 3)
{
/* set gamma */
gchar buf[64];
c->gamma_dialog = gtk_dialog_new ();
- gtk_window_set_title (GTK_WINDOW (c->gamma_dialog), "Gamma");
+ gtk_window_set_screen (GTK_WINDOW (c->gamma_dialog),
+ gtk_widget_get_screen (w));
+ gtk_window_set_title (GTK_WINDOW (c->gamma_dialog), _("Gamma"));
+ g_object_add_weak_pointer (G_OBJECT (c->gamma_dialog),
+ (gpointer *)&c->gamma_dialog);
+
vbox = GTK_DIALOG (c->gamma_dialog)->vbox;
hbox = gtk_hbox_new (/* homogeneous */ FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 2);
gtk_widget_show (hbox);
- label = gtk_label_new ("Gamma value");
+ label = gtk_label_new_with_mnemonic (_("_Gamma value"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
gtk_widget_show (label);
sprintf (buf, "%g", c->gamma);
c->gamma_text = gtk_entry_new ();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), c->gamma_text);
gtk_entry_set_text (GTK_ENTRY (c->gamma_text), buf);
gtk_box_pack_start (GTK_BOX (hbox), c->gamma_text, TRUE, TRUE, 2);
gtk_widget_show (c->gamma_text);
/* fill in action area: */
hbox = GTK_DIALOG (c->gamma_dialog)->action_area;
-
- button = gtk_button_new_with_label ("OK");
- GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
- (GtkSignalFunc) gamma_ok_callback, c);
+
+ button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (gamma_cancel_callback), c);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
- gtk_widget_grab_default (button);
gtk_widget_show (button);
- button = gtk_button_new_with_label ("Cancel");
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
- (GtkSignalFunc) gamma_cancel_callback, c);
+ button = gtk_button_new_from_stock (GTK_STOCK_OK);
+ GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (gamma_ok_callback), c);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+ gtk_widget_grab_default (button);
gtk_widget_show (button);
gtk_widget_show (c->gamma_dialog);
default: active = 2; break;
}
if (!GTK_TOGGLE_BUTTON (c->button[active])->active)
- gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (c->button[active]), TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (c->button[active]), TRUE);
}
GtkWidget*
gtk_gamma_curve_new (void)
{
- return gtk_type_new (gtk_gamma_curve_get_type ());
+ return g_object_new (GTK_TYPE_GAMMA_CURVE, NULL);
}
static void
{
GtkGammaCurve *c;
- g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_GAMMA_CURVE (object));
c = GTK_GAMMA_CURVE (object);
projects / ~andy / gtk / blobdiff