reflect Pango API change

2001-11-23  Hans Breuer  <hans@breuer.org>

	* gdk/win32/gdkfont-win32.c (gdk_font_from_description) :
	reflect Pango API change

	* gtk/gtk.def : updated externals

	* gtk/gtkfixed.c (gtk_fixed_get_has_window) : use
	g_return_val_if_fail() to avoid 'function must return a value'

	* gtk/gtkrc.c : added spaces to fix small coding style issues
	* gtk/gtkwidget.c : ... and linebreaks. Also a static for
	'static correctness'

	* gtk/makefile.msc.in : temporary(?) disable gtk<plug|socket>
	because they only can be build on win32 after applying my patch

12 files changed, 136 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 77041cbcb4..faaa368924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2001-11-23  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_from_description) : 
+	reflect Pango API change
+
+	* gtk/gtk.def : updated externals
+
+	* gtk/gtkfixed.c (gtk_fixed_get_has_window) : use 
+	g_return_val_if_fail() to avoid 'function must return a value'
+
+	* gtk/gtkrc.c : added spaces to fix small coding style issues
+	* gtk/gtkwidget.c : ... and linebreaks. Also a static for
+	'static correctness'
+
+	* gtk/makefile.msc.in : temporary(?) disable gtk<plug|socket>
+	because they only can be build on win32 after applying my patch
+
 Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbutton.c (gtk_button_map): raise event window afte
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 77041cbcb4..faaa368924 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,20 @@
+2001-11-23  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_from_description) : 
+	reflect Pango API change
+
+	* gtk/gtk.def : updated externals
+
+	* gtk/gtkfixed.c (gtk_fixed_get_has_window) : use 
+	g_return_val_if_fail() to avoid 'function must return a value'
+
+	* gtk/gtkrc.c : added spaces to fix small coding style issues
+	* gtk/gtkwidget.c : ... and linebreaks. Also a static for
+	'static correctness'
+
+	* gtk/makefile.msc.in : temporary(?) disable gtk<plug|socket>
+	because they only can be build on win32 after applying my patch
+
 Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbutton.c (gtk_button_map): raise event window afte
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 77041cbcb4..faaa368924 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+2001-11-23  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_from_description) : 
+	reflect Pango API change
+
+	* gtk/gtk.def : updated externals
+
+	* gtk/gtkfixed.c (gtk_fixed_get_has_window) : use 
+	g_return_val_if_fail() to avoid 'function must return a value'
+
+	* gtk/gtkrc.c : added spaces to fix small coding style issues
+	* gtk/gtkwidget.c : ... and linebreaks. Also a static for
+	'static correctness'
+
+	* gtk/makefile.msc.in : temporary(?) disable gtk<plug|socket>
+	because they only can be build on win32 after applying my patch
+
 Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbutton.c (gtk_button_map): raise event window afte
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 77041cbcb4..faaa368924 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,20 @@
+2001-11-23  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_from_description) : 
+	reflect Pango API change
+
+	* gtk/gtk.def : updated externals
+
+	* gtk/gtkfixed.c (gtk_fixed_get_has_window) : use 
+	g_return_val_if_fail() to avoid 'function must return a value'
+
+	* gtk/gtkrc.c : added spaces to fix small coding style issues
+	* gtk/gtkwidget.c : ... and linebreaks. Also a static for
+	'static correctness'
+
+	* gtk/makefile.msc.in : temporary(?) disable gtk<plug|socket>
+	because they only can be build on win32 after applying my patch
+
 Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbutton.c (gtk_button_map): raise event window afte
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 77041cbcb4..faaa368924 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+2001-11-23  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_from_description) : 
+	reflect Pango API change
+
+	* gtk/gtk.def : updated externals
+
+	* gtk/gtkfixed.c (gtk_fixed_get_has_window) : use 
+	g_return_val_if_fail() to avoid 'function must return a value'
+
+	* gtk/gtkrc.c : added spaces to fix small coding style issues
+	* gtk/gtkwidget.c : ... and linebreaks. Also a static for
+	'static correctness'
+
+	* gtk/makefile.msc.in : temporary(?) disable gtk<plug|socket>
+	because they only can be build on win32 after applying my patch
+
 Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbutton.c (gtk_button_map): raise event window afte
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 77041cbcb4..faaa368924 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+2001-11-23  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_from_description) : 
+	reflect Pango API change
+
+	* gtk/gtk.def : updated externals
+
+	* gtk/gtkfixed.c (gtk_fixed_get_has_window) : use 
+	g_return_val_if_fail() to avoid 'function must return a value'
+
+	* gtk/gtkrc.c : added spaces to fix small coding style issues
+	* gtk/gtkwidget.c : ... and linebreaks. Also a static for
+	'static correctness'
+
+	* gtk/makefile.msc.in : temporary(?) disable gtk<plug|socket>
+	because they only can be build on win32 after applying my patch
+
 Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbutton.c (gtk_button_map): raise event window afte
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 77041cbcb4..faaa368924 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+2001-11-23  Hans Breuer  <hans@breuer.org>
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_from_description) : 
+	reflect Pango API change
+
+	* gtk/gtk.def : updated externals
+
+	* gtk/gtkfixed.c (gtk_fixed_get_has_window) : use 
+	g_return_val_if_fail() to avoid 'function must return a value'
+
+	* gtk/gtkrc.c : added spaces to fix small coding style issues
+	* gtk/gtkwidget.c : ... and linebreaks. Also a static for
+	'static correctness'
+
+	* gtk/makefile.msc.in : temporary(?) disable gtk<plug|socket>
+	because they only can be build on win32 after applying my patch
+
 Wed Nov 21 22:55:37 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkbutton.c (gtk_button_map): raise event window afte
diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index a03634011c..1dd5ae1b87 100644
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -31,6 +31,7 @@
 #include <pango/pangowin32.h>
 
 #include "gdkfont.h"
+#include "gdkpango.h" /* gdk_pango_context_get() */
 #include "gdkprivate-win32.h"
 
 static GHashTable *font_name_hash = NULL;
@@ -1578,7 +1579,7 @@ gdk_font_from_description (PangoFontDescription *font_desc)
   g_return_val_if_fail (font_desc != NULL, NULL);
 
   font_map = pango_win32_font_map_for_display ();
-  font = pango_font_map_load_font (font_map, font_desc);
+  font = pango_font_map_load_font (font_map, gdk_pango_context_get (), font_desc);
 
   if (font)
     {
diff --git a/gtk/gtk.def b/gtk/gtk.def
index 08ef824b46..0989149d3a 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -88,7 +88,9 @@ EXPORTS
 	GTK_TYPE_WRAP_MODE
 
 	gtk_accel_group_connect
+	gtk_accel_group_connect_by_path
 	gtk_accel_group_disconnect
+	gtk_accel_group_disconnect_key
 	gtk_accel_group_find
 	gtk_accel_group_from_accel_closure
 	gtk_accel_group_get_type
@@ -97,8 +99,7 @@ EXPORTS
 	gtk_accel_group_query
 	gtk_accel_group_unlock
 	gtk_accel_groups_activate
-	gtk_accel_groups_disconnect_closure
-	gtk_accel_groups_from_acceleratable
+	gtk_accel_groups_from_object
 	gtk_accel_label_get_accel_widget
 	gtk_accel_label_get_accel_width
 	gtk_accel_label_get_type
@@ -108,7 +109,6 @@ EXPORTS
 	gtk_accel_label_set_accel_widget
 	gtk_accel_map_add_entry
 	gtk_accel_map_add_filter
-	gtk_accel_map_add_notifer
 	gtk_accel_map_change_entry
 	gtk_accel_map_foreach
 	gtk_accel_map_foreach_unfiltered
@@ -116,7 +116,6 @@ EXPORTS
 	gtk_accel_map_load_fd
 	gtk_accel_map_load_scanner
 	gtk_accel_map_lookup_entry
-	gtk_accel_map_remove_notifer
 	gtk_accel_map_save
 	gtk_accel_map_save_fd
 	gtk_accelerator_get_default_mod_mask
@@ -589,10 +588,12 @@ EXPORTS
 	gtk_file_selection_new
 	gtk_file_selection_set_filename
 	gtk_file_selection_show_fileop_buttons
+	gtk_fixed_get_has_window
 	gtk_fixed_get_type
 	gtk_fixed_move
 	gtk_fixed_new
 	gtk_fixed_put
+	gtk_fixed_set_has_window
 	gtk_font_selection_dialog_get_font
 	gtk_font_selection_dialog_get_font_name
 	gtk_font_selection_dialog_get_preview_text
@@ -1846,6 +1847,7 @@ EXPORTS
 	gtk_tree_view_column_get_max_width
 	gtk_tree_view_column_get_min_width
 	gtk_tree_view_column_get_reorderable
+	gtk_tree_view_column_get_resizable
 	gtk_tree_view_column_get_sizing
 	gtk_tree_view_column_get_sort_column_id
 	gtk_tree_view_column_get_sort_indicator
@@ -1868,6 +1870,7 @@ EXPORTS
 	gtk_tree_view_column_set_max_width
 	gtk_tree_view_column_set_min_width
 	gtk_tree_view_column_set_reorderable
+	gtk_tree_view_column_set_resizable
 	gtk_tree_view_column_set_sizing
 	gtk_tree_view_column_set_sort_column_id
 	gtk_tree_view_column_set_sort_indicator
@@ -2020,6 +2023,7 @@ EXPORTS
 	gtk_widget_intersect
 	gtk_widget_is_ancestor
 	gtk_widget_is_focus
+	gtk_widget_list_accel_closures
 	gtk_widget_map
 	gtk_widget_mnemonic_activate
 	gtk_widget_modify_base
diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index c16aa2300f..4781c0f898 100644
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -545,7 +545,7 @@ gtk_fixed_set_has_window (GtkFixed *fixed,
 gboolean
 gtk_fixed_get_has_window (GtkFixed *fixed)
 {
-  g_return_if_fail (GTK_IS_FIXED (fixed));
+  g_return_val_if_fail (GTK_IS_FIXED (fixed), FALSE);
 
   return !GTK_WIDGET_NO_WINDOW (fixed);
 }
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index d60b09a848..efe5ddeaed 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -343,7 +343,7 @@ gtk_rc_get_im_module_file (void)
 }
 
 gchar *
-gtk_rc_get_theme_dir(void)
+gtk_rc_get_theme_dir (void)
 {
   gchar *var, *path;
 
@@ -357,7 +357,7 @@ gtk_rc_get_theme_dir(void)
 }
 
 gchar *
-gtk_rc_get_module_dir(void)
+gtk_rc_get_module_dir (void)
 {
   return gtk_rc_make_default_dir ("engines");
 }
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index bb64921cf3..dbfef6090f 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6249,7 +6249,8 @@ gtk_requisition_free (GtkRequisition *requisition)
   g_free (requisition);
 }
 
-AtkObject* gtk_widget_get_accessible (GtkWidget *widget)
+AtkObject* 
+gtk_widget_get_accessible (GtkWidget *widget)
 {
   GtkWidgetClass *klass;
 
@@ -6262,7 +6263,8 @@ AtkObject* gtk_widget_get_accessible (GtkWidget *widget)
   return klass->get_accessible (widget);
 }
 
-AtkObject* gtk_widget_real_get_accessible (GtkWidget *widget)
+static AtkObject* 
+gtk_widget_real_get_accessible (GtkWidget *widget)
 {
   AtkObject* accessible;