callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep all these abstract for now

Browse Source 
svn path=/trunk/; revision=22026
This commit is contained in:
Matthias Clasen
2008-12-31 19:13:23 +00:00
parent 5a751f46b6
commit 3ba573aa02
10 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-12-31 Matthias Clasen <mclasen@redhat.com>
* 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 <mclasen@redhat.com>
* gtk/gtkentry.c: Rename the icon signals to ::icon-press and

4
gtk/gtk.symbols
View File

@ -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

8
gtk/gtkpaned.c
View File

@ -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,

2
gtk/gtkpaned.h
View File

@ -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,

4
gtk/gtkscale.c
View File

@ -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:

7
gtk/gtkscale.h
View File

@ -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);

5
gtk/gtkscrollbar.c
View File

@ -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"

2
gtk/gtkscrollbar.h
View File

@ -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

9
gtk/gtkseparator.c
View File

@ -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"

1
gtk/gtkseparator.h
View File

@ -60,7 +60,6 @@ struct _GtkSeparatorClass
GType gtk_separator_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_separator_new (GtkOrientation orientation);
G_END_DECLS