Merges from gtk-1-2

This commit is contained in:
Owen Taylor
2000-03-14 19:57:25 +00:00
parent 3f98a849c7
commit 10ba4fd066
98 changed files with 3772 additions and 1749 deletions

View File

@ -588,7 +588,7 @@ void gtk_widget_modify_style (GtkWidget *widget,
* the returned name is newly allocated.
*/
void gtk_widget_set_composite_name (GtkWidget *widget,
gchar *name);
const gchar *name);
gchar* gtk_widget_get_composite_name (GtkWidget *widget);
/* Descend recursively and set rc-style on all widgets without user styles */