Commit ca8cf020 authored by Alexander Larsson's avatar Alexander Larsson

2001-09-09 Alexander Larsson <alla@lysator.liu.se>

	* gtk/gtkwidget.c (_gtk_widget_peek_colormap):
	Really return NULL if not set.
	(gtk_widget_init): Remove unused varaible.
parent 3230ecc2
2001-09-09 Alexander Larsson <alla@lysator.liu.se> 2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* gtk/gtkwidget.c (_gtk_widget_peek_colormap):
Really return NULL if not set.
(gtk_widget_init): Remove unused varaible.
2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* configure.in: * configure.in:
Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer
......
2001-09-09 Alexander Larsson <alla@lysator.liu.se> 2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* gtk/gtkwidget.c (_gtk_widget_peek_colormap):
Really return NULL if not set.
(gtk_widget_init): Remove unused varaible.
2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* configure.in: * configure.in:
Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer
......
2001-09-09 Alexander Larsson <alla@lysator.liu.se> 2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* gtk/gtkwidget.c (_gtk_widget_peek_colormap):
Really return NULL if not set.
(gtk_widget_init): Remove unused varaible.
2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* configure.in: * configure.in:
Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer
......
2001-09-09 Alexander Larsson <alla@lysator.liu.se> 2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* gtk/gtkwidget.c (_gtk_widget_peek_colormap):
Really return NULL if not set.
(gtk_widget_init): Remove unused varaible.
2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* configure.in: * configure.in:
Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer
......
2001-09-09 Alexander Larsson <alla@lysator.liu.se> 2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* gtk/gtkwidget.c (_gtk_widget_peek_colormap):
Really return NULL if not set.
(gtk_widget_init): Remove unused varaible.
2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* configure.in: * configure.in:
Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer
......
2001-09-09 Alexander Larsson <alla@lysator.liu.se> 2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* gtk/gtkwidget.c (_gtk_widget_peek_colormap):
Really return NULL if not set.
(gtk_widget_init): Remove unused varaible.
2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* configure.in: * configure.in:
Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer
......
2001-09-09 Alexander Larsson <alla@lysator.liu.se> 2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* gtk/gtkwidget.c (_gtk_widget_peek_colormap):
Really return NULL if not set.
(gtk_widget_init): Remove unused varaible.
2001-09-09 Alexander Larsson <alla@lysator.liu.se>
* configure.in: * configure.in:
Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer
......
...@@ -1229,8 +1229,6 @@ gtk_widget_get_property (GObject *object, ...@@ -1229,8 +1229,6 @@ gtk_widget_get_property (GObject *object,
static void static void
gtk_widget_init (GtkWidget *widget) gtk_widget_init (GtkWidget *widget)
{ {
GdkColormap *colormap;
GTK_PRIVATE_FLAGS (widget) = PRIVATE_GTK_CHILD_VISIBLE; GTK_PRIVATE_FLAGS (widget) = PRIVATE_GTK_CHILD_VISIBLE;
widget->state = GTK_STATE_NORMAL; widget->state = GTK_STATE_NORMAL;
widget->saved_state = GTK_STATE_NORMAL; widget->saved_state = GTK_STATE_NORMAL;
...@@ -5351,6 +5349,7 @@ _gtk_widget_peek_colormap (void) ...@@ -5351,6 +5349,7 @@ _gtk_widget_peek_colormap (void)
{ {
if (colormap_stack) if (colormap_stack)
return (GdkColormap*) colormap_stack->data; return (GdkColormap*) colormap_stack->data;
return NULL;
} }
static void static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment