From 3ba573aa0200f42bd337eb5c31c070de94ec5ddb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 31 Dec 2008 19:13:23 +0000 Subject: [PATCH] Keep all these abstract for now svn path=/trunk/; revision=22026 --- ChangeLog | 8 ++++++++ gtk/gtk.symbols | 4 ---- gtk/gtkpaned.c | 8 +++++--- gtk/gtkpaned.h | 2 -- gtk/gtkscale.c | 4 +++- gtk/gtkscale.h | 7 ------- gtk/gtkscrollbar.c | 5 ++++- gtk/gtkscrollbar.h | 2 -- gtk/gtkseparator.c | 9 ++++++--- gtk/gtkseparator.h | 1 - 10 files changed, 26 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index e54c670f2..b4290098c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-31 Matthias Clasen + + * gtk/gtk.symbols: + * gtk/gtkpaned.[hc]: + * gtk/gtkscale.[hc]: + * gtk/gtkscrollbar.[hc]: + * gtk/gtkseparator.[hc]: Keep these all abstract for now. + 2008-12-30 Matthias Clasen * gtk/gtkentry.c: Rename the icon signals to ::icon-press and diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 1d2db055f..6869c444b 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -2619,7 +2619,6 @@ gtk_paned_get_child1 gtk_paned_get_child2 gtk_paned_get_position gtk_paned_get_type G_GNUC_CONST -gtk_paned_new gtk_paned_pack1 gtk_paned_pack2 gtk_paned_set_position @@ -3446,7 +3445,6 @@ gtk_scale_get_draw_value gtk_scale_get_layout gtk_scale_get_layout_offsets gtk_scale_get_type G_GNUC_CONST -gtk_scale_new gtk_scale_get_value_pos gtk_scale_set_digits gtk_scale_set_draw_value @@ -3474,7 +3472,6 @@ gtk_scale_button_get_popup #if IN_HEADER(__GTK_SCROLLBAR_H__) #if IN_FILE(__GTK_SCROLLBAR_C__) gtk_scrollbar_get_type G_GNUC_CONST -gtk_scrollbar_new #endif #endif @@ -3555,7 +3552,6 @@ gtk_target_table_free #if IN_HEADER(__GTK_SEPARATOR_H__) #if IN_FILE(__GTK_SEPARATOR_C__) gtk_separator_get_type G_GNUC_CONST -gtk_separator_new #endif #endif diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 6dfdd3fcd..ba4282103 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -153,9 +153,9 @@ struct _GtkPanedPrivate }; -G_DEFINE_TYPE_WITH_CODE (GtkPaned, gtk_paned, GTK_TYPE_CONTAINER, - G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, - NULL)) +G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkPaned, gtk_paned, GTK_TYPE_CONTAINER, + G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, + NULL)) static guint signals[LAST_SIGNAL] = { 0 }; @@ -1324,6 +1324,7 @@ gtk_paned_motion (GtkWidget *widget, return FALSE; } +#if 0 /** * gtk_paned_new: * @orientation: the paned's orientation. @@ -1341,6 +1342,7 @@ gtk_paned_new (GtkOrientation orientation) "orientation", orientation, NULL); } +#endif void gtk_paned_add1 (GtkPaned *paned, diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h index a1c774d91..178d6cf19 100644 --- a/gtk/gtkpaned.h +++ b/gtk/gtkpaned.h @@ -107,8 +107,6 @@ struct _GtkPanedClass GType gtk_paned_get_type (void) G_GNUC_CONST; -GtkWidget * gtk_paned_new (GtkOrientation orientation); - void gtk_paned_add1 (GtkPaned *paned, GtkWidget *child); void gtk_paned_add2 (GtkPaned *paned, diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 29e5e6561..e602f9e4f 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -89,7 +89,7 @@ static void gtk_scale_real_get_layout_offsets (GtkScale *scale, gint *x, gint *y); -G_DEFINE_TYPE (GtkScale, gtk_scale, GTK_TYPE_RANGE) +G_DEFINE_ABSTRACT_TYPE (GtkScale, gtk_scale, GTK_TYPE_RANGE) static gboolean single_string_accumulator (GSignalInvocationHint *ihint, @@ -422,6 +422,7 @@ gtk_scale_get_property (GObject *object, } } +#if 0 /** * gtk_scale_new: * @orientation: the scale's orientation. @@ -499,6 +500,7 @@ gtk_scale_new_with_range (GtkOrientation orientation, "digits", digits, NULL); } +#endif /** * gtk_scale_set_digits: diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index b8587d282..34e690ada 100644 --- a/gtk/gtkscale.h +++ b/gtk/gtkscale.h @@ -77,13 +77,6 @@ struct _GtkScaleClass }; GType gtk_scale_get_type (void) G_GNUC_CONST; -GtkWidget * gtk_scale_new (GtkOrientation orientation, - GtkAdjustment *adjustment); -GtkWidget * gtk_scale_new_with_range (GtkOrientation orientation, - gdouble min, - gdouble max, - gdouble step); - void gtk_scale_set_digits (GtkScale *scale, gint digits); gint gtk_scale_get_digits (GtkScale *scale); diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c index 4c6998381..5c0864d02 100644 --- a/gtk/gtkscrollbar.c +++ b/gtk/gtkscrollbar.c @@ -35,7 +35,7 @@ static void gtk_scrollbar_style_set (GtkWidget *widget, GtkStyle *previous); -G_DEFINE_TYPE (GtkScrollbar, gtk_scrollbar, GTK_TYPE_RANGE) +G_DEFINE_ABSTRACT_TYPE (GtkScrollbar, gtk_scrollbar, GTK_TYPE_RANGE) static void gtk_scrollbar_class_init (GtkScrollbarClass *class) @@ -125,6 +125,7 @@ gtk_scrollbar_style_set (GtkWidget *widget, GTK_WIDGET_CLASS (gtk_scrollbar_parent_class)->style_set (widget, previous); } +#if 0 /** * gtk_scrollbar_new: * @orientation: the scrollbar's orientation. @@ -148,6 +149,8 @@ gtk_scrollbar_new (GtkOrientation orientation, "adjustment", adjustment, NULL); } +#endif + #define __GTK_SCROLLBAR_C__ #include "gtkaliasdef.c" diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h index 2cca80a0c..524335da1 100644 --- a/gtk/gtkscrollbar.h +++ b/gtk/gtkscrollbar.h @@ -66,8 +66,6 @@ struct _GtkScrollbarClass GType gtk_scrollbar_get_type (void) G_GNUC_CONST; -GtkWidget * gtk_scrollbar_new (GtkOrientation orientation, - GtkAdjustment *adjustment); G_END_DECLS diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c index f713cfb17..44976a174 100644 --- a/gtk/gtkseparator.c +++ b/gtk/gtkseparator.c @@ -64,9 +64,9 @@ static gboolean gtk_separator_expose (GtkWidget *widget, GdkEventExpose *event); -G_DEFINE_TYPE_WITH_CODE (GtkSeparator, gtk_separator, GTK_TYPE_WIDGET, - G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, - NULL)) +G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkSeparator, gtk_separator, GTK_TYPE_WIDGET, + G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, + NULL)) static void @@ -237,6 +237,7 @@ gtk_separator_expose (GtkWidget *widget, return FALSE; } +#if 0 /** * gtk_separator_new: * @orientation: the separator's orientation. @@ -254,6 +255,8 @@ gtk_separator_new (GtkOrientation orientation) "orientation", orientation, NULL); } +#endif + #define __GTK_SEPARATOR_C__ #include "gtkaliasdef.c" diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h index 2e41a9628..e0f646735 100644 --- a/gtk/gtkseparator.h +++ b/gtk/gtkseparator.h @@ -60,7 +60,6 @@ struct _GtkSeparatorClass GType gtk_separator_get_type (void) G_GNUC_CONST; -GtkWidget * gtk_separator_new (GtkOrientation orientation); G_END_DECLS -- 2.43.2