From 7ba4ba0d2fd431a74281a6ace2e75d8b83dc92c2 Mon Sep 17 00:00:00 2001 From: Raph Levien Date: Sun, 2 Aug 1998 05:39:47 +0000 Subject: [PATCH] Made some config changes to make it work better both as a standalone module (i.e. with Gtk 1.0) and as a module under Gtk 1.1+, i.e. harmonized with the separate GdkRgb release. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/gdkrgb.c | 19 +++++++++++++++++-- 8 files changed, 52 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3662c1eb03..4c965724c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 1 22:17:00 1998 Raph Levien + + * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb + with the standalone release. + Fri Jul 31 20:45:07 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3662c1eb03..4c965724c0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat Aug 1 22:17:00 1998 Raph Levien + + * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb + with the standalone release. + Fri Jul 31 20:45:07 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3662c1eb03..4c965724c0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Aug 1 22:17:00 1998 Raph Levien + + * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb + with the standalone release. + Fri Jul 31 20:45:07 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3662c1eb03..4c965724c0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Aug 1 22:17:00 1998 Raph Levien + + * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb + with the standalone release. + Fri Jul 31 20:45:07 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3662c1eb03..4c965724c0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Aug 1 22:17:00 1998 Raph Levien + + * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb + with the standalone release. + Fri Jul 31 20:45:07 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3662c1eb03..4c965724c0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Aug 1 22:17:00 1998 Raph Levien + + * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb + with the standalone release. + Fri Jul 31 20:45:07 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3662c1eb03..4c965724c0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Aug 1 22:17:00 1998 Raph Levien + + * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb + with the standalone release. + Fri Jul 31 20:45:07 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion) diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c index bec679cdba..691e21d5bc 100644 --- a/gdk/gdkrgb.c +++ b/gdk/gdkrgb.c @@ -27,9 +27,22 @@ #define ENABLE_GRAYSCALE +#ifdef GDK_RGB_STANDALONE + +/* Compiling as a standalone module (i.e. with Gtk 1.0) */ +/* gtk/gtk.h is already included in gdkrgbstub.c */ +#include "config.h" +#include + +#else + +/* Compiling as a part of Gtk 1.1 or later */ #include "../config.h" -#include "gdk/gdk.h" -#include "gdk/gdkprivate.h" +#include "gdk.h" +#include "gdkprivate.h" + +#endif + #include "gdkrgb.h" typedef struct _GdkRgbInfo GdkRgbInfo; @@ -2386,8 +2399,10 @@ gdk_draw_rgb_image_core (GdkDrawable *drawable, conv (image, xs0, ys0, width1, height1, buf_ptr, rowstride, x + x0, y + y0, cmap); +#ifndef DONT_ACTUALLY_DRAW gdk_draw_image (drawable, gc, image, xs0, ys0, x + x0, y + y0, width1, height1); +#endif } } } -- GitLab