diff --git a/ChangeLog b/ChangeLog index 9196946b00..52878b0d39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9196946b00..52878b0d39 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9196946b00..52878b0d39 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9196946b00..52878b0d39 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9196946b00..52878b0d39 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9196946b00..52878b0d39 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index 259d568d22..d73647fbe0 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -496,7 +496,9 @@ make_solid_mask (GdkScreen *screen, gint width, gint height) return bitmap; } -#define PACKED_COLOR(c) ((((c)->red & 0xff) << 8) | ((c)->green & 0xff) | ((c)->blue >> 8)) +#define PACKED_COLOR(c) ((((c)->red & 0xff00) << 8) | \ + ((c)->green & 0xff00) | \ + ((c)->blue >> 8)) static GdkPixmap * gdk_pixmap_colormap_new_from_pixbuf (GdkColormap *colormap,