make rewrite_event_for_window() static gtk_rc_clear_realized_style()

2002-03-03  Hans Breuer  <hans@breuer.org>

	* gtk/gtkmain.c : make rewrite_event_for_window() static
	* gtk/gtkrc.c : gtk_rc_clear_realized_style() static

	* gtk/makefile.msc.in : adapt to makeenums build changes

	* gtk.def : sorted alphabetical again

5 files changed, 239 insertions, 176 deletions

diff --git a/gtk/gtk.def b/gtk/gtk.def
index 578ef63bdf..0f6d394040 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -1,85 +1,5 @@
 EXPORTS
 	gtk_accel_flags_get_type
-	gtk_anchor_type_get_type
-	gtk_arg_flags_get_type
-	gtk_arrow_type_get_type
-	gtk_attach_options_get_type
-	gtk_buttons_type_get_type
-	gtk_button_action_get_type
-	gtk_button_box_style_get_type
-	gtk_calendar_display_options_get_type
-	gtk_cell_renderer_mode_get_type
-	gtk_cell_renderer_state_get_type
-	gtk_cell_type_get_type
-	gtk_clist_drag_pos_get_type
-	gtk_corner_type_get_type
-	gtk_ctree_expander_style_get_type
-	gtk_ctree_expansion_type_get_type
-	gtk_ctree_line_style_get_type
-	gtk_ctree_pos_get_type
-	gtk_curve_type_get_type
-	gtk_debug_flag_get_type
-	gtk_delete_type_get_type
-	gtk_dest_defaults_get_type
-	gtk_dialog_flags_get_type
-	gtk_direction_type_get_type
-	gtk_expander_style_get_type
-	gtk_icon_size_get_type
-	gtk_image_type_get_type
-	gtk_justification_get_type
-	gtk_match_type_get_type
-	gtk_menu_direction_type_get_type
-	gtk_message_type_get_type
-	gtk_metric_type_get_type
-	gtk_movement_step_get_type
-	gtk_notebook_tab_get_type
-	gtk_object_flags_get_type
-	gtk_orientation_get_type
-	gtk_pack_type_get_type
-	gtk_path_priority_type_get_type
-	gtk_path_type_get_type
-	gtk_policy_type_get_type
-	gtk_position_type_get_type
-	gtk_preview_type_get_type
-	gtk_private_flags_get_type
-	gtk_progress_bar_orientation_get_type
-	gtk_progress_bar_style_get_type
-	gtk_rc_flags_get_type
-	gtk_rc_token_type_get_type
-	gtk_relief_style_get_type
-	gtk_resize_mode_get_type
-	gtk_response_type_get_type
-	gtk_scroll_type_get_type
-	gtk_selection_mode_get_type
-	gtk_shadow_type_get_type
-	gtk_side_type_get_type
-	gtk_signal_run_type_get_type
-	gtk_size_group_mode_get_type
-	gtk_sort_type_get_type
-	gtk_spin_button_update_policy_get_type
-	gtk_spin_type_get_type
-	gtk_state_type_get_type
-	gtk_submenu_direction_get_type
-	gtk_submenu_placement_get_type
-	gtk_target_flags_get_type
-	gtk_text_direction_get_type
-	gtk_text_search_flags_get_type
-	gtk_text_window_type_get_type
-	gtk_toolbar_child_type_get_type
-	gtk_toolbar_space_style_get_type
-	gtk_toolbar_style_get_type
-	gtk_tree_model_flags_get_type
-	gtk_tree_view_column_sizing_get_type
-	gtk_tree_view_drop_position_get_type
-	gtk_tree_view_mode_get_type
-	gtk_update_type_get_type
-	gtk_visibility_get_type
-	gtk_widget_flags_get_type
-	gtk_widget_help_type_get_type
-	gtk_window_position_get_type
-	gtk_window_type_get_type
-	gtk_wrap_mode_get_type
-
 	gtk_accel_group_connect
 	gtk_accel_group_connect_by_path
 	gtk_accel_group_disconnect
@@ -128,12 +48,16 @@ EXPORTS
 	gtk_alignment_get_type
 	gtk_alignment_new
 	gtk_alignment_set
+	gtk_anchor_type_get_type
+	gtk_arg_flags_get_type
 	gtk_arrow_get_type
 	gtk_arrow_new
 	gtk_arrow_set
+	gtk_arrow_type_get_type
 	gtk_aspect_frame_get_type
 	gtk_aspect_frame_new
 	gtk_aspect_frame_set
+	gtk_attach_options_get_type
 	gtk_bin_get_child
 	gtk_bin_get_type
 	gtk_binary_age
@@ -163,6 +87,7 @@ EXPORTS
 	gtk_box_set_child_packing
 	gtk_box_set_homogeneous
 	gtk_box_set_spacing
+	gtk_button_action_get_type
 	gtk_button_box_get_child_ipadding
 	gtk_button_box_get_child_size
 	gtk_button_box_get_layout
@@ -171,6 +96,7 @@ EXPORTS
 	gtk_button_box_set_child_secondary
 	gtk_button_box_set_child_size
 	gtk_button_box_set_layout
+	gtk_button_box_style_get_type
 	gtk_button_clicked
 	gtk_button_enter
 	gtk_button_get_label
@@ -189,8 +115,10 @@ EXPORTS
 	gtk_button_set_relief
 	gtk_button_set_use_stock
 	gtk_button_set_use_underline
+	gtk_buttons_type_get_type
 	gtk_calendar_clear_marks
 	gtk_calendar_display_options
+	gtk_calendar_display_options_get_type
 	gtk_calendar_freeze
 	gtk_calendar_get_date
 	gtk_calendar_get_type
@@ -208,11 +136,13 @@ EXPORTS
 	gtk_cell_renderer_get_fixed_size
 	gtk_cell_renderer_get_size
 	gtk_cell_renderer_get_type
+	gtk_cell_renderer_mode_get_type
 	gtk_cell_renderer_pixbuf_get_type
 	gtk_cell_renderer_pixbuf_new
 	gtk_cell_renderer_render
 	gtk_cell_renderer_set_fixed_size
 	gtk_cell_renderer_start_editing
+	gtk_cell_renderer_state_get_type
 	gtk_cell_renderer_text_get_type
 	gtk_cell_renderer_text_new
 	gtk_cell_renderer_text_set_fixed_height_from_font
@@ -222,6 +152,7 @@ EXPORTS
 	gtk_cell_renderer_toggle_new
 	gtk_cell_renderer_toggle_set_active
 	gtk_cell_renderer_toggle_set_radio
+	gtk_cell_type_get_type
 	gtk_check_button_get_type
 	gtk_check_button_new
 	gtk_check_button_new_with_label
@@ -257,6 +188,7 @@ EXPORTS
 	gtk_clist_column_titles_passive
 	gtk_clist_column_titles_show
 	gtk_clist_columns_autosize
+	gtk_clist_drag_pos_get_type
 	gtk_clist_find_row_from_data
 	gtk_clist_freeze
 	gtk_clist_get_cell_style
@@ -388,12 +320,15 @@ EXPORTS
 	gtk_container_set_reallocate_redraws
 	gtk_container_set_resize_mode
 	gtk_container_unset_focus_chain
+	gtk_corner_type_get_type
 	gtk_ctree_collapse
 	gtk_ctree_collapse_recursive
 	gtk_ctree_collapse_to_depth
 	gtk_ctree_expand
 	gtk_ctree_expand_recursive
 	gtk_ctree_expand_to_depth
+	gtk_ctree_expander_style_get_type
+	gtk_ctree_expansion_type_get_type
 	gtk_ctree_export_to_gnode
 	gtk_ctree_find
 	gtk_ctree_find_all_by_row_data
@@ -409,6 +344,7 @@ EXPORTS
 	gtk_ctree_is_hot_spot
 	gtk_ctree_is_viewable
 	gtk_ctree_last
+	gtk_ctree_line_style_get_type
 	gtk_ctree_move
 	gtk_ctree_new
 	gtk_ctree_new_with_titles
@@ -435,6 +371,7 @@ EXPORTS
 	gtk_ctree_node_set_selectable
 	gtk_ctree_node_set_shift
 	gtk_ctree_node_set_text
+	gtk_ctree_pos_get_type
 	gtk_ctree_post_recursive
 	gtk_ctree_post_recursive_to_depth
 	gtk_ctree_pre_recursive
@@ -464,14 +401,19 @@ EXPORTS
 	gtk_curve_set_gamma
 	gtk_curve_set_range
 	gtk_curve_set_vector
+	gtk_curve_type_get_type
+	gtk_debug_flag_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_delete_type_get_type
+	gtk_dest_defaults_get_type
 	gtk_dialog_add_action_widget
 	gtk_dialog_add_button
 	gtk_dialog_add_buttons
+	gtk_dialog_flags_get_type
 	gtk_dialog_get_has_separator
 	gtk_dialog_get_type
 	gtk_dialog_new
@@ -481,6 +423,7 @@ EXPORTS
 	gtk_dialog_set_default_response
 	gtk_dialog_set_has_separator
 	gtk_dialog_set_response_sensitive
+	gtk_direction_type_get_type
 	gtk_disable_setlocale
 	gtk_drag_begin
 	gtk_drag_check_threshold
@@ -574,6 +517,7 @@ EXPORTS
 	gtk_event_box_new
 	gtk_events_pending
 	gtk_exit
+	gtk_expander_style_get_type
 	gtk_false
 	gtk_file_selection_complete
 	gtk_file_selection_get_filename
@@ -680,6 +624,7 @@ EXPORTS
 	gtk_icon_set_unref
 	gtk_icon_size_from_name
 	gtk_icon_size_get_name
+	gtk_icon_size_get_type
 	gtk_icon_size_lookup
 	gtk_icon_size_register
 	gtk_icon_size_register_alias
@@ -703,6 +648,7 @@ EXPORTS
 	gtk_icon_source_set_size_wildcarded
 	gtk_icon_source_set_state
 	gtk_icon_source_set_state_wildcarded
+	gtk_identifier_get_type
 	gtk_idle_add
 	gtk_idle_add_full
 	gtk_idle_add_priority
@@ -759,6 +705,7 @@ EXPORTS
 	gtk_image_set_from_pixbuf
 	gtk_image_set_from_pixmap
 	gtk_image_set_from_stock
+	gtk_image_type_get_type
 	gtk_init
 	gtk_init_abi_check
 	gtk_init_add
@@ -799,6 +746,7 @@ EXPORTS
 	gtk_item_get_type
 	gtk_item_select
 	gtk_item_toggle
+	gtk_justification_get_type
 	gtk_key_snooper_install
 	gtk_key_snooper_remove
 	gtk_label_get
@@ -923,10 +871,12 @@ EXPORTS
 	gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER
 	gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM
 	gtk_marshal_VOID__UINT_STRING
+	gtk_match_type_get_type
 	gtk_menu_attach_to_widget
 	gtk_menu_bar_get_type
 	gtk_menu_bar_new
 	gtk_menu_detach
+	gtk_menu_direction_type_get_type
 	gtk_menu_get_accel_group
 	gtk_menu_get_active
 	gtk_menu_get_attach_widget
@@ -968,6 +918,8 @@ EXPORTS
 	gtk_menu_shell_select_item
 	gtk_message_dialog_get_type
 	gtk_message_dialog_new
+	gtk_message_type_get_type
+	gtk_metric_type_get_type
 	gtk_micro_version
 	gtk_minor_version
 	gtk_misc_get_alignment
@@ -975,6 +927,7 @@ EXPORTS
 	gtk_misc_get_type
 	gtk_misc_set_alignment
 	gtk_misc_set_padding
+	gtk_movement_step_get_type
 	gtk_notebook_append_page
 	gtk_notebook_append_page_menu
 	gtk_notebook_get_current_page
@@ -1015,8 +968,10 @@ EXPORTS
 	gtk_notebook_set_tab_label_text
 	gtk_notebook_set_tab_pos
 	gtk_notebook_set_tab_vborder
+	gtk_notebook_tab_get_type
 	gtk_object_add_arg_type
 	gtk_object_destroy
+	gtk_object_flags_get_type
 	gtk_object_get
 	gtk_object_get_data
 	gtk_object_get_data_by_id
@@ -1048,6 +1003,8 @@ EXPORTS
 	gtk_option_menu_remove_menu
 	gtk_option_menu_set_history
 	gtk_option_menu_set_menu
+	gtk_orientation_get_type
+	gtk_pack_type_get_type
 	gtk_paint_arrow
 	gtk_paint_box
 	gtk_paint_box_gap
@@ -1077,6 +1034,8 @@ EXPORTS
 	gtk_paned_pack1
 	gtk_paned_pack2
 	gtk_paned_set_position
+	gtk_path_priority_type_get_type
+	gtk_path_type_get_type
 	gtk_pixmap_get
 	gtk_pixmap_get_type
 	gtk_pixmap_new
@@ -1086,6 +1045,8 @@ EXPORTS
 ;	gtk_plug_get_id
 ;	gtk_plug_get_type
 ;	gtk_plug_new
+	gtk_policy_type_get_type
+	gtk_position_type_get_type
 	gtk_preview_draw_row
 	gtk_preview_get_cmap
 	gtk_preview_get_info
@@ -1101,7 +1062,9 @@ EXPORTS
 	gtk_preview_set_install_cmap
 	gtk_preview_set_reserved
 	gtk_preview_size
+	gtk_preview_type_get_type
 	gtk_preview_uninit
+	gtk_private_flags_get_type
 	gtk_progress_bar_get_fraction
 	gtk_progress_bar_get_orientation
 	gtk_progress_bar_get_pulse_step
@@ -1109,6 +1072,7 @@ EXPORTS
 	gtk_progress_bar_get_type
 	gtk_progress_bar_new
 	gtk_progress_bar_new_with_adjustment
+	gtk_progress_bar_orientation_get_type
 	gtk_progress_bar_pulse
 	gtk_progress_bar_set_activity_blocks
 	gtk_progress_bar_set_activity_step
@@ -1118,6 +1082,7 @@ EXPORTS
 	gtk_progress_bar_set_orientation
 	gtk_progress_bar_set_pulse_step
 	gtk_progress_bar_set_text
+	gtk_progress_bar_style_get_type
 	gtk_progress_bar_update
 	gtk_progress_configure
 	gtk_progress_get_current_percentage
@@ -1171,6 +1136,7 @@ EXPORTS
 	gtk_rc_add_widget_name_style
 	gtk_rc_find_module_in_path
 	gtk_rc_find_pixmap_in_path
+	gtk_rc_flags_get_type
 	gtk_rc_get_default_files
 	gtk_rc_get_im_module_file
 	gtk_rc_get_im_module_path
@@ -1197,9 +1163,13 @@ EXPORTS
 	gtk_rc_style_new
 	gtk_rc_style_ref
 	gtk_rc_style_unref
+	gtk_rc_token_type_get_type
+	gtk_relief_style_get_type
 	gtk_requisition_copy
 	gtk_requisition_free
 	gtk_requisition_get_type
+	gtk_resize_mode_get_type
+	gtk_response_type_get_type
 	gtk_rgb_to_hsv
 	gtk_ruler_draw_pos
 	gtk_ruler_draw_ticks
@@ -1215,6 +1185,7 @@ EXPORTS
 	gtk_scale_set_digits
 	gtk_scale_set_draw_value
 	gtk_scale_set_value_pos
+	gtk_scroll_type_get_type
 	gtk_scrollbar_get_type
 	gtk_scrolled_window_add_with_viewport
 	gtk_scrolled_window_get_hadjustment
@@ -1243,6 +1214,7 @@ EXPORTS
 	gtk_selection_data_set_text
 	gtk_selection_data_targets_include_text
 	gtk_selection_incr_event
+	gtk_selection_mode_get_type
 	gtk_selection_notify
 	gtk_selection_owner_set
 	gtk_selection_property_notify
@@ -1260,6 +1232,8 @@ EXPORTS
 	gtk_settings_set_long_property
 	gtk_settings_set_property_value
 	gtk_settings_set_string_property
+	gtk_shadow_type_get_type
+	gtk_side_type_get_type
 	gtk_signal_compat_matched
 	gtk_signal_connect_full
 	gtk_signal_connect_object_while_alive
@@ -1271,9 +1245,11 @@ EXPORTS
 	gtk_signal_emitv_by_name
 	gtk_signal_new
 	gtk_signal_newv
+	gtk_signal_run_type_get_type
 	gtk_size_group_add_widget
 	gtk_size_group_get_mode
 	gtk_size_group_get_type
+	gtk_size_group_mode_get_type
 	gtk_size_group_new
 	gtk_size_group_remove_widget
 	gtk_size_group_set_mode
@@ -1282,6 +1258,7 @@ EXPORTS
 ;	gtk_socket_get_type
 ;	gtk_socket_new
 ;	gtk_socket_steal
+	gtk_sort_type_get_type
 	gtk_spin_button_configure
 	gtk_spin_button_get_adjustment
 	gtk_spin_button_get_digits
@@ -1307,6 +1284,9 @@ EXPORTS
 	gtk_spin_button_set_wrap
 	gtk_spin_button_spin
 	gtk_spin_button_update
+	gtk_spin_button_update_policy_get_type
+	gtk_spin_type_get_type
+	gtk_state_type_get_type
 	gtk_statusbar_get_context_id
 	gtk_statusbar_get_has_resize_grip
 	gtk_statusbar_get_type
@@ -1334,6 +1314,8 @@ EXPORTS
 	gtk_style_set_background
 	gtk_style_set_font
 	gtk_style_unref
+	gtk_submenu_direction_get_type
+	gtk_submenu_placement_get_type
 	gtk_table_attach
 	gtk_table_attach_defaults
 	gtk_table_get_col_spacing
@@ -1349,6 +1331,7 @@ EXPORTS
 	gtk_table_set_homogeneous
 	gtk_table_set_row_spacing
 	gtk_table_set_row_spacings
+	gtk_target_flags_get_type
 	gtk_target_list_add
 	gtk_target_list_add_table
 	gtk_target_list_find
@@ -1430,6 +1413,7 @@ EXPORTS
 	gtk_text_child_anchor_queue_resize
 	gtk_text_child_anchor_register_child
 	gtk_text_child_anchor_unregister_child
+	gtk_text_direction_get_type
 	gtk_text_forward_delete
 	gtk_text_freeze
 	gtk_text_get_length
@@ -1564,6 +1548,7 @@ EXPORTS
 	gtk_text_mark_get_visible
 	gtk_text_mark_set_visible
 	gtk_text_new
+	gtk_text_search_flags_get_type
 	gtk_text_set_adjustments
 	gtk_text_set_editable
 	gtk_text_set_line_wrap
@@ -1636,6 +1621,7 @@ EXPORTS
 	gtk_text_view_set_wrap_mode
 	gtk_text_view_starts_display_line
 	gtk_text_view_window_to_buffer_coords
+	gtk_text_window_type_get_type
 	gtk_theme_engine_create_rc_style
 	gtk_theme_engine_get
 	gtk_theme_engine_get_type
@@ -1663,6 +1649,7 @@ EXPORTS
 	gtk_toolbar_append_item
 	gtk_toolbar_append_space
 	gtk_toolbar_append_widget
+	gtk_toolbar_child_type_get_type
 	gtk_toolbar_get_icon_size
 	gtk_toolbar_get_orientation
 	gtk_toolbar_get_style
@@ -1683,6 +1670,8 @@ EXPORTS
 	gtk_toolbar_set_orientation
 	gtk_toolbar_set_style
 	gtk_toolbar_set_tooltips
+	gtk_toolbar_space_style_get_type
+	gtk_toolbar_style_get_type
 	gtk_toolbar_unset_icon_size
 	gtk_toolbar_unset_style
 	gtk_tooltips_data_get
@@ -1719,6 +1708,7 @@ EXPORTS
 	gtk_tree_iter_copy
 	gtk_tree_iter_free
 	gtk_tree_iter_get_type
+	gtk_tree_model_flags_get_type
 	gtk_tree_model_foreach
 	gtk_tree_model_get
 	gtk_tree_model_get_column_type
@@ -1880,8 +1870,10 @@ EXPORTS
 	gtk_tree_view_column_set_title
 	gtk_tree_view_column_set_visible
 	gtk_tree_view_column_set_widget
+	gtk_tree_view_column_sizing_get_type
 	gtk_tree_view_columns_autosize
 	gtk_tree_view_create_row_drag_icon
+	gtk_tree_view_drop_position_get_type
 	gtk_tree_view_enable_model_drag_dest
 	gtk_tree_view_enable_model_drag_source
 	gtk_tree_view_expand_all
@@ -1912,6 +1904,7 @@ EXPORTS
 	gtk_tree_view_insert_column_with_attributes
 	gtk_tree_view_insert_column_with_data_func
 	gtk_tree_view_map_expanded_rows
+	gtk_tree_view_mode_get_type
 	gtk_tree_view_move_column_after
 	gtk_tree_view_new
 	gtk_tree_view_new_with_model
@@ -1948,6 +1941,7 @@ EXPORTS
 	gtk_type_init
 	gtk_type_new
 	gtk_type_unique
+	gtk_update_type_get_type
 	gtk_vbox_get_type
 	gtk_vbox_new
 	gtk_vbutton_box_get_layout_default
@@ -1964,6 +1958,7 @@ EXPORTS
 	gtk_viewport_set_hadjustment
 	gtk_viewport_set_shadow_type
 	gtk_viewport_set_vadjustment
+	gtk_visibility_get_type
 	gtk_vpaned_get_type
 	gtk_vpaned_new
 	gtk_vruler_get_type
@@ -1990,6 +1985,7 @@ EXPORTS
 	gtk_widget_draw
 	gtk_widget_ensure_style
 	gtk_widget_event
+	gtk_widget_flags_get_type
 	gtk_widget_freeze_child_notify
 	gtk_widget_get_accessible
 	gtk_widget_get_ancestor
@@ -2018,6 +2014,7 @@ EXPORTS
 	gtk_widget_get_visual
 	gtk_widget_grab_default
 	gtk_widget_grab_focus
+	gtk_widget_help_type_get_type
 	gtk_widget_hide
 	gtk_widget_hide_all
 	gtk_widget_hide_on_delete
@@ -2048,13 +2045,13 @@ EXPORTS
 	gtk_widget_ref
 	gtk_widget_region_intersect
 	gtk_widget_remove_accelerator
-	gtk_widget_set_accel_path
 	gtk_widget_render_icon
 	gtk_widget_reparent
 	gtk_widget_reset_rc_styles
 	gtk_widget_reset_shapes
 	gtk_widget_send_expose
 	gtk_widget_set
+	gtk_widget_set_accel_path
 	gtk_widget_set_app_paintable
 	gtk_widget_set_child_visible
 	gtk_widget_set_colormap
@@ -2130,6 +2127,7 @@ EXPORTS
 	gtk_window_move
 	gtk_window_new
 	gtk_window_parse_geometry
+	gtk_window_position_get_type
 	gtk_window_present
 	gtk_window_remove_accel_group
 	gtk_window_remove_embedded_xid
@@ -2159,5 +2157,7 @@ EXPORTS
 	gtk_window_set_type_hint
 	gtk_window_set_wmclass
 	gtk_window_stick
+	gtk_window_type_get_type
 	gtk_window_unmaximize
 	gtk_window_unstick
+	gtk_wrap_mode_get_type
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index ad5021bd75..e6396498ad 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1036,7 +1036,7 @@ rewrite_events_translate (GdkWindow *old_window,
   *y += new_origin_y - old_origin_y;
 }
 
-GdkEvent *
+static GdkEvent *
 rewrite_event_for_window (GdkEvent  *event,
 			  GdkWindow *new_window)
 {
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 28ef67912f..b9d3581cbf 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1249,7 +1249,7 @@ gtk_rc_reset_widgets (GtkRcContext *context)
   g_list_free (toplevels);
 }
 
-void
+static void
 gtk_rc_clear_realized_style (gpointer key,
 			     gpointer value,
 			     gpointer data)
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 0ca53d29d5..eb6fec9f90 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -193,6 +193,7 @@ gtk_OBJECTS = 					\
 	gtktreeview.obj			\
 	gtktreeviewcolumn.obj			\
 	gtktypeutils.obj			\
+	gtktypebuiltins.obj \
 	gtkvbbox.obj				\
 	gtkvbox.obj				\
 	gtkviewport.obj				\
@@ -349,15 +350,13 @@ gtk_public_h_sources =		\
 # these aren't use here, but listed for reference
 gtk_extra_sources = \
 	gtkversion.h		\
-	maketypes.awk		\
-	makeenums.h		\
 	gtk-boxed.defs		\
 	gtkmarshal.list		\
 
 ..\config.h : ..\config.h.win32
 	copy ..\config.h.win32 ..\config.h
 
-GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c
+GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins.c gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c
 
 #
 # Generated source files:
@@ -365,26 +364,38 @@ GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_id
 generated : $(GENERATED)
 	$(TOUCH) generated
 
-gtk.defs : makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) makefile.msc
-	$(PERL) makeenums.pl defs $(gtk_public_h_sources) >gd.tmp
-	copy gd.tmp+gtk-boxed.defs gtk.defs
-	@erase gd.tmp
+gtk.defs : gtk-boxed.defs $(gtk_public_h_sources) makefile.msc
+	$(PERL) $(GLIB)\gobject\glib-mkenums \
+		--comments ";; @comment@" \
+		--fprod "; enumerations from \"@filename@\"\n " \
+		--vhead "(define-@type@ @EnumName@" \
+		--vprod "   (@valuenick@ @VALUENAME@)" \
+		--vtail ")" \
+		$(gtk_public_h_sources) > xgen-gdef
+	copy xgen-gdef+gtk-boxed.defs gtk.defs
 
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins.h: gtk.defs maketypes.awk
-	$(AWK) -f maketypes.awk gtk.defs macros >gtktypebuiltins.h
-
-# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins_vars.c: gtk.defs maketypes.awk
-	$(AWK) -f maketypes.awk gtk.defs variables >gtktypebuiltins_vars.c
-
-# generate type entries for type-id registration
-gtktypebuiltins_ids.c: gtk.defs maketypes.awk
-	$(AWK) -f maketypes.awk gtk.defs entries >gtktypebuiltins_ids.c
-
-# generate enum value arrays
-gtktypebuiltins_evals.c: makeenums.pl gtk.defs
-	$(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) >gtktypebuiltins_evals.c
+# use 'echo' to work around 'command line too long'
+gtktypebuiltins.h: $(gtk_public_h_sources) makefile.msc
+	echo #ifndef __GTK_TYPE_BUILTINS_H__ > gtktypebuiltins.h
+	echo #define __GTK_TYPE_BUILTINS_H__ >> gtktypebuiltins.h
+	echo #include "glib-object.h" >> gtktypebuiltins.h
+	echo G_BEGIN_DECLS >> gtktypebuiltins.h
+	$(PERL) $(GLIB)\gobject\glib-mkenums \
+		--fprod "/* enumerations from \"@filename@\" */\n" \
+		--vhead "GType @enum_name@_get_type (void);\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+		--ftail "G_END_DECLS\n\n#endif /* __GTK_TYPE_BUILTINS_H__ */" \
+		$(gtk_public_h_sources) >> gtktypebuiltins.h
+
+gtktypebuiltins.c: $(gtk_public_h_sources) makefile.msc
+	$(PERL) $(GLIB)\gobject\glib-mkenums \
+		--fhead "#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
+		--fprod "\n/* enumerations from \"@filename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
+		--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+		$(gtk_public_h_sources) > xgen-gtbc
+	copy xgen-gtbc gtktypebuiltins.c
 
 # private marshalers
 gtkmarshalers.h : gtkmarshalers.list
diff --git a/gtk/stock-icons/makefile.msc b/gtk/stock-icons/makefile.msc
index 2d877a0b39..91a71c944e 100644
--- a/gtk/stock-icons/makefile.msc
+++ b/gtk/stock-icons/makefile.msc
@@ -1,76 +1,128 @@
 VARIABLES = \
-		dialog_error     		dialog_error.png    			\
-	        dialog_info      		dialog_info.png     			\
-		dialog_question  		dialog_question.png 			\
-	 	dialog_warning   		dialog_warning.png  			\
-		stock_add          		stock_add.png 			\
-		stock_align_justify		stock_align_justify.png             	\
-		stock_align_left		stock_align_left.png             	\
-		stock_button_apply 		stock_button_apply.png  		\
-		stock_button_cancel     	stock_button_cancel.png 		\
-		stock_button_close      	stock_button_close.png  		\
-		stock_dnd_multiple              stock_dnd_multiple.png 		\
-		stock_button_no         	stock_button_no.png  			\
-		stock_button_ok     		stock_button_ok.png  			\
-		stock_button_yes		stock_button_yes.png  		\
-	       	stock_align_center		stock_align_center.png             	\
-	        stock_align_right		stock_align_right.png             	\
-                stock_bottom			stock_bottom.png             		\
-                stock_cdrom			stock_cdrom.png             		\
-                stock_clear			stock_clear.png             		\
-                stock_close			stock_close.png             		\
-                stock_colorselector		stock_colorselector.png             	\
-                stock_convert			stock_convert.png             	\
-                stock_copy			stock_copy.png             		\
-                stock_cut			stock_cut.png             		\
-                stock_down_arrow		stock_down_arrow.png             	\
-                stock_exec			stock_exec.png             		\
-		stock_exit			stock_exit.png 			\
-                stock_first			stock_first.png             		\
-                stock_font			stock_font.png             		\
-                stock_help			stock_help.png             		\
-                stock_home			stock_home.png             		\
-                stock_index			stock_index.png             		\
-                stock_jump_to			stock_jump_to.png             	\
-                stock_last			stock_last.png             		\
-                stock_left_arrow		stock_left_arrow.png             	\
-                stock_menu_print_preview	stock_menu_print_preview.png    	\
-                stock_menu_sort_ascending	stock_menu_sort_ascending.png        \
-                stock_menu_sort_descending	stock_menu_sort_descending.png        \
-		stock_missing_image	stock_broken_image.png        \
-		stock_new			stock_new.png				\
-		stock_open			stock_open.png  			\
-                stock_paste			stock_paste.png             		\
-                stock_preferences		stock_preferences.png             	\
-                stock_print			stock_print.png             		\
-                stock_print_preview		stock_print_preview.png             	\
-                stock_properties		stock_properties.png             	\
-                stock_redo			stock_redo.png             		\
-                stock_refresh			stock_refresh.png             	\
-                stock_remove			stock_remove.png             		\
-                stock_revert			stock_revert.png             		\
-                stock_right_arrow		stock_right_arrow.png             	\
-		stock_save			stock_save.png			\
-                stock_save_as			stock_save_as.png             	\
-                stock_search			stock_search.png             		\
-                stock_search_replace		stock_search_replace.png             	\
-                stock_sort_ascending		stock_sort_ascending.png             	\
-                stock_sort_descending		stock_sort_descending.png             \
-                stock_spellcheck		stock_spellcheck.png             	\
-                stock_stop			stock_stop.png             		\
-                stock_text_bold			stock_text_bold.png             	\
-                stock_text_italic		stock_text_italic.png             	\
-                stock_text_strikeout		stock_text_strikeout.png             	\
-                stock_text_underline		stock_text_underline.png             	\
-                stock_top			stock_top.png             		\
-                stock_trash			stock_trash.png             		\
-                stock_undelete			stock_undelete.png             	\
-                stock_undo			stock_undo.png             		\
-                stock_up_arrow			stock_up_arrow.png             	\
-                stock_zoom_1			stock_zoom_1.png             		\
-                stock_zoom_fit			stock_zoom_fit.png             	\
-                stock_zoom_in			stock_zoom_in.png            		\
-                stock_zoom_out			stock_zoom_out.png             	\
+	stock_add_24		stock_add_24.png	\
+	stock_align_center_16		stock_align_center_16.png	\
+	stock_align_center_24		stock_align_center_24.png	\
+	stock_align_justify_16		stock_align_justify_16.png	\
+	stock_align_justify_24		stock_align_justify_24.png	\
+	stock_align_left_16		stock_align_left_16.png	\
+	stock_align_left_24		stock_align_left_24.png	\
+	stock_align_right_16		stock_align_right_16.png	\
+	stock_align_right_24		stock_align_right_24.png	\
+	stock_apply_20		stock_apply_20.png	\
+	stock_bottom_16		stock_bottom_16.png	\
+	stock_bottom_24		stock_bottom_24.png	\
+	stock_missing_image_16		stock_broken_image_16.png	\
+	stock_missing_image_24		stock_broken_image_24.png	\
+	stock_cancel_20		stock_cancel_20.png	\
+	stock_cdrom_16		stock_cdrom_16.png	\
+	stock_cdrom_24		stock_cdrom_24.png	\
+	stock_clear_24		stock_clear_24.png	\
+	stock_close_20		stock_close_20.png	\
+	stock_close_24		stock_close_24.png	\
+	stock_colorselector_24		stock_colorselector_24.png	\
+	stock_convert_16		stock_convert_16.png	\
+	stock_convert_24		stock_convert_24.png	\
+	stock_copy_16		stock_copy_16.png	\
+	stock_copy_24		stock_copy_24.png	\
+	stock_cut_16		stock_cut_16.png	\
+	stock_cut_24		stock_cut_24.png	\
+	stock_dialog_error_48		stock_dialog_error_48.png	\
+	stock_dialog_info_48		stock_dialog_info_48.png	\
+	stock_dialog_question_48		stock_dialog_question_48.png	\
+	stock_dialog_warning_48		stock_dialog_warning_48.png	\
+	stock_dnd_32		stock_dnd_32.png	\
+	stock_dnd_multiple_32		stock_dnd_multiple_32.png	\
+	stock_down_arrow_16		stock_down_arrow_16.png	\
+	stock_down_arrow_24		stock_down_arrow_24.png	\
+	stock_exec_16		stock_exec_16.png	\
+	stock_exec_24		stock_exec_24.png	\
+	stock_exit_16		stock_exit_16.png	\
+	stock_exit_24		stock_exit_24.png	\
+	stock_first_16		stock_first_16.png	\
+	stock_first_24		stock_first_24.png	\
+	stock_font_16		stock_font_16.png	\
+	stock_font_24		stock_font_24.png	\
+	stock_help_16		stock_help_16.png	\
+	stock_help_24		stock_help_24.png	\
+	stock_home_16		stock_home_16.png	\
+	stock_home_24		stock_home_24.png	\
+	stock_index_24		stock_index_24.png	\
+	stock_insert_image_16		stock_insert_image_16.png	\
+	stock_insert_image_24		stock_insert_image_24.png	\
+	stock_insert_object_16		stock_insert_object_16.png	\
+	stock_insert_object_24		stock_insert_object_24.png	\
+	stock_jump_to_16		stock_jump_to_16.png	\
+	stock_jump_to_24		stock_jump_to_24.png	\
+	stock_last_16		stock_last_16.png	\
+	stock_last_24		stock_last_24.png	\
+	stock_left_arrow_16		stock_left_arrow_16.png	\
+	stock_left_arrow_24		stock_left_arrow_24.png	\
+	stock_new_16		stock_new_16.png	\
+	stock_new_24		stock_new_24.png	\
+	stock_no_20		stock_no_20.png	\
+	stock_ok_20		stock_ok_20.png	\
+	stock_open_16		stock_open_16.png	\
+	stock_open_24		stock_open_24.png	\
+	stock_paste_16		stock_paste_16.png	\
+	stock_paste_24		stock_paste_24.png	\
+	stock_preferences_16		stock_preferences_16.png	\
+	stock_preferences_24		stock_preferences_24.png	\
+	stock_print_16		stock_print_16.png	\
+	stock_print_24		stock_print_24.png	\
+	stock_print_preview_16		stock_print_preview_16.png	\
+	stock_print_preview_24		stock_print_preview_24.png	\
+	stock_properties_16		stock_properties_16.png	\
+	stock_properties_24		stock_properties_24.png	\
+	stock_redo_16		stock_redo_16.png	\
+	stock_redo_24		stock_redo_24.png	\
+	stock_refresh_16		stock_refresh_16.png	\
+	stock_refresh_24		stock_refresh_24.png	\
+	stock_remove_24		stock_remove_24.png	\
+	stock_revert_16		stock_revert_16.png	\
+	stock_revert_24		stock_revert_24.png	\
+	stock_right_arrow_16		stock_right_arrow_16.png	\
+	stock_right_arrow_24		stock_right_arrow_24.png	\
+	stock_save_16		stock_save_16.png	\
+	stock_save_24		stock_save_24.png	\
+	stock_save_as_16		stock_save_as_16.png	\
+	stock_save_as_24		stock_save_as_24.png	\
+	stock_search_16		stock_search_16.png	\
+	stock_search_24		stock_search_24.png	\
+	stock_search_replace_16		stock_search_replace_16.png	\
+	stock_search_replace_24		stock_search_replace_24.png	\
+	stock_sort_ascending_16		stock_sort_ascending_16.png	\
+	stock_sort_ascending_24		stock_sort_ascending_24.png	\
+	stock_sort_descending_16		stock_sort_descending_16.png	\
+	stock_sort_descending_24		stock_sort_descending_24.png	\
+	stock_spellcheck_16		stock_spellcheck_16.png	\
+	stock_spellcheck_24		stock_spellcheck_24.png	\
+	stock_stop_16		stock_stop_16.png	\
+	stock_stop_24		stock_stop_24.png	\
+	stock_text_bold_16		stock_text_bold_16.png	\
+	stock_text_bold_24		stock_text_bold_24.png	\
+	stock_text_italic_16		stock_text_italic_16.png	\
+	stock_text_italic_24		stock_text_italic_24.png	\
+	stock_text_strikethrough_16		stock_text_strikethrough_16.png	\
+	stock_text_strikethrough_24		stock_text_strikethrough_24.png	\
+	stock_text_underline_16		stock_text_underline_16.png	\
+	stock_text_underline_24		stock_text_underline_24.png	\
+	stock_top_16		stock_top_16.png	\
+	stock_top_24		stock_top_24.png	\
+	stock_trash_16		stock_trash_16.png	\
+	stock_trash_24		stock_trash_24.png	\
+	stock_undelete_16		stock_undelete_16.png	\
+	stock_undelete_24		stock_undelete_24.png	\
+	stock_undo_16		stock_undo_16.png	\
+	stock_undo_24		stock_undo_24.png	\
+	stock_up_arrow_16		stock_up_arrow_16.png	\
+	stock_up_arrow_24		stock_up_arrow_24.png	\
+	stock_wizard_24		stock_wizard_24.png	\
+	stock_yes_20		stock_yes_20.png	\
+	stock_zoom_1_24		stock_zoom_1_24.png	\
+	stock_zoom_fit_24		stock_zoom_fit_24.png	\
+	stock_zoom_in_24		stock_zoom_in_24.png	\
+	stock_zoom_out_24		stock_zoom_out_24.png	\
+
 
 all: \
 	gtkstockpixbufs.h