Remove leaks.
2001-03-30 Alexander Larsson <alexl@redhat.com> * gtk/gtkbutton.c (gtk_button_get_property): * gtk/gtklabel.c: Remove leaks. * gtk/gtkcontainer.c: * gtk/gtkhscale.c: * gtk/gtkhscrollbar.c: * gtk/gtklayout.c: * gtk/gtkmisc.c: * gtk/gtkprogress.c: * gtk/gtkprogressbar.c: * gtk/gtkrange.c: * gtk/gtktable.c: * gtk/gtkviewport.c: * gtk/gtkvscale.c: * gtk/gtkvscrollbar.c: * gtk/gtkwidget.c: Property patches, based on patches from John Margaglione and Lee Mallabone.
This commit is contained in:
committed by
Alexander Larsson
parent
c80b705470
commit
aa209a95fa
@ -27,6 +27,7 @@
|
||||
#include "gtkhscrollbar.h"
|
||||
#include "gtksignal.h"
|
||||
#include "gdk/gdkkeysyms.h"
|
||||
#include "gtkintl.h"
|
||||
|
||||
|
||||
#define EPSILON 0.01
|
||||
@ -34,18 +35,20 @@
|
||||
#define RANGE_CLASS(w) GTK_RANGE_GET_CLASS (w)
|
||||
|
||||
enum {
|
||||
ARG_0,
|
||||
ARG_ADJUSTMENT
|
||||
PROP_0,
|
||||
PROP_ADJUSTMENT
|
||||
};
|
||||
|
||||
static void gtk_hscrollbar_class_init (GtkHScrollbarClass *klass);
|
||||
static void gtk_hscrollbar_init (GtkHScrollbar *hscrollbar);
|
||||
static void gtk_hscrollbar_set_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_hscrollbar_get_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_hscrollbar_get_property (GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec);
|
||||
static void gtk_hscrollbar_set_property (GObject *object,
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec);
|
||||
static void gtk_hscrollbar_realize (GtkWidget *widget);
|
||||
static void gtk_hscrollbar_size_allocate (GtkWidget *widget,
|
||||
GtkAllocation *allocation);
|
||||
@ -87,22 +90,19 @@ gtk_hscrollbar_get_type (void)
|
||||
static void
|
||||
gtk_hscrollbar_class_init (GtkHScrollbarClass *class)
|
||||
{
|
||||
GObjectClass *gobject_class;
|
||||
GtkObjectClass *object_class;
|
||||
GtkWidgetClass *widget_class;
|
||||
GtkRangeClass *range_class;
|
||||
|
||||
gobject_class = (GObjectClass*) class;
|
||||
object_class = (GtkObjectClass*) class;
|
||||
widget_class = (GtkWidgetClass*) class;
|
||||
range_class = (GtkRangeClass*) class;
|
||||
|
||||
gtk_object_add_arg_type ("GtkHScrollbar::adjustment",
|
||||
GTK_TYPE_ADJUSTMENT,
|
||||
GTK_ARG_READWRITE,
|
||||
ARG_ADJUSTMENT);
|
||||
|
||||
object_class->set_arg = gtk_hscrollbar_set_arg;
|
||||
object_class->get_arg = gtk_hscrollbar_get_arg;
|
||||
|
||||
gobject_class->set_property = gtk_hscrollbar_set_property;
|
||||
gobject_class->get_property = gtk_hscrollbar_get_property;
|
||||
|
||||
widget_class->realize = gtk_hscrollbar_realize;
|
||||
widget_class->size_allocate = gtk_hscrollbar_size_allocate;
|
||||
|
||||
@ -112,43 +112,56 @@ gtk_hscrollbar_class_init (GtkHScrollbarClass *class)
|
||||
range_class->trough_click = _gtk_range_default_htrough_click;
|
||||
range_class->trough_keys = gtk_hscrollbar_trough_keys;
|
||||
range_class->motion = _gtk_range_default_hmotion;
|
||||
|
||||
g_object_class_install_property (gobject_class,
|
||||
PROP_ADJUSTMENT,
|
||||
g_param_spec_object ("adjustment",
|
||||
_("Adjustment"),
|
||||
_("The GtkAdjustment that determines the values to use for this scrollbar."),
|
||||
GTK_TYPE_ADJUSTMENT,
|
||||
G_PARAM_READWRITE));
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_hscrollbar_set_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id)
|
||||
static void
|
||||
gtk_hscrollbar_set_property (GObject *object,
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
GtkHScrollbar *hscrollbar;
|
||||
|
||||
hscrollbar = GTK_HSCROLLBAR (object);
|
||||
|
||||
switch (arg_id)
|
||||
switch (prop_id)
|
||||
{
|
||||
case ARG_ADJUSTMENT:
|
||||
gtk_range_set_adjustment (GTK_RANGE (hscrollbar), GTK_VALUE_POINTER (*arg));
|
||||
case PROP_ADJUSTMENT:
|
||||
gtk_range_set_adjustment (GTK_RANGE (hscrollbar),
|
||||
g_value_get_object (value));
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_hscrollbar_get_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id)
|
||||
static void
|
||||
gtk_hscrollbar_get_property (GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
GtkHScrollbar *hscrollbar;
|
||||
|
||||
hscrollbar = GTK_HSCROLLBAR (object);
|
||||
|
||||
switch (arg_id)
|
||||
switch (prop_id)
|
||||
{
|
||||
case ARG_ADJUSTMENT:
|
||||
GTK_VALUE_POINTER (*arg) = GTK_RANGE (hscrollbar);
|
||||
case PROP_ADJUSTMENT:
|
||||
g_value_set_object (value, G_OBJECT (hscrollbar));
|
||||
break;
|
||||
default:
|
||||
arg->type = GTK_TYPE_INVALID;
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user