AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix reversed assertion. (Pointed out by Austin Donnelly

Browse Source 
Sun Jan 24 12:17:39 1999  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix
	 reversed assertion.
	 (Pointed out by Austin Donnelly <austin@greenend.org.uk>)

	* gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
	 and harmful call to gtk_paint_box(). We are going
	 to paint onto the backing store later anyways.
This commit is contained in:
Owen Taylor 1999-01-24 17:19:21 +00:00 committed by Owen Taylor
parent 42ffb3727e
commit a1cc053be2
10 changed files with 72 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sun Jan 24 12:17:39 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix
reversed assertion.
(Pointed out by Austin Donnelly <austin@greenend.org.uk>)
* gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
and harmful call to gtk_paint_box(). We are going
to paint onto the backing store later anyways.
Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org> Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org>
* gdk/gdkdnd.c (gdk_window_register_dnd): X expects * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

10
ChangeLog.pre-2-0
View File

@ -1,3 +1,13 @@
Sun Jan 24 12:17:39 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix
reversed assertion.
(Pointed out by Austin Donnelly <austin@greenend.org.uk>)
* gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
and harmful call to gtk_paint_box(). We are going
to paint onto the backing store later anyways.
Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org> Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org>
* gdk/gdkdnd.c (gdk_window_register_dnd): X expects * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
Sun Jan 24 12:17:39 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix
reversed assertion.
(Pointed out by Austin Donnelly <austin@greenend.org.uk>)
* gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
and harmful call to gtk_paint_box(). We are going
to paint onto the backing store later anyways.
Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org> Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org>
* gdk/gdkdnd.c (gdk_window_register_dnd): X expects * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

10
ChangeLog.pre-2-2
View File

@ -1,3 +1,13 @@
Sun Jan 24 12:17:39 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix
reversed assertion.
(Pointed out by Austin Donnelly <austin@greenend.org.uk>)
* gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
and harmful call to gtk_paint_box(). We are going
to paint onto the backing store later anyways.
Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org> Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org>
* gdk/gdkdnd.c (gdk_window_register_dnd): X expects * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

10
ChangeLog.pre-2-4
View File

@ -1,3 +1,13 @@
Sun Jan 24 12:17:39 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix
reversed assertion.
(Pointed out by Austin Donnelly <austin@greenend.org.uk>)
* gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
and harmful call to gtk_paint_box(). We are going
to paint onto the backing store later anyways.
Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org> Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org>
* gdk/gdkdnd.c (gdk_window_register_dnd): X expects * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
Sun Jan 24 12:17:39 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix
reversed assertion.
(Pointed out by Austin Donnelly <austin@greenend.org.uk>)
* gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
and harmful call to gtk_paint_box(). We are going
to paint onto the backing store later anyways.
Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org> Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org>
* gdk/gdkdnd.c (gdk_window_register_dnd): X expects * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
Sun Jan 24 12:17:39 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix
reversed assertion.
(Pointed out by Austin Donnelly <austin@greenend.org.uk>)
* gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
and harmful call to gtk_paint_box(). We are going
to paint onto the backing store later anyways.
Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org> Sat Jan 23 11:15:39 1999 Owen Taylor <otaylor@gtk.org>
* gdk/gdkdnd.c (gdk_window_register_dnd): X expects * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

2
gdk/gdkcolor.c
View File

@ -145,7 +145,7 @@ gdk_colormap_real_destroy (GdkColormap *colormap)
GdkColormapPrivate *private = (GdkColormapPrivate*) colormap; GdkColormapPrivate *private = (GdkColormapPrivate*) colormap;
g_return_if_fail (colormap != NULL); g_return_if_fail (colormap != NULL);
g_return_if_fail (private->ref_count > 0); g_return_if_fail (private->ref_count == 0);
gdk_colormap_remove (colormap); gdk_colormap_remove (colormap);
XFreeColormap (private->xdisplay, private->xcolormap); XFreeColormap (private->xdisplay, private->xcolormap);

2
gdk/x11/gdkcolor-x11.c
View File

@ -145,7 +145,7 @@ gdk_colormap_real_destroy (GdkColormap *colormap)
GdkColormapPrivate *private = (GdkColormapPrivate*) colormap; GdkColormapPrivate *private = (GdkColormapPrivate*) colormap;
g_return_if_fail (colormap != NULL); g_return_if_fail (colormap != NULL);
g_return_if_fail (private->ref_count > 0); g_return_if_fail (private->ref_count == 0);
gdk_colormap_remove (colormap); gdk_colormap_remove (colormap);
XFreeColormap (private->xdisplay, private->xcolormap); XFreeColormap (private->xdisplay, private->xcolormap);

5
gtk/gtkruler.c
View File

@ -249,11 +249,6 @@ gtk_ruler_expose (GtkWidget *widget,
{ {
ruler = GTK_RULER (widget); ruler = GTK_RULER (widget);
gtk_paint_box (widget->style, widget->window,
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
NULL, widget, "ruler",
0, 0, -1, -1);
gtk_ruler_draw_ticks (ruler); gtk_ruler_draw_ticks (ruler);
gdk_draw_pixmap (widget->window, gdk_draw_pixmap (widget->window,