Include <stdlib.h> for getenv().

2001-01-16  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkvisual-win32.c: Include <stdlib.h> for getenv().

	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Don't use
	GDK_COLORMAP_PRIVATE_DATA on a potentially NULL GdkColormap.

	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Adapt calls
	to g_{locale,filename}_{to,from}_utf8 to match current API.

	* gtk/makefile.msc.in (gtk_OBJECTS)
	* gtk/makefile.mingw.in (gtk_OBJECTS): Add gtkwindow-decorate.

	* gtk/gtk.def: Update.

13 files changed, 134 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index bed16ea3ff..e7a2dfe6de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-01-16  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkvisual-win32.c: Include <stdlib.h> for getenv().
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Don't use
+	GDK_COLORMAP_PRIVATE_DATA on a potentially NULL GdkColormap.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Adapt calls
+	to g_{locale,filename}_{to,from}_utf8 to match current API.
+
+	* gtk/makefile.msc.in (gtk_OBJECTS)
+	* gtk/makefile.mingw.in (gtk_OBJECTS): Add gtkwindow-decorate.
+
+	* gtk/gtk.def: Update.
+
 2001-01-15  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkevents-win32.c (synthesize_crossing_events): New
@@ -406,7 +421,7 @@ Mon Jan  8 14:06:29 2001  Jonathan Blandford  <jrb@redhat.com>
 2001-01-07  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
-	gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+	gdk_window_new): Adapt calls to g_{locale,filename}_{to,from}_utf8
 	to match current API.
 
 	* gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bed16ea3ff..e7a2dfe6de 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,18 @@
+2001-01-16  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkvisual-win32.c: Include <stdlib.h> for getenv().
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Don't use
+	GDK_COLORMAP_PRIVATE_DATA on a potentially NULL GdkColormap.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Adapt calls
+	to g_{locale,filename}_{to,from}_utf8 to match current API.
+
+	* gtk/makefile.msc.in (gtk_OBJECTS)
+	* gtk/makefile.mingw.in (gtk_OBJECTS): Add gtkwindow-decorate.
+
+	* gtk/gtk.def: Update.
+
 2001-01-15  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkevents-win32.c (synthesize_crossing_events): New
@@ -406,7 +421,7 @@ Mon Jan  8 14:06:29 2001  Jonathan Blandford  <jrb@redhat.com>
 2001-01-07  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
-	gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+	gdk_window_new): Adapt calls to g_{locale,filename}_{to,from}_utf8
 	to match current API.
 
 	* gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bed16ea3ff..e7a2dfe6de 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+2001-01-16  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkvisual-win32.c: Include <stdlib.h> for getenv().
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Don't use
+	GDK_COLORMAP_PRIVATE_DATA on a potentially NULL GdkColormap.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Adapt calls
+	to g_{locale,filename}_{to,from}_utf8 to match current API.
+
+	* gtk/makefile.msc.in (gtk_OBJECTS)
+	* gtk/makefile.mingw.in (gtk_OBJECTS): Add gtkwindow-decorate.
+
+	* gtk/gtk.def: Update.
+
 2001-01-15  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkevents-win32.c (synthesize_crossing_events): New
@@ -406,7 +421,7 @@ Mon Jan  8 14:06:29 2001  Jonathan Blandford  <jrb@redhat.com>
 2001-01-07  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
-	gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+	gdk_window_new): Adapt calls to g_{locale,filename}_{to,from}_utf8
 	to match current API.
 
 	* gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bed16ea3ff..e7a2dfe6de 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,18 @@
+2001-01-16  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkvisual-win32.c: Include <stdlib.h> for getenv().
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Don't use
+	GDK_COLORMAP_PRIVATE_DATA on a potentially NULL GdkColormap.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Adapt calls
+	to g_{locale,filename}_{to,from}_utf8 to match current API.
+
+	* gtk/makefile.msc.in (gtk_OBJECTS)
+	* gtk/makefile.mingw.in (gtk_OBJECTS): Add gtkwindow-decorate.
+
+	* gtk/gtk.def: Update.
+
 2001-01-15  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkevents-win32.c (synthesize_crossing_events): New
@@ -406,7 +421,7 @@ Mon Jan  8 14:06:29 2001  Jonathan Blandford  <jrb@redhat.com>
 2001-01-07  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
-	gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+	gdk_window_new): Adapt calls to g_{locale,filename}_{to,from}_utf8
 	to match current API.
 
 	* gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bed16ea3ff..e7a2dfe6de 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,18 @@
+2001-01-16  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkvisual-win32.c: Include <stdlib.h> for getenv().
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Don't use
+	GDK_COLORMAP_PRIVATE_DATA on a potentially NULL GdkColormap.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Adapt calls
+	to g_{locale,filename}_{to,from}_utf8 to match current API.
+
+	* gtk/makefile.msc.in (gtk_OBJECTS)
+	* gtk/makefile.mingw.in (gtk_OBJECTS): Add gtkwindow-decorate.
+
+	* gtk/gtk.def: Update.
+
 2001-01-15  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkevents-win32.c (synthesize_crossing_events): New
@@ -406,7 +421,7 @@ Mon Jan  8 14:06:29 2001  Jonathan Blandford  <jrb@redhat.com>
 2001-01-07  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
-	gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+	gdk_window_new): Adapt calls to g_{locale,filename}_{to,from}_utf8
 	to match current API.
 
 	* gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bed16ea3ff..e7a2dfe6de 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,18 @@
+2001-01-16  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkvisual-win32.c: Include <stdlib.h> for getenv().
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Don't use
+	GDK_COLORMAP_PRIVATE_DATA on a potentially NULL GdkColormap.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Adapt calls
+	to g_{locale,filename}_{to,from}_utf8 to match current API.
+
+	* gtk/makefile.msc.in (gtk_OBJECTS)
+	* gtk/makefile.mingw.in (gtk_OBJECTS): Add gtkwindow-decorate.
+
+	* gtk/gtk.def: Update.
+
 2001-01-15  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkevents-win32.c (synthesize_crossing_events): New
@@ -406,7 +421,7 @@ Mon Jan  8 14:06:29 2001  Jonathan Blandford  <jrb@redhat.com>
 2001-01-07  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
-	gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+	gdk_window_new): Adapt calls to g_{locale,filename}_{to,from}_utf8
 	to match current API.
 
 	* gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bed16ea3ff..e7a2dfe6de 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+2001-01-16  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkvisual-win32.c: Include <stdlib.h> for getenv().
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Don't use
+	GDK_COLORMAP_PRIVATE_DATA on a potentially NULL GdkColormap.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Adapt calls
+	to g_{locale,filename}_{to,from}_utf8 to match current API.
+
+	* gtk/makefile.msc.in (gtk_OBJECTS)
+	* gtk/makefile.mingw.in (gtk_OBJECTS): Add gtkwindow-decorate.
+
+	* gtk/gtk.def: Update.
+
 2001-01-15  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkevents-win32.c (synthesize_crossing_events): New
@@ -406,7 +421,7 @@ Mon Jan  8 14:06:29 2001  Jonathan Blandford  <jrb@redhat.com>
 2001-01-07  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title,
-	gdk_window_new): Adapt  calls to g_{locale,filename}_{to,from}_utf8
+	gdk_window_new): Adapt calls to g_{locale,filename}_{to,from}_utf8
 	to match current API.
 
 	* gdk/win32/gdkvisual-win32.c (gdk_visual_init): If a secret
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 60995d4101..9b48c9809b 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -1622,6 +1622,7 @@ gdk_event_translate (GdkEvent *event,
    window_impl = (window ? GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl) : NULL))
 
   GdkWindow *orig_window, *new_window;
+  GdkColormap *colormap;
   GdkColormapPrivateWin32 *colormap_private;
   GdkPixmap *pixmap;
   GdkPixmapImplWin32 *pixmap_impl;
@@ -2595,9 +2596,11 @@ gdk_event_translate (GdkEvent *event,
       if (GDK_WINDOW_DESTROYED (window))
 	break;
 
-      colormap_private = GDK_COLORMAP_PRIVATE_DATA (GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->colormap);
+      colormap = GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->colormap;
+      if (colormap)
+	colormap_private = GDK_COLORMAP_PRIVATE_DATA (colormap);
       hdc = (HDC) msg->wParam;
-      if (colormap_private && colormap_private->xcolormap->rc_palette)
+      if (colormap && colormap_private->xcolormap->rc_palette)
 	{
 	  int k;
 
diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index 3b26d7f736..69c893f022 100644
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -224,7 +224,7 @@ logfont_to_xlfd (const LOGFONT *lfp,
   /* Convert the facename Windows fives us from the locale-dependent
    * codepage to UTF-8.
    */
-  utf8_facename = g_filename_to_utf8 (lfp->lfFaceName, NULL);
+  utf8_facename = g_filename_to_utf8 (lfp->lfFaceName, -1, NULL, NULL, NULL);
 
   /* Replace characters illegal in an XLFD with hex escapes. */
   p = facename;
@@ -1284,7 +1284,7 @@ gdk_font_load_internal (const gchar *font_name)
       logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
       logfont.lfQuality = PROOF_QUALITY;
       logfont.lfPitchAndFamily = DEFAULT_PITCH;
-      fn = g_filename_from_utf8 (font_name, NULL);
+      fn = g_filename_from_utf8 (font_name, -1, NULL, NULL, NULL);
       strcpy (logfont.lfFaceName, fn);
       g_free (fn);
     }
@@ -1473,7 +1473,7 @@ gdk_font_load_internal (const gchar *font_name)
 	logfont.lfPitchAndFamily = VARIABLE_PITCH;
       else 
 	logfont.lfPitchAndFamily = DEFAULT_PITCH;
-      fn = g_filename_from_utf8 (family, NULL);
+      fn = g_filename_from_utf8 (family, -1, NULL, NULL, NULL);
       strcpy (logfont.lfFaceName, fn);
       g_free (fn);
     }
diff --git a/gdk/win32/gdkvisual-win32.c b/gdk/win32/gdkvisual-win32.c
index e76f1476f1..9e1c353451 100644
--- a/gdk/win32/gdkvisual-win32.c
+++ b/gdk/win32/gdkvisual-win32.c
@@ -29,6 +29,8 @@
 #include "gdkvisual.h"
 #include "gdkprivate-win32.h"
 
+#include <stdlib.h>
+
 static void  gdk_visual_decompose_mask (gulong     mask,
 					gint      *shift,
 					gint      *prec);
diff --git a/gtk/gtk.def b/gtk/gtk.def
index 415709bf89..9430d1f704 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -461,6 +461,10 @@ EXPORTS
 	gtk_curve_set_vector
 	gtk_data_get_type
 	gtk_debug_flags
+	gtk_decorated_window_calculate_frame_size
+	gtk_decorated_window_init
+	gtk_decorated_window_move_resize_window
+	gtk_decorated_window_set_title
 	gtk_dialog_add_action_widget
 	gtk_dialog_add_button
 	gtk_dialog_add_buttons
@@ -1347,9 +1351,8 @@ EXPORTS
 	gtk_tree_set_view_mode
 	gtk_tree_store_append
 	gtk_tree_store_get
-	gtk_tree_store_get_root_iter
 	gtk_tree_store_get_type
-	gtk_tree_store_getv
+	gtk_tree_store_get_valist
 	gtk_tree_store_insert
 	gtk_tree_store_insert_after
 	gtk_tree_store_insert_before
@@ -1363,7 +1366,7 @@ EXPORTS
 	gtk_tree_store_set_cell
 	gtk_tree_store_set_column_type
 	gtk_tree_store_set_n_columns
-	gtk_tree_store_setv
+	gtk_tree_store_set_valist
 	gtk_tree_unselect_child
 	gtk_tree_unselect_item
 	gtk_tree_view_append_column
@@ -1371,10 +1374,10 @@ EXPORTS
 	gtk_tree_view_collapse_row
 	gtk_tree_view_column_add_attribute
 	gtk_tree_view_column_clicked
-	gtk_tree_view_column_get_col_type
 	gtk_tree_view_column_get_max_width
 	gtk_tree_view_column_get_min_width
 	gtk_tree_view_column_get_size
+	gtk_tree_view_column_get_sizing
 	gtk_tree_view_column_get_title
 	gtk_tree_view_column_get_type
 	gtk_tree_view_column_get_visible
@@ -1384,7 +1387,7 @@ EXPORTS
 	gtk_tree_view_column_set_attributes
 	gtk_tree_view_column_set_cell_data
 	gtk_tree_view_column_set_cell_renderer
-	gtk_tree_view_column_set_header_clickable
+	gtk_tree_view_column_set_clickable
 	gtk_tree_view_column_set_justification
 	gtk_tree_view_column_set_max_width
 	gtk_tree_view_column_set_min_width
diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in
index 3ad907f38d..957e5f744b 100644
--- a/gtk/makefile.mingw.in
+++ b/gtk/makefile.mingw.in
@@ -195,7 +195,8 @@ gtk_OBJECTS =			\
 	gtkvscrollbar.o		\
 	gtkvseparator.o		\
 	gtkwidget.o		\
-	gtkwindow.o
+	gtkwindow.o		\
+	gtkwindow-decorate.o
 
 # Source headers which are non-autogenerated headers
 gtk_public_h_sources =		\
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 76f5707c15..afb53f4385 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -182,7 +182,8 @@ gtk_OBJECTS = 					\
 	gtkvscrollbar.obj			\
 	gtkvseparator.obj			\
 	gtkwidget.obj				\
-	gtkwindow.obj
+	gtkwindow.obj				\
+	gtkwindow-decorate.obj
 
 # Source headers which are non-autogenerated headers
 gtk_public_h_sources =		\