diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 10 | ||||
| -rw-r--r-- | gdk/gdkcolor.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkcolor-x11.c | 2 | ||||
| -rw-r--r-- | gtk/gtkruler.c | 5 |
10 files changed, 72 insertions, 7 deletions
@@ -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> * gdk/gdkdnd.c (gdk_window_register_dnd): X expects diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d9f2210615..25ca0edbe6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -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> * gdk/gdkdnd.c (gdk_window_register_dnd): X expects diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d9f2210615..25ca0edbe6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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> * gdk/gdkdnd.c (gdk_window_register_dnd): X expects diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d9f2210615..25ca0edbe6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -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> * gdk/gdkdnd.c (gdk_window_register_dnd): X expects diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d9f2210615..25ca0edbe6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -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> * gdk/gdkdnd.c (gdk_window_register_dnd): X expects diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d9f2210615..25ca0edbe6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -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> * gdk/gdkdnd.c (gdk_window_register_dnd): X expects diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d9f2210615..25ca0edbe6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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> * gdk/gdkdnd.c (gdk_window_register_dnd): X expects diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c index f84f570255..41f6286de7 100644 --- a/gdk/gdkcolor.c +++ b/gdk/gdkcolor.c @@ -145,7 +145,7 @@ gdk_colormap_real_destroy (GdkColormap *colormap) GdkColormapPrivate *private = (GdkColormapPrivate*) colormap; 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); XFreeColormap (private->xdisplay, private->xcolormap); diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c index f84f570255..41f6286de7 100644 --- a/gdk/x11/gdkcolor-x11.c +++ b/gdk/x11/gdkcolor-x11.c @@ -145,7 +145,7 @@ gdk_colormap_real_destroy (GdkColormap *colormap) GdkColormapPrivate *private = (GdkColormapPrivate*) colormap; 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); XFreeColormap (private->xdisplay, private->xcolormap); diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c index d5c2273f67..e8c1d258f2 100644 --- a/gtk/gtkruler.c +++ b/gtk/gtkruler.c @@ -249,11 +249,6 @@ gtk_ruler_expose (GtkWidget *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); gdk_draw_pixmap (widget->window, |