to simplify parsing for exported functions: - made implementation

2001-10-27  Hans Breuer  <hans@breuer.org>

	* gtk/gtkbbox.c gtk/gtkctree.c gtk/gtkhbbox.c
	  gtk/gtkimmulticontext.c gtk/gtklabel.c gtk/gtkliststore.c
	  gtk/gtkmenu.c gtk/gtkpaned.c gtk/gtkrc.c gtk/gtkscale.c
	  gtk/gtkstyle.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
	  gtk/gtktexttag.c gtk/gtktexttagtable.c gtk/gtktextview.c
	  gtk/gtktreestore.c gtk/gtkvbbox.c :
	to simplify parsing for exported functions:
	- made implementation signature static, when the local
	  prototype already was
	- put the functions return value on it's own line
	- added as space between the function name and the
	  opening bracket

	* gtk/gtk.def : added the remaining exported functions

25 files changed, 222 insertions, 59 deletions

diff --git a/ChangeLog b/ChangeLog
index daacdb1a5..927c21e01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2001-10-27  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkbbox.c gtk/gtkctree.c gtk/gtkhbbox.c
+	  gtk/gtkimmulticontext.c gtk/gtklabel.c gtk/gtkliststore.c
+	  gtk/gtkmenu.c gtk/gtkpaned.c gtk/gtkrc.c gtk/gtkscale.c
+	  gtk/gtkstyle.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
+	  gtk/gtktexttag.c gtk/gtktexttagtable.c gtk/gtktextview.c
+	  gtk/gtktreestore.c gtk/gtkvbbox.c : 
+	to simplify parsing for exported functions:
+	- made implementation signature static, when the local 
+	  prototype already was
+	- put the functions return value on it's own line
+	- added as space between the function name and the 
+	  opening bracket
+
+	* gtk/gtk.def : added the remaining exported functions
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index daacdb1a5..927c21e01 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,20 @@
+2001-10-27  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkbbox.c gtk/gtkctree.c gtk/gtkhbbox.c
+	  gtk/gtkimmulticontext.c gtk/gtklabel.c gtk/gtkliststore.c
+	  gtk/gtkmenu.c gtk/gtkpaned.c gtk/gtkrc.c gtk/gtkscale.c
+	  gtk/gtkstyle.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
+	  gtk/gtktexttag.c gtk/gtktexttagtable.c gtk/gtktextview.c
+	  gtk/gtktreestore.c gtk/gtkvbbox.c : 
+	to simplify parsing for exported functions:
+	- made implementation signature static, when the local 
+	  prototype already was
+	- put the functions return value on it's own line
+	- added as space between the function name and the 
+	  opening bracket
+
+	* gtk/gtk.def : added the remaining exported functions
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index daacdb1a5..927c21e01 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+2001-10-27  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkbbox.c gtk/gtkctree.c gtk/gtkhbbox.c
+	  gtk/gtkimmulticontext.c gtk/gtklabel.c gtk/gtkliststore.c
+	  gtk/gtkmenu.c gtk/gtkpaned.c gtk/gtkrc.c gtk/gtkscale.c
+	  gtk/gtkstyle.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
+	  gtk/gtktexttag.c gtk/gtktexttagtable.c gtk/gtktextview.c
+	  gtk/gtktreestore.c gtk/gtkvbbox.c : 
+	to simplify parsing for exported functions:
+	- made implementation signature static, when the local 
+	  prototype already was
+	- put the functions return value on it's own line
+	- added as space between the function name and the 
+	  opening bracket
+
+	* gtk/gtk.def : added the remaining exported functions
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index daacdb1a5..927c21e01 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,20 @@
+2001-10-27  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkbbox.c gtk/gtkctree.c gtk/gtkhbbox.c
+	  gtk/gtkimmulticontext.c gtk/gtklabel.c gtk/gtkliststore.c
+	  gtk/gtkmenu.c gtk/gtkpaned.c gtk/gtkrc.c gtk/gtkscale.c
+	  gtk/gtkstyle.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
+	  gtk/gtktexttag.c gtk/gtktexttagtable.c gtk/gtktextview.c
+	  gtk/gtktreestore.c gtk/gtkvbbox.c : 
+	to simplify parsing for exported functions:
+	- made implementation signature static, when the local 
+	  prototype already was
+	- put the functions return value on it's own line
+	- added as space between the function name and the 
+	  opening bracket
+
+	* gtk/gtk.def : added the remaining exported functions
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index daacdb1a5..927c21e01 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+2001-10-27  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkbbox.c gtk/gtkctree.c gtk/gtkhbbox.c
+	  gtk/gtkimmulticontext.c gtk/gtklabel.c gtk/gtkliststore.c
+	  gtk/gtkmenu.c gtk/gtkpaned.c gtk/gtkrc.c gtk/gtkscale.c
+	  gtk/gtkstyle.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
+	  gtk/gtktexttag.c gtk/gtktexttagtable.c gtk/gtktextview.c
+	  gtk/gtktreestore.c gtk/gtkvbbox.c : 
+	to simplify parsing for exported functions:
+	- made implementation signature static, when the local 
+	  prototype already was
+	- put the functions return value on it's own line
+	- added as space between the function name and the 
+	  opening bracket
+
+	* gtk/gtk.def : added the remaining exported functions
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index daacdb1a5..927c21e01 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+2001-10-27  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkbbox.c gtk/gtkctree.c gtk/gtkhbbox.c
+	  gtk/gtkimmulticontext.c gtk/gtklabel.c gtk/gtkliststore.c
+	  gtk/gtkmenu.c gtk/gtkpaned.c gtk/gtkrc.c gtk/gtkscale.c
+	  gtk/gtkstyle.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
+	  gtk/gtktexttag.c gtk/gtktexttagtable.c gtk/gtktextview.c
+	  gtk/gtktreestore.c gtk/gtkvbbox.c : 
+	to simplify parsing for exported functions:
+	- made implementation signature static, when the local 
+	  prototype already was
+	- put the functions return value on it's own line
+	- added as space between the function name and the 
+	  opening bracket
+
+	* gtk/gtk.def : added the remaining exported functions
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index daacdb1a5..927c21e01 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+2001-10-27  Hans Breuer  <hans@breuer.org>
+
+	* gtk/gtkbbox.c gtk/gtkctree.c gtk/gtkhbbox.c
+	  gtk/gtkimmulticontext.c gtk/gtklabel.c gtk/gtkliststore.c
+	  gtk/gtkmenu.c gtk/gtkpaned.c gtk/gtkrc.c gtk/gtkscale.c
+	  gtk/gtkstyle.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
+	  gtk/gtktexttag.c gtk/gtktexttagtable.c gtk/gtktextview.c
+	  gtk/gtktreestore.c gtk/gtkvbbox.c : 
+	to simplify parsing for exported functions:
+	- made implementation signature static, when the local 
+	  prototype already was
+	- put the functions return value on it's own line
+	- added as space between the function name and the 
+	  opening bracket
+
+	* gtk/gtk.def : added the remaining exported functions
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
diff --git a/gtk/gtk.def b/gtk/gtk.def
index eb78a4b72..13202007a 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -245,6 +245,7 @@ EXPORTS
 	gtk_clipboard_set_with_owner
 	gtk_clipboard_wait_for_contents
 	gtk_clipboard_wait_for_text
+	gtk_clipboard_wait_is_text_available
 	gtk_clist_append
 	gtk_clist_clear
 	gtk_clist_column_title_active
@@ -417,6 +418,7 @@ EXPORTS
 	gtk_ctree_node_get_row_style
 	gtk_ctree_node_get_selectable
 	gtk_ctree_node_get_text
+	gtk_ctree_node_get_type
 	gtk_ctree_node_is_visible
 	gtk_ctree_node_moveto
 	gtk_ctree_node_nth
@@ -477,11 +479,12 @@ EXPORTS
 	gtk_dialog_set_default_response
 	gtk_dialog_set_has_separator
 	gtk_dialog_set_response_sensitive
+	gtk_disable_setlocale
 	gtk_drag_begin
-	gtk_drag_dest_set
 	gtk_drag_check_threshold
 	gtk_drag_dest_find_target
 	gtk_drag_dest_get_target_list
+	gtk_drag_dest_set
 	gtk_drag_dest_set_proxy
 	gtk_drag_dest_set_target_list
 	gtk_drag_dest_unset
@@ -491,7 +494,9 @@ EXPORTS
 	gtk_drag_highlight
 	gtk_drag_set_default_icon
 	gtk_drag_set_icon_default
+	gtk_drag_set_icon_pixbuf
 	gtk_drag_set_icon_pixmap
+	gtk_drag_set_icon_stock
 	gtk_drag_set_icon_widget
 	gtk_drag_source_set
 	gtk_drag_source_set_icon
@@ -711,8 +716,6 @@ EXPORTS
 	gtk_im_multicontext_commit_cb
 	gtk_im_multicontext_get_type
 	gtk_im_multicontext_new
-	gtk_im_multicontext_preedit_changed_cb
-	gtk_im_multicontext_preedit_end_cb
 	gtk_image_get
 	gtk_image_get_animation
 	gtk_image_get_icon_set
@@ -811,8 +814,8 @@ EXPORTS
 	gtk_label_new
 	gtk_label_new_with_mnemonic
 	gtk_label_parse_uline
-	gtk_label_set_attributes
 	gtk_label_select_region
+	gtk_label_set_attributes
 	gtk_label_set_justify
 	gtk_label_set_label
 	gtk_label_set_line_wrap
@@ -901,7 +904,9 @@ EXPORTS
 	gtk_marshal_STRING__DOUBLE
 	gtk_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN
 	gtk_marshal_VOID__BOXED_BOXED
+	gtk_marshal_VOID__BOXED_BOXED_BOXED
 	gtk_marshal_VOID__BOXED_BOXED_POINTER
+	gtk_marshal_VOID__BOXED_INT
 	gtk_marshal_VOID__BOXED_OBJECT
 	gtk_marshal_VOID__BOXED_POINTER
 	gtk_marshal_VOID__BOXED_STRING_INT
@@ -929,6 +934,7 @@ EXPORTS
 	gtk_marshal_VOID__POINTER_POINTER_POINTER
 	gtk_marshal_VOID__POINTER_UINT
 	gtk_marshal_VOID__STRING_INT_POINTER
+	gtk_marshal_VOID__STRING_STRING
 	gtk_marshal_VOID__UINT_BOXED_UINT_FLAGS_FLAGS
 	gtk_marshal_VOID__UINT_OBJECT_UINT_FLAGS_FLAGS
 	gtk_marshal_VOID__UINT_STRING
@@ -1169,7 +1175,6 @@ EXPORTS
 	gtk_range_set_adjustment
 	gtk_range_set_increments
 	gtk_range_set_inverted
-	gtk_range_set_inverted
 	gtk_range_set_range
 	gtk_range_set_update_policy
 	gtk_range_set_value
@@ -1180,18 +1185,25 @@ EXPORTS
 	gtk_rc_find_module_in_path
 	gtk_rc_find_pixmap_in_path
 	gtk_rc_get_default_files
+	gtk_rc_get_im_module_file
+	gtk_rc_get_im_module_path
 	gtk_rc_get_module_dir
 	gtk_rc_get_style
+	gtk_rc_get_style_by_paths
 	gtk_rc_get_theme_dir
 	gtk_rc_parse
 	gtk_rc_parse_color
 	gtk_rc_parse_priority
 	gtk_rc_parse_state
 	gtk_rc_parse_string
+	gtk_rc_property_parse_border
 	gtk_rc_property_parse_color
 	gtk_rc_property_parse_enum
 	gtk_rc_property_parse_flags
+	gtk_rc_property_parse_requisition
 	gtk_rc_reparse_all
+	gtk_rc_reparse_all_for_settings
+	gtk_rc_scanner_new
 	gtk_rc_set_default_files
 	gtk_rc_style_copy
 	gtk_rc_style_get_type
@@ -1236,11 +1248,13 @@ EXPORTS
 	gtk_selection_convert
 	gtk_selection_data_copy
 	gtk_selection_data_free
+	gtk_selection_data_get_targets
 	gtk_selection_data_get_text
 	gtk_selection_data_get_tree_row
 	gtk_selection_data_set
 	gtk_selection_data_set_text
 	gtk_selection_data_set_tree_row
+	gtk_selection_data_targets_include_text
 	gtk_selection_incr_event
 	gtk_selection_notify
 	gtk_selection_owner_set
@@ -1257,6 +1271,7 @@ EXPORTS
 	gtk_settings_install_property_parser
 	gtk_settings_set_double_property
 	gtk_settings_set_long_property
+	gtk_settings_set_property_value
 	gtk_settings_set_string_property
 	gtk_signal_compat_matched
 	gtk_signal_connect_full
@@ -1447,12 +1462,13 @@ EXPORTS
 	gtk_text_iter_backward_word_start
 	gtk_text_iter_backward_word_starts
 	gtk_text_iter_begins_tag
+	gtk_text_iter_can_insert
 	gtk_text_iter_compare
 	gtk_text_iter_copy
 	gtk_text_iter_editable
 	gtk_text_iter_ends_line
-	gtk_text_iter_ends_tag
 	gtk_text_iter_ends_sentence
+	gtk_text_iter_ends_tag
 	gtk_text_iter_ends_word
 	gtk_text_iter_equal
 	gtk_text_iter_forward_char
@@ -1504,11 +1520,12 @@ EXPORTS
 	gtk_text_iter_set_line_index
 	gtk_text_iter_set_line_offset
 	gtk_text_iter_set_offset
+	gtk_text_iter_set_visible_line_index
 	gtk_text_iter_set_visible_line_offset
 	gtk_text_iter_starts_line
-	gtk_text_iter_toggles_tag
 	gtk_text_iter_starts_sentence
 	gtk_text_iter_starts_word
+	gtk_text_iter_toggles_tag
 	gtk_text_layout_changed
 	gtk_text_layout_clamp_iter_to_vrange
 	gtk_text_layout_default_style_changed
@@ -1652,7 +1669,6 @@ EXPORTS
 	gtk_toggle_button_new_with_mnemonic
 	gtk_toggle_button_set_active
 	gtk_toggle_button_set_inconsistent
-	gtk_toggle_button_set_inconsistent
 	gtk_toggle_button_set_mode
 	gtk_toggle_button_toggled
 	gtk_toolbar_append_element
@@ -1717,6 +1733,7 @@ EXPORTS
 	gtk_tree_model_get_column_type
 	gtk_tree_model_get_flags
 	gtk_tree_model_get_iter
+	gtk_tree_model_get_iter_from_string
 	gtk_tree_model_get_iter_root
 	gtk_tree_model_get_n_columns
 	gtk_tree_model_get_path
@@ -1735,9 +1752,15 @@ EXPORTS
 	gtk_tree_model_row_has_child_toggled
 	gtk_tree_model_row_inserted
 	gtk_tree_model_rows_reordered
+	gtk_tree_model_sort_clear_cache
+	gtk_tree_model_sort_convert_child_iter_to_iter
+	gtk_tree_model_sort_convert_child_path_to_path
+	gtk_tree_model_sort_convert_iter_to_child_iter
+	gtk_tree_model_sort_convert_path_to_child_path
 	gtk_tree_model_sort_get_model
 	gtk_tree_model_sort_get_type
 	gtk_tree_model_sort_new_with_model
+	gtk_tree_model_sort_reset_default_sort_func
 	gtk_tree_model_unref_node
 	gtk_tree_new
 	gtk_tree_path_append_index
@@ -1775,6 +1798,8 @@ EXPORTS
 	gtk_tree_selection_get_tree_view
 	gtk_tree_selection_get_type
 	gtk_tree_selection_get_user_data
+	gtk_tree_selection_iter_is_selected
+	gtk_tree_selection_path_is_selected
 	gtk_tree_selection_select_all
 	gtk_tree_selection_select_iter
 	gtk_tree_selection_select_path
@@ -1816,24 +1841,27 @@ EXPORTS
 	gtk_tree_view_collapse_all
 	gtk_tree_view_collapse_row
 	gtk_tree_view_column_add_attribute
+	gtk_tree_view_column_cell_draw_focus
+	gtk_tree_view_column_cell_focus
 	gtk_tree_view_column_cell_get_size
 	gtk_tree_view_column_cell_is_visible
 	gtk_tree_view_column_cell_render
 	gtk_tree_view_column_cell_set_cell_data
-	gtk_tree_view_column_clear_attributes
+	gtk_tree_view_column_cell_set_dirty
 	gtk_tree_view_column_clear
+	gtk_tree_view_column_clear_attributes
 	gtk_tree_view_column_clicked
 	gtk_tree_view_column_get_alignment
 	gtk_tree_view_column_get_cell_renderers
 	gtk_tree_view_column_get_clickable
+	gtk_tree_view_column_get_fixed_width
 	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_sizing
-	gtk_tree_view_column_get_sizing
+	gtk_tree_view_column_get_sort_column_id
 	gtk_tree_view_column_get_sort_indicator
 	gtk_tree_view_column_get_sort_order
-	gtk_tree_view_column_get_sort_column_id
 	gtk_tree_view_column_get_spacing
 	gtk_tree_view_column_get_title
 	gtk_tree_view_column_get_type
@@ -1855,8 +1883,8 @@ EXPORTS
 	gtk_tree_view_column_set_sizing
 	gtk_tree_view_column_set_sort_column_id
 	gtk_tree_view_column_set_sort_indicator
-	gtk_tree_view_column_set_spacing
 	gtk_tree_view_column_set_sort_order
+	gtk_tree_view_column_set_spacing
 	gtk_tree_view_column_set_title
 	gtk_tree_view_column_set_visible
 	gtk_tree_view_column_set_widget
@@ -1868,6 +1896,7 @@ EXPORTS
 	gtk_tree_view_get_cell_area
 	gtk_tree_view_get_column
 	gtk_tree_view_get_columns
+	gtk_tree_view_get_cursor
 	gtk_tree_view_get_dest_row_at_pos
 	gtk_tree_view_get_drag_dest_row
 	gtk_tree_view_get_enable_search
@@ -1886,6 +1915,7 @@ EXPORTS
 	gtk_tree_view_get_visible_rect
 	gtk_tree_view_insert_column
 	gtk_tree_view_insert_column_with_attributes
+	gtk_tree_view_insert_column_with_data_func
 	gtk_tree_view_map_expanded_rows
 	gtk_tree_view_move_column_after
 	gtk_tree_view_new
@@ -2053,7 +2083,6 @@ EXPORTS
 	gtk_widget_set_style
 	gtk_widget_set_uposition
 	gtk_widget_set_usize
-	gtk_widget_set_size_request
 	gtk_widget_shape_combine_mask
 	gtk_widget_show
 	gtk_widget_show_all
@@ -2064,6 +2093,7 @@ EXPORTS
 	gtk_widget_style_get_property
 	gtk_widget_style_get_valist
 	gtk_widget_thaw_child_notify
+	gtk_widget_translate_coordinates
 	gtk_widget_unlock_accelerators
 	gtk_widget_unmap
 	gtk_widget_unparent
@@ -2075,6 +2105,7 @@ EXPORTS
 	gtk_window_add_embedded_xid
 	gtk_window_add_mnemonic
 	gtk_window_begin_move_drag
+	gtk_window_begin_resize_drag
 	gtk_window_deiconify
 	gtk_window_get_decorated
 	gtk_window_get_default_icon_list
@@ -2082,7 +2113,6 @@ EXPORTS
 	gtk_window_get_destroy_with_parent
 	gtk_window_get_frame_dimensions
 	gtk_window_get_gravity
-;	gtk_window_get_location
 	gtk_window_get_has_frame
 	gtk_window_get_icon
 	gtk_window_get_icon_list
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index dc9679d7c..a1d7ec493 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -263,21 +263,25 @@ gtk_button_box_get_child_property (GtkContainer *container,
 
 /* set per widget values for spacing, child size and child internal padding */
 
-void gtk_button_box_set_child_size (GtkButtonBox *widget, gint width, gint height)
+void 
+gtk_button_box_set_child_size (GtkButtonBox *widget, 
+                               gint width, gint height)
 {
   widget->child_min_width = width;
   widget->child_min_height = height;
 }
 
-void gtk_button_box_set_child_ipadding (GtkButtonBox *widget,
-					gint ipad_x, gint ipad_y)
+void 
+gtk_button_box_set_child_ipadding (GtkButtonBox *widget,
+                                   gint ipad_x, gint ipad_y)
 {
   widget->child_ipad_x = ipad_x;
   widget->child_ipad_y = ipad_y;
 }
 
-void gtk_button_box_set_layout (GtkButtonBox *widget, 
-				GtkButtonBoxStyle layout_style)
+void
+gtk_button_box_set_layout (GtkButtonBox      *widget, 
+                           GtkButtonBoxStyle  layout_style)
 {
   g_return_if_fail (layout_style >= GTK_BUTTONBOX_DEFAULT_STYLE &&
 		    layout_style <= GTK_BUTTONBOX_END);
@@ -293,15 +297,17 @@ void gtk_button_box_set_layout (GtkButtonBox *widget,
 
 /* get per widget values for spacing, child size and child internal padding */
 
-void gtk_button_box_get_child_size (GtkButtonBox *widget,
-				     gint *width, gint *height)
+void 
+gtk_button_box_get_child_size (GtkButtonBox *widget,
+                               gint *width, gint *height)
 {
   *width  = widget->child_min_width;
   *height = widget->child_min_height;
 }
 
-void gtk_button_box_get_child_ipadding (GtkButtonBox *widget,
-					 gint* ipad_x, gint *ipad_y)
+void
+gtk_button_box_get_child_ipadding (GtkButtonBox *widget,
+                                   gint* ipad_x, gint *ipad_y)
 {
   *ipad_x = widget->child_ipad_x;
   *ipad_y = widget->child_ipad_y;
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index f5615edb7..2ca063185 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -5223,8 +5223,9 @@ gtk_ctree_node_moveto (GtkCTree     *ctree,
   gtk_clist_moveto (clist, row, column, row_align, col_align);
 }
 
-GtkVisibility gtk_ctree_node_is_visible (GtkCTree     *ctree,
-                                         GtkCTreeNode *node)
+GtkVisibility 
+gtk_ctree_node_is_visible (GtkCTree     *ctree,
+                           GtkCTreeNode *node)
 {
   gint row;
   
@@ -6128,13 +6129,13 @@ gtk_ctree_drag_data_received (GtkWidget        *widget,
 /* dummy boxed type definition, used so that the GtkCTreeNode signal
  * arguments have a reasonable type.
  */
-gpointer
+static gpointer
 ctree_node_copy (gpointer boxed)
 {
   return boxed;
 }
 
-void
+static void
 ctree_node_free (gpointer boxed)
 {
   /* nothing */
diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c
index 5c6c18555..950cbae5a 100644
--- a/gtk/gtkhbbox.c
+++ b/gtk/gtkhbbox.c
@@ -92,7 +92,8 @@ gtk_hbutton_box_new (void)
 
 /* set default value for spacing */
 
-void gtk_hbutton_box_set_spacing_default (gint spacing)
+void 
+gtk_hbutton_box_set_spacing_default (gint spacing)
 {
   default_spacing = spacing;
 }
@@ -100,7 +101,8 @@ void gtk_hbutton_box_set_spacing_default (gint spacing)
 
 /* set default value for layout style */
 
-void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout)
+void 
+gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout)
 {
   g_return_if_fail (layout >= GTK_BUTTONBOX_DEFAULT_STYLE &&
 		    layout <= GTK_BUTTONBOX_END);
@@ -110,7 +112,8 @@ void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout)
 
 /* get default value for spacing */
 
-gint gtk_hbutton_box_get_spacing_default (void)
+gint 
+gtk_hbutton_box_get_spacing_default (void)
 {
   return default_spacing;
 }
@@ -118,7 +121,8 @@ gint gtk_hbutton_box_get_spacing_default (void)
 
 /* get default value for layout style */
 
-GtkButtonBoxStyle gtk_hbutton_box_get_layout_default (void)
+GtkButtonBoxStyle
+gtk_hbutton_box_get_layout_default (void)
 {
   return default_layout_style;
 }
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index e11d50eb8..a7a9d1075 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -46,11 +46,11 @@ static void     gtk_im_multicontext_reset              (GtkIMContext
 static void     gtk_im_multicontext_set_cursor_location (GtkIMContext            *context,
 							GdkRectangle		*area);
 
-void            gtk_im_multicontext_preedit_start_cb   (GtkIMContext            *slave,
+static void     gtk_im_multicontext_preedit_start_cb   (GtkIMContext            *slave,
 							GtkIMMulticontext       *multicontext);
-void            gtk_im_multicontext_preedit_end_cb     (GtkIMContext            *slave,
+static void     gtk_im_multicontext_preedit_end_cb     (GtkIMContext            *slave,
 							GtkIMMulticontext       *multicontext);
-void            gtk_im_multicontext_preedit_changed_cb (GtkIMContext            *slave,
+static void     gtk_im_multicontext_preedit_changed_cb (GtkIMContext            *slave,
 							GtkIMMulticontext       *multicontext);
 void            gtk_im_multicontext_commit_cb          (GtkIMContext            *slave,
 							const gchar             *str,
@@ -294,21 +294,21 @@ gtk_im_multicontext_set_cursor_location (GtkIMContext   *context,
     gtk_im_context_set_cursor_location (slave, area);
 }
 
-void
+static void
 gtk_im_multicontext_preedit_start_cb   (GtkIMContext      *slave,
 					GtkIMMulticontext *multicontext)
 {
   g_signal_emit_by_name (multicontext, "preedit_start");
 }
 
-void
+static void
 gtk_im_multicontext_preedit_end_cb (GtkIMContext      *slave,
 				    GtkIMMulticontext *multicontext)
 {
   g_signal_emit_by_name (multicontext, "preedit_end");
 }
 
-void
+static void
 gtk_im_multicontext_preedit_changed_cb (GtkIMContext      *slave,
 					GtkIMMulticontext *multicontext)
 {
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index a76f88da9..776caa996 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1794,7 +1794,7 @@ gtk_label_expose (GtkWidget      *widget,
   return TRUE;
 }
 
-void
+static void
 gtk_label_set_uline_text_internal (GtkLabel    *label,
 				   const gchar *str)
 {
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 312b0c7d0..77c1df072 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -597,7 +597,7 @@ gtk_list_store_iter_parent (GtkTreeModel *tree_model,
   return FALSE;
 }
 
-gboolean
+static gboolean
 gtk_list_store_real_set_value (GtkListStore *list_store,
 			       GtkTreeIter  *iter,
 			       gint          column,
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index d1e910bd8..34781391c 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -490,7 +490,7 @@ gtk_menu_detach (GtkMenu *menu)
   gtk_widget_unref (GTK_WIDGET (menu));
 }
 
-void 
+static void 
 gtk_menu_remove (GtkContainer *container,
 		 GtkWidget    *widget)
 {
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 876fdf6fc..9c46b33f0 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -497,10 +497,10 @@ gtk_paned_set_position (GtkPaned *paned,
 }
 
 void
-gtk_paned_compute_position(GtkPaned *paned,
-			   gint      allocation,
-			   gint      child1_req,
-			   gint      child2_req)
+gtk_paned_compute_position (GtkPaned *paned,
+			    gint      allocation,
+			    gint      child1_req,
+			    gint      child2_req)
 {
   gint old_position;
   
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 4920c4ea9..79be496be 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -87,7 +87,7 @@ gtk_scale_get_type (void)
   return scale_type;
 }
 
-gboolean
+static gboolean
 single_string_accumulator (GSignalInvocationHint *ihint,
                            GValue                *return_accu,
                            const GValue          *handler_return,
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index f6a99aa4f..f5beb0e2e 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -1354,7 +1354,7 @@ _gtk_style_peek_property_value (GtkStyle           *style,
   return &pcache->value;
 }
 
-GdkPixmap *
+static GdkPixmap *
 load_bg_image (GdkColormap *colormap,
 	       GdkColor    *bg_color,
 	       const gchar *filename)
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 8fb74866c..4663c644d 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -300,7 +300,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   0);  
 }
 
-void
+static void
 gtk_text_buffer_init (GtkTextBuffer *buffer)
 {
   buffer->clipboard_contents_buffers = NULL;
@@ -440,7 +440,6 @@ gtk_text_buffer_set_text (GtkTextBuffer *buffer,
  */
 
 static void
-
 gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
                                   GtkTextIter *iter,
                                   const gchar *text,
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 018a33aea..67592dceb 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -210,7 +210,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
                   GTK_TYPE_INT);
 }
 
-void
+static void
 gtk_text_layout_init (GtkTextLayout *text_layout)
 {
   text_layout->cursor_visible = TRUE;
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 7e7eee075..6bb028420 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -629,7 +629,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                   GTK_TYPE_TEXT_ITER);
 }
 
-void
+static void
 gtk_text_tag_init (GtkTextTag *text_tag)
 {
   /* 0 is basically a fine way to initialize everything in the
diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index cb246b263..e1cce7b4f 100644
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -106,7 +106,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
                   G_TYPE_OBJECT);
 }
 
-void
+static void
 gtk_text_tag_table_init (GtkTextTagTable *table)
 {
   table->hash = g_hash_table_new (g_str_hash, g_str_equal);
@@ -149,7 +149,7 @@ gtk_text_tag_table_finalize (GObject *object)
   table = GTK_TEXT_TAG_TABLE (object);
 
   gtk_text_tag_table_foreach (table, foreach_unref, NULL);
-  
+
   g_hash_table_destroy (table->hash);
   g_slist_free (table->anonymous);
 
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index e33c86d37..0c015601c 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -920,7 +920,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                 "toggle_overwrite", 0);
 }
 
-void
+static void
 gtk_text_view_init (GtkTextView *text_view)
 {
   GtkWidget *widget;
@@ -5779,7 +5779,7 @@ text_window_scroll        (GtkTextWindow *win,
     }
 }
 
-void
+static void
 text_window_invalidate_rect (GtkTextWindow *win,
                              GdkRectangle  *rect)
 {
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index b815fc5e0..0d6dc1812 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -714,7 +714,7 @@ gtk_tree_store_iter_parent (GtkTreeModel *tree_model,
 
 
 /* Does not emit a signal */
-gboolean
+static gboolean
 gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
 			       GtkTreeIter  *iter,
 			       gint          column,
diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c
index f7abb6aa5..3cda26136 100644
--- a/gtk/gtkvbbox.c
+++ b/gtk/gtkvbbox.c
@@ -92,7 +92,8 @@ gtk_vbutton_box_new (void)
 
 /* set default value for spacing */
 
-void gtk_vbutton_box_set_spacing_default (gint spacing)
+void
+gtk_vbutton_box_set_spacing_default (gint spacing)
 {
   default_spacing = spacing;
 }
@@ -100,7 +101,8 @@ void gtk_vbutton_box_set_spacing_default (gint spacing)
 
 /* set default value for layout style */
 
-void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout)
+void
+gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout)
 {
   g_return_if_fail (layout >= GTK_BUTTONBOX_DEFAULT_STYLE &&
 		    layout <= GTK_BUTTONBOX_END);
@@ -110,7 +112,8 @@ void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout)
 
 /* get default value for spacing */
 
-gint gtk_vbutton_box_get_spacing_default (void)
+gint
+gtk_vbutton_box_get_spacing_default (void)
 {
   return default_spacing;
 }
@@ -119,7 +122,8 @@ gint gtk_vbutton_box_get_spacing_default (void)
 
 /* get default value for layout style */
 
-GtkButtonBoxStyle gtk_vbutton_box_get_layout_default (void)
+GtkButtonBoxStyle
+gtk_vbutton_box_get_layout_default (void)
 {
   return default_layout_style;
 }