Gdk patch (win32)

[Hans Breuer <hans breuer org>]

Ok to commit this as well ?
	Hans

* gdk/gdk.def : updated exported symbols

* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_image) :
only use SetDIBitsToDevice if there is a palette at the drawable
and the image is GDK_VISUAL_PSEUDO_COLOR

* gdk/win32/gdkkeys-win32.c : msvc still has no <unistd.h> ...

* gdk/win32/gdkwindow-win32.c : #include "gdk.h" /* gdk_rectangle_intersect */

diff --exclude-from=c:\util\tool\diff.ign -u -r from-cvs/gtk+\gdk/gdk.def
my-gtk/gtk+\gdk/gdk.def
--- from-cvs/gtk+\gdk/gdk.def	Thu Feb 15 22:40:58 2001
+++ my-gtk/gtk+\gdk/gdk.def	Sat Feb 17 19:58:38 2001
@@ -66,6 +66,7 @@
 	gdk_draw_indexed_image
 	gdk_draw_layout
 	gdk_draw_layout_line
+	gdk_draw_layout_with_colors
 	gdk_draw_line
 	gdk_draw_lines
 	gdk_draw_point
@@ -215,6 +216,7 @@
 	gdk_pango_attr_stipple_new
 	gdk_pango_context_get
 	gdk_pango_context_set_colormap
+	gdk_pango_layout_get_clip_region
 	gdk_parent_root
 	gdk_pixbuf_get_from_drawable
 	gdk_pixbuf_render_pixmap_and_mask
diff --exclude-from=c:\util\tool\diff.ign -u -r
from-cvs/gtk+\gdk/win32/gdkdrawable-win32.c
my-gtk/gtk+\gdk/win32/gdkdrawable-win32.c
--- from-cvs/gtk+\gdk/win32/gdkdrawable-win32.c	Sat Nov 11 22:31:46 2000
+++ my-gtk/gtk+\gdk/win32/gdkdrawable-win32.c	Sat Feb 17 23:33:00 2001
@@ -928,7 +928,8 @@
 
   hdc = gdk_win32_hdc_get (drawable, gc, 0);
 
-  if (colormap_private && colormap_private->xcolormap->rc_palette)
+  if (image->visual->type == GDK_VISUAL_PSEUDO_COLOR &&
+	  colormap_private && colormap_private->xcolormap->rc_palette)
     {
       if (!bmi_inited)
 	{
diff --exclude-from=c:\util\tool\diff.ign -u -r
from-cvs/gtk+\gdk/win32/gdkfont-win32.c my-gtk/gtk+\gdk/win32/gdkfont-win32.c
--- from-cvs/gtk+\gdk/win32/gdkfont-win32.c	Fri Jan 19 11:42:10 2001
+++ my-gtk/gtk+\gdk/win32/gdkfont-win32.c	Sun Feb 18 13:27:54 2001
@@ -1524,9 +1524,10 @@
   if (font)
     return font;
 
+  font = gdk_font_from_one_singlefont (gdk_font_load_internal (font_name));
   gdk_font_hash_insert (GDK_FONT_FONTSET, font, font_name);
 
-  return gdk_font_from_one_singlefont (gdk_font_load_internal (font_name));
+  return font;
 }
 
 /**
diff --exclude-from=c:\util\tool\diff.ign -u -r
from-cvs/gtk+\gdk/win32/gdkkeys-win32.c my-gtk/gtk+\gdk/win32/gdkkeys-win32.c
--- from-cvs/gtk+\gdk/win32/gdkkeys-win32.c	Fri Dec 15 00:14:18 2000
+++ my-gtk/gtk+\gdk/win32/gdkkeys-win32.c	Sat Feb 17 17:15:48 2001
@@ -23,12 +23,15 @@
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
+#include "config.h"
 
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <limits.h>
 #include <errno.h>
 
diff --exclude-from=c:\util\tool\diff.ign -u -r
from-cvs/gtk+\gdk/win32/gdkwindow-win32.c
my-gtk/gtk+\gdk/win32/gdkwindow-win32.c
--- from-cvs/gtk+\gdk/win32/gdkwindow-win32.c	Thu Feb 15 22:41:02 2001
+++ my-gtk/gtk+\gdk/win32/gdkwindow-win32.c	Sat Feb 17 21:02:48 2001
@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 
+#include "gdk.h" /* gdk_rectangle_intersect */
 #include "gdkevents.h"
 #include "gdkpixmap.h"
 #include "gdkwindow.h"

-------- Hans "at" Breuer "dot" Org -----------
Tell me what you need, and I'll tell you how to 
get along without it.                -- Dilbert