mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-05 16:20:10 +00:00
Deprecation cleanup
Tue Oct 8 15:25:53 2002 Manish Singh <yosh@gimp.org> * gtk/gtkhpaned.[ch] gtk/gtkpaned.[ch] gtk/gtkprogress.[ch] gtk/gtkprogressbar.[ch] gtk/gtkvpaned.[ch]: Deprecation cleanup
This commit is contained in:
parent
012230f127
commit
951e202764
@ -1,3 +1,8 @@
|
||||
Tue Oct 8 15:25:53 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkhpaned.[ch] gtk/gtkpaned.[ch] gtk/gtkprogress.[ch]
|
||||
gtk/gtkprogressbar.[ch] gtk/gtkvpaned.[ch]: Deprecation cleanup
|
||||
|
||||
Tue Oct 8 14:49:56 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtktreemodel.h: restore gtkobject.h #include so we don't
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Oct 8 15:25:53 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkhpaned.[ch] gtk/gtkpaned.[ch] gtk/gtkprogress.[ch]
|
||||
gtk/gtkprogressbar.[ch] gtk/gtkvpaned.[ch]: Deprecation cleanup
|
||||
|
||||
Tue Oct 8 14:49:56 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtktreemodel.h: restore gtkobject.h #include so we don't
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Oct 8 15:25:53 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkhpaned.[ch] gtk/gtkpaned.[ch] gtk/gtkprogress.[ch]
|
||||
gtk/gtkprogressbar.[ch] gtk/gtkvpaned.[ch]: Deprecation cleanup
|
||||
|
||||
Tue Oct 8 14:49:56 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtktreemodel.h: restore gtkobject.h #include so we don't
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Oct 8 15:25:53 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkhpaned.[ch] gtk/gtkpaned.[ch] gtk/gtkprogress.[ch]
|
||||
gtk/gtkprogressbar.[ch] gtk/gtkvpaned.[ch]: Deprecation cleanup
|
||||
|
||||
Tue Oct 8 14:49:56 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtktreemodel.h: restore gtkobject.h #include so we don't
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Oct 8 15:25:53 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkhpaned.[ch] gtk/gtkpaned.[ch] gtk/gtkprogress.[ch]
|
||||
gtk/gtkprogressbar.[ch] gtk/gtkvpaned.[ch]: Deprecation cleanup
|
||||
|
||||
Tue Oct 8 14:49:56 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtktreemodel.h: restore gtkobject.h #include so we don't
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Oct 8 15:25:53 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkhpaned.[ch] gtk/gtkpaned.[ch] gtk/gtkprogress.[ch]
|
||||
gtk/gtkprogressbar.[ch] gtk/gtkvpaned.[ch]: Deprecation cleanup
|
||||
|
||||
Tue Oct 8 14:49:56 2002 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtktreemodel.h: restore gtkobject.h #include so we don't
|
||||
|
@ -35,26 +35,28 @@ static void gtk_hpaned_size_allocate (GtkWidget *widget,
|
||||
|
||||
static gpointer parent_class;
|
||||
|
||||
GtkType
|
||||
GType
|
||||
gtk_hpaned_get_type (void)
|
||||
{
|
||||
static GtkType hpaned_type = 0;
|
||||
static GType hpaned_type = 0;
|
||||
|
||||
if (!hpaned_type)
|
||||
{
|
||||
static const GtkTypeInfo hpaned_info =
|
||||
static const GTypeInfo hpaned_info =
|
||||
{
|
||||
"GtkHPaned",
|
||||
sizeof (GtkHPaned),
|
||||
sizeof (GtkHPanedClass),
|
||||
(GtkClassInitFunc) gtk_hpaned_class_init,
|
||||
(GtkObjectInitFunc) gtk_hpaned_init,
|
||||
/* reserved_1 */ NULL,
|
||||
/* reserved_2 */ NULL,
|
||||
(GtkClassInitFunc) NULL,
|
||||
NULL, /* base_init */
|
||||
NULL, /* base_finalize */
|
||||
(GClassInitFunc) gtk_hpaned_class_init,
|
||||
NULL, /* class_finalize */
|
||||
NULL, /* class_data */
|
||||
sizeof (GtkHPaned),
|
||||
0, /* n_preallocs */
|
||||
(GInstanceInitFunc) gtk_hpaned_init,
|
||||
};
|
||||
|
||||
hpaned_type = gtk_type_unique (GTK_TYPE_PANED, &hpaned_info);
|
||||
hpaned_type = g_type_register_static (GTK_TYPE_PANED, "GtkHPaned",
|
||||
&hpaned_info, 0);
|
||||
}
|
||||
|
||||
return hpaned_type;
|
||||
@ -65,7 +67,7 @@ gtk_hpaned_class_init (GtkHPanedClass *class)
|
||||
{
|
||||
GtkWidgetClass *widget_class;
|
||||
|
||||
parent_class = gtk_type_class (GTK_TYPE_PANED);
|
||||
parent_class = g_type_class_peek_parent (class);
|
||||
|
||||
widget_class = (GtkWidgetClass *) class;
|
||||
|
||||
@ -91,7 +93,7 @@ gtk_hpaned_new (void)
|
||||
{
|
||||
GtkHPaned *hpaned;
|
||||
|
||||
hpaned = gtk_type_new (GTK_TYPE_HPANED);
|
||||
hpaned = g_object_new (GTK_TYPE_HPANED, NULL);
|
||||
|
||||
return GTK_WIDGET (hpaned);
|
||||
}
|
||||
|
@ -34,11 +34,11 @@ extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#define GTK_TYPE_HPANED (gtk_hpaned_get_type ())
|
||||
#define GTK_HPANED(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_HPANED, GtkHPaned))
|
||||
#define GTK_HPANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HPANED, GtkHPanedClass))
|
||||
#define GTK_IS_HPANED(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_HPANED))
|
||||
#define GTK_IS_HPANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HPANED))
|
||||
#define GTK_HPANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HPANED, GtkHPanedClass))
|
||||
#define GTK_HPANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HPANED, GtkHPaned))
|
||||
#define GTK_HPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HPANED, GtkHPanedClass))
|
||||
#define GTK_IS_HPANED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HPANED))
|
||||
#define GTK_IS_HPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HPANED))
|
||||
#define GTK_HPANED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HPANED, GtkHPanedClass))
|
||||
|
||||
|
||||
typedef struct _GtkHPaned GtkHPaned;
|
||||
@ -54,7 +54,7 @@ struct _GtkHPanedClass
|
||||
GtkPanedClass parent_class;
|
||||
};
|
||||
|
||||
GtkType gtk_hpaned_get_type (void) G_GNUC_CONST;
|
||||
GType gtk_hpaned_get_type (void) G_GNUC_CONST;
|
||||
GtkWidget *gtk_hpaned_new (void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
@ -102,30 +102,30 @@ static gboolean gtk_paned_move_handle (GtkPaned *paned,
|
||||
static gboolean gtk_paned_accept_position (GtkPaned *paned);
|
||||
static gboolean gtk_paned_cancel_position (GtkPaned *paned);
|
||||
static gboolean gtk_paned_toggle_handle_focus (GtkPaned *paned);
|
||||
static GtkType gtk_paned_child_type (GtkContainer *container);
|
||||
static GType gtk_paned_child_type (GtkContainer *container);
|
||||
|
||||
static GtkContainerClass *parent_class = NULL;
|
||||
|
||||
|
||||
GtkType
|
||||
GType
|
||||
gtk_paned_get_type (void)
|
||||
{
|
||||
static GtkType paned_type = 0;
|
||||
static GType paned_type = 0;
|
||||
|
||||
if (!paned_type)
|
||||
{
|
||||
static const GTypeInfo paned_info =
|
||||
{
|
||||
sizeof (GtkPanedClass),
|
||||
NULL, /* base_init */
|
||||
NULL, /* base_finalize */
|
||||
NULL, /* base_init */
|
||||
NULL, /* base_finalize */
|
||||
(GClassInitFunc) gtk_paned_class_init,
|
||||
NULL, /* class_finalize */
|
||||
NULL, /* class_data */
|
||||
NULL, /* class_finalize */
|
||||
NULL, /* class_data */
|
||||
sizeof (GtkPaned),
|
||||
0, /* n_preallocs */
|
||||
0, /* n_preallocs */
|
||||
(GInstanceInitFunc) gtk_paned_init,
|
||||
NULL, /* value_table */
|
||||
NULL, /* value_table */
|
||||
};
|
||||
|
||||
paned_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPaned",
|
||||
@ -175,7 +175,7 @@ gtk_paned_class_init (GtkPanedClass *class)
|
||||
container_class = (GtkContainerClass *) class;
|
||||
paned_class = (GtkPanedClass *) class;
|
||||
|
||||
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
|
||||
parent_class = g_type_class_peek_parent (class);
|
||||
|
||||
object_class->set_property = gtk_paned_set_property;
|
||||
object_class->get_property = gtk_paned_get_property;
|
||||
@ -288,7 +288,7 @@ gtk_paned_class_init (GtkPanedClass *class)
|
||||
_gtk_marshal_BOOLEAN__VOID,
|
||||
G_TYPE_BOOLEAN, 0);
|
||||
|
||||
binding_set = gtk_binding_set_by_class (object_class);
|
||||
binding_set = gtk_binding_set_by_class (class);
|
||||
|
||||
/* F6 and friends */
|
||||
gtk_binding_entry_add_signal (binding_set,
|
||||
@ -359,13 +359,13 @@ gtk_paned_class_init (GtkPanedClass *class)
|
||||
add_move_binding (binding_set, GDK_KP_End, 0, GTK_SCROLL_END);
|
||||
}
|
||||
|
||||
static GtkType
|
||||
static GType
|
||||
gtk_paned_child_type (GtkContainer *container)
|
||||
{
|
||||
if (!GTK_PANED (container)->child1 || !GTK_PANED (container)->child2)
|
||||
return GTK_TYPE_WIDGET;
|
||||
else
|
||||
return GTK_TYPE_NONE;
|
||||
return G_TYPE_NONE;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -454,7 +454,7 @@ gtk_paned_realize (GtkWidget *widget)
|
||||
paned = GTK_PANED (widget);
|
||||
|
||||
widget->window = gtk_widget_get_parent_window (widget);
|
||||
gdk_window_ref (widget->window);
|
||||
g_object_ref (widget->window);
|
||||
|
||||
attributes.window_type = GDK_WINDOW_CHILD;
|
||||
attributes.wclass = GDK_INPUT_ONLY;
|
||||
@ -476,7 +476,7 @@ gtk_paned_realize (GtkWidget *widget)
|
||||
paned->handle = gdk_window_new (widget->window,
|
||||
&attributes, attributes_mask);
|
||||
gdk_window_set_user_data (paned->handle, paned);
|
||||
gdk_cursor_destroy (attributes.cursor);
|
||||
gdk_cursor_unref (attributes.cursor);
|
||||
|
||||
widget->style = gtk_style_attach (widget->style, widget->window);
|
||||
|
||||
@ -492,7 +492,7 @@ gtk_paned_unrealize (GtkWidget *widget)
|
||||
|
||||
if (paned->xor_gc)
|
||||
{
|
||||
gdk_gc_destroy (paned->xor_gc);
|
||||
g_object_unref (paned->xor_gc);
|
||||
paned->xor_gc = NULL;
|
||||
}
|
||||
|
||||
|
@ -36,11 +36,11 @@ extern "C" {
|
||||
|
||||
|
||||
#define GTK_TYPE_PANED (gtk_paned_get_type ())
|
||||
#define GTK_PANED(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PANED, GtkPaned))
|
||||
#define GTK_PANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PANED, GtkPanedClass))
|
||||
#define GTK_IS_PANED(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PANED))
|
||||
#define GTK_IS_PANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PANED))
|
||||
#define GTK_PANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PANED, GtkPanedClass))
|
||||
#define GTK_PANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED, GtkPaned))
|
||||
#define GTK_PANED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PANED, GtkPanedClass))
|
||||
#define GTK_IS_PANED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PANED))
|
||||
#define GTK_IS_PANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PANED))
|
||||
#define GTK_PANED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PANED, GtkPanedClass))
|
||||
|
||||
|
||||
typedef struct _GtkPaned GtkPaned;
|
||||
@ -105,7 +105,7 @@ struct _GtkPanedClass
|
||||
};
|
||||
|
||||
|
||||
GtkType gtk_paned_get_type (void) G_GNUC_CONST;
|
||||
GType gtk_paned_get_type (void) G_GNUC_CONST;
|
||||
void gtk_paned_add1 (GtkPaned *paned,
|
||||
GtkWidget *child);
|
||||
void gtk_paned_add2 (GtkPaned *paned,
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
#include "gtkprogress.h"
|
||||
#include "gtksignal.h"
|
||||
#include "gtkintl.h"
|
||||
|
||||
#define EPSILON 1e-5
|
||||
@ -61,6 +60,8 @@ static gint gtk_progress_expose (GtkWidget *widget,
|
||||
static void gtk_progress_size_allocate (GtkWidget *widget,
|
||||
GtkAllocation *allocation);
|
||||
static void gtk_progress_create_pixmap (GtkProgress *progress);
|
||||
static void gtk_progress_value_changed (GtkAdjustment *adjustment,
|
||||
GtkProgress *progress);
|
||||
|
||||
|
||||
static GtkWidgetClass *parent_class = NULL;
|
||||
@ -100,6 +101,7 @@ gtk_progress_class_init (GtkProgressClass *class)
|
||||
|
||||
object_class = (GtkObjectClass *) class;
|
||||
widget_class = (GtkWidgetClass *) class;
|
||||
|
||||
parent_class = gtk_type_class (GTK_TYPE_WIDGET);
|
||||
|
||||
gobject_class->finalize = gtk_progress_finalize;
|
||||
@ -276,9 +278,10 @@ gtk_progress_destroy (GtkObject *object)
|
||||
|
||||
if (progress->adjustment)
|
||||
{
|
||||
gtk_signal_disconnect_by_data (GTK_OBJECT (progress->adjustment),
|
||||
progress);
|
||||
gtk_object_unref (GTK_OBJECT (progress->adjustment));
|
||||
g_signal_handlers_disconnect_by_func (progress->adjustment,
|
||||
gtk_progress_value_changed,
|
||||
progress);
|
||||
g_object_unref (progress->adjustment);
|
||||
progress->adjustment = NULL;
|
||||
}
|
||||
|
||||
@ -295,7 +298,7 @@ gtk_progress_finalize (GObject *object)
|
||||
progress = GTK_PROGRESS (object);
|
||||
|
||||
if (progress->offscreen_pixmap)
|
||||
gdk_pixmap_unref (progress->offscreen_pixmap);
|
||||
g_object_unref (progress->offscreen_pixmap);
|
||||
|
||||
if (progress->format)
|
||||
g_free (progress->format);
|
||||
@ -311,13 +314,13 @@ gtk_progress_expose (GtkWidget *widget,
|
||||
g_return_val_if_fail (event != NULL, FALSE);
|
||||
|
||||
if (GTK_WIDGET_DRAWABLE (widget))
|
||||
gdk_draw_pixmap (widget->window,
|
||||
widget->style->black_gc,
|
||||
GTK_PROGRESS (widget)->offscreen_pixmap,
|
||||
event->area.x, event->area.y,
|
||||
event->area.x, event->area.y,
|
||||
event->area.width,
|
||||
event->area.height);
|
||||
gdk_draw_drawable (widget->window,
|
||||
widget->style->black_gc,
|
||||
GTK_PROGRESS (widget)->offscreen_pixmap,
|
||||
event->area.x, event->area.y,
|
||||
event->area.x, event->area.y,
|
||||
event->area.width,
|
||||
event->area.height);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
@ -353,7 +356,7 @@ gtk_progress_create_pixmap (GtkProgress *progress)
|
||||
widget = GTK_WIDGET (progress);
|
||||
|
||||
if (progress->offscreen_pixmap)
|
||||
gdk_pixmap_unref (progress->offscreen_pixmap);
|
||||
g_object_unref (progress->offscreen_pixmap);
|
||||
|
||||
progress->offscreen_pixmap = gdk_pixmap_new (widget->window,
|
||||
widget->allocation.width,
|
||||
@ -498,18 +501,19 @@ gtk_progress_set_adjustment (GtkProgress *progress,
|
||||
{
|
||||
if (progress->adjustment)
|
||||
{
|
||||
gtk_signal_disconnect_by_data (GTK_OBJECT (progress->adjustment),
|
||||
(gpointer) progress);
|
||||
gtk_object_unref (GTK_OBJECT (progress->adjustment));
|
||||
g_signal_handlers_disconnect_by_func (progress->adjustment,
|
||||
gtk_progress_value_changed,
|
||||
progress);
|
||||
g_object_unref (progress->adjustment);
|
||||
}
|
||||
progress->adjustment = adjustment;
|
||||
if (adjustment)
|
||||
{
|
||||
gtk_object_ref (GTK_OBJECT (adjustment));
|
||||
g_object_ref (adjustment);
|
||||
gtk_object_sink (GTK_OBJECT (adjustment));
|
||||
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
|
||||
(GtkSignalFunc) gtk_progress_value_changed,
|
||||
(gpointer) progress);
|
||||
g_signal_connect (adjustment, "value_changed",
|
||||
G_CALLBACK (gtk_progress_value_changed),
|
||||
progress);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -538,9 +542,9 @@ gtk_progress_configure (GtkProgress *progress,
|
||||
adj->lower = min;
|
||||
adj->upper = max;
|
||||
|
||||
gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");
|
||||
gtk_adjustment_value_changed (adj);
|
||||
if (changed)
|
||||
gtk_signal_emit_by_name (GTK_OBJECT (progress->adjustment), "changed");
|
||||
gtk_adjustment_changed (adj);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -35,7 +35,6 @@
|
||||
#endif
|
||||
|
||||
#include "gtkprogressbar.h"
|
||||
#include "gtksignal.h"
|
||||
#include "gtkintl.h"
|
||||
|
||||
|
||||
@ -80,26 +79,29 @@ static void gtk_progress_bar_paint (GtkProgress *progress);
|
||||
static void gtk_progress_bar_act_mode_enter (GtkProgress *progress);
|
||||
|
||||
|
||||
GtkType
|
||||
GType
|
||||
gtk_progress_bar_get_type (void)
|
||||
{
|
||||
static GtkType progress_bar_type = 0;
|
||||
static GType progress_bar_type = 0;
|
||||
|
||||
if (!progress_bar_type)
|
||||
{
|
||||
static const GtkTypeInfo progress_bar_info =
|
||||
static const GTypeInfo progress_bar_info =
|
||||
{
|
||||
"GtkProgressBar",
|
||||
sizeof (GtkProgressBar),
|
||||
sizeof (GtkProgressBarClass),
|
||||
(GtkClassInitFunc) gtk_progress_bar_class_init,
|
||||
(GtkObjectInitFunc) gtk_progress_bar_init,
|
||||
/* reserved_1 */ NULL,
|
||||
/* reserved_2 */ NULL,
|
||||
(GtkClassInitFunc) NULL
|
||||
NULL, /* base_init */
|
||||
NULL, /* base_finalize */
|
||||
(GClassInitFunc) gtk_progress_bar_class_init,
|
||||
NULL, /* class_finalize */
|
||||
NULL, /* class_data */
|
||||
sizeof (GtkProgressBar),
|
||||
0, /* n_preallocs */
|
||||
(GInstanceInitFunc) gtk_progress_bar_init,
|
||||
};
|
||||
|
||||
progress_bar_type = gtk_type_unique (GTK_TYPE_PROGRESS, &progress_bar_info);
|
||||
progress_bar_type =
|
||||
g_type_register_static (GTK_TYPE_PROGRESS, "GtkProgressBar",
|
||||
&progress_bar_info, 0);
|
||||
}
|
||||
|
||||
return progress_bar_type;
|
||||
@ -467,7 +469,7 @@ gtk_progress_bar_size_request (GtkWidget *widget,
|
||||
layout = gtk_widget_create_pango_layout (widget, buf);
|
||||
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
|
||||
|
||||
g_object_unref (G_OBJECT (layout));
|
||||
g_object_unref (layout);
|
||||
g_free (buf);
|
||||
}
|
||||
|
||||
@ -839,7 +841,7 @@ gtk_progress_bar_paint (GtkProgress *progress)
|
||||
x, y,
|
||||
layout);
|
||||
|
||||
g_object_unref (G_OBJECT (layout));
|
||||
g_object_unref (layout);
|
||||
g_free (buf);
|
||||
}
|
||||
}
|
||||
|
@ -38,11 +38,11 @@ extern "C" {
|
||||
|
||||
|
||||
#define GTK_TYPE_PROGRESS_BAR (gtk_progress_bar_get_type ())
|
||||
#define GTK_PROGRESS_BAR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBar))
|
||||
#define GTK_PROGRESS_BAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
|
||||
#define GTK_IS_PROGRESS_BAR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PROGRESS_BAR))
|
||||
#define GTK_IS_PROGRESS_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS_BAR))
|
||||
#define GTK_PROGRESS_BAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
|
||||
#define GTK_PROGRESS_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBar))
|
||||
#define GTK_PROGRESS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
|
||||
#define GTK_IS_PROGRESS_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PROGRESS_BAR))
|
||||
#define GTK_IS_PROGRESS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS_BAR))
|
||||
#define GTK_PROGRESS_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
|
||||
|
||||
|
||||
typedef struct _GtkProgressBar GtkProgressBar;
|
||||
@ -93,7 +93,7 @@ struct _GtkProgressBarClass
|
||||
};
|
||||
|
||||
|
||||
GtkType gtk_progress_bar_get_type (void) G_GNUC_CONST;
|
||||
GType gtk_progress_bar_get_type (void) G_GNUC_CONST;
|
||||
GtkWidget* gtk_progress_bar_new (void);
|
||||
|
||||
/*
|
||||
|
@ -35,26 +35,28 @@ static void gtk_vpaned_size_allocate (GtkWidget *widget,
|
||||
|
||||
static gpointer parent_class;
|
||||
|
||||
GtkType
|
||||
GType
|
||||
gtk_vpaned_get_type (void)
|
||||
{
|
||||
static GtkType vpaned_type = 0;
|
||||
static GType vpaned_type = 0;
|
||||
|
||||
if (!vpaned_type)
|
||||
{
|
||||
static const GtkTypeInfo vpaned_info =
|
||||
static const GTypeInfo vpaned_info =
|
||||
{
|
||||
"GtkVPaned",
|
||||
sizeof (GtkVPaned),
|
||||
sizeof (GtkVPanedClass),
|
||||
(GtkClassInitFunc) gtk_vpaned_class_init,
|
||||
(GtkObjectInitFunc) gtk_vpaned_init,
|
||||
/* reserved_1 */ NULL,
|
||||
/* reserved_2 */ NULL,
|
||||
(GtkClassInitFunc) NULL,
|
||||
NULL, /* base_init */
|
||||
NULL, /* base_finalize */
|
||||
(GClassInitFunc) gtk_vpaned_class_init,
|
||||
NULL, /* class_finalize */
|
||||
NULL, /* class_data */
|
||||
sizeof (GtkVPaned),
|
||||
0, /* n_preallocs */
|
||||
(GInstanceInitFunc) gtk_vpaned_init,
|
||||
};
|
||||
|
||||
vpaned_type = gtk_type_unique (GTK_TYPE_PANED, &vpaned_info);
|
||||
vpaned_type = g_type_register_static (GTK_TYPE_PANED, "GtkVPaned",
|
||||
&vpaned_info, 0);
|
||||
}
|
||||
|
||||
return vpaned_type;
|
||||
@ -65,7 +67,7 @@ gtk_vpaned_class_init (GtkVPanedClass *class)
|
||||
{
|
||||
GtkWidgetClass *widget_class;
|
||||
|
||||
parent_class = gtk_type_class (GTK_TYPE_PANED);
|
||||
parent_class = g_type_class_peek_parent (class);
|
||||
|
||||
widget_class = (GtkWidgetClass *) class;
|
||||
|
||||
@ -91,7 +93,7 @@ gtk_vpaned_new (void)
|
||||
{
|
||||
GtkVPaned *vpaned;
|
||||
|
||||
vpaned = gtk_type_new (GTK_TYPE_VPANED);
|
||||
vpaned = g_object_new (GTK_TYPE_VPANED, NULL);
|
||||
|
||||
return GTK_WIDGET (vpaned);
|
||||
}
|
||||
|
@ -35,11 +35,11 @@ extern "C" {
|
||||
|
||||
|
||||
#define GTK_TYPE_VPANED (gtk_vpaned_get_type ())
|
||||
#define GTK_VPANED(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_VPANED, GtkVPaned))
|
||||
#define GTK_VPANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_VPANED, GtkVPanedClass))
|
||||
#define GTK_IS_VPANED(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_VPANED))
|
||||
#define GTK_IS_VPANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VPANED))
|
||||
#define GTK_VPANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VPANED, GtkVPanedClass))
|
||||
#define GTK_VPANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VPANED, GtkVPaned))
|
||||
#define GTK_VPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VPANED, GtkVPanedClass))
|
||||
#define GTK_IS_VPANED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VPANED))
|
||||
#define GTK_IS_VPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VPANED))
|
||||
#define GTK_VPANED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VPANED, GtkVPanedClass))
|
||||
|
||||
|
||||
typedef struct _GtkVPaned GtkVPaned;
|
||||
@ -55,7 +55,7 @@ struct _GtkVPanedClass
|
||||
GtkPanedClass parent_class;
|
||||
};
|
||||
|
||||
GtkType gtk_vpaned_get_type (void) G_GNUC_CONST;
|
||||
GType gtk_vpaned_get_type (void) G_GNUC_CONST;
|
||||
GtkWidget *gtk_vpaned_new (void);
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user