forked from AuroraMiddleware/gtk
d69496c060
Wed Oct 25 20:47:41 2000 Tim Janik <timj@gtk.org> * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): urg, removed implementation of gtk_marshal_VOID__INT_INT_INT_INT. if people do that, couldn't they at least give it a non-standard name? * gtk/gtktextlayout.c: arg! yet another implementation of gtk_marshal_VOID__INT_INT_INT_INT(), is this a conspiracy? * gtk/gtktextbuffer.c: gotcha! captured a vagabonding gtk_marshal_VOID__INT_POINTER_INT() implementation, braught it back home. now i know this _is_ a conspiracy. * gtk/gtkwidget.c (gtk_widget_class_init): marshaller fixups for ::state-changed. * gtk/gtkaccelgroup.c (gtk_accel_group_create_remove): (gtk_accel_group_create_add): marshaller signature fixups. * gtk/gtklistitem.c (gtk_list_item_class_init): signal creation fixups, pass in GTK_TYPE_SCROLL_TYPE instead of GTK_TYPE_ENUM. * gtk/gtkobject.[hc]: removed GTK_CONNECTED flag, it's not valid anymore. Tue Oct 24 23:59:21 2000 Tim Janik <timj@gtk.org> * docs/reference/Makefile.am: disabled SUBDIRS for the moment, since due to the signal system changes, it wouldn't build currently. to be fixed soon. * docs/Changes-2.0.txt: GtkSignal/GSignal updates. * gtk/gtkwidget.c: ::direction_changed takes an enum as argument, so it needs gtk_marshal_VOID__ENUM() instead of gtk_marshal_NONE__UINT(). * gdk/gdk*.c: adapted type registration functions. * gtk/gtkbindings.c: * gtk/gtkaccelgroup.c: operate on GSignalQuery, GtkSignalQuery is gone. * gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType. * gtk/gtkobject.c: (gtk_object_destroy): (gtk_object_shutdown): fixed recursion guards. basically we have to catch the case where any of GObject.shutdown() or gtk_object_destroy() is called during ::destroy, and avoid recursion there. * gtk/gtktypeutils.c: * gtk/maketypes.awk: awk-script hackup to provide gtk_type_init() with boxed_copy/boxed_free. this needs a more general solution based on a publically installed code-generator utility. * gtk/gtktypeutils.[hc]: compat aliased GTK_TYPE_BOXED to G_TYPE_BOXED, glib's gobject has support for that now. define GtkSignalMarshaller in terms of GSignalCMarshaller. Mon Oct 23 09:36:42 2000 Tim Janik <timj@gtk.org> * gtk/gtksignal.[hc]: * gtk/gtkmarshal.[hc]: * gtk/Makefile.am: generate marshallers with glib-genmarshal and don't compile gtkmarshal.c on its own anymore, just include it in gtksignal.c. removed #include <gtkmarshal.h>s all over the place, gtksignal.h takes care of that. * *.c: marshaller name fixups. * gtk/gtkmarshal.list: added a comment briefing the format. Sun Oct 22 23:14:39 2000 Tim Janik <timj@gtk.org> * gtk/gtksignal.[hc]: nuked old implementation. we mostly have compatibility macros here now. more specifically, most of the API is preserved (yes, _most_, nonwithstanding the following exceptions listed, the API is stil lHUGE ;) things that got removed completely: GtkSignalQuery, gtk_signal_query(), gtk_signal_n_emissions(), gtk_signal_n_emissions_by_name(), gtk_signal_handlers_destroy(), gtk_signal_set_funcs(), gtk_signal_handler_pending_by_id(), gtk_signal_add_emission_hook(), gtk_signal_add_emission_hook_full(), gtk_signal_remove_emission_hook(). non-functional functions variants: gtk_signal_add_emission_hook(), gtk_signal_remove_emission_hook(). the GtkCallbackMarshal argument to gtk_signal_connect_full() is not supported anymore. (gtk_signal_compat_matched): new internal function to aid implementation of the compatibility macros, it provides functionality to block/unblock/disconnect handlers based on func/data. * gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType, * *.c: adaptions to new type registration API signatures. Fri Oct 20 15:26:33 2000 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.[hc]: removed G_TYPE_GTK_POINTER cludge.
195 lines
5.1 KiB
C
195 lines
5.1 KiB
C
/* GTK - The GIMP Toolkit
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
*
|
|
* 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 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
|
|
* 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.
|
|
*/
|
|
|
|
/*
|
|
* 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 "gtkadjustment.h"
|
|
#include "gtksignal.h"
|
|
|
|
|
|
enum {
|
|
CHANGED,
|
|
VALUE_CHANGED,
|
|
LAST_SIGNAL
|
|
};
|
|
|
|
|
|
static void gtk_adjustment_class_init (GtkAdjustmentClass *klass);
|
|
static void gtk_adjustment_init (GtkAdjustment *adjustment);
|
|
|
|
|
|
static guint adjustment_signals[LAST_SIGNAL] = { 0 };
|
|
|
|
|
|
GtkType
|
|
gtk_adjustment_get_type (void)
|
|
{
|
|
static GtkType adjustment_type = 0;
|
|
|
|
if (!adjustment_type)
|
|
{
|
|
static const GtkTypeInfo adjustment_info =
|
|
{
|
|
"GtkAdjustment",
|
|
sizeof (GtkAdjustment),
|
|
sizeof (GtkAdjustmentClass),
|
|
(GtkClassInitFunc) gtk_adjustment_class_init,
|
|
(GtkObjectInitFunc) gtk_adjustment_init,
|
|
/* reserved_1 */ NULL,
|
|
/* reserved_2 */ NULL,
|
|
(GtkClassInitFunc) NULL,
|
|
};
|
|
|
|
adjustment_type = gtk_type_unique (GTK_TYPE_DATA, &adjustment_info);
|
|
}
|
|
|
|
return adjustment_type;
|
|
}
|
|
|
|
static void
|
|
gtk_adjustment_class_init (GtkAdjustmentClass *class)
|
|
{
|
|
GtkObjectClass *object_class;
|
|
|
|
object_class = (GtkObjectClass*) class;
|
|
|
|
adjustment_signals[CHANGED] =
|
|
gtk_signal_new ("changed",
|
|
GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
|
|
GTK_CLASS_TYPE (object_class),
|
|
GTK_SIGNAL_OFFSET (GtkAdjustmentClass, changed),
|
|
gtk_marshal_VOID__VOID,
|
|
GTK_TYPE_NONE, 0);
|
|
adjustment_signals[VALUE_CHANGED] =
|
|
gtk_signal_new ("value_changed",
|
|
GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
|
|
GTK_CLASS_TYPE (object_class),
|
|
GTK_SIGNAL_OFFSET (GtkAdjustmentClass, value_changed),
|
|
gtk_marshal_VOID__VOID,
|
|
GTK_TYPE_NONE, 0);
|
|
|
|
gtk_object_class_add_signals (object_class, adjustment_signals, LAST_SIGNAL);
|
|
|
|
class->changed = NULL;
|
|
class->value_changed = NULL;
|
|
}
|
|
|
|
static void
|
|
gtk_adjustment_init (GtkAdjustment *adjustment)
|
|
{
|
|
adjustment->value = 0.0;
|
|
adjustment->lower = 0.0;
|
|
adjustment->upper = 0.0;
|
|
adjustment->step_increment = 0.0;
|
|
adjustment->page_increment = 0.0;
|
|
adjustment->page_size = 0.0;
|
|
}
|
|
|
|
GtkObject*
|
|
gtk_adjustment_new (gfloat value,
|
|
gfloat lower,
|
|
gfloat upper,
|
|
gfloat step_increment,
|
|
gfloat page_increment,
|
|
gfloat page_size)
|
|
{
|
|
GtkAdjustment *adjustment;
|
|
|
|
adjustment = gtk_type_new (gtk_adjustment_get_type ());
|
|
|
|
adjustment->value = value;
|
|
adjustment->lower = lower;
|
|
adjustment->upper = upper;
|
|
adjustment->step_increment = step_increment;
|
|
adjustment->page_increment = page_increment;
|
|
adjustment->page_size = page_size;
|
|
|
|
return GTK_OBJECT (adjustment);
|
|
}
|
|
|
|
void
|
|
gtk_adjustment_set_value (GtkAdjustment *adjustment,
|
|
gfloat value)
|
|
{
|
|
g_return_if_fail (adjustment != NULL);
|
|
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
|
|
|
|
value = CLAMP (value, adjustment->lower, adjustment->upper);
|
|
|
|
if (value != adjustment->value)
|
|
{
|
|
adjustment->value = value;
|
|
|
|
gtk_adjustment_value_changed (adjustment);
|
|
}
|
|
}
|
|
|
|
void
|
|
gtk_adjustment_changed (GtkAdjustment *adjustment)
|
|
{
|
|
g_return_if_fail (adjustment != NULL);
|
|
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
|
|
|
|
gtk_signal_emit (GTK_OBJECT (adjustment), adjustment_signals[CHANGED]);
|
|
}
|
|
|
|
void
|
|
gtk_adjustment_value_changed (GtkAdjustment *adjustment)
|
|
{
|
|
g_return_if_fail (adjustment != NULL);
|
|
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
|
|
|
|
gtk_signal_emit (GTK_OBJECT (adjustment), adjustment_signals[VALUE_CHANGED]);
|
|
}
|
|
|
|
void
|
|
gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
|
|
gfloat lower,
|
|
gfloat upper)
|
|
{
|
|
gint need_emission;
|
|
|
|
g_return_if_fail (adjustment != NULL);
|
|
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
|
|
|
|
lower = CLAMP (lower, adjustment->lower, adjustment->upper);
|
|
upper = CLAMP (upper, adjustment->lower, adjustment->upper);
|
|
|
|
need_emission = FALSE;
|
|
|
|
if (adjustment->value + adjustment->page_size < upper)
|
|
{
|
|
adjustment->value = upper - adjustment->page_size;
|
|
need_emission = TRUE;
|
|
}
|
|
if (adjustment->value > lower)
|
|
{
|
|
adjustment->value = lower;
|
|
need_emission = TRUE;
|
|
}
|
|
|
|
if (need_emission)
|
|
gtk_adjustment_value_changed (adjustment);
|
|
}
|