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.
This commit is contained in:
Raph Levien 1998-08-02 05:39:47 +00:00
parent 8ad52d1024
commit 7ba4ba0d2f
8 changed files with 52 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Sat Aug 1 22:17:00 1998 Raph Levien <raph@acm.org>
* gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
with the standalone release.
Fri Jul 31 20:45:07 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

View File

@ -1,3 +1,8 @@
Sat Aug 1 22:17:00 1998 Raph Levien <raph@acm.org>
* gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
with the standalone release.
Fri Jul 31 20:45:07 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

View File

@ -1,3 +1,8 @@
Sat Aug 1 22:17:00 1998 Raph Levien <raph@acm.org>
* gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
with the standalone release.
Fri Jul 31 20:45:07 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

View File

@ -1,3 +1,8 @@
Sat Aug 1 22:17:00 1998 Raph Levien <raph@acm.org>
* gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
with the standalone release.
Fri Jul 31 20:45:07 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

View File

@ -1,3 +1,8 @@
Sat Aug 1 22:17:00 1998 Raph Levien <raph@acm.org>
* gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
with the standalone release.
Fri Jul 31 20:45:07 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

View File

@ -1,3 +1,8 @@
Sat Aug 1 22:17:00 1998 Raph Levien <raph@acm.org>
* gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
with the standalone release.
Fri Jul 31 20:45:07 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

View File

@ -1,3 +1,8 @@
Sat Aug 1 22:17:00 1998 Raph Levien <raph@acm.org>
* gdk/gdkrgb.c: made some minor config changes to unify GdkRgb
with the standalone release.
Fri Jul 31 20:45:07 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_button_press) (gtk_clist_motion)

View File

@ -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 <gdk/gdkprivate.h>
#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
}
}
}