diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-03-20 07:01:23 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-03-20 07:01:23 +0000 |
| commit | cca8dd63475ab582d8592039f1f69d7f22a3b928 (patch) | |
| tree | f800dcc62e1ab8a0010e774a05e669b14c3ff5e1 /gtk | |
| parent | b39b0bfc0471258285169113bc176320b0b5ae71 (diff) | |
| download | gtk+-cca8dd63475ab582d8592039f1f69d7f22a3b928.tar.gz | |
Make PLT-reduction work with gcc4, and don't include everything in
2005-03-20 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in gdkalias.h:
* gtk/grk.symbols: Group symbols by header and source file.
* gtk/makegtkalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegtkalias.pl -def
* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
this file.
* gtk/*.c: Include gtkalias.h after the other headers,
include gtkaliasdef.c at the bottom.
* gtk/*.h: Small cleanups.
Diffstat (limited to 'gtk')
295 files changed, 2471 insertions, 1533 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 4904894ac5..a509c247a6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -75,10 +75,12 @@ uninstall-ms-lib: endif gtk.def: gtk.symbols - (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gtk.def + (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gtk.def gtkalias.h: gtk.symbols $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h +gtkaliasdef.c: gtk.symbols + $(PERL) $(srcdir)/makegtkalias.pl -def < $(srcdir)/gtk.symbols > gtkaliasdef.c if OS_LINUX TESTS = abicheck.sh @@ -553,6 +555,7 @@ gtk_built_private_headers = \ gtkmarshalers.h gtk_built_sources = \ + gtkaliasdef.c \ gtktypebuiltins.c \ gtkmarshalers.c \ gtkmarshalers.h \ @@ -636,7 +639,8 @@ stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile && echo timestamp > $(@F) gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile ( cd $(srcdir) && glib-mkenums \ - --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtkalias.h\"\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \ + --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"\n#include \"gtkalias.h\"\n" \ + --ftail "#define __GTK_TYPE_BUILTINS_C__\n#include \"gtkaliasdef.c\"\n" \ --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@\" }," \ diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh index c426f8c318..e779838fc3 100755 --- a/gtk/abicheck.sh +++ b/gtk/abicheck.sh @@ -1,5 +1,5 @@ #! /bin/sh -cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi +cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi nm -D .libs/libgtk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi diff -u expected-abi actual-abi && rm expected-abi actual-abi diff --git a/gtk/fnmatch.c b/gtk/fnmatch.c index aeb5ebd422..677ff9f719 100644 --- a/gtk/fnmatch.c +++ b/gtk/fnmatch.c @@ -41,8 +41,6 @@ #define _GNU_SOURCE #endif -#include "gtkalias.h" - static gunichar get_char (const char **str) { diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index d92ddc11f1..bed716f016 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -6,7 +6,23 @@ * or only on Unix, or only with the X11 backend must be included in * similar ifdefs, using the symbols G_OS_WIN32, G_OS_UNIX and * GTK_WINDOWING_X11. + * + * Every symbol must be included in the right + * #ifdef IN_HEADER(sym) #endif and + * #ifdef IN_FILE(sym) #endif sections. + * + * gdkalias.h must be included *after* all other gdk headers + * in each source file, gdkaliasdef.c must be included at the + * very bottom, after a line defining the right symbol. */ +#ifdef ALL_FILES +#define IN_FILE(x) 1 +#define IN_HEADER(x) 1 +#endif + +#if IN_HEADER(__GTK_ABOUT_DIALOG_H__) +#if IN_FILE(__GTK_ABOUT_DIALOG_C__) +gtk_show_about_dialog G_GNUC_NULL_TERMINATED gtk_about_dialog_get_artists gtk_about_dialog_get_authors gtk_about_dialog_get_comments @@ -37,13 +53,18 @@ gtk_about_dialog_set_url_hook gtk_about_dialog_set_version gtk_about_dialog_set_website gtk_about_dialog_set_website_label +#endif +#endif + +#if IN_HEADER(__GTK_ACCEL_GROUP_H__) +#if IN_FILE(__GTK_ACCEL_GROUP_C__) gtk_accelerator_get_default_mod_mask gtk_accelerator_get_label gtk_accelerator_name gtk_accelerator_parse gtk_accelerator_set_default_mod_mask gtk_accelerator_valid G_GNUC_CONST -gtk_accel_flags_get_type G_GNUC_CONST + gtk_accel_group_activate gtk_accel_group_connect gtk_accel_group_connect_by_path @@ -58,6 +79,11 @@ gtk_accel_group_query gtk_accel_groups_activate gtk_accel_groups_from_object gtk_accel_group_unlock +#endif +#endif + +#if IN_HEADER(__GTK_ACCEL_LABEL_H__) +#if IN_FILE(__GTK_ACCEL_LABEL_C__) gtk_accel_label_get_accel_widget gtk_accel_label_get_accel_width gtk_accel_label_get_type G_GNUC_CONST @@ -65,6 +91,11 @@ gtk_accel_label_new gtk_accel_label_refetch gtk_accel_label_set_accel_closure gtk_accel_label_set_accel_widget +#endif +#endif + +#if IN_HEADER(__GTK_ACCEL_MAP_H__) +#if IN_FILE(__GTK_ACCEL_MAP_C__) gtk_accel_map_add_entry gtk_accel_map_add_filter gtk_accel_map_change_entry @@ -86,8 +117,18 @@ gtk_accel_map_save_utf8 #endif gtk_accel_map_save_fd gtk_accel_map_unlock_path +#endif +#endif + +#if IN_HEADER(__GTK_ACCESSIBLE_H__) +#if IN_FILE(__GTK_ACCESSIBLE_C__) gtk_accessible_connect_widget_destroyed gtk_accessible_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_ACTION_H__) +#if IN_FILE(__GTK_ACTION_C__) gtk_action_activate gtk_action_block_activate_from gtk_action_connect_accelerator @@ -103,6 +144,19 @@ gtk_action_get_proxies gtk_action_get_sensitive gtk_action_get_type G_GNUC_CONST gtk_action_get_visible +gtk_action_is_sensitive +gtk_action_is_visible +gtk_action_new +gtk_action_set_accel_group +gtk_action_set_accel_path +gtk_action_set_sensitive +gtk_action_set_visible +gtk_action_unblock_activate_from +#endif +#endif + +#if IN_HEADER(__GTK_ACTION_GROUP_H__) +#if IN_FILE(__GTK_ACTION_GROUP_C__) gtk_action_group_add_action gtk_action_group_add_actions gtk_action_group_add_actions_full @@ -124,14 +178,11 @@ gtk_action_group_set_translate_func gtk_action_group_set_translation_domain gtk_action_group_set_visible gtk_action_group_translate_string -gtk_action_is_sensitive -gtk_action_is_visible -gtk_action_new -gtk_action_set_accel_group -gtk_action_set_accel_path -gtk_action_set_sensitive -gtk_action_set_visible -gtk_action_unblock_activate_from +#endif +#endif + +#if IN_HEADER(__GTK_ADJUSTMENT_H__) +#if IN_FILE(__GTK_ADJUSTMENT_C__) gtk_adjustment_changed gtk_adjustment_clamp_page gtk_adjustment_get_type G_GNUC_CONST @@ -139,25 +190,132 @@ gtk_adjustment_get_value gtk_adjustment_new gtk_adjustment_set_value gtk_adjustment_value_changed +#endif +#endif + +#if IN_HEADER(__GTK_ALIGNMENT_H__) +#if IN_FILE(__GTK_ALIGNMENT_C__) gtk_alignment_get_padding gtk_alignment_get_type G_GNUC_CONST gtk_alignment_new gtk_alignment_set gtk_alignment_set_padding -gtk_alternative_dialog_button_order +#endif +#endif + +#if IN_HEADER(__GTK_TYPE_BUILTINS_H__) +#if IN_FILE(__GTK_TYPE_BUILTINS_C__) +gtk_pack_direction_get_type G_GNUC_CONST +gtk_ui_manager_item_type_get_type G_GNUC_CONST +gtk_spin_button_update_policy_get_type G_GNUC_CONST +gtk_notebook_tab_get_type G_GNUC_CONST gtk_anchor_type_get_type G_GNUC_CONST gtk_arg_flags_get_type G_GNUC_CONST +gtk_arrow_type_get_type G_GNUC_CONST +gtk_attach_options_get_type G_GNUC_CONST +gtk_button_action_get_type G_GNUC_CONST +gtk_buttons_type_get_type G_GNUC_CONST +gtk_calendar_display_options_get_type G_GNUC_CONST +gtk_cell_renderer_mode_get_type G_GNUC_CONST +gtk_cell_renderer_state_get_type G_GNUC_CONST +gtk_corner_type_get_type G_GNUC_CONST +gtk_debug_flag_get_type G_GNUC_CONST +gtk_delete_type_get_type G_GNUC_CONST +gtk_dest_defaults_get_type G_GNUC_CONST +gtk_clist_drag_pos_get_type G_GNUC_CONST +gtk_dialog_flags_get_type G_GNUC_CONST +gtk_direction_type_get_type G_GNUC_CONST +gtk_expander_style_get_type G_GNUC_CONST +gtk_file_chooser_action_get_type G_GNUC_CONST +gtk_file_filter_flags_get_type G_GNUC_CONST +gtk_window_type_get_type G_GNUC_CONST +gtk_wrap_mode_get_type G_GNUC_CONST +gtk_widget_flags_get_type G_GNUC_CONST +gtk_widget_help_type_get_type G_GNUC_CONST +gtk_window_position_get_type G_GNUC_CONST +gtk_tree_view_column_sizing_get_type G_GNUC_CONST +gtk_tree_view_drop_position_get_type G_GNUC_CONST +gtk_button_box_style_get_type G_GNUC_CONST +gtk_cell_type_get_type G_GNUC_CONST +gtk_ctree_expander_style_get_type G_GNUC_CONST +gtk_ctree_expansion_type_get_type G_GNUC_CONST +gtk_ctree_line_style_get_type G_GNUC_CONST +gtk_ctree_pos_get_type G_GNUC_CONST +gtk_curve_type_get_type G_GNUC_CONST +gtk_icon_lookup_flags_get_type G_GNUC_CONST +gtk_image_type_get_type G_GNUC_CONST +gtk_im_preedit_style_get_type G_GNUC_CONST +gtk_im_status_style_get_type G_GNUC_CONST +gtk_justification_get_type G_GNUC_CONST +gtk_match_type_get_type G_GNUC_CONST +gtk_menu_direction_type_get_type G_GNUC_CONST +gtk_message_type_get_type G_GNUC_CONST +gtk_metric_type_get_type G_GNUC_CONST +gtk_movement_step_get_type G_GNUC_CONST +gtk_orientation_get_type G_GNUC_CONST +gtk_pack_type_get_type G_GNUC_CONST +gtk_path_priority_type_get_type G_GNUC_CONST +gtk_path_type_get_type G_GNUC_CONST +gtk_policy_type_get_type G_GNUC_CONST +gtk_position_type_get_type G_GNUC_CONST +gtk_preview_type_get_type G_GNUC_CONST +gtk_private_flags_get_type G_GNUC_CONST +gtk_progress_bar_orientation_get_type G_GNUC_CONST +gtk_progress_bar_style_get_type G_GNUC_CONST +gtk_rc_flags_get_type G_GNUC_CONST +gtk_rc_token_type_get_type G_GNUC_CONST +gtk_relief_style_get_type G_GNUC_CONST +gtk_resize_mode_get_type G_GNUC_CONST +gtk_response_type_get_type G_GNUC_CONST +gtk_scroll_step_get_type G_GNUC_CONST +gtk_scroll_type_get_type G_GNUC_CONST +gtk_selection_mode_get_type G_GNUC_CONST +gtk_shadow_type_get_type G_GNUC_CONST +gtk_side_type_get_type G_GNUC_CONST +gtk_signal_run_type_get_type G_GNUC_CONST +gtk_size_group_mode_get_type G_GNUC_CONST +gtk_sort_type_get_type G_GNUC_CONST +gtk_spin_type_get_type G_GNUC_CONST +gtk_state_type_get_type G_GNUC_CONST +gtk_submenu_direction_get_type G_GNUC_CONST +gtk_submenu_placement_get_type G_GNUC_CONST +gtk_target_flags_get_type G_GNUC_CONST +gtk_text_direction_get_type G_GNUC_CONST +gtk_text_search_flags_get_type G_GNUC_CONST +gtk_text_window_type_get_type G_GNUC_CONST +gtk_tree_model_flags_get_type G_GNUC_CONST +gtk_tree_view_mode_get_type G_GNUC_CONST +gtk_update_type_get_type G_GNUC_CONST +gtk_visibility_get_type G_GNUC_CONST +gtk_object_flags_get_type G_GNUC_CONST +gtk_accel_flags_get_type G_GNUC_CONST +gtk_icon_size_get_type G_GNUC_CONST +gtk_file_chooser_error_get_type G_GNUC_CONST +gtk_icon_theme_error_get_type G_GNUC_CONST +gtk_toolbar_child_type_get_type G_GNUC_CONST +gtk_toolbar_space_style_get_type G_GNUC_CONST +gtk_toolbar_style_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_ARROW_H__) +#if IN_FILE(__GTK_ARROW_C__) gtk_arrow_get_type G_GNUC_CONST gtk_arrow_new gtk_arrow_set -gtk_arrow_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_ASPECT_FRAME_H__) +#if IN_FILE(__GTK_ASPECT_FRAME_C__) gtk_aspect_frame_get_type G_GNUC_CONST gtk_aspect_frame_new gtk_aspect_frame_set -gtk_attach_options_get_type G_GNUC_CONST -#ifdef INCLUDE_VARIABLES -gtk_binary_age #endif +#endif + +#if IN_HEADER(__GTK_BINDINGS_H__) +#if IN_FILE(__GTK_BINDINGS_C__) gtk_binding_entry_add_signal gtk_binding_entry_add_signall gtk_binding_entry_clear @@ -170,11 +328,18 @@ gtk_binding_set_add_path gtk_binding_set_by_class gtk_binding_set_find gtk_binding_set_new +#endif +#endif + +#if IN_HEADER(__GTK_BIN_H__) +#if IN_FILE(__GTK_BIN_C__) gtk_bin_get_child gtk_bin_get_type G_GNUC_CONST -gtk_border_copy -gtk_border_free -gtk_border_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_BOX_H__) +#if IN_FILE(__GTK_BOX_C__) gtk_box_get_homogeneous gtk_box_get_spacing gtk_box_get_type G_GNUC_CONST @@ -187,17 +352,27 @@ gtk_box_reorder_child gtk_box_set_child_packing gtk_box_set_homogeneous gtk_box_set_spacing -gtk_button_action_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_BUTTON_BOX_H__) +#if IN_FILE(__GTK_BUTTON_BOX_C__) +#ifndef GTK_DISABLE_DEPRECATED +gtk_button_box_set_child_size +gtk_button_box_set_child_ipadding gtk_button_box_get_child_ipadding -gtk_button_box_get_child_secondary gtk_button_box_get_child_size +#endif +gtk_button_box_get_child_secondary gtk_button_box_get_layout gtk_button_box_get_type G_GNUC_CONST -gtk_button_box_set_child_ipadding gtk_button_box_set_child_secondary -gtk_button_box_set_child_size gtk_button_box_set_layout -gtk_button_box_style_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_BUTTON_H__) +#if IN_FILE(__GTK_BUTTON_C__) gtk_button_clicked gtk_button_enter gtk_button_get_alignment @@ -222,10 +397,15 @@ gtk_button_set_label gtk_button_set_relief gtk_button_set_use_stock gtk_button_set_use_underline -gtk_buttons_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_CALENDAR_H__) +#if IN_FILE(__GTK_CALENDAR_C__) gtk_calendar_clear_marks +#ifndef GTK_DISABLE_DEPRECATED gtk_calendar_display_options -gtk_calendar_display_options_get_type G_GNUC_CONST +#endif gtk_calendar_freeze gtk_calendar_get_date gtk_calendar_get_display_options @@ -237,10 +417,20 @@ gtk_calendar_select_month gtk_calendar_set_display_options gtk_calendar_thaw gtk_calendar_unmark_day +#endif +#endif + +#if IN_HEADER(__GTK_CELL_EDITABLE_H__) +#if IN_FILE(__GTK_CELL_EDITABLE_C__) gtk_cell_editable_editing_done gtk_cell_editable_get_type G_GNUC_CONST gtk_cell_editable_remove_widget gtk_cell_editable_start_editing +#endif +#endif + +#if IN_HEADER(__GTK_CELL_LAYOUT_H__) +#if IN_FILE(__GTK_CELL_LAYOUT_C__) gtk_cell_layout_add_attribute gtk_cell_layout_clear gtk_cell_layout_clear_attributes @@ -250,33 +440,67 @@ gtk_cell_layout_pack_start gtk_cell_layout_reorder gtk_cell_layout_set_attributes G_GNUC_NULL_TERMINATED gtk_cell_layout_set_cell_data_func +#endif +#endif + +#if IN_HEADER(__GTK_CELL_RENDERER_H__) +#if IN_FILE(__GTK_CELL_RENDERER_C__) gtk_cell_renderer_activate -gtk_cell_renderer_combo_get_type G_GNUC_CONST -gtk_cell_renderer_combo_new +#ifndef GTK_DISABLE_DEPRECATED gtk_cell_renderer_editing_canceled +#endif gtk_cell_renderer_get_fixed_size gtk_cell_renderer_get_size gtk_cell_renderer_get_type G_GNUC_CONST -gtk_cell_renderer_mode_get_type G_GNUC_CONST -gtk_cell_renderer_pixbuf_get_type G_GNUC_CONST -gtk_cell_renderer_pixbuf_new -gtk_cell_renderer_progress_get_type G_GNUC_CONST -gtk_cell_renderer_progress_new gtk_cell_renderer_render gtk_cell_renderer_set_fixed_size gtk_cell_renderer_start_editing -gtk_cell_renderer_state_get_type G_GNUC_CONST gtk_cell_renderer_stop_editing +#endif +#endif + +#if IN_HEADER(__GTK_CELL_RENDERER_COMBO_H__) +#if IN_FILE(__GTK_CELL_RENDERER_COMBO_C__) +gtk_cell_renderer_combo_get_type G_GNUC_CONST +gtk_cell_renderer_combo_new +#endif +#endif + +#if IN_HEADER(__GTK_CELL_RENDERER_PIXBUF_H__) +#if IN_FILE(__GTK_CELL_RENDERER_PIXBUF_C__) +gtk_cell_renderer_pixbuf_get_type G_GNUC_CONST +gtk_cell_renderer_pixbuf_new +#endif +#endif + +#if IN_HEADER(__GTK_CELL_RENDERER_PROGRESS_H__) +#if IN_FILE(__GTK_CELL_RENDERER_PROGRESS_C__) +gtk_cell_renderer_progress_get_type G_GNUC_CONST +gtk_cell_renderer_progress_new +#endif +#endif + +#if IN_HEADER(__GTK_CELL_RENDERER_TEXT_H__) +#if IN_FILE(__GTK_CELL_RENDERER_TEXT_C__) gtk_cell_renderer_text_get_type G_GNUC_CONST gtk_cell_renderer_text_new gtk_cell_renderer_text_set_fixed_height_from_font +#endif +#endif + +#if IN_HEADER(__GTK_CELL_RENDERER_TOGGLE_H__) +#if IN_FILE(__GTK_CELL_RENDERER_TOGGLE_C__) gtk_cell_renderer_toggle_get_active gtk_cell_renderer_toggle_get_radio gtk_cell_renderer_toggle_get_type G_GNUC_CONST gtk_cell_renderer_toggle_new gtk_cell_renderer_toggle_set_active gtk_cell_renderer_toggle_set_radio -gtk_cell_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_CELL_VIEW_H__) +#if IN_FILE(__GTK_CELL_VIEW_C__) gtk_cell_view_get_cell_renderers gtk_cell_view_get_displayed_row gtk_cell_view_get_size_of_row @@ -288,10 +512,20 @@ gtk_cell_view_new_with_text gtk_cell_view_set_background_color gtk_cell_view_set_displayed_row gtk_cell_view_set_model +#endif +#endif + +#if IN_HEADER(__GTK_CHECK_BUTTON_H__) +#if IN_FILE(__GTK_CHECK_BUTTON_C__) gtk_check_button_get_type G_GNUC_CONST gtk_check_button_new gtk_check_button_new_with_label gtk_check_button_new_with_mnemonic +#endif +#endif + +#if IN_HEADER(__GTK_MENU_CHECK_ITEM_H__) +#if IN_FILE(__GTK_MENU_CHECK_ITEM_C__) gtk_check_menu_item_get_active gtk_check_menu_item_get_draw_as_radio gtk_check_menu_item_get_inconsistent @@ -302,9 +536,15 @@ gtk_check_menu_item_new_with_mnemonic gtk_check_menu_item_set_active gtk_check_menu_item_set_draw_as_radio gtk_check_menu_item_set_inconsistent +#ifndef GTK_DISABLE_DEPRECATED gtk_check_menu_item_set_show_toggle +#endif gtk_check_menu_item_toggled -gtk_check_version +#endif +#endif + +#if IN_HEADER(__GTK_CLIPBOARD_H__) +#if IN_FILE(__GTK_CLIPBOARD_C__) gtk_clipboard_clear gtk_clipboard_get gtk_clipboard_get_display @@ -328,6 +568,12 @@ gtk_clipboard_wait_for_text gtk_clipboard_wait_is_image_available gtk_clipboard_wait_is_text_available gtk_clipboard_wait_is_target_available +#endif +#endif + +#if IN_HEADER(__GTK_CLIST_H__) +#if IN_FILE(__GTK_CLIST_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_clist_append gtk_clist_clear gtk_clist_columns_autosize @@ -337,7 +583,6 @@ gtk_clist_column_titles_active gtk_clist_column_titles_hide gtk_clist_column_titles_passive gtk_clist_column_titles_show -gtk_clist_drag_pos_get_type G_GNUC_CONST gtk_clist_find_row_from_data gtk_clist_freeze gtk_clist_get_cell_style @@ -403,6 +648,12 @@ gtk_clist_thaw gtk_clist_undo_selection gtk_clist_unselect_all gtk_clist_unselect_row +#endif +#endif +#endif + +#if IN_HEADER(__GTK_COLOR_BUTTON_H__) +#if IN_FILE(__GTK_COLOR_BUTTON_C__) gtk_color_button_get_alpha gtk_color_button_get_color gtk_color_button_get_title @@ -414,9 +665,11 @@ gtk_color_button_set_alpha gtk_color_button_set_color gtk_color_button_set_title gtk_color_button_set_use_alpha -gtk_color_selection_dialog_get_type G_GNUC_CONST -gtk_color_selection_dialog_new -gtk_color_selection_get_color +#endif +#endif + +#if IN_HEADER(__GTK_COLOR_SELECTION_H__) +#if IN_FILE(__GTK_COLOR_SELECTION_C__) gtk_color_selection_get_current_alpha gtk_color_selection_get_current_color gtk_color_selection_get_has_opacity_control @@ -428,23 +681,32 @@ gtk_color_selection_is_adjusting gtk_color_selection_new gtk_color_selection_palette_from_string gtk_color_selection_palette_to_string +#ifndef GTK_DISABLE_DEPRECATED gtk_color_selection_set_change_palette_hook -gtk_color_selection_set_change_palette_with_screen_hook gtk_color_selection_set_color +gtk_color_selection_get_color +gtk_color_selection_set_update_policy +#endif +gtk_color_selection_set_change_palette_with_screen_hook gtk_color_selection_set_current_alpha gtk_color_selection_set_current_color gtk_color_selection_set_has_opacity_control gtk_color_selection_set_has_palette gtk_color_selection_set_previous_alpha gtk_color_selection_set_previous_color -gtk_color_selection_set_update_policy +#endif +#endif + +#if IN_HEADER(__GTK_COLOR_SELECTION_DIALOG_H__) +#if IN_FILE(__GTK_COLOR_SELECTION_DIALOG_C__) +gtk_color_selection_dialog_get_type G_GNUC_CONST +gtk_color_selection_dialog_new +#endif +#endif + +#if IN_HEADER(__GTK_COMBO_BOX_H__) +#if IN_FILE(__GTK_COMBO_BOX_C__) gtk_combo_box_append_text -gtk_combo_box_entry_get_text_column -gtk_combo_box_entry_get_type G_GNUC_CONST -gtk_combo_box_entry_new -gtk_combo_box_entry_new_text -gtk_combo_box_entry_new_with_model -gtk_combo_box_entry_set_text_column gtk_combo_box_get_active gtk_combo_box_get_active_iter gtk_combo_box_get_active_text @@ -474,6 +736,23 @@ gtk_combo_box_set_model gtk_combo_box_set_row_separator_func gtk_combo_box_set_row_span_column gtk_combo_box_set_wrap_width +#endif +#endif + +#if IN_HEADER(__GTK_COMBO_BOX_ENTRY_H__) +#if IN_FILE(__GTK_COMBO_BOX_ENTRY_C__) +gtk_combo_box_entry_get_text_column +gtk_combo_box_entry_get_type G_GNUC_CONST +gtk_combo_box_entry_new +gtk_combo_box_entry_new_text +gtk_combo_box_entry_new_with_model +gtk_combo_box_entry_set_text_column +#endif +#endif + +#if IN_HEADER(__GTK_SMART_COMBO_H__) +#if IN_FILE(__GTK_SMART_COMBO_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_combo_disable_activate gtk_combo_get_type G_GNUC_CONST gtk_combo_new @@ -483,9 +762,12 @@ gtk_combo_set_popdown_strings gtk_combo_set_use_arrows gtk_combo_set_use_arrows_always gtk_combo_set_value_in_list -#ifdef INCLUDE_VARIABLES -gtk_combo_string_key #endif +#endif +#endif + +#if IN_HEADER(__GTK_CONTAINER_H__) +#if IN_FILE(__GTK_CONTAINER_C__) gtk_container_add gtk_container_add_with_properties G_GNUC_NULL_TERMINATED gtk_container_check_resize @@ -501,7 +783,9 @@ gtk_container_class_install_child_property gtk_container_class_list_child_properties gtk_container_forall gtk_container_foreach +#ifndef GTK_DISABLE_DEPRECATED gtk_container_foreach_full +#endif gtk_container_get_border_width gtk_container_get_children gtk_container_get_focus_chain @@ -520,15 +804,18 @@ gtk_container_set_focus_vadjustment gtk_container_set_reallocate_redraws gtk_container_set_resize_mode gtk_container_unset_focus_chain -gtk_corner_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__C_TREE_H__) +#if IN_FILE(__G_TREE_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_ctree_collapse gtk_ctree_collapse_recursive gtk_ctree_collapse_to_depth gtk_ctree_expand -gtk_ctree_expander_style_get_type G_GNUC_CONST gtk_ctree_expand_recursive gtk_ctree_expand_to_depth -gtk_ctree_expansion_type_get_type G_GNUC_CONST gtk_ctree_export_to_gnode gtk_ctree_find gtk_ctree_find_all_by_row_data @@ -544,7 +831,6 @@ gtk_ctree_is_ancestor gtk_ctree_is_hot_spot gtk_ctree_is_viewable gtk_ctree_last -gtk_ctree_line_style_get_type G_GNUC_CONST gtk_ctree_move gtk_ctree_new gtk_ctree_new_with_titles @@ -571,7 +857,6 @@ gtk_ctree_node_set_row_style gtk_ctree_node_set_selectable gtk_ctree_node_set_shift gtk_ctree_node_set_text -gtk_ctree_pos_get_type G_GNUC_CONST gtk_ctree_post_recursive gtk_ctree_post_recursive_to_depth gtk_ctree_pre_recursive @@ -593,6 +878,12 @@ gtk_ctree_toggle_expansion gtk_ctree_toggle_expansion_recursive gtk_ctree_unselect gtk_ctree_unselect_recursive +#endif +#endif +#endif + +#if IN_HEADER(__GTK_CURVE_H__) +#if IN_FILE(__GTK_CURVE_C__) gtk_curve_get_type G_GNUC_CONST gtk_curve_get_vector gtk_curve_new @@ -601,34 +892,40 @@ gtk_curve_set_curve_type gtk_curve_set_gamma gtk_curve_set_range gtk_curve_set_vector -gtk_curve_type_get_type G_GNUC_CONST -gtk_debug_flag_get_type G_GNUC_CONST -#ifdef INCLUDE_VARIABLES -gtk_debug_flags #endif +#endif + +#if IN_HEADER(__GTK_WINDOW_DECORATE_H__) +#if IN_FILE(__GTK_WINDOW_DECORATE_C__) 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 G_GNUC_CONST -gtk_dest_defaults_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_DIALOG_H__) +#if IN_FILE(__GTK_DIALOG_C__) gtk_dialog_add_action_widget gtk_dialog_add_button gtk_dialog_add_buttons G_GNUC_NULL_TERMINATED -gtk_dialog_flags_get_type G_GNUC_CONST gtk_dialog_get_has_separator gtk_dialog_get_type G_GNUC_CONST gtk_dialog_new gtk_dialog_new_with_buttons G_GNUC_NULL_TERMINATED gtk_dialog_response gtk_dialog_run +gtk_alternative_dialog_button_order gtk_dialog_set_alternative_button_order gtk_dialog_set_alternative_button_order_from_array gtk_dialog_set_default_response gtk_dialog_set_has_separator gtk_dialog_set_response_sensitive -gtk_direction_type_get_type G_GNUC_CONST -gtk_disable_setlocale +#endif +#endif + +#if IN_HEADER(__GTK_DND_H__) +#if IN_FILE(__GTK_DND_C__) gtk_drag_begin gtk_drag_check_threshold gtk_drag_dest_add_image_targets @@ -644,7 +941,9 @@ gtk_drag_finish gtk_drag_get_data gtk_drag_get_source_widget gtk_drag_highlight +#ifndef GTK_DISABLE_DEPRECATED gtk_drag_set_default_icon +#endif gtk_drag_set_icon_default gtk_drag_set_icon_pixbuf gtk_drag_set_icon_pixmap @@ -661,6 +960,12 @@ gtk_drag_source_set_icon_stock gtk_drag_source_set_target_list gtk_drag_source_unset gtk_drag_unhighlight +#endif +#endif + +#if IN_HEADER(__GTK_STYLE_H__) +#if IN_FILE(__GTK_STYLE_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_draw_arrow gtk_draw_box gtk_draw_box_gap @@ -672,9 +977,6 @@ gtk_draw_flat_box gtk_draw_focus gtk_draw_handle gtk_draw_hline -gtk_drawing_area_get_type G_GNUC_CONST -gtk_drawing_area_new -gtk_drawing_area_size gtk_draw_insertion_cursor gtk_draw_layout gtk_draw_option @@ -686,6 +988,59 @@ gtk_draw_slider gtk_draw_string gtk_draw_tab gtk_draw_vline +gtk_style_set_font +gtk_style_get_font +gtk_style_ref +gtk_style_unref +gtk_paint_string +#endif +gtk_paint_arrow +gtk_paint_box +gtk_paint_box_gap +gtk_paint_check +gtk_paint_diamond +gtk_paint_expander +gtk_paint_extension +gtk_paint_flat_box +gtk_paint_focus +gtk_paint_handle +gtk_paint_hline +gtk_paint_layout +gtk_paint_option +gtk_paint_polygon +gtk_paint_resize_grip +gtk_paint_shadow +gtk_paint_shadow_gap +gtk_paint_slider +gtk_paint_tab +gtk_paint_vline +gtk_border_copy +gtk_border_free +gtk_border_get_type G_GNUC_CONST +gtk_style_apply_default_background +gtk_style_attach +gtk_style_copy +gtk_style_detach +gtk_style_get_type G_GNUC_CONST +gtk_style_lookup_icon_set +gtk_style_new +gtk_style_render_icon +gtk_style_set_background +#endif +#endif + +#if IN_HEADER(__GTK_DRAWING_AREA_H__) +#if IN_FILE(__GTK_DRAWING_AREA_C__) +gtk_drawing_area_get_type G_GNUC_CONST +gtk_drawing_area_new +#ifndef GTK_DISABLE_DEPRECATED +gtk_drawing_area_size +#endif +#endif +#endif + +#if IN_HEADER(__GTK_EDITABLE_H__) +#if IN_FILE(__GTK_EDITABLE_C__) gtk_editable_copy_clipboard gtk_editable_cut_clipboard gtk_editable_delete_selection @@ -700,26 +1055,11 @@ gtk_editable_paste_clipboard gtk_editable_select_region gtk_editable_set_editable gtk_editable_set_position -gtk_entry_append_text -gtk_entry_completion_complete -gtk_entry_completion_delete_action -gtk_entry_completion_get_entry -gtk_entry_completion_get_inline_completion -gtk_entry_completion_get_minimum_key_length -gtk_entry_completion_get_model -gtk_entry_completion_get_popup_completion -gtk_entry_completion_get_text_column -gtk_entry_completion_get_type G_GNUC_CONST -gtk_entry_completion_insert_action_markup -gtk_entry_completion_insert_action_text -gtk_entry_completion_insert_prefix -gtk_entry_completion_new -gtk_entry_completion_set_inline_completion -gtk_entry_completion_set_match_func -gtk_entry_completion_set_minimum_key_length -gtk_entry_completion_set_model -gtk_entry_completion_set_popup_completion -gtk_entry_completion_set_text_column +#endif +#endif + +#if IN_HEADER(__GTK_ENTRY_H__) +#if IN_FILE(__GTK_ENTRY_C__) gtk_entry_get_activates_default gtk_entry_get_alignment gtk_entry_get_completion @@ -734,29 +1074,64 @@ gtk_entry_get_visibility gtk_entry_get_width_chars gtk_entry_layout_index_to_text_index gtk_entry_new +#ifndef GTK_DISABLE_DEPRECATED gtk_entry_new_with_max_length +gtk_entry_append_text gtk_entry_prepend_text gtk_entry_select_region +gtk_entry_set_position +gtk_entry_set_editable +#endif gtk_entry_set_activates_default gtk_entry_set_alignment gtk_entry_set_completion -gtk_entry_set_editable gtk_entry_set_has_frame gtk_entry_set_invisible_char gtk_entry_set_max_length -gtk_entry_set_position gtk_entry_set_text gtk_entry_set_visibility gtk_entry_set_width_chars gtk_entry_text_index_to_layout_index +#endif +#endif + +#if IN_HEADER(__GTK_ENTRY_COMPLETION_H__) +#if IN_FILE(__GTK_ENTRY_COMPLETION_C__) +gtk_entry_completion_complete +gtk_entry_completion_delete_action +gtk_entry_completion_get_entry +gtk_entry_completion_get_inline_completion +gtk_entry_completion_get_minimum_key_length +gtk_entry_completion_get_model +gtk_entry_completion_get_popup_completion +gtk_entry_completion_get_text_column +gtk_entry_completion_get_type G_GNUC_CONST +gtk_entry_completion_insert_action_markup +gtk_entry_completion_insert_action_text +gtk_entry_completion_insert_prefix +gtk_entry_completion_new +gtk_entry_completion_set_inline_completion +gtk_entry_completion_set_match_func +gtk_entry_completion_set_minimum_key_length +gtk_entry_completion_set_model +gtk_entry_completion_set_popup_completion +gtk_entry_completion_set_text_column +#endif +#endif + +#if IN_HEADER(__GTK_EVENT_BOX_H__) +#if IN_FILE(__GTK_EVENT_BOX_C__) gtk_event_box_get_above_child gtk_event_box_get_type G_GNUC_CONST gtk_event_box_get_visible_window gtk_event_box_new gtk_event_box_set_above_child gtk_event_box_set_visible_window -gtk_events_pending -gtk_exit +#endif +#endif + +#if IN_HEADER(__GTK_EXPANDER_H__) +#if IN_FILE(__GTK_EXPANDER_C__) gtk_expander_get_expanded gtk_expander_get_label gtk_expander_get_label_widget @@ -772,27 +1147,17 @@ gtk_expander_set_label_widget gtk_expander_set_spacing gtk_expander_set_use_markup gtk_expander_set_use_underline -gtk_expander_style_get_type G_GNUC_CONST -gtk_false G_GNUC_CONST -gtk_file_chooser_action_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_FILE_CHOOSER_H__) +#if IN_FILE(__GTK_FILE_CHOOSER_C__) gtk_file_chooser_add_filter gtk_file_chooser_add_shortcut_folder PRIVATE #ifdef G_OS_WIN32 gtk_file_chooser_add_shortcut_folder_utf8 #endif gtk_file_chooser_add_shortcut_folder_uri -gtk_file_chooser_button_get_title -gtk_file_chooser_button_get_type G_GNUC_CONST -gtk_file_chooser_button_get_width_chars -gtk_file_chooser_button_new -gtk_file_chooser_button_new_with_backend -gtk_file_chooser_button_new_with_dialog -gtk_file_chooser_button_set_title -gtk_file_chooser_button_set_width_chars -gtk_file_chooser_dialog_get_type G_GNUC_CONST -gtk_file_chooser_dialog_new G_GNUC_NULL_TERMINATED -gtk_file_chooser_dialog_new_with_backend G_GNUC_NULL_TERMINATED -gtk_file_chooser_error_get_type gtk_file_chooser_error_quark gtk_file_chooser_get_action gtk_file_chooser_get_current_folder PRIVATE @@ -868,20 +1233,55 @@ gtk_file_chooser_unselect_filename PRIVATE gtk_file_chooser_unselect_filename_utf8 #endif gtk_file_chooser_unselect_uri +#endif +#endif + +#if IN_HEADER(__GTK_FILE_CHOOSER_DIALOG_H__) +#if IN_FILE(__GTK_FILE_CHOOSER_DIALOG_C__) +gtk_file_chooser_dialog_get_type G_GNUC_CONST +gtk_file_chooser_dialog_new G_GNUC_NULL_TERMINATED +gtk_file_chooser_dialog_new_with_backend G_GNUC_NULL_TERMINATED +#endif +#endif + +#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__) +#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__) gtk_file_chooser_widget_get_type G_GNUC_CONST gtk_file_chooser_widget_new gtk_file_chooser_widget_new_with_backend +#endif +#endif + +#if IN_HEADER(__GTK_FILE_CHOOSER_BUTTON_H__) +#if IN_FILE(__GTK_FILE_CHOOSER_BUTTON_C__) +gtk_file_chooser_button_get_title +gtk_file_chooser_button_get_type G_GNUC_CONST +gtk_file_chooser_button_get_width_chars +gtk_file_chooser_button_new +gtk_file_chooser_button_new_with_backend +gtk_file_chooser_button_new_with_dialog +gtk_file_chooser_button_set_title +gtk_file_chooser_button_set_width_chars +#endif +#endif + +#if IN_HEADER(__GTK_FILE_FILTER_H__) +#if IN_FILE(__GTK_FILE_FILTER_C__) gtk_file_filter_add_custom gtk_file_filter_add_mime_type gtk_file_filter_add_pattern gtk_file_filter_add_pixbuf_formats gtk_file_filter_filter -gtk_file_filter_flags_get_type G_GNUC_CONST gtk_file_filter_get_name gtk_file_filter_get_needed gtk_file_filter_get_type G_GNUC_CONST gtk_file_filter_new gtk_file_filter_set_name +#endif +#endif + +#if IN_HEADER(__GTK_FILE_SYSTEM_H__) +#if IN_FILE(__GTK_FILE_SYSTEM_C__) gtk_file_folder_get_info gtk_file_folder_get_type G_GNUC_CONST gtk_file_folder_is_finished_loading @@ -907,25 +1307,6 @@ gtk_file_path_get_type G_GNUC_CONST gtk_file_paths_copy gtk_file_paths_free gtk_file_paths_sort -gtk_file_selection_complete -gtk_file_selection_get_filename PRIVATE -#ifdef G_OS_WIN32 -gtk_file_selection_get_filename_utf8 -#endif -gtk_file_selection_get_selections PRIVATE -#ifdef G_OS_WIN32 -gtk_file_selection_get_selections_utf8 -#endif -gtk_file_selection_get_select_multiple -gtk_file_selection_get_type G_GNUC_CONST -gtk_file_selection_hide_fileop_buttons -gtk_file_selection_new -gtk_file_selection_set_filename PRIVATE -#ifdef G_OS_WIN32 -gtk_file_selection_set_filename_utf8 -#endif -gtk_file_selection_set_select_multiple -gtk_file_selection_show_fileop_buttons gtk_file_system_create_folder gtk_file_system_error_quark gtk_file_system_filename_to_path @@ -943,10 +1324,6 @@ gtk_file_system_path_to_filename gtk_file_system_path_to_uri gtk_file_system_remove_bookmark gtk_file_system_render_icon -#ifdef G_OS_UNIX -gtk_file_system_unix_get_type G_GNUC_CONST -gtk_file_system_unix_new -#endif gtk_file_system_uri_to_path gtk_file_system_volume_free gtk_file_system_volume_get_base_path @@ -954,16 +1331,65 @@ gtk_file_system_volume_get_display_name gtk_file_system_volume_get_is_mounted gtk_file_system_volume_mount gtk_file_system_volume_render_icon +#endif +#endif + +#if IN_HEADER(__GTK_FILE_SYSTEM_UNIX_H__) +#if IN_FILE(__GTK_FILE_SYSTEM_UNIX_C__) +#ifdef G_OS_UNIX +gtk_file_system_unix_get_type G_GNUC_CONST +gtk_file_system_unix_new +#endif +#endif +#endif + +#if IN_HEADER(__GTK_FILE_SYSTEM_WIN32_H__) +#if IN_FILE(__GTK_FILE_SYSTEM_WIN32_C__) #ifdef G_OS_WIN32 gtk_file_system_win32_get_type G_GNUC_CONST gtk_file_system_win32_new +_gtk_file_system_win32_path_compare +#endif +#endif +#endif + +#if IN_HEADER(__GTK_FILESEL_H__) +#if IN_FILE(__GTK_FILESEL_C__) +gtk_file_selection_complete +gtk_file_selection_get_filename PRIVATE +#ifdef G_OS_WIN32 +gtk_file_selection_get_filename_utf8 +#endif +gtk_file_selection_get_selections PRIVATE +#ifdef G_OS_WIN32 +gtk_file_selection_get_selections_utf8 #endif +gtk_file_selection_get_select_multiple +gtk_file_selection_get_type G_GNUC_CONST +gtk_file_selection_hide_fileop_buttons +gtk_file_selection_new +gtk_file_selection_set_filename PRIVATE +#ifdef G_OS_WIN32 +gtk_file_selection_set_filename_utf8 +#endif +gtk_file_selection_set_select_multiple +gtk_file_selection_show_fileop_buttons +#endif +#endif + +#if IN_HEADER(__GTK_FIXED_H__) +#if IN_FILE(__GTK_FIXED_C__) gtk_fixed_get_has_window gtk_fixed_get_type G_GNUC_CONST gtk_fixed_move gtk_fixed_new gtk_fixed_put gtk_fixed_set_has_window +#endif +#endif + +#if IN_HEADER(__GTK_FONT_BUTTON_H__) +#if IN_FILE(__GTK_FONT_BUTTON_C__) gtk_font_button_get_font_name gtk_font_button_get_show_size gtk_font_button_get_show_style @@ -979,20 +1405,32 @@ gtk_font_button_set_show_style gtk_font_button_set_title gtk_font_button_set_use_font gtk_font_button_set_use_size -gtk_font_selection_dialog_get_font +#endif +#endif + +#if IN_HEADER(__GTK_FONSEL_H__) +#if IN_FILE(__GTK_FONSEL_C__) gtk_font_selection_dialog_get_font_name gtk_font_selection_dialog_get_preview_text gtk_font_selection_dialog_get_type G_GNUC_CONST gtk_font_selection_dialog_new gtk_font_selection_dialog_set_font_name gtk_font_selection_dialog_set_preview_text +#ifndef GTK_DISABLE_DEPRECATED gtk_font_selection_get_font +gtk_font_selection_dialog_get_font +#endif gtk_font_selection_get_font_name gtk_font_selection_get_preview_text gtk_font_selection_get_type G_GNUC_CONST gtk_font_selection_new gtk_font_selection_set_font_name gtk_font_selection_set_preview_text +#endif +#endif + +#if IN_HEADER(__GTK_FRAME_H__) +#if IN_FILE(__GTK_FRAME_C__) gtk_frame_get_label gtk_frame_get_label_align gtk_frame_get_label_widget @@ -1003,19 +1441,25 @@ gtk_frame_set_label gtk_frame_set_label_align gtk_frame_set_label_widget gtk_frame_set_shadow_type +#endif +#endif + +#if IN_HEADER(__GTK_GAMMA_CURVE_H__) +#if IN_FILE(__GTK_GAMMA_CURVE_C__) gtk_gamma_curve_get_type G_GNUC_CONST gtk_gamma_curve_new +#endif +#endif + +#if IN_HEADER(__GTK_GC_H__) +#if IN_FILE(__GTK_GC_C__) gtk_gc_get gtk_gc_release -gtk_get_current_event -gtk_get_current_event_state -gtk_get_current_event_time -gtk_get_default_language -gtk_get_event_widget -gtk_get_option_group -gtk_grab_add -gtk_grab_get_current -gtk_grab_remove +#endif +#endif + +#if IN_HEADER(__GTK_HANDLE_BOX_H__) +#if IN_FILE(__GTK_HANDLE_BOX_C__) gtk_handle_box_get_handle_position gtk_handle_box_get_shadow_type gtk_handle_box_get_snap_edge @@ -1024,25 +1468,67 @@ gtk_handle_box_new gtk_handle_box_set_handle_position gtk_handle_box_set_shadow_type gtk_handle_box_set_snap_edge +#endif +#endif + +#if IN_HEADER(__GTK_HBOX_H__) +#if IN_FILE(__GTK_HBOX_C__) gtk_hbox_get_type G_GNUC_CONST gtk_hbox_new +#endif +#endif + +#if IN_HEADER(__GTK_HBUTTON_BOX_H__) +#if IN_FILE(__GTK_HBUTTON_BOX_C__) +gtk_hbutton_box_new +gtk_hbutton_box_get_type G_GNUC_CONST +#ifndef GTK_DISABLE_DEPRECATED gtk_hbutton_box_get_layout_default gtk_hbutton_box_get_spacing_default -gtk_hbutton_box_get_type G_GNUC_CONST -gtk_hbutton_box_new gtk_hbutton_box_set_layout_default gtk_hbutton_box_set_spacing_default +#endif +#endif +#endif + +#if IN_HEADER(__GTK_HPANED_H__) +#if IN_FILE(__GTK_HPANED_C__) gtk_hpaned_get_type G_GNUC_CONST gtk_hpaned_new +#endif +#endif + +#if IN_HEADER(__GTK_HRULER_H__) +#if IN_FILE(__GTK_HRULER_C__) gtk_hruler_get_type G_GNUC_CONST gtk_hruler_new +#endif +#endif + +#if IN_HEADER(__GTK_HSCALE_H__) +#if IN_FILE(__GTK_HSCALE_C__) gtk_hscale_get_type G_GNUC_CONST gtk_hscale_new gtk_hscale_new_with_range +#endif +#endif + +#if IN_HEADER(__GTK_HSCROLLBAR_H__) +#if IN_FILE(__GTK_HSCROLLBAR_C__) gtk_hscrollbar_get_type G_GNUC_CONST gtk_hscrollbar_new +#endif +#endif + +#if IN_HEADER(__GTK_HSEPARATOR_H__) +#if IN_FILE(__GTK_HSEPARATOR_C__) gtk_hseparator_get_type G_GNUC_CONST gtk_hseparator_new +#endif +#endif + +#if IN_HEADER(__GTK_HSV_H__) +#if IN_FILE(__GTK_HSV_C__) gtk_hsv_get_color gtk_hsv_get_metrics gtk_hsv_get_type G_GNUC_CONST @@ -1051,6 +1537,12 @@ gtk_hsv_new gtk_hsv_set_color gtk_hsv_set_metrics gtk_hsv_to_rgb +gtk_rgb_to_hsv +#endif +#endif + +#if IN_HEADER(__GTK_ICON_FACTORY_H__) +#if IN_FILE(__GTK_ICON_FACTORY_C__) gtk_icon_factory_add gtk_icon_factory_add_default gtk_icon_factory_get_type G_GNUC_CONST @@ -1058,21 +1550,12 @@ gtk_icon_factory_lookup gtk_icon_factory_lookup_default gtk_icon_factory_new gtk_icon_factory_remove_default -gtk_icon_info_copy -gtk_icon_info_free -gtk_icon_info_get_attach_points -gtk_icon_info_get_base_size -gtk_icon_info_get_builtin_pixbuf -gtk_icon_info_get_display_name -gtk_icon_info_get_embedded_rect -gtk_icon_info_get_filename PRIVATE -#ifdef G_OS_WIN32 -gtk_icon_info_get_filename_utf8 -#endif -gtk_icon_info_get_type G_GNUC_CONST -gtk_icon_info_load_icon -gtk_icon_info_set_raw_coordinates -gtk_icon_lookup_flags_get_type G_GNUC_CONST +gtk_icon_size_from_name +gtk_icon_size_get_name +gtk_icon_size_lookup +gtk_icon_size_lookup_for_settings +gtk_icon_size_register +gtk_icon_size_register_alias gtk_icon_set_add_source gtk_icon_set_copy gtk_icon_set_get_sizes @@ -1082,13 +1565,6 @@ gtk_icon_set_new_from_pixbuf gtk_icon_set_ref gtk_icon_set_render_icon gtk_icon_set_unref -gtk_icon_size_from_name -gtk_icon_size_get_name -gtk_icon_size_get_type G_GNUC_CONST -gtk_icon_size_lookup -gtk_icon_size_lookup_for_settings -gtk_icon_size_register -gtk_icon_size_register_alias gtk_icon_source_copy gtk_icon_source_free gtk_icon_source_get_direction @@ -1117,12 +1593,30 @@ gtk_icon_source_set_size gtk_icon_source_set_size_wildcarded gtk_icon_source_set_state gtk_icon_source_set_state_wildcarded +#endif +#endif + +#if IN_HEADER(__GTK_ICON_THEME_H__) +#if IN_FILE(__GTK_ICON_THEME_C__) +gtk_icon_info_copy +gtk_icon_info_free +gtk_icon_info_get_attach_points +gtk_icon_info_get_base_size +gtk_icon_info_get_builtin_pixbuf +gtk_icon_info_get_display_name +gtk_icon_info_get_embedded_rect +gtk_icon_info_get_filename PRIVATE +#ifdef G_OS_WIN32 +gtk_icon_info_get_filename_utf8 +#endif +gtk_icon_info_get_type G_GNUC_CONST +gtk_icon_info_load_icon +gtk_icon_info_set_raw_coordinates gtk_icon_theme_add_builtin_icon gtk_icon_theme_append_search_path PRIVATE #ifdef G_OS_WIN32 gtk_icon_theme_append_search_path_utf8 #endif -gtk_icon_theme_error_get_type gtk_icon_theme_error_quark gtk_icon_theme_get_default gtk_icon_theme_get_example_icon_name @@ -1149,6 +1643,11 @@ gtk_icon_theme_set_search_path PRIVATE #ifdef G_OS_WIN32 gtk_icon_theme_set_search_path_utf8 #endif +#endif +#endif + +#if IN_HEADER(__GTK_ICON_VIEW_H__) +#if IN_FILE(__GTK_ICON_VIEW_C__) gtk_icon_view_get_column_spacing gtk_icon_view_get_columns gtk_icon_view_get_item_width @@ -1185,13 +1684,15 @@ gtk_icon_view_set_spacing gtk_icon_view_set_text_column gtk_icon_view_unselect_all gtk_icon_view_unselect_path -gtk_identifier_get_type G_GNUC_CONST -gtk_idle_add -gtk_idle_add_full -gtk_idle_add_priority -gtk_idle_remove -gtk_idle_remove_by_data +#endif +#endif + +#if IN_HEADER(__GTK_IMAGE_H__) +#if IN_FILE(__GTK_IMAGE_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_image_get +gtk_image_set +#endif gtk_image_get_animation gtk_image_get_icon_name gtk_image_get_icon_set @@ -1202,13 +1703,6 @@ gtk_image_get_pixmap gtk_image_get_stock gtk_image_get_storage_type gtk_image_get_type G_GNUC_CONST -gtk_image_menu_item_get_image -gtk_image_menu_item_get_type G_GNUC_CONST -gtk_image_menu_item_new -gtk_image_menu_item_new_from_stock -gtk_image_menu_item_new_with_label -gtk_image_menu_item_new_with_mnemonic -gtk_image_menu_item_set_image gtk_image_new gtk_image_new_from_animation gtk_image_new_from_file PRIVATE @@ -1221,7 +1715,6 @@ gtk_image_new_from_image gtk_image_new_from_pixbuf gtk_image_new_from_pixmap gtk_image_new_from_stock -gtk_image_set gtk_image_set_from_animation gtk_image_set_from_file PRIVATE #ifdef G_OS_WIN32 @@ -1234,7 +1727,23 @@ gtk_image_set_from_pixbuf gtk_image_set_from_pixmap gtk_image_set_from_stock gtk_image_set_pixel_size -gtk_image_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_IMAGE_MENU_ITEM_H__) +#if IN_FILE(__GTK_IMAGE_MENU_ITEM_C__) +gtk_image_menu_item_get_image +gtk_image_menu_item_get_type G_GNUC_CONST +gtk_image_menu_item_new +gtk_image_menu_item_new_from_stock +gtk_image_menu_item_new_with_label +gtk_image_menu_item_new_with_mnemonic +gtk_image_menu_item_set_image +#endif +#endif + +#if IN_HEADER(__GTK_IM_CONTEXT_H__) +#if IN_FILE(__GTK_IM_CONTEXT_C__) gtk_im_context_delete_surrounding gtk_im_context_filter_keypress gtk_im_context_focus_in @@ -1247,37 +1756,47 @@ gtk_im_context_set_client_window gtk_im_context_set_cursor_location gtk_im_context_set_surrounding gtk_im_context_set_use_preedit +#endif +#endif + +#if IN_HEADER(__GTK_IM_CONTEXT_SIMPLE_H__) +#if IN_FILE(__GTK_IM_CONTEXT_SIMPLE_C__) gtk_im_context_simple_add_table gtk_im_context_simple_get_type G_GNUC_CONST gtk_im_context_simple_new +#endif +#endif + +#if IN_HEADER(__GTK_IM_MULTICONTEXT_H__) +#if IN_FILE(__GTK_IM_MULTICONTEXT_C__) gtk_im_multicontext_append_menuitems gtk_im_multicontext_get_type G_GNUC_CONST gtk_im_multicontext_new -gtk_im_preedit_style_get_type G_GNUC_CONST -gtk_im_status_style_get_type G_GNUC_CONST -gtk_init -#ifdef G_OS_WIN32 -gtk_init_abi_check -#endif -gtk_init_add -gtk_init_check -#ifdef G_OS_WIN32 -gtk_init_check_abi_check #endif -gtk_init_with_args -gtk_input_add_full -gtk_input_dialog_get_type G_GNUC_CONST -gtk_input_dialog_new -gtk_input_remove -#ifdef INCLUDE_VARIABLES -gtk_interface_age #endif + +#if IN_HEADER(__GTK_INVISIBLE_H__) +#if IN_FILE(__GTK_INVISIBLE_C__) gtk_invisible_get_screen gtk_invisible_get_type G_GNUC_CONST gtk_invisible_new gtk_invisible_new_for_screen gtk_invisible_set_screen +#endif +#endif + +#if IN_HEADER(__GTK_ITEM_H__) +#if IN_FILE(__GTK_ITEM_C__) gtk_item_deselect +gtk_item_get_type G_GNUC_CONST +gtk_item_select +gtk_item_toggle +#endif +#endif + +#if IN_HEADER(__GTK_ITEM__FACTORY_H__) +#if IN_FILE(__GTK_ITEM_FACTORY_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_item_factories_path_delete gtk_item_factory_add_foreign gtk_item_factory_construct @@ -1302,13 +1821,16 @@ gtk_item_factory_popup_data gtk_item_factory_popup_data_from_widget gtk_item_factory_popup_with_data gtk_item_factory_set_translate_func -gtk_item_get_type G_GNUC_CONST -gtk_item_select -gtk_item_toggle -gtk_justification_get_type G_GNUC_CONST -gtk_key_snooper_install -gtk_key_snooper_remove +#endif +#endif +#endif + +#if IN_HEADER(__GTK_LABEL_H__) +#if IN_FILE(__GTK_LABEL_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_label_get +gtk_label_parse_uline +#endif gtk_label_get_angle gtk_label_get_attributes gtk_label_get_ellipsize @@ -1330,7 +1852,6 @@ gtk_label_get_use_underline gtk_label_get_width_chars gtk_label_new gtk_label_new_with_mnemonic -gtk_label_parse_uline gtk_label_select_region gtk_label_set_angle gtk_label_set_attributes @@ -1350,7 +1871,11 @@ gtk_label_set_text_with_mnemonic gtk_label_set_use_markup gtk_label_set_use_underline gtk_label_set_width_chars -gtk_layout_freeze +#endif +#endif + +#if IN_HEADER(__GTK_LAYOUT_H__) +#if IN_FILE(__GTK_LAYOUT_C__) gtk_layout_get_hadjustment gtk_layout_get_size gtk_layout_get_type G_GNUC_CONST @@ -1361,7 +1886,15 @@ gtk_layout_put gtk_layout_set_hadjustment gtk_layout_set_size gtk_layout_set_vadjustment +#ifndef GTK_DISABLE_DEPRECATED +gtk_layout_freeze gtk_layout_thaw +#endif +#endif +#endif + +#if IN_HEADER(__GTK_LIST_H__) +#if IN_FILE(__GTK_LIST_C__) gtk_list_append_items gtk_list_child_position gtk_list_clear_items @@ -1370,11 +1903,6 @@ gtk_list_end_selection gtk_list_extend_selection gtk_list_get_type G_GNUC_CONST gtk_list_insert_items -gtk_list_item_deselect -gtk_list_item_get_type G_GNUC_CONST -gtk_list_item_new -gtk_list_item_new_with_label -gtk_list_item_select gtk_list_new gtk_list_prepend_items gtk_list_remove_items @@ -1386,6 +1914,28 @@ gtk_list_select_child gtk_list_select_item gtk_list_set_selection_mode gtk_list_start_selection +gtk_list_toggle_add_mode +gtk_list_toggle_focus_row +gtk_list_toggle_row +gtk_list_undo_selection +gtk_list_unselect_all +gtk_list_unselect_child +gtk_list_unselect_item +#endif +#endif + +#if IN_HEADER(__GTK_LIST_ITEM_H__) +#if IN_FILE(__GTK_LIST_ITEM_C__) +gtk_list_item_deselect +gtk_list_item_get_type G_GNUC_CONST +gtk_list_item_new +gtk_list_item_new_with_label +gtk_list_item_select +#endif +#endif + +#if IN_HEADER(__GTK_LIST_STORE_H__) +#if IN_FILE(__GTK_LIST_STORE_C__) gtk_list_store_append gtk_list_store_clear gtk_list_store_get_type G_GNUC_CONST @@ -1407,22 +1957,76 @@ gtk_list_store_set_column_types gtk_list_store_set_valist gtk_list_store_set_value gtk_list_store_swap -gtk_list_toggle_add_mode -gtk_list_toggle_focus_row -gtk_list_toggle_row -gtk_list_undo_selection -gtk_list_unselect_all -gtk_list_unselect_child -gtk_list_unselect_item +#endif +#endif + +#if IN_HEADER(__GTK_MAIN_H__) +#if IN_FILE(__GTK_MAIN_C__) +gtk_get_option_group +gtk_get_current_event +gtk_get_current_event_state +gtk_get_current_event_time +#ifndef GTK_DISABLE_DEPRECATED +gtk_exit +gtk_idle_add +gtk_idle_add_full +gtk_idle_add_priority +gtk_idle_remove +gtk_idle_remove_by_data +gtk_timeout_add +gtk_timeout_add_full +gtk_timeout_remove +gtk_input_add_full +gtk_input_remove +#endif +gtk_false G_GNUC_CONST +gtk_true G_GNUC_CONST +gtk_events_pending +gtk_disable_setlocale +gtk_set_locale +gtk_check_version +gtk_get_default_language +gtk_get_event_widget +gtk_grab_add +gtk_grab_get_current +gtk_grab_remove +gtk_propagate_event +gtk_quit_add +gtk_quit_add_destroy +gtk_quit_add_full +gtk_quit_remove +gtk_quit_remove_by_data +gtk_key_snooper_install +gtk_key_snooper_remove +gtk_init +#ifdef G_OS_WIN32 +gtk_init_abi_check +#endif +gtk_init_add +gtk_init_check +#ifdef G_OS_WIN32 +gtk_init_check_abi_check +#endif +gtk_init_with_args +gtk_parse_args gtk_main gtk_main_do_event gtk_main_iteration gtk_main_iteration_do gtk_main_level gtk_main_quit -#ifdef INCLUDE_VARIABLES -gtk_major_version #endif +#endif + +#if IN_HEADER(__GTK_INPUTDIALOG_H__) +#if IN_FILE(__GTK_INPUTDIALOG_C__) +gtk_input_dialog_get_type G_GNUC_CONST +gtk_input_dialog_new +#endif +#endif + +#if IN_HEADER(__gtk_marshal_MARSHAL_H__) +#if IN_FILE(__gtk_marshal_MARSHAL_C__) gtk_marshal_BOOLEAN__POINTER gtk_marshal_BOOLEAN__POINTER_INT_INT gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT @@ -1449,17 +2053,25 @@ gtk_marshal_VOID__STRING_INT_POINTER 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 G_GNUC_CONST -gtk_menu_attach -gtk_menu_attach_to_widget -gtk_menu_bar_get_child_pack_direction -gtk_menu_bar_get_pack_direction +#endif +#endif + +#if IN_HEADER(__GTK_MENU_BAR_H__) +#if IN_FILE(__GTK_MENU_BAR_C__) gtk_menu_bar_get_type G_GNUC_CONST gtk_menu_bar_new +gtk_menu_bar_get_child_pack_direction gtk_menu_bar_set_child_pack_direction +gtk_menu_bar_get_pack_direction gtk_menu_bar_set_pack_direction +#endif +#endif + +#if IN_HEADER(__GTK_MENU_H__) +#if IN_FILE(__GTK_MENU_C__) +gtk_menu_attach +gtk_menu_attach_to_widget gtk_menu_detach -gtk_menu_direction_type_get_type G_GNUC_CONST gtk_menu_get_accel_group gtk_menu_get_active gtk_menu_get_attach_widget @@ -1467,6 +2079,23 @@ gtk_menu_get_for_attach_widget gtk_menu_get_tearoff_state gtk_menu_get_title gtk_menu_get_type G_GNUC_CONST +gtk_menu_new +gtk_menu_popdown +gtk_menu_popup +gtk_menu_reorder_child +gtk_menu_reposition +gtk_menu_set_accel_group +gtk_menu_set_accel_path +gtk_menu_set_active +gtk_menu_set_monitor +gtk_menu_set_screen +gtk_menu_set_tearoff_state +gtk_menu_set_title +#endif +#endif + +#if IN_HEADER(__GTK_MENU_ITEM_H__) +#if IN_FILE(__GTK_MENU_ITEM_C__) gtk_menu_item_activate gtk_menu_item_deselect gtk_menu_item_get_right_justified @@ -1482,18 +2111,11 @@ gtk_menu_item_set_right_justified gtk_menu_item_set_submenu gtk_menu_item_toggle_size_allocate gtk_menu_item_toggle_size_request -gtk_menu_new -gtk_menu_popdown -gtk_menu_popup -gtk_menu_reorder_child -gtk_menu_reposition -gtk_menu_set_accel_group -gtk_menu_set_accel_path -gtk_menu_set_active -gtk_menu_set_monitor -gtk_menu_set_screen -gtk_menu_set_tearoff_state -gtk_menu_set_title +#endif +#endif + +#if IN_HEADER(__GTK_MENU_SHELL_H__) +#if IN_FILE(__GTK_MENU_SHELL_C__) gtk_menu_shell_activate_item gtk_menu_shell_append gtk_menu_shell_cancel @@ -1504,30 +2126,43 @@ gtk_menu_shell_insert gtk_menu_shell_prepend gtk_menu_shell_select_first gtk_menu_shell_select_item +#endif +#endif + +#if IN_HEADER(__GTK_MENU_TOOL_BUTTON_H__) +#if IN_FILE(__GTK_MENU_TOOL_BUTTON_C__) gtk_menu_tool_button_get_menu gtk_menu_tool_button_get_type G_GNUC_CONST gtk_menu_tool_button_new gtk_menu_tool_button_new_from_stock gtk_menu_tool_button_set_arrow_tooltip gtk_menu_tool_button_set_menu +#endif +#endif + +#if IN_HEADER(__GTK_MESSAGE_DIALOG_H__) +#if IN_FILE(__GTK_MESSAGE_DIALOG_C__) gtk_message_dialog_format_secondary_markup G_GNUC_PRINTF(2,3) gtk_message_dialog_format_secondary_text G_GNUC_PRINTF(2,3) gtk_message_dialog_get_type G_GNUC_CONST gtk_message_dialog_new G_GNUC_PRINTF(5,6) gtk_message_dialog_new_with_markup G_GNUC_PRINTF(5,6) gtk_message_dialog_set_markup -gtk_message_type_get_type G_GNUC_CONST -gtk_metric_type_get_type G_GNUC_CONST -#ifdef INCLUDE_VARIABLES -gtk_micro_version -gtk_minor_version #endif +#endif + +#if IN_HEADER(__GTK_MISC_H__) +#if IN_FILE(__GTK_MISC_C__) gtk_misc_get_alignment gtk_misc_get_padding gtk_misc_get_type G_GNUC_CONST gtk_misc_set_alignment gtk_misc_set_padding -gtk_movement_step_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_NOTEBOOK_H__) +#if IN_FILE(__GTK_NOTEBOOK_C__) gtk_notebook_append_page gtk_notebook_append_page_menu gtk_notebook_get_current_page @@ -1556,47 +2191,64 @@ gtk_notebook_query_tab_label_packing gtk_notebook_remove_page gtk_notebook_reorder_child gtk_notebook_set_current_page +#ifndef GTK_DISABLE_DEPRECATED gtk_notebook_set_homogeneous_tabs +gtk_notebook_set_tab_border +gtk_notebook_set_tab_hborder +gtk_notebook_set_tab_vborder +#endif gtk_notebook_set_menu_label gtk_notebook_set_menu_label_text gtk_notebook_set_scrollable gtk_notebook_set_show_border gtk_notebook_set_show_tabs -gtk_notebook_set_tab_border -gtk_notebook_set_tab_hborder gtk_notebook_set_tab_label gtk_notebook_set_tab_label_packing gtk_notebook_set_tab_label_text gtk_notebook_set_tab_pos -gtk_notebook_set_tab_vborder -gtk_notebook_tab_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_OBJECT_H__) +#if IN_FILE(__GTK_OBJECT_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_object_add_arg_type -gtk_object_destroy -gtk_object_flags_get_type G_GNUC_CONST gtk_object_get G_GNUC_NULL_TERMINATED +gtk_object_set G_GNUC_NULL_TERMINATED gtk_object_get_data gtk_object_get_data_by_id -gtk_object_get_type G_GNUC_CONST gtk_object_get_user_data gtk_object_new G_GNUC_NULL_TERMINATED -gtk_object_ref gtk_object_remove_data gtk_object_remove_data_by_id gtk_object_remove_no_notify gtk_object_remove_no_notify_by_id -gtk_object_set G_GNUC_NULL_TERMINATED +gtk_object_ref +gtk_object_unref +gtk_object_weakref +gtk_object_weakunref gtk_object_set_data gtk_object_set_data_by_id gtk_object_set_data_by_id_full gtk_object_set_data_full gtk_object_set_user_data +#endif +gtk_object_destroy +gtk_object_get_type G_GNUC_CONST gtk_object_sink -gtk_object_unref -gtk_object_weakref -gtk_object_weakunref +#endif +#endif + +#if IN_HEADER(__GTK_OLD_EDITABLE_H__) +#if IN_FILE(__GTK_OLD_EDITABLE_C__) gtk_old_editable_changed gtk_old_editable_claim_selection gtk_old_editable_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_OPTION_MENU_H__) +#if IN_FILE(__GTK_OPTION_MENU_C__) gtk_option_menu_get_history gtk_option_menu_get_menu gtk_option_menu_get_type G_GNUC_CONST @@ -1604,29 +2256,11 @@ gtk_option_menu_new gtk_option_menu_remove_menu gtk_option_menu_set_history gtk_option_menu_set_menu -gtk_orientation_get_type -gtk_pack_type_get_type G_GNUC_CONST -gtk_paint_arrow -gtk_paint_box -gtk_paint_box_gap -gtk_paint_check -gtk_paint_diamond -gtk_paint_expander -gtk_paint_extension -gtk_paint_flat_box -gtk_paint_focus -gtk_paint_handle -gtk_paint_hline -gtk_paint_layout -gtk_paint_option -gtk_paint_polygon -gtk_paint_resize_grip -gtk_paint_shadow -gtk_paint_shadow_gap -gtk_paint_slider -gtk_paint_string -gtk_paint_tab -gtk_paint_vline +#endif +#endif + +#if IN_HEADER(__GTK_PANED_H__) +#if IN_FILE(__GTK_PANED_C__) gtk_paned_add1 gtk_paned_add2 gtk_paned_compute_position @@ -1637,15 +2271,27 @@ gtk_paned_get_type G_GNUC_CONST gtk_paned_pack1 gtk_paned_pack2 gtk_paned_set_position -gtk_parse_args +#endif +#endif + +#if IN_HEADER(__GTK_PATH_BAR_H__) +#if IN_FILE(__GTK_PATH_BAR_C__) gtk_path_bar_get_type G_GNUC_CONST -gtk_path_priority_type_get_type G_GNUC_CONST -gtk_path_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_PIXMAP_H__) +#if IN_FILE(__GTK_PIXMAP_C__) gtk_pixmap_get gtk_pixmap_get_type G_GNUC_CONST gtk_pixmap_new gtk_pixmap_set gtk_pixmap_set_build_insensitive +#endif +#endif + +#if IN_HEADER(__GTK_PLUG_H__) +#if IN_FILE(__GTK_PLUG_C__) #ifdef GTK_WINDOWING_X11 gtk_plug_construct gtk_plug_construct_for_display @@ -1654,8 +2300,11 @@ gtk_plug_get_type G_GNUC_CONST gtk_plug_new gtk_plug_new_for_display #endif -gtk_policy_type_get_type G_GNUC_CONST -gtk_position_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_PREVIEW_H__) +#if IN_FILE(__GTK_PREVIEW_C__) gtk_preview_draw_row gtk_preview_get_cmap gtk_preview_get_info @@ -1671,9 +2320,12 @@ gtk_preview_set_gamma gtk_preview_set_install_cmap gtk_preview_set_reserved gtk_preview_size -gtk_preview_type_get_type G_GNUC_CONST gtk_preview_uninit -gtk_private_flags_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_PROGRESS_BAR_H__) +#if IN_FILE(__GTK_PROGRESS_BAR_C__) gtk_progress_bar_get_fraction gtk_progress_bar_get_orientation gtk_progress_bar_get_pulse_step @@ -1681,20 +2333,25 @@ gtk_progress_bar_get_text gtk_progress_bar_get_ellipsize gtk_progress_bar_get_type G_GNUC_CONST gtk_progress_bar_new +#ifndef GTK_DISABLE_DEPRECATED gtk_progress_bar_new_with_adjustment -gtk_progress_bar_orientation_get_type G_GNUC_CONST -gtk_progress_bar_pulse -gtk_progress_bar_set_activity_blocks -gtk_progress_bar_set_activity_step gtk_progress_bar_set_bar_style gtk_progress_bar_set_discrete_blocks +gtk_progress_bar_set_activity_blocks +gtk_progress_bar_set_activity_step +gtk_progress_bar_update +#endif +gtk_progress_bar_pulse gtk_progress_bar_set_fraction gtk_progress_bar_set_orientation gtk_progress_bar_set_pulse_step gtk_progress_bar_set_text gtk_progress_bar_set_ellipsize -gtk_progress_bar_style_get_type G_GNUC_CONST -gtk_progress_bar_update +#endif +#endif + +#if IN_HEADER(__GTK_PROGRESS_H__) +#if IN_FILE(__GTK_PROGRESS_C__) gtk_progress_configure gtk_progress_get_current_percentage gtk_progress_get_current_text @@ -1709,17 +2366,21 @@ gtk_progress_set_percentage gtk_progress_set_show_text gtk_progress_set_text_alignment gtk_progress_set_value -gtk_propagate_event -gtk_quit_add -gtk_quit_add_destroy -gtk_quit_add_full -gtk_quit_remove -gtk_quit_remove_by_data +#endif +#endif + +#if IN_HEADER(__GTK_RADIO_ACTION_H__) +#if IN_FILE(__GTK_RADIO_ACTION_C__) gtk_radio_action_get_current_value gtk_radio_action_get_group gtk_radio_action_get_type G_GNUC_CONST gtk_radio_action_new gtk_radio_action_set_group +#endif +#endif + +#if IN_HEADER(__GTK_RADIO_BUTTON_H__) +#if IN_FILE(__GTK_RADIO_BUTTON_C__) gtk_radio_button_get_group gtk_radio_button_get_type G_GNUC_CONST gtk_radio_button_new @@ -1729,6 +2390,11 @@ gtk_radio_button_new_with_label_from_widget gtk_radio_button_new_with_mnemonic gtk_radio_button_new_with_mnemonic_from_widget gtk_radio_button_set_group +#endif +#endif + +#if IN_HEADER(__GTK_RADIO_MENU_ITEM_H__) +#if IN_FILE(__GTK_RADIO_MENU_ITEM_C__) gtk_radio_menu_item_get_group gtk_radio_menu_item_get_type G_GNUC_CONST gtk_radio_menu_item_new @@ -1738,6 +2404,11 @@ gtk_radio_menu_item_new_with_label_from_widget gtk_radio_menu_item_new_with_mnemonic gtk_radio_menu_item_new_with_mnemonic_from_widget gtk_radio_menu_item_set_group +#endif +#endif + +#if IN_HEADER(__GTK_RADIO_TOOL_BUTTON_H__) +#if IN_FILE(__GTK_RADIO_TOOL_BUTTON_C__) gtk_radio_tool_button_get_group gtk_radio_tool_button_get_type G_GNUC_CONST gtk_radio_tool_button_new @@ -1745,6 +2416,11 @@ gtk_radio_tool_button_new_from_stock gtk_radio_tool_button_new_from_widget gtk_radio_tool_button_new_with_stock_from_widget gtk_radio_tool_button_set_group +#endif +#endif + +#if IN_HEADER(__GTK_RANGE_H__) +#if IN_FILE(__GTK_RANGE_C__) gtk_range_get_adjustment gtk_range_get_inverted gtk_range_get_type G_GNUC_CONST @@ -1756,16 +2432,22 @@ gtk_range_set_inverted gtk_range_set_range gtk_range_set_update_policy gtk_range_set_value +#endif +#endif + +#if IN_HEADER(__GTK_RC_H__) +#if IN_FILE(__GTK_RC_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_rc_add_class_style +gtk_rc_add_widget_class_style +gtk_rc_add_widget_name_style +#endif gtk_rc_add_default_file PRIVATE #ifdef G_OS_WIN32 gtk_rc_add_default_file_utf8 #endif -gtk_rc_add_widget_class_style -gtk_rc_add_widget_name_style gtk_rc_find_module_in_path gtk_rc_find_pixmap_in_path -gtk_rc_flags_get_type G_GNUC_CONST gtk_rc_get_default_files gtk_rc_get_im_module_file gtk_rc_get_im_module_path @@ -1781,11 +2463,6 @@ 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_reset_styles @@ -1799,14 +2476,11 @@ gtk_rc_style_get_type G_GNUC_CONST gtk_rc_style_new gtk_rc_style_ref gtk_rc_style_unref -gtk_rc_token_type_get_type G_GNUC_CONST -gtk_relief_style_get_type G_GNUC_CONST -gtk_requisition_copy -gtk_requisition_free -gtk_requisition_get_type G_GNUC_CONST -gtk_resize_mode_get_type G_GNUC_CONST -gtk_response_type_get_type G_GNUC_CONST -gtk_rgb_to_hsv +#endif +#endif + +#if IN_HEADER(__GTK_RULER_H__) +#if IN_FILE(__GTK_RULER_C__) gtk_ruler_draw_pos gtk_ruler_draw_ticks gtk_ruler_get_metric @@ -1814,6 +2488,11 @@ gtk_ruler_get_range gtk_ruler_get_type G_GNUC_CONST gtk_ruler_set_metric gtk_ruler_set_range +#endif +#endif + +#if IN_HEADER(__GTK_SCALE_H__) +#if IN_FILE(__GTK_SCALE_C__) gtk_scale_get_digits gtk_scale_get_draw_value gtk_scale_get_layout @@ -1823,7 +2502,17 @@ gtk_scale_get_value_pos gtk_scale_set_digits gtk_scale_set_draw_value gtk_scale_set_value_pos +#endif +#endif + +#if IN_HEADER(__GTK_SCROLLBAR_H__) +#if IN_FILE(__GTK_SCROLLBAR_C__) gtk_scrollbar_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_SCROLLED_WINDOW_H__) +#if IN_FILE(__GTK_SCROLLED_WINDOW_C__) gtk_scrolled_window_add_with_viewport gtk_scrolled_window_get_hadjustment gtk_scrolled_window_get_placement @@ -1837,8 +2526,11 @@ gtk_scrolled_window_set_placement gtk_scrolled_window_set_policy gtk_scrolled_window_set_shadow_type gtk_scrolled_window_set_vadjustment -gtk_scroll_step_get_type G_GNUC_CONST -gtk_scroll_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_SELECTION_H__) +#if IN_FILE(__GTK_SELECTION_C__) gtk_selection_add_target gtk_selection_add_targets gtk_selection_clear @@ -1857,18 +2549,46 @@ gtk_selection_data_set_text gtk_selection_data_set_uris gtk_selection_data_targets_include_image gtk_selection_data_targets_include_text -gtk_selection_mode_get_type G_GNUC_CONST gtk_selection_owner_set gtk_selection_owner_set_for_display gtk_selection_remove_all +gtk_target_list_add +gtk_target_list_add_image_targets +gtk_target_list_add_table +gtk_target_list_add_text_targets +gtk_target_list_add_uri_targets +gtk_target_list_find +gtk_target_list_new +gtk_target_list_ref +gtk_target_list_remove +gtk_target_list_unref +#endif +#endif + +#if IN_HEADER(__GTK_SEPARATOR_H__) +#if IN_FILE(__GTK_SEPARATOR_C__) gtk_separator_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_SEPARATOR_MENU_ITEM_H__) +#if IN_FILE(__GTK_SEPARATOR_MENU_ITEM_C__) gtk_separator_menu_item_get_type G_GNUC_CONST gtk_separator_menu_item_new +#endif +#endif + +#if IN_HEADER(__GTK_SEPARATOR_TOOL_ITEM_H__) +#if IN_FILE(__GTK_SEPARATOR_TOOL_ITEM_C__) gtk_separator_tool_item_get_draw gtk_separator_tool_item_get_type G_GNUC_CONST gtk_separator_tool_item_new gtk_separator_tool_item_set_draw -gtk_set_locale +#endif +#endif + +#if IN_HEADER(__GTK_SETTINGS_H__) +#if IN_FILE(__GTK_SETTINGS_C__) gtk_settings_get_default gtk_settings_get_for_screen gtk_settings_get_type G_GNUC_CONST @@ -1878,9 +2598,17 @@ gtk_settings_set_double_property gtk_settings_set_long_property gtk_settings_set_property_value gtk_settings_set_string_property -gtk_shadow_type_get_type G_GNUC_CONST -gtk_show_about_dialog G_GNUC_NULL_TERMINATED -gtk_side_type_get_type G_GNUC_CONST +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 +#endif +#endif + +#if IN_HEADER(__GTK_SIGNAL_H__) +#if IN_FILE(__GTK_SIGNAL_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_signal_compat_matched gtk_signal_connect_full gtk_signal_connect_object_while_alive @@ -1892,14 +2620,24 @@ gtk_signal_emitv gtk_signal_emitv_by_name gtk_signal_new gtk_signal_newv -gtk_signal_run_type_get_type G_GNUC_CONST +#endif +#endif +#endif + +#if IN_HEADER(__GTK_SIZE_GROUP_H__) +#if IN_FILE(__GTK_SIZE_GROUP_C__) gtk_size_group_add_widget gtk_size_group_get_mode gtk_size_group_get_type G_GNUC_CONST -gtk_size_group_mode_get_type G_GNUC_CONST gtk_size_group_new gtk_size_group_remove_widget gtk_size_group_set_mode +#endif +#endif + + +#if IN_HEADER(__GTK_SOCKET_H__) +#if IN_FILE(__GTK_SOCKET_C__) #ifdef GTK_WINDOWING_X11 gtk_socket_add_id gtk_socket_get_id @@ -1907,7 +2645,11 @@ gtk_socket_get_type G_GNUC_CONST gtk_socket_new gtk_socket_steal #endif -gtk_sort_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_SPIN_BUTTON_H__) +#if IN_FILE(__GTK_SPIN_BUTTON_C__) gtk_spin_button_configure gtk_spin_button_get_adjustment gtk_spin_button_get_digits @@ -1933,9 +2675,11 @@ gtk_spin_button_set_value gtk_spin_button_set_wrap gtk_spin_button_spin gtk_spin_button_update -gtk_spin_button_update_policy_get_type G_GNUC_CONST -gtk_spin_type_get_type G_GNUC_CONST -gtk_state_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_STATUSBAR_H__) +#if IN_FILE(__GTK_STATUSBAR_C__) gtk_statusbar_get_context_id gtk_statusbar_get_has_resize_grip gtk_statusbar_get_type G_GNUC_CONST @@ -1944,6 +2688,11 @@ gtk_statusbar_pop gtk_statusbar_push gtk_statusbar_remove gtk_statusbar_set_has_resize_grip +#endif +#endif + +#if IN_HEADER(__GTK_STOCK_H__) +#if IN_FILE(__GTK_STOCK_C__) gtk_stock_add gtk_stock_add_static gtk_stock_item_copy @@ -1951,21 +2700,11 @@ gtk_stock_item_free gtk_stock_list_ids gtk_stock_lookup gtk_stock_set_translate_func -gtk_style_apply_default_background -gtk_style_attach -gtk_style_copy -gtk_style_detach -gtk_style_get_font -gtk_style_get_type G_GNUC_CONST -gtk_style_lookup_icon_set -gtk_style_new -gtk_style_ref -gtk_style_render_icon -gtk_style_set_background -gtk_style_set_font -gtk_style_unref -gtk_submenu_direction_get_type G_GNUC_CONST -gtk_submenu_placement_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_TABLE_H__) +#if IN_FILE(__GTK_TABLE_C__) gtk_table_attach gtk_table_attach_defaults gtk_table_get_col_spacing @@ -1981,30 +2720,65 @@ gtk_table_set_col_spacings gtk_table_set_homogeneous gtk_table_set_row_spacing gtk_table_set_row_spacings -gtk_target_flags_get_type G_GNUC_CONST -gtk_target_list_add -gtk_target_list_add_image_targets -gtk_target_list_add_table -gtk_target_list_add_text_targets -gtk_target_list_add_uri_targets -gtk_target_list_find -gtk_target_list_new -gtk_target_list_ref -gtk_target_list_remove -gtk_target_list_unref +#endif +#endif + +#if IN_HEADER(__GTK_TEAROFF_MENU_ITEM_H__) +#if IN_FILE(__GTK_TEAROFF_MENU_ITEM_C__) gtk_tearoff_menu_item_get_type G_GNUC_CONST gtk_tearoff_menu_item_new -gtk_text_anchored_child_set_layout -#ifdef INCLUDE_VARIABLES -gtk_text_attr_appearance_type #endif +#endif + +#if IN_HEADER(__GTK_TEXT_TAG_H__) +#if IN_FILE(__GTK_TEXT_TAG_C__) gtk_text_attributes_copy gtk_text_attributes_copy_values gtk_text_attributes_get_type G_GNUC_CONST gtk_text_attributes_new gtk_text_attributes_ref gtk_text_attributes_unref +gtk_text_tag_event +gtk_text_tag_get_priority +gtk_text_tag_get_type G_GNUC_CONST +gtk_text_tag_new +gtk_text_tag_set_priority +#endif +#endif + +#if IN_HEADER(__GTK_TEXT_TAG_TABLE_H__) +#if IN_FILE(__GTK_TEXT_TAG_TABLE_C__) +gtk_text_tag_table_add +gtk_text_tag_table_foreach +gtk_text_tag_table_get_size +gtk_text_tag_table_get_type G_GNUC_CONST +gtk_text_tag_table_lookup +gtk_text_tag_table_new +gtk_text_tag_table_remove +#endif +#endif + +#if IN_HEADER(__GTK_TEXT_H__) +#if IN_FILE(__GTK_TEXT_C__) gtk_text_backward_delete +gtk_text_forward_delete +gtk_text_freeze +gtk_text_get_length +gtk_text_get_point +gtk_text_get_type G_GNUC_CONST +gtk_text_insert +gtk_text_new +gtk_text_set_adjustments +gtk_text_set_editable +gtk_text_set_line_wrap +gtk_text_set_point +gtk_text_set_word_wrap +gtk_text_thaw +#endif +#endif + +#if IN_HEADER(__GTK_TEXT_BUFFER_H__) +#if IN_FILE(__GTK_TEXT_BUFFER_C__) gtk_text_buffer_add_selection_clipboard gtk_text_buffer_apply_tag gtk_text_buffer_apply_tag_by_name @@ -2063,27 +2837,17 @@ gtk_text_buffer_remove_tag_by_name gtk_text_buffer_select_range gtk_text_buffer_set_modified gtk_text_buffer_set_text +#endif +#endif + +#if IN_HEADER(__GTK_TEXT_TYPES_H__) +#if IN_FILE(__GTK_TEXT_TYPES_C__) gtk_text_byte_begins_utf8_char -#ifdef INCLUDE_VARIABLES -gtk_text_char_type #endif -gtk_text_child_anchor_get_deleted -gtk_text_child_anchor_get_type G_GNUC_CONST -gtk_text_child_anchor_get_widgets -gtk_text_child_anchor_new -gtk_text_child_anchor_queue_resize -gtk_text_child_anchor_register_child -gtk_text_child_anchor_unregister_child -#ifdef INCLUDE_VARIABLES -gtk_text_child_type #endif -gtk_text_direction_get_type G_GNUC_CONST -gtk_text_forward_delete -gtk_text_freeze -gtk_text_get_length -gtk_text_get_point -gtk_text_get_type G_GNUC_CONST -gtk_text_insert + +#if IN_HEADER(__GTK_TEXT_ITER_H__) +#if IN_FILE(__GTK_TEXT_ITER_C__) gtk_text_iter_backward_char gtk_text_iter_backward_chars gtk_text_iter_backward_cursor_position @@ -2171,10 +2935,14 @@ gtk_text_iter_starts_line gtk_text_iter_starts_sentence gtk_text_iter_starts_word gtk_text_iter_toggles_tag +#endif +#endif + +#if IN_HEADER(__GTK_TEXT_LAYOUT_H__) +#if IN_FILE(__GTK_TEXT_LAYOUT_C__) gtk_text_layout_changed gtk_text_layout_clamp_iter_to_vrange gtk_text_layout_default_style_changed -gtk_text_layout_draw gtk_text_layout_free_line_data gtk_text_layout_free_line_display gtk_text_layout_get_buffer @@ -2213,46 +2981,58 @@ gtk_text_layout_validate_yrange gtk_text_layout_wrap gtk_text_layout_wrap_loop_end gtk_text_layout_wrap_loop_start -#ifdef INCLUDE_VARIABLES -gtk_text_left_mark_type #endif +#endif + +#if IN_HEADER(__GTK_TEXT_CHILD_H__) +#if IN_FILE(__GTK_TEXT_CHILD_C__) +gtk_text_child_anchor_get_deleted +gtk_text_child_anchor_get_type G_GNUC_CONST +gtk_text_child_anchor_get_widgets +gtk_text_child_anchor_new +#endif +#endif + +#if IN_HEADER(__GTK_TEXT_LAYOUT_H__) +#if IN_FILE(__GTK_TEXT_CHILD_C__) +gtk_text_child_anchor_queue_resize +gtk_text_child_anchor_register_child +gtk_text_child_anchor_unregister_child +gtk_text_anchored_child_set_layout +#endif +#endif + +#if IN_HEADER(__GTK_TEXT_DISPLAY_H__) +#if IN_FILE(__GTK_TEXT_DISPLAY_C__) +gtk_text_layout_draw +#endif +#endif + +#if IN_HEADER(__GTK_TEXT_SEGMENT_H__) +#if IN_FILE(__GTK_TEXT_SEGMENT_C__) gtk_text_line_segment_split +#endif +#endif + +#if IN_HEADER(__GTK_TEXT_MARK_H__) +#if IN_FILE(__GTK_TEXT_MARK_C__) gtk_text_mark_get_buffer gtk_text_mark_get_deleted gtk_text_mark_get_left_gravity gtk_text_mark_get_name gtk_text_mark_get_type G_GNUC_CONST gtk_text_mark_get_visible +#endif +#endif + +#if IN_HEADER(__GTK_TEXT_MARK_H__) +#if IN_FILE(__GTK_TEXT_BTREE_C__) gtk_text_mark_set_visible -gtk_text_new -#ifdef INCLUDE_VARIABLES -gtk_text_pixbuf_type -gtk_text_right_mark_type #endif -gtk_text_search_flags_get_type G_GNUC_CONST -gtk_text_set_adjustments -gtk_text_set_editable -gtk_text_set_line_wrap -gtk_text_set_point -gtk_text_set_word_wrap -gtk_text_tag_event -gtk_text_tag_get_priority -gtk_text_tag_get_type G_GNUC_CONST -gtk_text_tag_new -gtk_text_tag_set_priority -gtk_text_tag_table_add -gtk_text_tag_table_foreach -gtk_text_tag_table_get_size -gtk_text_tag_table_get_type G_GNUC_CONST -gtk_text_tag_table_lookup -gtk_text_tag_table_new -gtk_text_tag_table_remove -gtk_text_thaw -#ifdef INCLUDE_VARIABLES -gtk_text_toggle_off_type -gtk_text_toggle_on_type -gtk_text_unknown_char_utf8 #endif + +#if IN_HEADER(__GTK_TEXT_VIEW_H__) +#if IN_FILE(__GTK_TEXT_VIEW_C__) gtk_text_view_add_child_at_anchor gtk_text_view_add_child_in_window gtk_text_view_backward_display_line @@ -2311,19 +3091,30 @@ gtk_text_view_set_tabs 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 G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_THEMES_H__) +#if IN_FILE(__GTK_THEMES_C__) gtk_theme_engine_create_rc_style gtk_theme_engine_get gtk_theme_engine_get_type G_GNUC_CONST -gtk_timeout_add -gtk_timeout_add_full -gtk_timeout_remove +#endif +#endif + +#if IN_HEADER(__GTK_TIPS_QUERY_H__) +#if IN_FILE(__GTK_TIPS_QUERY_C__) gtk_tips_query_get_type G_GNUC_CONST gtk_tips_query_new gtk_tips_query_set_caller gtk_tips_query_set_labels gtk_tips_query_start_query gtk_tips_query_stop_query +#endif +#endif + +#if IN_HEADER(__GTK_TOGGLE_ACTION_H__) +#if IN_FILE(__GTK_TOGGLE_ACTION_C__) gtk_toggle_action_get_active gtk_toggle_action_get_draw_as_radio gtk_toggle_action_get_type G_GNUC_CONST @@ -2331,6 +3122,11 @@ gtk_toggle_action_new gtk_toggle_action_set_active gtk_toggle_action_set_draw_as_radio gtk_toggle_action_toggled +#endif +#endif + +#if IN_HEADER(__GTK_TOGGLE_BUTTON_H__) +#if IN_FILE(__GTK_TOGGLE_BUTTON_C__) gtk_toggle_button_get_active gtk_toggle_button_get_inconsistent gtk_toggle_button_get_mode @@ -2342,16 +3138,39 @@ gtk_toggle_button_set_active gtk_toggle_button_set_inconsistent gtk_toggle_button_set_mode gtk_toggle_button_toggled +#endif +#endif + +#if IN_HEADER(__GTK_TOGGLE_TOOL_BUTTON_H__) +#if IN_FILE(__GTK_TOGGLE_TOOL_BUTTON_C__) gtk_toggle_tool_button_get_active gtk_toggle_tool_button_get_type G_GNUC_CONST gtk_toggle_tool_button_new gtk_toggle_tool_button_new_from_stock gtk_toggle_tool_button_set_active +#endif +#endif + +#if IN_HEADER(__GTK_TOOLBAR_H__) +#if IN_FILE(__GTK_TOOLBAR_C__) +#ifndef GTK_DISABLE_DEPRECATED gtk_toolbar_append_element +gtk_toolbar_set_icon_size +gtk_toolbar_unset_icon_size gtk_toolbar_append_item +gtk_toolbar_prepend_element +gtk_toolbar_prepend_item +gtk_toolbar_insert_element +gtk_toolbar_insert_item +gtk_toolbar_insert_space +gtk_toolbar_insert_stock gtk_toolbar_append_space +gtk_toolbar_prepend_space +gtk_toolbar_remove_space gtk_toolbar_append_widget -gtk_toolbar_child_type_get_type G_GNUC_CONST +gtk_toolbar_insert_widget +gtk_toolbar_prepend_widget +#endif gtk_toolbar_get_drop_index gtk_toolbar_get_icon_size gtk_toolbar_get_item_index @@ -2364,27 +3183,18 @@ gtk_toolbar_get_style gtk_toolbar_get_tooltips gtk_toolbar_get_type G_GNUC_CONST gtk_toolbar_insert -gtk_toolbar_insert_element -gtk_toolbar_insert_item -gtk_toolbar_insert_space -gtk_toolbar_insert_stock -gtk_toolbar_insert_widget gtk_toolbar_new -gtk_toolbar_prepend_element -gtk_toolbar_prepend_item -gtk_toolbar_prepend_space -gtk_toolbar_prepend_widget -gtk_toolbar_remove_space gtk_toolbar_set_drop_highlight_item -gtk_toolbar_set_icon_size gtk_toolbar_set_orientation gtk_toolbar_set_show_arrow gtk_toolbar_set_style gtk_toolbar_set_tooltips -gtk_toolbar_space_style_get_type G_GNUC_CONST -gtk_toolbar_style_get_type G_GNUC_CONST -gtk_toolbar_unset_icon_size gtk_toolbar_unset_style +#endif +#endif + +#if IN_HEADER(__GTK_TOOL_BUTTON_H__) +#if IN_FILE(__GTK_TOOL_BUTTON_C__) gtk_tool_button_get_icon_widget gtk_tool_button_get_label gtk_tool_button_get_label_widget @@ -2398,6 +3208,11 @@ gtk_tool_button_set_label gtk_tool_button_set_label_widget gtk_tool_button_set_stock_id gtk_tool_button_set_use_underline +#endif +#endif + +#if IN_HEADER(__GTK_TOOL_ITEM_H__) +#if IN_FILE(__GTK_TOOL_ITEM_C__) gtk_tool_item_get_expand gtk_tool_item_get_homogeneous gtk_tool_item_get_icon_size @@ -2421,6 +3236,11 @@ gtk_tool_item_set_tooltip gtk_tool_item_set_use_drag_window gtk_tool_item_set_visible_horizontal gtk_tool_item_set_visible_vertical +#endif +#endif + +#if IN_HEADER(__GTK_TOOLTIPS_H__) +#if IN_FILE(__GTK_TOOLTIPS_C__) gtk_tooltips_data_get gtk_tooltips_disable gtk_tooltips_enable @@ -2428,11 +3248,36 @@ gtk_tooltips_force_window gtk_tooltips_get_info_from_tip_window gtk_tooltips_get_type G_GNUC_CONST gtk_tooltips_new +#ifndef GTK_DISABLE_DEPRECATED gtk_tooltips_set_delay +#endif gtk_tooltips_set_tip +#endif +#endif + +#if IN_HEADER(__GTK_TREE_H__) +#if IN_FILE(__GTK_TREE_C__) gtk_tree_append gtk_tree_child_position gtk_tree_clear_items +gtk_tree_get_type G_GNUC_CONST +gtk_tree_insert +gtk_tree_prepend +gtk_tree_remove_item +gtk_tree_remove_items +gtk_tree_select_child +gtk_tree_select_item +gtk_tree_set_selection_mode +gtk_tree_set_view_lines +gtk_tree_set_view_mode +gtk_tree_unselect_child +gtk_tree_unselect_item +gtk_tree_new +#endif +#endif + +#if IN_HEADER(__GTK_TREE_DND_H__) +#if IN_FILE(__GTK_TREE_DND_C__) gtk_tree_drag_dest_drag_data_received gtk_tree_drag_dest_get_type G_GNUC_CONST gtk_tree_drag_dest_row_drop_possible @@ -2441,8 +3286,12 @@ gtk_tree_drag_source_drag_data_get gtk_tree_drag_source_get_type G_GNUC_CONST gtk_tree_drag_source_row_draggable gtk_tree_get_row_drag_data -gtk_tree_get_type G_GNUC_CONST -gtk_tree_insert +gtk_tree_set_row_drag_data +#endif +#endif + +#if IN_HEADER(__GTK_TREE_ITEM_H__) +#if IN_FILE(__GTK_TREE_ITEM_C__) gtk_tree_item_collapse gtk_tree_item_deselect gtk_tree_item_expand @@ -2452,22 +3301,14 @@ gtk_tree_item_new_with_label gtk_tree_item_remove_subtree gtk_tree_item_select gtk_tree_item_set_subtree +#endif +#endif + +#if IN_HEADER(__GTK_TREE_MODEL_H__) +#if IN_FILE(__GTK_TREE_MODEL_C__) gtk_tree_iter_copy gtk_tree_iter_free gtk_tree_iter_get_type G_GNUC_CONST -gtk_tree_model_filter_clear_cache -gtk_tree_model_filter_convert_child_iter_to_iter -gtk_tree_model_filter_convert_child_path_to_path -gtk_tree_model_filter_convert_iter_to_child_iter -gtk_tree_model_filter_convert_path_to_child_path -gtk_tree_model_filter_get_model -gtk_tree_model_filter_get_type G_GNUC_CONST -gtk_tree_model_filter_new -gtk_tree_model_filter_refilter -gtk_tree_model_filter_set_modify_func -gtk_tree_model_filter_set_visible_column -gtk_tree_model_filter_set_visible_func -gtk_tree_model_flags_get_type G_GNUC_CONST gtk_tree_model_foreach gtk_tree_model_get gtk_tree_model_get_column_type @@ -2493,18 +3334,7 @@ gtk_tree_model_row_deleted 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 G_GNUC_CONST -gtk_tree_model_sort_iter_is_valid -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 gtk_tree_path_compare gtk_tree_path_copy @@ -2524,9 +3354,6 @@ gtk_tree_path_prepend_index gtk_tree_path_prev gtk_tree_path_to_string gtk_tree_path_up -gtk_tree_prepend -gtk_tree_remove_item -gtk_tree_remove_items gtk_tree_row_reference_copy gtk_tree_row_reference_deleted gtk_tree_row_reference_free @@ -2537,7 +3364,43 @@ gtk_tree_row_reference_new gtk_tree_row_reference_new_proxy gtk_tree_row_reference_reordered gtk_tree_row_reference_valid -gtk_tree_select_child +#endif +#endif + +#if IN_HEADER(__GTK_TREE_MODEL_SORT_H__) +#if IN_FILE(__GTK_TREE_MODEL_SORT_C__) +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 G_GNUC_CONST +gtk_tree_model_sort_iter_is_valid +gtk_tree_model_sort_new_with_model +gtk_tree_model_sort_reset_default_sort_func +#endif +#endif + +#if IN_HEADER(__GTK_TREE_MODEL_FILTER_H__) +#if IN_FILE(__GTK_TREE_MODEL_FILTER_C__) +gtk_tree_model_filter_clear_cache +gtk_tree_model_filter_convert_child_iter_to_iter +gtk_tree_model_filter_convert_child_path_to_path +gtk_tree_model_filter_convert_iter_to_child_iter +gtk_tree_model_filter_convert_path_to_child_path +gtk_tree_model_filter_get_model +gtk_tree_model_filter_get_type G_GNUC_CONST +gtk_tree_model_filter_new +gtk_tree_model_filter_refilter +gtk_tree_model_filter_set_modify_func +gtk_tree_model_filter_set_visible_column +gtk_tree_model_filter_set_visible_func +#endif +#endif + +#if IN_HEADER(__GTK_TREE_SELECTION_H__) +#if IN_FILE(__GTK_TREE_SELECTION_C__) gtk_tree_selection_count_selected_rows gtk_tree_selection_get_mode gtk_tree_selection_get_selected @@ -2558,11 +3421,11 @@ gtk_tree_selection_unselect_all gtk_tree_selection_unselect_iter gtk_tree_selection_unselect_path gtk_tree_selection_unselect_range -gtk_tree_select_item -gtk_tree_set_row_drag_data -gtk_tree_set_selection_mode -gtk_tree_set_view_lines -gtk_tree_set_view_mode +#endif +#endif + +#if IN_HEADER(__GTK_TREE_SORTABLE_H__) +#if IN_FILE(__GTK_TREE_SORTABLE_C__) gtk_tree_sortable_get_sort_column_id gtk_tree_sortable_get_type G_GNUC_CONST gtk_tree_sortable_has_default_sort_func @@ -2570,6 +3433,11 @@ gtk_tree_sortable_set_default_sort_func gtk_tree_sortable_set_sort_column_id gtk_tree_sortable_set_sort_func gtk_tree_sortable_sort_column_changed +#endif +#endif + +#if IN_HEADER(__GTK_TREE_STORE_H__) +#if IN_FILE(__GTK_TREE_STORE_C__) gtk_tree_store_append gtk_tree_store_clear gtk_tree_store_get_type G_GNUC_CONST @@ -2591,11 +3459,11 @@ gtk_tree_store_set_column_types gtk_tree_store_set_valist gtk_tree_store_set_value gtk_tree_store_swap -gtk_tree_unselect_child -gtk_tree_unselect_item -gtk_tree_view_append_column -gtk_tree_view_collapse_all -gtk_tree_view_collapse_row +#endif +#endif + +#if IN_HEADER(__GTK_TREE_VIEW_COLUMN_H__) +#if IN_FILE(__GTK_TREE_VIEW_COLUMN_C__) gtk_tree_view_column_add_attribute gtk_tree_view_column_cell_get_position gtk_tree_view_column_cell_get_size @@ -2628,7 +3496,6 @@ gtk_tree_view_column_new gtk_tree_view_column_new_with_attributes G_GNUC_NULL_TERMINATED gtk_tree_view_column_pack_end gtk_tree_view_column_pack_start -gtk_tree_view_columns_autosize gtk_tree_view_column_set_alignment gtk_tree_view_column_set_attributes gtk_tree_view_column_set_cell_data_func @@ -2647,9 +3514,15 @@ gtk_tree_view_column_set_spacing 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 G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_TREE_VIEW_H__) +#if IN_FILE(__GTK_TREE_VIEW_C__) +gtk_tree_view_append_column +gtk_tree_view_collapse_all +gtk_tree_view_collapse_row gtk_tree_view_create_row_drag_icon -gtk_tree_view_drop_position_get_type G_GNUC_CONST gtk_tree_view_enable_model_drag_dest gtk_tree_view_enable_model_drag_source gtk_tree_view_expand_all @@ -2685,7 +3558,6 @@ gtk_tree_view_insert_column gtk_tree_view_insert_column_with_attributes G_GNUC_NULL_TERMINATED gtk_tree_view_insert_column_with_data_func gtk_tree_view_map_expanded_rows -gtk_tree_view_mode_get_type G_GNUC_CONST gtk_tree_view_move_column_after gtk_tree_view_new gtk_tree_view_new_with_model @@ -2718,8 +3590,15 @@ gtk_tree_view_tree_to_widget_coords gtk_tree_view_unset_rows_drag_dest gtk_tree_view_unset_rows_drag_source gtk_tree_view_widget_to_tree_coords -gtk_true G_GNUC_CONST +gtk_tree_view_columns_autosize +#endif +#endif + +#if IN_HEADER(__GTK_TYPE_UTILS_H__) +#if IN_FILE(__GTK_TYPE_UTILS_C__) gtk_type_class +gtk_identifier_get_type G_GNUC_CONST +#ifndef GTK_DISABLE_DEPRECATED gtk_type_enum_find_value gtk_type_enum_get_values gtk_type_flags_find_value @@ -2727,6 +3606,12 @@ gtk_type_flags_get_values gtk_type_init gtk_type_new gtk_type_unique +#endif +#endif +#endif + +#if IN_HEADER(__GTK_UI_MANAGER_H__) +#if IN_FILE(__GTK_UI_MANAGER_C__) gtk_ui_manager_add_ui gtk_ui_manager_add_ui_from_file PRIVATE #ifdef G_OS_WIN32 @@ -2743,21 +3628,34 @@ gtk_ui_manager_get_type G_GNUC_CONST gtk_ui_manager_get_ui gtk_ui_manager_get_widget gtk_ui_manager_insert_action_group -gtk_ui_manager_item_type_get_type G_GNUC_CONST gtk_ui_manager_new gtk_ui_manager_new_merge_id gtk_ui_manager_remove_action_group gtk_ui_manager_remove_ui gtk_ui_manager_set_add_tearoffs -gtk_update_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_VBOX_H__) +#if IN_FILE(__GTK_VBOX_C__) gtk_vbox_get_type G_GNUC_CONST gtk_vbox_new +#endif +#endif + +#if IN_HEADER(__GTK_VBUTTONBOX_H__) +#if IN_FILE(__GTK_VBUTTONBOX_C__) gtk_vbutton_box_get_layout_default gtk_vbutton_box_get_spacing_default gtk_vbutton_box_get_type G_GNUC_CONST gtk_vbutton_box_new gtk_vbutton_box_set_layout_default gtk_vbutton_box_set_spacing_default +#endif +#endif + +#if IN_HEADER(__GTK_VIEPORT_H__) +#if IN_FILE(__GTK_VIEPORT_C__) gtk_viewport_get_hadjustment gtk_viewport_get_shadow_type gtk_viewport_get_type G_GNUC_CONST @@ -2766,18 +3664,50 @@ gtk_viewport_new gtk_viewport_set_hadjustment gtk_viewport_set_shadow_type gtk_viewport_set_vadjustment -gtk_visibility_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GTK_VPANED_H__) +#if IN_FILE(__GTK_VPANED_C__) gtk_vpaned_get_type G_GNUC_CONST gtk_vpaned_new +#endif +#endif + +#if IN_HEADER(__GTK_VRULER_H__) +#if IN_FILE(__GTK_VRULER_C__) gtk_vruler_get_type G_GNUC_CONST gtk_vruler_new +#endif +#endif + +#if IN_HEADER(__GTK_VSCALE_H__) +#if IN_FILE(__GTK_VSCALE_C__) gtk_vscale_get_type G_GNUC_CONST gtk_vscale_new gtk_vscale_new_with_range +#endif +#endif + +#if IN_HEADER(__GTK_VSCROLLBAR_H__) +#if IN_FILE(__GTK_VSCROLLBAR_C__) gtk_vscrollbar_get_type G_GNUC_CONST gtk_vscrollbar_new +#endif +#endif + +#if IN_HEADER(__GTK_VSEPARATOR_H__) +#if IN_FILE(__GTK_VSEPARATOR_C__) gtk_vseparator_get_type G_GNUC_CONST gtk_vseparator_new +#endif +#endif + +#if IN_HEADER(__GTK_WIDGET_H__) +#if IN_FILE(__GTK_WIDGET_C__) +gtk_requisition_copy +gtk_requisition_free +gtk_requisition_get_type G_GNUC_CONST gtk_widget_activate gtk_widget_add_accelerator gtk_widget_add_events @@ -2794,10 +3724,8 @@ gtk_widget_create_pango_context gtk_widget_create_pango_layout gtk_widget_destroy gtk_widget_destroyed -gtk_widget_draw gtk_widget_ensure_style gtk_widget_event -gtk_widget_flags_get_type G_GNUC_CONST gtk_widget_freeze_child_notify gtk_widget_get_accessible gtk_widget_get_ancestor @@ -2832,7 +3760,6 @@ gtk_widget_get_visual gtk_widget_grab_default gtk_widget_grab_focus gtk_widget_has_screen -gtk_widget_help_type_get_type G_GNUC_CONST gtk_widget_hide gtk_widget_hide_all gtk_widget_hide_on_delete @@ -2855,8 +3782,14 @@ gtk_widget_pop_colormap gtk_widget_pop_composite_child gtk_widget_push_colormap gtk_widget_push_composite_child +#ifndef GTK_DISABLE_DEPRECATED +gtk_widget_draw gtk_widget_queue_clear gtk_widget_queue_clear_area +gtk_widget_set +gtk_widget_set_uposition +gtk_widget_set_usize +#endif gtk_widget_queue_draw gtk_widget_queue_draw_area gtk_widget_queue_resize @@ -2871,7 +3804,6 @@ gtk_widget_reparent gtk_widget_reset_rc_styles gtk_widget_reset_shapes gtk_widget_send_expose -gtk_widget_set G_GNUC_NULL_TERMINATED gtk_widget_set_accel_path gtk_widget_set_app_paintable gtk_widget_set_child_visible @@ -2893,8 +3825,6 @@ gtk_widget_set_sensitive gtk_widget_set_size_request gtk_widget_set_state gtk_widget_set_style -gtk_widget_set_uposition -gtk_widget_set_usize gtk_widget_shape_combine_mask gtk_widget_show gtk_widget_show_all @@ -2910,6 +3840,11 @@ gtk_widget_unmap gtk_widget_unparent gtk_widget_unrealize gtk_widget_unref +#endif +#endif + +#if IN_HEADER(__GTK_WINDOW_H__) +#if IN_FILE(__GTK_WINDOW_C__) gtk_window_activate_default gtk_window_activate_focus gtk_window_activate_key @@ -2959,7 +3894,6 @@ gtk_window_mnemonic_activate gtk_window_move gtk_window_new gtk_window_parse_geometry -gtk_window_position_get_type G_GNUC_CONST gtk_window_present gtk_window_propagate_key_event gtk_window_remove_accel_group @@ -2997,7 +3931,9 @@ gtk_window_set_keep_above gtk_window_set_keep_below gtk_window_set_mnemonic_modifier gtk_window_set_modal +#ifndef GTK_DISABLE_DEPRECATED gtk_window_set_policy +#endif gtk_window_set_position gtk_window_set_resizable gtk_window_set_role @@ -3009,11 +3945,27 @@ gtk_window_set_transient_for gtk_window_set_type_hint gtk_window_set_wmclass gtk_window_stick -gtk_window_type_get_type G_GNUC_CONST gtk_window_unfullscreen gtk_window_unmaximize gtk_window_unstick -gtk_wrap_mode_get_type G_GNUC_CONST -#ifdef G_OS_WIN32 -_gtk_file_system_win32_path_compare +#endif +#endif + +#ifdef INCLUDE_VARIABLES +gtk_binary_age +gtk_interface_age +gtk_major_version +gtk_minor_version +gtk_micro_version +gtk_combo_string_key +gtk_debug_flags +gtk_text_attr_appearance_type +gtk_text_char_type +gtk_text_child_type +gtk_text_left_mark_type +gtk_text_pixbuf_type +gtk_text_right_mark_type +gtk_text_toggle_off_type +gtk_text_toggle_on_type +gtk_text_unknown_char_utf8 #endif diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 73b41eaf95..72dab643fd 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -32,8 +32,6 @@ #include <gdk/gdkkeysyms.h> -#include "gtkalias.h" - #include "gtkaboutdialog.h" #include "gtkbutton.h" #include "gtkbbox.h" @@ -51,6 +49,8 @@ #include "gtkiconfactory.h" #include "gtkintl.h" +#include "gtkalias.h" + #include <string.h> typedef struct _GtkAboutDialogPrivate GtkAboutDialogPrivate; @@ -2219,3 +2219,6 @@ gtk_show_about_dialog (GtkWindow *parent, gtk_window_present (GTK_WINDOW (dialog)); } + +#define __GTK_ABOUT_DIALOG_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index 128cd457a5..b65a7ff459 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -28,7 +28,6 @@ #include <string.h> #include <stdlib.h> -#include "gtkalias.h" #include "gtkaccelgroup.h" #include "gtkaccellabel.h" /* For _gtk_accel_label_class_get_accelerator_label */ #include "gtkaccelmap.h" @@ -36,6 +35,7 @@ #include "gtkmain.h" /* For _gtk_boolean_handled_accumulator */ #include "gdk/gdkkeysyms.h" #include "gtkmarshalers.h" +#include "gtkalias.h" /* --- prototypes --- */ @@ -1246,3 +1246,6 @@ gtk_accelerator_get_default_mod_mask (void) { return default_accel_mod_mask; } + +#define __GTK_ACCEL_GROUP_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index e70a885f1d..0d7193c79e 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -30,11 +30,11 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkaccellabel.h" #include "gtkaccelmap.h" #include "gtkmain.h" #include "gtkintl.h" +#include "gtkalias.h" enum { PROP_0, @@ -636,3 +636,6 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label) return FALSE; } + +#define __GTK_ACCEL_LABEL_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c index c4cd681dd3..7b9d049ce1 100644 --- a/gtk/gtkaccelmap.c +++ b/gtk/gtkaccelmap.c @@ -19,11 +19,11 @@ #include <config.h> -#include "gtkalias.h" #include "gtkaccelmap.h" #include "gtkmarshalers.h" #include "gtkwindow.h" /* in lack of GtkAcceleratable */ +#include "gtkalias.h" #include <glib/gstdio.h> @@ -1028,3 +1028,6 @@ gtk_accel_map_save (const gchar *file_name) } #endif + +#define __GTK_ACCEL_MAP_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c index b7295f5c73..c1e772ab89 100644 --- a/gtk/gtkaccessible.c +++ b/gtk/gtkaccessible.c @@ -20,9 +20,9 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkwidget.h" #include "gtkaccessible.h" +#include "gtkalias.h" static void gtk_accessible_class_init (GtkAccessibleClass *klass); @@ -93,3 +93,6 @@ gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible) &accessible->widget); } } + +#define __GTK_ACCESSIBLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h index 853e657b19..ca8645be6a 100644 --- a/gtk/gtkaccessible.h +++ b/gtk/gtkaccessible.h @@ -23,9 +23,7 @@ #include <atk/atk.h> #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_ACCESSIBLE (gtk_accessible_get_type ()) #define GTK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessible)) @@ -69,10 +67,7 @@ GType gtk_accessible_get_type (void) G_GNUC_CONST; void gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_ACCESSIBLE_H__ */ diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index c40e7448b6..1feccf3c07 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -30,7 +30,6 @@ #include <config.h> -#include "gtkalias.h" #include "gtkaction.h" #include "gtkactiongroup.h" #include "gtkaccellabel.h" @@ -45,6 +44,7 @@ #include "gtktearoffmenuitem.h" #include "gtktoolbutton.h" #include "gtktoolbar.h" +#include "gtkalias.h" #define GTK_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION, GtkActionPrivate)) @@ -1574,3 +1574,6 @@ gtk_action_disconnect_accelerator (GtkAction *action) gtk_accel_group_disconnect (action->private_data->accel_group, action->private_data->accel_closure); } + +#define __GTK_ACTION_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 30758498a6..bda336bc6d 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -30,7 +30,6 @@ #include <config.h> -#include "gtkalias.h" #include "gtkactiongroup.h" #include "gtkstock.h" #include "gtktoggleaction.h" @@ -38,6 +37,7 @@ #include "gtkaccelmap.h" #include "gtkmarshalers.h" #include "gtkintl.h" +#include "gtkalias.h" #define GTK_ACTION_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroupPrivate)) @@ -1120,3 +1120,6 @@ _gtk_action_group_emit_post_activate (GtkActionGroup *action_group, { g_signal_emit (action_group, action_group_signals[POST_ACTIVATE], 0, action); } + +#define __GTK_ACTION_GROUP_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c index 8c2ac74d50..a257f7501e 100644 --- a/gtk/gtkadjustment.c +++ b/gtk/gtkadjustment.c @@ -25,10 +25,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkadjustment.h" #include "gtkintl.h" #include "gtkmarshalers.h" +#include "gtkalias.h" enum { @@ -421,3 +421,6 @@ gtk_adjustment_clamp_page (GtkAdjustment *adjustment, if (need_emission) gtk_adjustment_value_changed (adjustment); } + +#define __GTK_ADJUSTMENT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c index ec633c5064..894b93d8b0 100644 --- a/gtk/gtkalignment.c +++ b/gtk/gtkalignment.c @@ -25,9 +25,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkalignment.h" #include "gtkintl.h" +#include "gtkalias.h" enum { PROP_0, @@ -619,3 +619,6 @@ gtk_alignment_get_padding (GtkAlignment *alignment, if(padding_right) *padding_right = priv->padding_right; } + +#define __GTK_ALIGNMENT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c index 1116e3537e..4f3b505f5d 100644 --- a/gtk/gtkarrow.c +++ b/gtk/gtkarrow.c @@ -26,9 +26,9 @@ #include <config.h> #include <math.h> -#include "gtkalias.h" #include "gtkarrow.h" #include "gtkintl.h" +#include "gtkalias.h" #define MIN_ARROW_SIZE 15 @@ -288,3 +288,6 @@ gtk_arrow_expose (GtkWidget *widget, return FALSE; } + +#define __GTK_ARROW_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index 454260f481..7437f8f7ef 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -30,9 +30,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkaspectframe.h" #include "gtkintl.h" +#include "gtkalias.h" enum { PROP_0, @@ -335,3 +335,6 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame *frame, else parent_class->compute_child_allocation (frame, child_allocation); } + +#define __GTK_ASPECT_FRAME_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h index 426da7c956..437be5e26e 100644 --- a/gtk/gtkaspectframe.h +++ b/gtk/gtkaspectframe.h @@ -32,10 +32,7 @@ #include <gtk/gtkbin.h> #include <gtk/gtkframe.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_ASPECT_FRAME (gtk_aspect_frame_get_type ()) #define GTK_ASPECT_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame)) @@ -79,9 +76,6 @@ void gtk_aspect_frame_set (GtkAspectFrame *aspect_frame, gboolean obey_child); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_ASPECT_FRAME_H__ */ diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index a161e7e74c..a2747e9593 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -25,9 +25,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkbbox.h" #include "gtkintl.h" +#include "gtkalias.h" enum { PROP_0, @@ -503,3 +503,6 @@ _gtk_button_box_child_requisition (GtkWidget *widget, if (height) *height = needed_height; } + +#define __GTK_BUTTON_BOX_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h index 2773b69827..1f69197ff9 100644 --- a/gtk/gtkbbox.h +++ b/gtk/gtkbbox.h @@ -30,10 +30,7 @@ #include <gtk/gtkbox.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_BUTTON_BOX (gtk_button_box_get_type ()) #define GTK_BUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBox)) @@ -99,10 +96,7 @@ void _gtk_button_box_child_requisition (GtkWidget *widget, int *nvis_secondaries, int *width, int *height); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_BUTTON_BOX_H__ */ diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index 4d8309cc34..a6499b3a33 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkbin.h" +#include "gtkalias.h" static void gtk_bin_class_init (GtkBinClass *klass); @@ -183,3 +183,6 @@ gtk_bin_get_child (GtkBin *bin) return bin->child; } + +#define __GTK_BIN_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h index 89b61a4196..c919c1d941 100644 --- a/gtk/gtkbin.h +++ b/gtk/gtkbin.h @@ -32,10 +32,7 @@ #include <gtk/gtkcontainer.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_BIN (gtk_bin_get_type ()) #define GTK_BIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BIN, GtkBin)) @@ -65,9 +62,6 @@ GType gtk_bin_get_type (void) G_GNUC_CONST; GtkWidget *gtk_bin_get_child (GtkBin *bin); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_BIN_H__ */ diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index e866964c1b..7127d4d506 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -31,11 +31,11 @@ #include <string.h> #include <stdarg.h> #include <gdkkeysyms.h> -#include "gtkalias.h" #include "gtkbindings.h" #include "gtkkeyhash.h" #include "gtkwidget.h" #include "gtkrc.h" +#include "gtkalias.h" /* --- defines --- */ @@ -1504,3 +1504,6 @@ _gtk_binding_signal_new (const gchar *signal_name, return signal_id; } + +#define __GTK_BINDINGS_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 76f229b6c2..46c6ff7f32 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -25,9 +25,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkbox.h" #include "gtkintl.h" +#include "gtkalias.h" enum { PROP_0, @@ -712,3 +712,6 @@ gtk_box_forall (GtkContainer *container, (* callback) (child->widget, callback_data); } } + +#define __GTK_BOX_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index efdbced578..237a24971a 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -26,7 +26,6 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkalignment.h" #include "gtkbutton.h" #include "gtklabel.h" @@ -37,6 +36,7 @@ #include "gtkstock.h" #include "gtkiconfactory.h" #include "gtkintl.h" +#include "gtkalias.h" #define CHILD_SPACING 1 @@ -1787,4 +1787,5 @@ gtk_button_get_image (GtkButton *button) return priv->image; } - +#define __GTK_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h index da940be833..3537d7ba27 100644 --- a/gtk/gtkbutton.h +++ b/gtk/gtkbutton.h @@ -34,9 +34,7 @@ #include <gtk/gtkimage.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_BUTTON (gtk_button_get_type ()) #define GTK_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON, GtkButton)) @@ -134,9 +132,6 @@ void _gtk_button_paint (GtkButton *button, const gchar *main_detail, const gchar *default_detail); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_BUTTON_H__ */ diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 69a3e84103..3e740860a9 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -42,7 +42,6 @@ #include <time.h> #include <glib/gprintf.h> -#include "gtkalias.h" #include "gtkcalendar.h" #include "gtkdnd.h" #include "gtkintl.h" @@ -50,6 +49,7 @@ #include "gtkmarshalers.h" #include "gtkintl.h" #include "gdk/gdkkeysyms.h" +#include "gtkalias.h" /***************************************************************************/ /* The following date routines are taken from the lib_date package. Keep @@ -3553,3 +3553,6 @@ gtk_calendar_drag_data_received (GtkWidget *widget, gtk_calendar_select_day (calendar, day); g_object_thaw_notify (G_OBJECT (calendar)); } + +#define __GTK_CALENDAR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h index ef7143588e..162d814acc 100644 --- a/gtk/gtkcalendar.h +++ b/gtk/gtkcalendar.h @@ -36,10 +36,7 @@ #include <gtk/gtksignal.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_CALENDAR (gtk_calendar_get_type ()) #define GTK_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar)) @@ -148,10 +145,6 @@ void gtk_calendar_freeze (GtkCalendar *calendar); void gtk_calendar_thaw (GtkCalendar *calendar); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_CALENDAR_H__ */ diff --git a/gtk/gtkcelleditable.c b/gtk/gtkcelleditable.c index 8184d2a417..8df3351355 100644 --- a/gtk/gtkcelleditable.c +++ b/gtk/gtkcelleditable.c @@ -19,9 +19,9 @@ #include <config.h> -#include "gtkalias.h" #include "gtkcelleditable.h" #include "gtkmarshalers.h" +#include "gtkalias.h" static void gtk_cell_editable_base_init (gpointer g_class); @@ -128,3 +128,6 @@ gtk_cell_editable_remove_widget (GtkCellEditable *cell_editable) g_signal_emit_by_name (cell_editable, "remove_widget"); } + +#define __GTK_CELL_EDITABLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c index 7806ad4f3f..e402364ef0 100644 --- a/gtk/gtkcelllayout.c +++ b/gtk/gtkcelllayout.c @@ -18,8 +18,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkcelllayout.h" +#include "gtkalias.h" GType gtk_cell_layout_get_type (void) @@ -277,3 +277,6 @@ gtk_cell_layout_reorder (GtkCellLayout *cell_layout, cell, position); } + +#define __GTK_CELL_LAYOUT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index b9a11813d0..4c07d882e5 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -18,11 +18,11 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkcellrenderer.h" #include "gtkintl.h" #include "gtkmarshalers.h" #include "gtktreeprivate.h" +#include "gtkalias.h" static void gtk_cell_renderer_init (GtkCellRenderer *cell); static void gtk_cell_renderer_class_init (GtkCellRendererClass *class); @@ -808,3 +808,5 @@ gtk_cell_renderer_stop_editing (GtkCellRenderer *cell, } } +#define __GTK_CELL_RENDERER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c index ba3cb66552..96ac31a52e 100644 --- a/gtk/gtkcellrenderercombo.c +++ b/gtk/gtkcellrenderercombo.c @@ -20,7 +20,6 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkintl.h" #include "gtkbin.h" #include "gtkentry.h" @@ -29,6 +28,7 @@ #include "gtkcellrenderertext.h" #include "gtkcombobox.h" #include "gtkcomboboxentry.h" +#include "gtkalias.h" static void gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass); static void gtk_cell_renderer_combo_init (GtkCellRendererCombo *self); @@ -392,3 +392,6 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell, return GTK_CELL_EDITABLE (combo); } + +#define __GTK_CELL_RENDERER_COMBO_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h index f3efe33cb1..2c35d0965f 100644 --- a/gtk/gtkcellrenderercombo.h +++ b/gtk/gtkcellrenderercombo.h @@ -18,8 +18,8 @@ */ -#ifndef GTK_CELL_RENDERER_COMBO_H -#define GTK_CELL_RENDERER_COMBO_H +#ifndef __GTK_CELL_RENDERER_COMBO_H__ +#define __GTK_CELL_RENDERER_COMBO_H__ #include <gtk/gtktreemodel.h> #include <gtk/gtkcellrenderertext.h> diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c index 40e093eaca..e1960f9f45 100644 --- a/gtk/gtkcellrendererpixbuf.c +++ b/gtk/gtkcellrendererpixbuf.c @@ -19,10 +19,10 @@ #include <config.h> #include <stdlib.h> -#include "gtkalias.h" #include "gtkcellrendererpixbuf.h" #include "gtkiconfactory.h" #include "gtkintl.h" +#include "gtkalias.h" static void gtk_cell_renderer_pixbuf_get_property (GObject *object, guint param_id, @@ -609,3 +609,6 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer *cell, if (colorized) g_object_unref (colorized); } + +#define __GTK_CELL_RENDERER_PIXBUF_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c index fb9b0956f3..03f7cf1692 100644 --- a/gtk/gtkcellrendererprogress.c +++ b/gtk/gtkcellrendererprogress.c @@ -28,9 +28,9 @@ #include "config.h" #include <stdlib.h> -#include "gtkalias.h" #include "gtkcellrendererprogress.h" #include "gtkintl.h" +#include "gtkalias.h" #define GTK_CELL_RENDERER_PROGRESS_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), \ GTK_TYPE_CELL_RENDERER_PROGRESS, \ @@ -377,3 +377,5 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell, g_object_unref (gc); } +#define __GTK_CELL_RENDERER_PROGRESS_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 6dd4297c53..9527604f15 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -19,13 +19,13 @@ #include <config.h> #include <stdlib.h> -#include "gtkalias.h" #include "gtkcellrenderertext.h" #include "gtkeditable.h" #include "gtkentry.h" #include "gtkmarshalers.h" #include "gtkintl.h" #include "gtktreeprivate.h" +#include "gtkalias.h" static void gtk_cell_renderer_text_init (GtkCellRendererText *celltext); static void gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class); @@ -1874,3 +1874,6 @@ gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer renderer->calc_fixed_height = TRUE; } } + +#define __GTK_CELL_RENDERER_TEXT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c index 084d3d4afa..a0c9be559c 100644 --- a/gtk/gtkcellrenderertoggle.c +++ b/gtk/gtkcellrenderertoggle.c @@ -19,11 +19,11 @@ #include <config.h> #include <stdlib.h> -#include "gtkalias.h" #include "gtkcellrenderertoggle.h" #include "gtkintl.h" #include "gtkmarshalers.h" #include "gtktreeprivate.h" +#include "gtkalias.h" static void gtk_cell_renderer_toggle_get_property (GObject *object, guint param_id, @@ -481,3 +481,6 @@ gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *toggle, g_object_set (toggle, "active", setting ? TRUE : FALSE, NULL); } + +#define __GTK_CELL_RENDERER_TOGGLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 1b1d8c2c93..909a1b5a8c 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -18,7 +18,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkcellview.h" #include "gtkcelllayout.h" #include "gtkintl.h" @@ -26,6 +25,7 @@ #include "gtkcellrenderertext.h" #include "gtkcellrendererpixbuf.h" #include <gobject/gmarshal.h> +#include "gtkalias.h" typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo; struct _GtkCellViewCellInfo @@ -967,6 +967,18 @@ gtk_cell_view_set_displayed_row (GtkCellView *cell_view, gtk_widget_queue_draw (GTK_WIDGET (cell_view)); } +/** + * gtk_cell_view_get_displayed_row: + * @cell_view: a #GtkCellView + * + * Returns a #GtkTreePath referring to the currently + * displayed row. If no row is currently displayed, + * %NULL is returned. + * + * Returns: the currently displayed row or %NULL + * + * Since: 2.6 + */ GtkTreePath * gtk_cell_view_get_displayed_row (GtkCellView *cell_view) { @@ -1085,3 +1097,6 @@ gtk_cell_view_get_cell_renderers (GtkCellView *cell_view) return g_list_reverse (retval); } + +#define __GTK_CELL_VIEW_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index 7c6bc801e3..04a4d01f2b 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -25,10 +25,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkcheckbutton.h" #include "gtkintl.h" #include "gtklabel.h" +#include "gtkalias.h" #define INDICATOR_SIZE 13 @@ -451,3 +451,6 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button, x, y, indicator_size, indicator_size); } } + +#define __GTK_CHECK_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h index b2f3e1eaef..106bf5463d 100644 --- a/gtk/gtkcheckbutton.h +++ b/gtk/gtkcheckbutton.h @@ -32,10 +32,7 @@ #include <gtk/gtktogglebutton.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_CHECK_BUTTON (gtk_check_button_get_type ()) #define GTK_CHECK_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_BUTTON, GtkCheckButton)) @@ -77,9 +74,6 @@ void _gtk_check_button_get_props (GtkCheckButton *check_button, gint *indicator_size, gint *indicator_spacing); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_CHECK_BUTTON_H__ */ diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index 5a3e9884fc..9f78ccee0a 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -25,11 +25,11 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkcheckmenuitem.h" #include "gtkaccellabel.h" #include "gtkintl.h" #include "gtkmarshalers.h" +#include "gtkalias.h" enum { TOGGLED, @@ -541,3 +541,6 @@ gtk_check_menu_item_set_property (GObject *object, break; } } + +#define __GTK_CHECK_MENU_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h index 74b1ef133e..6db552fc61 100644 --- a/gtk/gtkcheckmenuitem.h +++ b/gtk/gtkcheckmenuitem.h @@ -24,18 +24,15 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_MENU_CHECK_ITEM_H__ -#define __GTK_MENU_CHECK_ITEM_H__ +#ifndef __GTK_CHECK_MENU_ITEM_H__ +#define __GTK_CHECK_MENU_ITEM_H__ #include <gdk/gdk.h> #include <gtk/gtkmenuitem.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_CHECK_MENU_ITEM (gtk_check_menu_item_get_type ()) #define GTK_CHECK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem)) @@ -97,9 +94,6 @@ void gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item, #define gtk_check_menu_item_set_state gtk_check_menu_item_set_active #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_CHECK_MENU_ITEM_H__ */ diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index a570b74c9d..bb21b009c7 100644 --- a/gtk/gtkclipboard.c +++ b/gtk/gtkclipboard.c @@ -23,11 +23,11 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkclipboard.h" #include "gtkinvisible.h" #include "gtkmain.h" #include "gtkmarshalers.h" +#include "gtkalias.h" #ifdef GDK_WINDOWING_X11 #include "x11/gdkx.h" @@ -1731,3 +1731,6 @@ _gtk_clipboard_store_all (void) g_slist_free (displays); } + +#define __GTK_CLIPBOARD_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h index dee672fa55..9be35a6360 100644 --- a/gtk/gtkclipboard.h +++ b/gtk/gtkclipboard.h @@ -22,12 +22,10 @@ #ifndef __GTK_CLIPBOARD_H__ #define __GTK_CLIPBOARD_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include <gtk/gtkselection.h> +G_BEGIN_DECLS + #define GTK_TYPE_CLIPBOARD (gtk_clipboard_get_type ()) #define GTK_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard)) #define GTK_IS_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD)) @@ -127,8 +125,6 @@ void _gtk_clipboard_handle_event (GdkEventOwnerChange *event); void _gtk_clipboard_store_all (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_CLIPBOARD_H__ */ diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index eabeb5a45d..ad77731cf4 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -33,13 +33,14 @@ #include <stdlib.h> #include <string.h> -#include "gtkalias.h" #include "gtkmain.h" +#include "gtkobject.h" #include "gtkclist.h" #include "gtkbindings.h" #include "gtkdnd.h" #include "gtkmarshalers.h" #include <gdk/gdkkeysyms.h> +#include "gtkalias.h" /* length of button_actions array */ #define MAX_BUTTON 5 @@ -7825,3 +7826,7 @@ gtk_clist_set_button_actions (GtkCList *clist, clist->button_actions[button] = button_actions; } } + +#define __GTK_CLIST_C__ +#include "gtkaliasdef.c" + diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index 65a2614684..f096962fb4 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -30,7 +30,6 @@ #include <config.h> -#include "gtkalias.h" #include "gtkcolorbutton.h" #include "gdk/gdkkeysyms.h" #include "gdk-pixbuf/gdk-pixbuf.h" @@ -45,6 +44,7 @@ #include "gtksignal.h" #include "gtkmarshalers.h" #include "gtkintl.h" +#include "gtkalias.h" /* Size of checks and gray levels for alpha compositing checkerboard */ #define CHECK_SIZE 4 @@ -1009,3 +1009,6 @@ gtk_color_button_get_property (GObject *object, break; } } + +#define __GTK_COLOR_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 7c6375bd97..119073838c 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -29,7 +29,6 @@ #include "gdkconfig.h" #include <math.h> -#include "gtkalias.h" #include "gdk/gdkkeysyms.h" #include "gtkcolorsel.h" #include "gtkhsv.h" @@ -60,6 +59,7 @@ #include "gtkimage.h" #include "gtkstock.h" #include "gtkaccessible.h" +#include "gtkalias.h" #include <string.h> @@ -2865,3 +2865,7 @@ make_all_relations (AtkObject *atk_obj, make_control_relations (atk_obj, priv->green_spinbutton); make_control_relations (atk_obj, priv->blue_spinbutton); } + +#define __GTK_COLOR_SELECTION_C__ +#include "gtkaliasdef.c" + diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h index dbdddf6166..8cfc3c931a 100644 --- a/gtk/gtkcolorsel.h +++ b/gtk/gtkcolorsel.h @@ -30,10 +30,7 @@ #include <gtk/gtkdialog.h> #include <gtk/gtkvbox.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_COLOR_SELECTION (gtk_color_selection_get_type ()) #define GTK_COLOR_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelection)) @@ -128,9 +125,6 @@ void gtk_color_selection_set_update_policy (GtkColorSelection *colorsel, GtkUpdateType policy); #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_COLOR_SELECTION_H__ */ diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c index 84b97de3fd..5591bc02bc 100644 --- a/gtk/gtkcolorseldialog.c +++ b/gtk/gtkcolorseldialog.c @@ -25,13 +25,13 @@ */ #include <config.h> #include <glib.h> -#include "gtkalias.h" #include "gtkcolorseldialog.h" #include "gtkframe.h" #include "gtkhbbox.h" #include "gtkbutton.h" #include "gtkstock.h" #include "gtkintl.h" +#include "gtkalias.h" static void gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass); @@ -138,3 +138,5 @@ gtk_color_selection_dialog_new (const gchar *title) return GTK_WIDGET (colorseldiag); } +#define __GTK_COLOR_SELECTION_DIALOG_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h index 6a1c657de3..7ad0249117 100644 --- a/gtk/gtkcolorseldialog.h +++ b/gtk/gtkcolorseldialog.h @@ -30,9 +30,7 @@ #include <gtk/gtkcolorsel.h> #include <gtk/gtkvbox.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_COLOR_SELECTION_DIALOG (gtk_color_selection_dialog_get_type ()) #define GTK_COLOR_SELECTION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialog)) @@ -73,9 +71,6 @@ GType gtk_color_selection_dialog_get_type (void) G_GNUC_CONST; GtkWidget* gtk_color_selection_dialog_new (const gchar *title); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_COLOR_SELECTION_DIALOG_H__ */ diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 51ed736d31..e62d6018ee 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -33,7 +33,6 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkarrow.h" #include "gtklabel.h" #include "gtklist.h" @@ -48,6 +47,7 @@ #include "gtkcombo.h" #include "gtkframe.h" #include "gtkintl.h" +#include "gtkalias.h" const gchar gtk_combo_string_key[] = "gtk-combo-string-value"; @@ -1254,3 +1254,6 @@ gtk_combo_get_property (GObject *object, } } + +#define __GTK_SMART_COMBO_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcombo.h b/gtk/gtkcombo.h index 9652dc2741..31655af3a4 100644 --- a/gtk/gtkcombo.h +++ b/gtk/gtkcombo.h @@ -32,9 +32,7 @@ #include <gtk/gtkhbox.h> #include <gtk/gtkitem.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_COMBO (gtk_combo_get_type ()) #define GTK_COMBO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO, GtkCombo)) @@ -113,9 +111,7 @@ void gtk_combo_set_popdown_strings (GtkCombo* combo, void gtk_combo_disable_activate (GtkCombo* combo); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_SMART_COMBO_H__ */ diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index c1ac9332bd..5a9a8b7b12 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -18,7 +18,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkcombobox.h" #include "gtkarrow.h" @@ -51,6 +50,7 @@ #include "gtkintl.h" #include "gtktreeprivate.h" +#include "gtkalias.h" /* WELCOME, to THE house of evil code */ @@ -5140,3 +5140,6 @@ gtk_combo_box_get_focus_on_click (GtkComboBox *combo) return combo->priv->focus_on_click; } + +#define __GTK_COMBO_BOX_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index 7598596588..9c3e698594 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -18,7 +18,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkcomboboxentry.h" #include "gtkcelllayout.h" @@ -26,6 +25,7 @@ #include "gtkcellrenderertext.h" #include "gtkintl.h" +#include "gtkalias.h" #define GTK_COMBO_BOX_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryPrivate)) @@ -382,3 +382,6 @@ gtk_combo_box_entry_new_text (void) return entry_box; } + +#define __GTK_COMBO_BOX_ENTRY_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 9ba1e7000a..45da39db50 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -29,7 +29,6 @@ #include <string.h> #include <stdlib.h> -#include "gtkalias.h" #include "gtkcontainer.h" #include "gtkprivate.h" #include "gtkmain.h" @@ -39,6 +38,7 @@ #include "gtktoolbar.h" #include <gobject/gobjectnotifyqueue.c> #include <gobject/gvaluecollector.h> +#include "gtkalias.h" enum { @@ -2463,3 +2463,6 @@ gtk_container_propagate_expose (GtkContainer *container, gdk_event_free (child_event); } } + +#define __GTK_CONTAINER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index afb8b12fdc..612fe8bcbe 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -34,10 +34,7 @@ #include <gtk/gtkadjustment.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_CONTAINER (gtk_container_get_type ()) #define GTK_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer)) @@ -223,9 +220,6 @@ GList *_gtk_container_focus_sort (GtkContainer *container, #define gtk_container_border_width gtk_container_set_border_width #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_CONTAINER_H__ */ diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 6434f17132..16e411ebdf 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -33,13 +33,13 @@ #include <config.h> #include <stdlib.h> -#include "gtkalias.h" #include "gtkctree.h" #include "gtkbindings.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkdnd.h" #include <gdk/gdkkeysyms.h> +#include "gtkalias.h" #define PM_SIZE 8 #define TAB_SIZE (PM_SIZE + 6) @@ -6119,3 +6119,6 @@ gtk_ctree_node_get_type (void) return our_type; } + +#define __GTK_CTREE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h index 9f6bd2a7e6..a67ee5f9a1 100644 --- a/gtk/gtkctree.h +++ b/gtk/gtkctree.h @@ -35,9 +35,7 @@ #include <gtk/gtkclist.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_CTREE (gtk_ctree_get_type ()) #define GTK_CTREE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CTREE, GtkCTree)) @@ -440,9 +438,7 @@ void gtk_ctree_sort_recursive (GtkCTree *ctree, */ GType gtk_ctree_node_get_type (void) G_GNUC_CONST; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_CTREE_H__ */ diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c index c3ee5aa98a..20f637ba85 100644 --- a/gtk/gtkcurve.c +++ b/gtk/gtkcurve.c @@ -29,7 +29,6 @@ #include <string.h> #include <math.h> -#include "gtkalias.h" #include "gtkcurve.h" #include "gtkdrawingarea.h" #include "gtkmain.h" @@ -37,6 +36,7 @@ #include "gtkradiobutton.h" #include "gtktable.h" #include "gtkintl.h" +#include "gtkalias.h" #define RADIUS 3 /* radius of the control points */ #define MIN_DISTANCE 8 /* min distance between control points */ @@ -1044,3 +1044,6 @@ gtk_curve_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } + +#define __GTK_CURVE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h index efc28a4ba1..94c2c59b1b 100644 --- a/gtk/gtkcurve.h +++ b/gtk/gtkcurve.h @@ -41,10 +41,7 @@ #include <gdk/gdk.h> #include <gtk/gtkdrawingarea.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_CURVE (gtk_curve_get_type ()) #define GTK_CURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CURVE, GtkCurve)) @@ -110,9 +107,6 @@ void gtk_curve_set_vector (GtkCurve *curve, void gtk_curve_set_curve_type (GtkCurve *curve, GtkCurveType type); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_CURVE_H__ */ diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index a93ed7b8c7..c860acd407 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -25,7 +25,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkbutton.h" #include "gtkdialog.h" #include "gtkhbbox.h" @@ -37,6 +36,7 @@ #include "gtkmain.h" #include "gtkintl.h" #include "gtkbindings.h" +#include "gtkalias.h" #define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_DIALOG, GtkDialogPrivate)) @@ -1237,3 +1237,5 @@ gtk_dialog_set_alternative_button_order_from_array (GtkDialog *dialog, } } +#define __GTK_DIALOG_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h index 27ffa201d9..0af0643b14 100644 --- a/gtk/gtkdialog.h +++ b/gtk/gtkdialog.h @@ -32,9 +32,7 @@ #include <gtk/gtkwindow.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* Parameters for dialog construction */ typedef enum @@ -174,9 +172,6 @@ void _gtk_dialog_set_ignore_separator (GtkDialog *dialog, gint _gtk_dialog_get_response_for_widget (GtkDialog *dialog, GtkWidget *widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_DIALOG_H__ */ diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index e58187475f..18c7d13be1 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -25,7 +25,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gdkconfig.h" #include "gdk/gdkkeysyms.h" @@ -37,6 +36,7 @@ #include "gtkplug.h" #include "gtkstock.h" #include "gtkwindow.h" +#include "gtkalias.h" static GSList *source_widgets = NULL; @@ -3699,3 +3699,6 @@ gtk_drag_check_threshold (GtkWidget *widget, return (ABS (current_x - start_x) > drag_threshold || ABS (current_y - start_y) > drag_threshold); } + +#define __GTK_DND_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h index 586980b061..ba52415df8 100644 --- a/gtk/gtkdnd.h +++ b/gtk/gtkdnd.h @@ -32,9 +32,7 @@ #include <gtk/gtkwidget.h> #include <gtk/gtkselection.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef enum { GTK_DEST_DEFAULT_MOTION = 1 << 0, /* respond to "drag_motion" */ @@ -168,9 +166,7 @@ void gtk_drag_set_default_icon (GdkColormap *colormap, gint hot_y); #endif /* !GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_DND_H__ */ diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c index 7656568881..edfab9b5cc 100644 --- a/gtk/gtkdrawingarea.c +++ b/gtk/gtkdrawingarea.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkdrawingarea.h" +#include "gtkalias.h" static void gtk_drawing_area_class_init (GtkDrawingAreaClass *klass); @@ -170,3 +170,6 @@ gtk_drawing_area_send_configure (GtkDrawingArea *darea) gtk_widget_event (widget, event); gdk_event_free (event); } + +#define __GTK_DRAWING_AREA_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h index a483117c89..fd445e16ac 100644 --- a/gtk/gtkdrawingarea.h +++ b/gtk/gtkdrawingarea.h @@ -32,10 +32,7 @@ #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_DRAWING_AREA (gtk_drawing_area_get_type ()) #define GTK_DRAWING_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingArea)) @@ -77,9 +74,6 @@ void gtk_drawing_area_size (GtkDrawingArea *darea, #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_DRAWING_AREA_H__ */ diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index 5e176f86cd..80473c1e64 100644 --- a/gtk/gtkeditable.c +++ b/gtk/gtkeditable.c @@ -27,9 +27,9 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkeditable.h" #include "gtkmarshalers.h" +#include "gtkalias.h" static void gtk_editable_base_init (gpointer g_class); @@ -242,3 +242,6 @@ gtk_editable_get_editable (GtkEditable *editable) return value; } + +#define __GTK_EDITABLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h index 331712d763..46de8150ef 100644 --- a/gtk/gtkeditable.h +++ b/gtk/gtkeditable.h @@ -31,10 +31,7 @@ #include <gdk/gdk.h> #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_EDITABLE (gtk_editable_get_type ()) #define GTK_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EDITABLE, GtkEditable)) @@ -111,9 +108,6 @@ void gtk_editable_set_editable (GtkEditable *editable, gboolean is_editable); gboolean gtk_editable_get_editable (GtkEditable *editable); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_EDITABLE_H__ */ diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 0659e12bf3..0ad8879f2d 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -30,7 +30,6 @@ #include <pango/pango.h> #include "gdk/gdkkeysyms.h" -#include "gtkalias.h" #include "gtkbindings.h" #include "gtkcelleditable.h" #include "gtkclipboard.h" @@ -53,6 +52,7 @@ #include "gtktreeselection.h" #include "gtkentryprivate.h" #include "gtkcelllayout.h" +#include "gtkalias.h" #define GTK_ENTRY_COMPLETION_KEY "gtk-entry-completion-key" @@ -5390,3 +5390,6 @@ gtk_entry_get_completion (GtkEntry *entry) return completion; } + +#define __GTK_ENTRY_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index 0c4c2aaa4e..6ba485aa8b 100644 --- a/gtk/gtkentry.h +++ b/gtk/gtkentry.h @@ -35,10 +35,7 @@ #include <gtk/gtkentrycompletion.h> #include <pango/pango.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_ENTRY (gtk_entry_get_type ()) #define GTK_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY, GtkEntry)) @@ -221,9 +218,6 @@ void _gtk_entry_get_borders (GtkEntry *entry, gint *yborder); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_ENTRY_H__ */ diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index 4af7527a56..e001a3db3e 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -18,10 +18,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkentrycompletion.h" #include "gtkentryprivate.h" #include "gtkcelllayout.h" +#include "gtkalias.h" #include "gtkintl.h" #include "gtkcellrenderertext.h" @@ -1607,3 +1607,6 @@ gtk_entry_completion_get_popup_completion (GtkEntryCompletion *completion) return completion->priv->popup_completion; } + +#define __GTK_ENTRY_COMPLETION_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c index 39f1fc5a48..4fa3ab8d09 100644 --- a/gtk/gtkeventbox.c +++ b/gtk/gtkeventbox.c @@ -25,9 +25,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkeventbox.h" #include "gtkintl.h" +#include "gtkalias.h" typedef struct { @@ -610,3 +610,5 @@ gtk_event_box_expose (GtkWidget *widget, return FALSE; } +#define __GTK_EVENT_BOX_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h index 5a5586b7d5..3fba8b4b6f 100644 --- a/gtk/gtkeventbox.h +++ b/gtk/gtkeventbox.h @@ -32,10 +32,7 @@ #include <gtk/gtkbin.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_EVENT_BOX (gtk_event_box_get_type ()) #define GTK_EVENT_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EVENT_BOX, GtkEventBox)) @@ -66,9 +63,6 @@ gboolean gtk_event_box_get_above_child (GtkEventBox *event_box); void gtk_event_box_set_above_child (GtkEventBox *event_box, gboolean above_child); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_EVENT_BOX_H__ */ diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 59f4a72347..82516f7111 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -23,7 +23,6 @@ #include <config.h> -#include "gtkalias.h" #include "gtkexpander.h" #include "gtklabel.h" @@ -33,6 +32,7 @@ #include "gtkintl.h" #include "gtkprivate.h" #include <gdk/gdkkeysyms.h> +#include "gtkalias.h" #define GTK_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, GtkExpanderPrivate)) @@ -1640,3 +1640,6 @@ gtk_expander_get_label_widget (GtkExpander *expander) return expander->priv->label_widget; } + +#define __GTK_EXPANDER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 6e8f54d32e..994e5cde5e 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -19,12 +19,12 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkfilechooser.h" #include "gtkfilechooserprivate.h" #include "gtkfilesystem.h" #include "gtkintl.h" #include "gtktypebuiltins.h" +#include "gtkalias.h" static void gtk_file_chooser_class_init (gpointer g_iface); @@ -1999,3 +1999,6 @@ gtk_file_chooser_list_shortcut_folders (GtkFileChooser *chooser) } #endif + +#define __GTK_FILE_CHOOSER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index eb7815e0c4..dedd2a9fe8 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -30,7 +30,6 @@ #include <string.h> -#include "gtkalias.h" #include "gtkintl.h" #include "gtkbutton.h" #include "gtkcelllayout.h" @@ -56,6 +55,8 @@ #include "gtkfilesystemwin32.h" #endif +#include "gtkalias.h" + /* **************** * * Private Macros * * **************** */ @@ -2339,3 +2340,6 @@ gtk_file_chooser_button_set_width_chars (GtkFileChooserButton *button, gtk_label_set_width_chars (GTK_LABEL (button->priv->label), n_chars); g_object_notify (G_OBJECT (button), "width-chars"); } + +#define __GTK_FILE_CHOOSER_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index b0fa607e1d..8e5a45c627 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -20,7 +20,6 @@ #include <config.h> #include "gdk/gdkkeysyms.h" -#include "gtkalias.h" #include "gtkalignment.h" #include "gtkbindings.h" #include "gtkbutton.h" @@ -74,6 +73,8 @@ #include "gtkfilesystemwin32.h" #endif +#include "gtkalias.h" + #include <errno.h> #include <string.h> #include <time.h> @@ -6501,3 +6502,6 @@ shortcuts_model_filter_new (GtkFileChooserDefault *impl, return GTK_TREE_MODEL (model); } + +#define __GTK_FILE_CHOOSER_DEFAULT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index 2e990a6f60..3c0234f2dd 100644 --- a/gtk/gtkfilechooserdialog.c +++ b/gtk/gtkfilechooserdialog.c @@ -19,13 +19,13 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkfilechooserdialog.h" #include "gtkfilechooserwidget.h" #include "gtkfilechooserutils.h" #include "gtkfilechooserembed.h" #include "gtkfilesystem.h" #include "gtktypebuiltins.h" +#include "gtkalias.h" #include <stdarg.h> @@ -667,3 +667,6 @@ gtk_file_chooser_dialog_new_with_backend (const gchar *title, return result; } + +#define __GTK_FILE_CHOOSER_DIALOG_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c index d192868f0c..68d25c9099 100644 --- a/gtk/gtkfilechooserembed.c +++ b/gtk/gtkfilechooserembed.c @@ -1,7 +1,7 @@ #include <config.h> -#include "gtkalias.h" #include "gtkfilechooserembed.h" #include "gtkmarshalers.h" +#include "gtkalias.h" static void gtk_file_chooser_embed_class_init (gpointer g_iface); static void delegate_get_default_size (GtkFileChooserEmbed *chooser_embed, @@ -181,3 +181,5 @@ _gtk_file_chooser_embed_get_resizable_hints (GtkFileChooserEmbed *chooser_embed, GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically); } +#define __GTK_FILE_CHOOSER_EMBED_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index 66bc6b566e..9bfcafcf2b 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -21,12 +21,12 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkcelllayout.h" #include "gtkcellrenderertext.h" #include "gtkentry.h" #include "gtkfilechooserentry.h" #include "gtkmain.h" +#include "gtkalias.h" typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass; @@ -991,3 +991,6 @@ _gtk_file_chooser_entry_get_action (GtkFileChooserEntry *chooser_entry) return chooser_entry->action; } + +#define __GTK_FILE_CHOOSER_ENTRY_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c index 2ba38fbf52..91275db9b2 100644 --- a/gtk/gtkfilechooserutils.c +++ b/gtk/gtkfilechooserutils.c @@ -20,11 +20,11 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkfilechooserutils.h" #include "gtkfilechooser.h" #include "gtkfilesystem.h" #include "gtktypebuiltins.h" +#include "gtkalias.h" static gboolean delegate_set_current_folder (GtkFileChooser *chooser, const GtkFilePath *path, @@ -341,3 +341,6 @@ delegate_file_activated (GtkFileChooser *chooser, { g_signal_emit_by_name (data, "file-activated"); } + +#define __GTK_FILE_CHOOSER_UTILS_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 00014727be..00798080fc 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -19,12 +19,12 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkfilechooserwidget.h" #include "gtkfilechooserdefault.h" #include "gtkfilechooserutils.h" #include "gtktypebuiltins.h" #include "gtkfilechooserembed.h" +#include "gtkalias.h" struct _GtkFileChooserWidgetPrivate { @@ -248,3 +248,6 @@ gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction action, "file-system-backend", backend, NULL); } + +#define __GTK_FILE_CHOOSER_WIDGET_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c index 0f6379fda0..9366161915 100644 --- a/gtk/gtkfilefilter.c +++ b/gtk/gtkfilefilter.c @@ -21,11 +21,12 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkfilefilter.h" #include "gtkobject.h" #include "gtkprivate.h" +#include "gtkalias.h" + #ifdef G_OS_UNIX #define XDG_PREFIX _gtk_xdg #include "xdgmime/xdgmime.h" @@ -453,3 +454,6 @@ gtk_file_filter_filter (GtkFileFilter *filter, return FALSE; } + +#define __GTK_FILE_FILTER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 7324e49b4e..c145a22bd8 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -56,7 +56,6 @@ #endif #include "gdk/gdkkeysyms.h" -#include "gtkalias.h" #include "gtkbutton.h" #include "gtkcellrenderertext.h" #include "gtkentry.h" @@ -87,6 +86,8 @@ #define WANT_HPANED 1 #include "gtkhpaned.h" +#include "gtkalias.h" + #ifdef G_OS_WIN32 #include <direct.h> #include <io.h> @@ -4091,3 +4092,6 @@ gtk_file_selection_get_selections (GtkFileSelection *filesel) } #endif /* G_OS_WIN32 */ + +#define __GTK_FILESEL_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 4943d0024b..f62e80ac3f 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -20,10 +20,10 @@ #include <config.h> #include <gmodule.h> -#include "gtkalias.h" #include "gtkfilesystem.h" #include "gtkicontheme.h" #include "gtkmodules.h" +#include "gtkalias.h" #include <string.h> @@ -1147,4 +1147,5 @@ _gtk_file_system_create (const char *file_system_name) return fs; } - +#define __GTK_FILE_SYSTEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 4f8ced177b..b841b95fd0 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -21,13 +21,13 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkfilesystemmodel.h" #include "gtkfilesystem.h" #include "gtkintl.h" #include "gtkmarshalers.h" #include "gtktreednd.h" #include "gtktreemodel.h" +#include "gtkalias.h" typedef struct _GtkFileSystemModelClass GtkFileSystemModelClass; typedef struct _FileModelNode FileModelNode; @@ -1869,3 +1869,6 @@ root_files_removed_callback (GtkFileFolder *folder, { do_files_removed (model, NULL, paths); } + +#define __GTK_FILE_SYSTEM_MODEL_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index f84ec0fda9..28960cfafd 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -20,12 +20,12 @@ #include <config.h> -#include "gtkalias.h" #include "gtkfilesystem.h" #include "gtkfilesystemunix.h" #include "gtkicontheme.h" #include "gtkintl.h" #include "gtkstock.h" +#include "gtkalias.h" #define XDG_PREFIX _gtk_xdg #include "xdgmime/xdgmime.h" @@ -2062,3 +2062,6 @@ filename_is_root (const char *filename) return (after_root != NULL && *after_root == '\0'); } + +#define __GTK_FILE_SYSTEM_UNIX_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c index 7821b4b21d..2824920e19 100644 --- a/gtk/gtkfilesystemwin32.c +++ b/gtk/gtkfilesystemwin32.c @@ -20,12 +20,12 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkfilesystem.h" #include "gtkfilesystemwin32.h" #include "gtkintl.h" #include "gtkstock.h" #include "gtkiconfactory.h" +#include "gtkalias.h" #include <glib/gstdio.h> @@ -1711,3 +1711,6 @@ _gtk_file_system_win32_path_compare (const gchar *path1, return retval; } + +#define __GTK_FILE_SYSTEM_WIN32_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c index e98eb1223b..fb0d88faf4 100644 --- a/gtk/gtkfixed.c +++ b/gtk/gtkfixed.c @@ -25,9 +25,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkfixed.h" #include "gtkintl.h" +#include "gtkalias.h" enum { CHILD_PROP_0, @@ -532,3 +532,6 @@ gtk_fixed_get_has_window (GtkFixed *fixed) return !GTK_WIDGET_NO_WINDOW (fixed); } + +#define __GTK_FIXED_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h index 53fdd80fdd..a313568cc8 100644 --- a/gtk/gtkfixed.h +++ b/gtk/gtkfixed.h @@ -32,10 +32,7 @@ #include <gtk/gtkcontainer.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_FIXED (gtk_fixed_get_type ()) #define GTK_FIXED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FIXED, GtkFixed)) @@ -83,9 +80,6 @@ void gtk_fixed_set_has_window (GtkFixed *fixed, gboolean has_window); gboolean gtk_fixed_get_has_window (GtkFixed *fixed); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_FIXED_H__ */ diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index de53ffcc7a..2d2615a0da 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -28,7 +28,6 @@ #include <config.h> -#include "gtkalias.h" #include "gtkfontbutton.h" #include "gtksignal.h" @@ -41,6 +40,7 @@ #include "gtkimage.h" #include "gtkmarshalers.h" #include "gtkintl.h" +#include "gtkalias.h" #include <string.h> #include <stdio.h> @@ -936,10 +936,5 @@ gtk_font_button_update_font_info (GtkFontButton *font_button) pango_font_description_free (desc); } - - - - - - - +#define __GTK_FONT_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index ff621b70ab..a9af76e8be 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -39,7 +39,6 @@ #include "gdk/gdk.h" #include "gdk/gdkkeysyms.h" -#include "gtkalias.h" #include "gtkfontsel.h" #include "gtkbutton.h" @@ -59,6 +58,7 @@ #include "gtkscrolledwindow.h" #include "gtkintl.h" #include "gtkaccessible.h" +#include "gtkalias.h" /* We don't enable the font and style entries because they don't add * much in terms of visible effect and have a weird effect on keynav. @@ -1430,3 +1430,6 @@ gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd, { gtk_font_selection_set_preview_text (GTK_FONT_SELECTION (fsd->fontsel), text); } + +#define __GTK_FONTSEL_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h index 3f48b118d3..f41339910d 100644 --- a/gtk/gtkfontsel.h +++ b/gtk/gtkfontsel.h @@ -36,9 +36,7 @@ #include <gtk/gtkdialog.h> #include <gtk/gtkvbox.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_FONT_SELECTION (gtk_font_selection_get_type ()) #define GTK_FONT_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection)) @@ -194,9 +192,7 @@ void gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd, const gchar *text); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_FONTSEL_H__ */ diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 32274ff80b..0ffd0874c1 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -26,10 +26,10 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkframe.h" #include "gtklabel.h" #include "gtkintl.h" +#include "gtkalias.h" #define LABEL_PAD 1 #define LABEL_SIDE_PAD 2 @@ -720,3 +720,6 @@ gtk_frame_real_compute_child_allocation (GtkFrame *frame, child_allocation->x += allocation->x; child_allocation->y += allocation->y; } + +#define __GTK_FRAME_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c index 5da172a5bf..fa2f948566 100644 --- a/gtk/gtkgamma.c +++ b/gtk/gtkgamma.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <stdio.h> -#include "gtkalias.h" #include "gtkgamma.h" #include "gtkcurve.h" #include "gtkdialog.h" @@ -45,6 +44,7 @@ #include "gtkvbox.h" #include "gtkwindow.h" #include "gtkintl.h" +#include "gtkalias.h" static GtkVBoxClass *parent_class = NULL; @@ -486,3 +486,5 @@ gtk_gamma_curve_destroy (GtkObject *object) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } +#define __GTK_GAMMA_CURVE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkgamma.h b/gtk/gtkgamma.h index bbf1aab219..fa6999b372 100644 --- a/gtk/gtkgamma.h +++ b/gtk/gtkgamma.h @@ -42,10 +42,7 @@ #include <gtk/gtkvbox.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_GAMMA_CURVE (gtk_gamma_curve_get_type ()) #define GTK_GAMMA_CURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurve)) @@ -87,9 +84,6 @@ GType gtk_gamma_curve_get_type (void) G_GNUC_CONST; GtkWidget* gtk_gamma_curve_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_GAMMA_CURVE_H__ */ diff --git a/gtk/gtkgc.c b/gtk/gtkgc.c index 12ffc8d738..09c5a62123 100644 --- a/gtk/gtkgc.c +++ b/gtk/gtkgc.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkgc.h" +#include "gtkalias.h" typedef struct _GtkGCKey GtkGCKey; @@ -415,3 +415,6 @@ gtk_gc_drawable_equal (GtkGCDrawable *a, { return (a->depth == b->depth); } + +#define __GTK_GC_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkgc.h b/gtk/gtkgc.h index 78e26c6ac3..38d70a6bb7 100644 --- a/gtk/gtkgc.h +++ b/gtk/gtkgc.h @@ -31,10 +31,7 @@ #include <gdk/gdk.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS GdkGC* gtk_gc_get (gint depth, GdkColormap *colormap, @@ -43,9 +40,6 @@ GdkGC* gtk_gc_get (gint depth, void gtk_gc_release (GdkGC *gc); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_GC_H__ */ diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 7db1625a7b..b4bdd7d3d6 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -27,13 +27,13 @@ #include <config.h> #include <stdlib.h> -#include "gtkalias.h" #include "gtkhandlebox.h" #include "gtkinvisible.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkwindow.h" #include "gtkintl.h" +#include "gtkalias.h" typedef struct _GtkHandleBoxPrivate GtkHandleBoxPrivate; @@ -1446,4 +1446,7 @@ gtk_handle_box_end_drag (GtkHandleBox *hb, g_signal_handlers_disconnect_by_func (invisible, G_CALLBACK (gtk_handle_box_grab_event), hb); - } +} + +#define __GTK_HANDLE_BOX_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h index 07010ba071..c690a04b16 100644 --- a/gtk/gtkhandlebox.h +++ b/gtk/gtkhandlebox.h @@ -38,10 +38,7 @@ #include <gtk/gtkbin.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_HANDLE_BOX (gtk_handle_box_get_type ()) #define GTK_HANDLE_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBox)) @@ -106,10 +103,6 @@ void gtk_handle_box_set_snap_edge (GtkHandleBox *handle_box, GtkPositionType edge); GtkPositionType gtk_handle_box_get_snap_edge (GtkHandleBox *handle_box); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_HANDLE_BOX_H__ */ diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c index 3620913b3a..880dcdf374 100644 --- a/gtk/gtkhbbox.c +++ b/gtk/gtkhbbox.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkhbbox.h" +#include "gtkalias.h" static void gtk_hbutton_box_class_init (GtkHButtonBoxClass *klass); @@ -305,3 +305,5 @@ gtk_hbutton_box_size_allocate (GtkWidget *widget, } } +#define __GTK_HBUTTON_BOX_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkhbbox.h b/gtk/gtkhbbox.h index 52203b4724..7423a7547b 100644 --- a/gtk/gtkhbbox.h +++ b/gtk/gtkhbbox.h @@ -31,10 +31,7 @@ #include <gtk/gtkbbox.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_HBUTTON_BOX (gtk_hbutton_box_get_type ()) #define GTK_HBUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBUTTON_BOX, GtkHButtonBox)) @@ -71,9 +68,6 @@ void gtk_hbutton_box_set_spacing_default (gint spacing); void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout); #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_HBUTTON_BOX_H__ */ diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c index e3e88d79f3..5b3c38bd00 100644 --- a/gtk/gtkhbox.c +++ b/gtk/gtkhbox.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkhbox.h" +#include "gtkalias.h" static void gtk_hbox_class_init (GtkHBoxClass *klass); @@ -332,3 +332,6 @@ gtk_hbox_size_allocate (GtkWidget *widget, } } } + +#define __GTK_HBOX_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkhbox.h b/gtk/gtkhbox.h index 600e80cfb1..5296e21e3c 100644 --- a/gtk/gtkhbox.h +++ b/gtk/gtkhbox.h @@ -32,10 +32,7 @@ #include <gtk/gtkbox.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_HBOX (gtk_hbox_get_type ()) #define GTK_HBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBOX, GtkHBox)) @@ -64,9 +61,6 @@ GtkWidget* gtk_hbox_new (gboolean homogeneous, gint spacing); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_HBOX_H__ */ diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c index bbc8e47b20..25a6f97565 100644 --- a/gtk/gtkhpaned.c +++ b/gtk/gtkhpaned.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkhpaned.h" +#include "gtkalias.h" static void gtk_hpaned_class_init (GtkHPanedClass *klass); static void gtk_hpaned_init (GtkHPaned *hpaned); @@ -247,3 +247,6 @@ gtk_hpaned_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (paned->child2, &child_allocation); } } + +#define __GTK_HPANED_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h index 2aed5aefe2..2272dfd4a7 100644 --- a/gtk/gtkhpaned.h +++ b/gtk/gtkhpaned.h @@ -29,9 +29,7 @@ #include <gtk/gtkpaned.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_HPANED (gtk_hpaned_get_type ()) #define GTK_HPANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HPANED, GtkHPaned)) @@ -57,8 +55,6 @@ struct _GtkHPanedClass GType gtk_hpaned_get_type (void) G_GNUC_CONST; GtkWidget *gtk_hpaned_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_HPANED_H__ */ diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c index b4997c8957..f88dad5f27 100644 --- a/gtk/gtkhruler.c +++ b/gtk/gtkhruler.c @@ -28,8 +28,8 @@ #include <math.h> #include <glib/gprintf.h> #include <string.h> -#include "gtkalias.h" #include "gtkhruler.h" +#include "gtkalias.h" #define RULER_HEIGHT 14 @@ -326,3 +326,6 @@ gtk_hruler_draw_pos (GtkRuler *ruler) } } } + +#define __GTK_HRULER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h index 3440d1b528..375b808644 100644 --- a/gtk/gtkhruler.h +++ b/gtk/gtkhruler.h @@ -42,9 +42,7 @@ #include <gtk/gtkruler.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_HRULER (gtk_hruler_get_type ()) @@ -73,9 +71,7 @@ GType gtk_hruler_get_type (void) G_GNUC_CONST; GtkWidget* gtk_hruler_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_HRULER_H__ */ diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index 338e9351ae..d954e9c550 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -28,9 +28,9 @@ #include <math.h> #include <stdio.h> #include <stdlib.h> -#include "gtkalias.h" #include "gtkhscale.h" #include "gtkintl.h" +#include "gtkalias.h" static gpointer parent_class; @@ -258,3 +258,6 @@ gtk_hscale_get_layout_offsets (GtkScale *scale, *x += widget->allocation.x; *y += widget->allocation.y; } + +#define __GTK_HSCALE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkhscale.h b/gtk/gtkhscale.h index 9b820bb111..6f41090774 100644 --- a/gtk/gtkhscale.h +++ b/gtk/gtkhscale.h @@ -32,10 +32,7 @@ #include <gtk/gtkscale.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_HSCALE (gtk_hscale_get_type ()) #define GTK_HSCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSCALE, GtkHScale)) @@ -66,9 +63,6 @@ GtkWidget* gtk_hscale_new_with_range (gdouble min, gdouble step); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_HSCALE_H__ */ diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c index 0280a493f9..135858aa83 100644 --- a/gtk/gtkhscrollbar.c +++ b/gtk/gtkhscrollbar.c @@ -26,10 +26,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkhscrollbar.h" #include "gdk/gdkkeysyms.h" #include "gtkintl.h" +#include "gtkalias.h" static void gtk_hscrollbar_class_init (GtkHScrollbarClass *klass); static void gtk_hscrollbar_init (GtkHScrollbar *hscrollbar); @@ -90,3 +90,5 @@ gtk_hscrollbar_new (GtkAdjustment *adjustment) return hscrollbar; } +#define __GTK_HSCROLLBAR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c index 83fbe2a323..12e9b51064 100644 --- a/gtk/gtkhseparator.c +++ b/gtk/gtkhseparator.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkhseparator.h" +#include "gtkalias.h" static void gtk_hseparator_class_init (GtkHSeparatorClass *klass); @@ -101,3 +101,6 @@ gtk_hseparator_expose (GtkWidget *widget, return FALSE; } + +#define __GTK_HSEPARATOR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h index 8028302018..008a2fe403 100644 --- a/gtk/gtkhseparator.h +++ b/gtk/gtkhseparator.h @@ -32,10 +32,7 @@ #include <gtk/gtkseparator.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_HSEPARATOR (gtk_hseparator_get_type ()) #define GTK_HSEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparator)) @@ -63,9 +60,6 @@ GType gtk_hseparator_get_type (void) G_GNUC_CONST; GtkWidget* gtk_hseparator_new (void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_HSEPARATOR_H__ */ diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c index cc8203d660..61353a92d0 100644 --- a/gtk/gtkhsv.c +++ b/gtk/gtkhsv.c @@ -25,12 +25,12 @@ #include <config.h> #include <math.h> #include <string.h> -#include "gtkalias.h" #include "gtkhsv.h" #include "gdk/gdkkeysyms.h" #include "gtkbindings.h" #include "gtkcontainer.h" #include "gtkmarshalers.h" +#include "gtkalias.h" /* * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS @@ -917,7 +917,7 @@ gtk_hsv_motion (GtkWidget *widget, /* Redrawing */ -void +static void set_source_surface (cairo_t *cr, cairo_surface_t *surface) { @@ -1712,3 +1712,6 @@ gtk_hsv_move (GtkHSV *hsv, gtk_hsv_set_color (hsv, hue, sat, val); } + +#define __GTK_HSV_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkhsv.h b/gtk/gtkhsv.h index c8dac79569..b8bdd8323a 100644 --- a/gtk/gtkhsv.h +++ b/gtk/gtkhsv.h @@ -33,9 +33,7 @@ #include <gtk/gtkcontainer.h> -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS #define GTK_TYPE_HSV (gtk_hsv_get_type ()) #define GTK_HSV(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSV, GtkHSV)) @@ -101,8 +99,6 @@ void gtk_rgb_to_hsv (gdouble r, gdouble *v); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __GTK_HSV_H__ */ diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c index 5849549ee3..20166d8a64 100644 --- a/gtk/gtkiconcache.c +++ b/gtk/gtkiconcache.c @@ -233,7 +233,7 @@ icon_name_hash (gconstpointer key) return h; } -gint +static gint find_image_offset (GtkIconCache *cache, const gchar *icon_name, const gchar *directory) diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 74be267e84..5706320611 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -28,7 +28,6 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include "gtkalias.h" #include <pango/pango-utils.h> /* For pango_scan_* */ #include "gtkiconfactory.h" #include "stock-icons/gtkstockpixbufs.h" @@ -38,6 +37,7 @@ #include "gtkstock.h" #include "gtkwidget.h" #include "gtkintl.h" +#include "gtkalias.h" static GSList *all_icon_factories = NULL; @@ -2988,3 +2988,6 @@ gtk_icon_source_get_filename (const GtkIconSource *source) } #endif + +#define __GTK_ICON_FACTORY_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h index 79e6ffeccc..38fb51492e 100644 --- a/gtk/gtkiconfactory.h +++ b/gtk/gtkiconfactory.h @@ -30,9 +30,7 @@ #include <gdk/gdk.h> #include <gtk/gtkrc.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _GtkIconFactoryClass GtkIconFactoryClass; @@ -182,8 +180,6 @@ void _gtk_icon_set_invalidate_caches (void); GSList* _gtk_icon_factory_list_ids (void); void _gtk_icon_factory_ensure_default_icons (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_ICON_FACTORY_H__ */ diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index d487fd8847..b8d88313f5 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -28,7 +28,6 @@ #include <stdlib.h> #include <glib.h> #include <glib/gstdio.h> -#include "gtkalias.h" #ifdef G_OS_WIN32 #ifndef S_ISDIR @@ -42,7 +41,7 @@ #include "gtkintl.h" #include "gtksettings.h" #include "gtkprivate.h" - +#include "gtkalias.h" #define DEFAULT_THEME_NAME "hicolor" @@ -3025,3 +3024,6 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info) } #endif + +#define __GTK_ICON_THEME_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 518bd00d32..b62586f756 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -24,7 +24,6 @@ #include <gdk/gdkkeysyms.h> -#include "gtkalias.h" #include "gtkiconview.h" #include "gtkmarshalers.h" #include "gtkbindings.h" @@ -35,6 +34,7 @@ #include "gtkaccessible.h" #include "gtkwindow.h" #include "gtktextbuffer.h" +#include "gtkalias.h" #undef DEBUG_ICON_VIEW @@ -6234,3 +6234,5 @@ gtk_icon_view_get_accessible (GtkWidget *widget) return GTK_WIDGET_CLASS (parent_class)->get_accessible (widget); } +#define __GTK_ICON_VIEW_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index b368075ce1..87f1f9319a 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -26,13 +26,13 @@ #include <config.h> #include <math.h> -#include "gtkalias.h" #include "gtkcontainer.h" #include "gtkimage.h" #include "gtkiconfactory.h" #include "gtkstock.h" #include "gtkicontheme.h" #include "gtkintl.h" +#include "gtkalias.h" #include <string.h> typedef struct _GtkImagePrivate GtkImagePrivate; @@ -2140,3 +2140,6 @@ gtk_image_set_from_file (GtkImage *image, } #endif + +#define __GTK_IMAGE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 829666220b..701fe2d299 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -32,9 +32,7 @@ #include <gtk/gtkmisc.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_IMAGE (gtk_image_get_type ()) #define GTK_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE, GtkImage)) @@ -220,9 +218,6 @@ void gtk_image_get (GtkImage *image, GdkBitmap **mask); #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_IMAGE_H__ */ diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c index fb05efd46b..576e4c9ba2 100644 --- a/gtk/gtkimagemenuitem.c +++ b/gtk/gtkimagemenuitem.c @@ -25,7 +25,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkimagemenuitem.h" #include "gtkaccellabel.h" #include "gtkintl.h" @@ -34,6 +33,7 @@ #include "gtkimage.h" #include "gtkcontainer.h" #include "gtkwindow.h" +#include "gtkalias.h" static void gtk_image_menu_item_class_init (GtkImageMenuItemClass *klass); static void gtk_image_menu_item_init (GtkImageMenuItem *image_menu_item); @@ -606,3 +606,5 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget, show_image_change_notify (GTK_IMAGE_MENU_ITEM (widget)); } +#define __GTK_IMAGE_MENU_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h index 2cefa4113f..f70df311a8 100644 --- a/gtk/gtkimagemenuitem.h +++ b/gtk/gtkimagemenuitem.h @@ -24,18 +24,14 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_MENU_IMAGE_ITEM_H__ -#define __GTK_MENU_IMAGE_ITEM_H__ +#ifndef __GTK_IMAGE_MENU_ITEM_H__ +#define __GTK_IMAGE_MENU_ITEM_H__ #include <gdk/gdk.h> #include <gtk/gtkmenuitem.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_IMAGE_MENU_ITEM (gtk_image_menu_item_get_type ()) #define GTK_IMAGE_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItem)) @@ -72,10 +68,6 @@ void gtk_image_menu_item_set_image (GtkImageMenuItem *image_menu_i GtkWidget *image); GtkWidget* gtk_image_menu_item_get_image (GtkImageMenuItem *image_menu_item); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_IMAGE_MENU_ITEM_H__ */ diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index 3f993cfa40..d00eff7c0c 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -19,10 +19,10 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkimcontext.h" #include "gtkmain.h" /* For _gtk_boolean_handled_accumulator */ #include "gtkmarshalers.h" +#include "gtkalias.h" enum { PREEDIT_START, @@ -554,3 +554,5 @@ gtk_im_context_delete_surrounding (GtkIMContext *context, return result; } +#define __GTK_IM_CONTEXT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h index 4ca114bcbf..ae4a71072a 100644 --- a/gtk/gtkimcontext.h +++ b/gtk/gtkimcontext.h @@ -24,10 +24,7 @@ #include <gtk/gtkobject.h> #include <pango/pango.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_IM_CONTEXT (gtk_im_context_get_type ()) #define GTK_IM_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext)) @@ -123,9 +120,6 @@ gboolean gtk_im_context_delete_surrounding (GtkIMContext *context, gint offset, gint n_chars); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_IM_CONTEXT_H__ */ diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 38a745756b..f104909249 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -21,9 +21,9 @@ #include <stdlib.h> #include <gdk/gdkkeysyms.h> -#include "gtkalias.h" #include "gtkaccelgroup.h" #include "gtkimcontextsimple.h" +#include "gtkalias.h" typedef struct _GtkComposeTable GtkComposeTable; @@ -1504,3 +1504,5 @@ gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple, context_simple->tables = g_slist_prepend (context_simple->tables, table); } +#define __GTK_IM_CONTEXT_SIMPLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index 7de9133f7e..a40744aff9 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -35,11 +35,11 @@ #include <glib/gstdio.h> #include <gmodule.h> #include <pango/pango-utils.h> -#include "gtkalias.h" #include "gtkimmodule.h" #include "gtkimcontextsimple.h" #include "gtkrc.h" #include "gtkintl.h" +#include "gtkalias.h" /* Do *not* include "gtkprivate.h" in this file. If you do, the * correct_libdir_prefix() function below will have to move somewhere diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index bf03589b75..414d67ed22 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -22,13 +22,13 @@ #include <string.h> #include <locale.h> -#include "gtkalias.h" #include "gtkimmulticontext.h" #include "gtkimmodule.h" #include "gtkmain.h" #include "gtkradiomenuitem.h" #include "gtkintl.h" #include "gtkprivate.h" +#include "gtkalias.h" struct _GtkIMMulticontextPrivate { @@ -567,3 +567,5 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context, g_free (contexts); } +#define __GTK_IM_MULTICONTEXT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h index 348d04b9df..d80b81d650 100644 --- a/gtk/gtkimmulticontext.h +++ b/gtk/gtkimmulticontext.h @@ -23,10 +23,7 @@ #include <gtk/gtkimcontext.h> #include <gtk/gtkmenushell.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_IM_MULTICONTEXT (gtk_im_multicontext_get_type ()) #define GTK_IM_MULTICONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontext)) @@ -68,9 +65,6 @@ GtkIMContext *gtk_im_multicontext_new (void); void gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context, GtkMenuShell *menushell); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_IM_MULTICONTEXT_H__ */ diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c index 6651303f81..b936ee12ad 100644 --- a/gtk/gtkinputdialog.c +++ b/gtk/gtkinputdialog.c @@ -35,7 +35,6 @@ #include <config.h> #include <glib/gprintf.h> #include <stdlib.h> -#include "gtkalias.h" #include "gdk/gdkkeysyms.h" #include "gtkbutton.h" #include "gtkentry.h" @@ -59,6 +58,7 @@ #define GTK_DISABLE_DEPRECATED #include "gtkintl.h" +#include "gtkalias.h" typedef struct _GtkInputDialogPrivate GtkInputDialogPrivate; typedef struct _GtkInputKeyInfo GtkInputKeyInfo; @@ -768,3 +768,6 @@ gtk_input_dialog_fill_keys(GtkInputDialog *inputd, GdkDevice *info) info->keys[i].modifiers); } } + +#define __GTK_INPUTDIALOG_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h index e386240722..1a1a648994 100644 --- a/gtk/gtkinputdialog.h +++ b/gtk/gtkinputdialog.h @@ -42,10 +42,7 @@ #include <gtk/gtkdialog.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_INPUT_DIALOG (gtk_input_dialog_get_type ()) #define GTK_INPUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_INPUT_DIALOG, GtkInputDialog)) @@ -97,9 +94,6 @@ GType gtk_input_dialog_get_type (void) G_GNUC_CONST; GtkWidget* gtk_input_dialog_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_INPUTDIALOG_H__ */ diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c index 184a4e1dd7..dc1f1d2612 100644 --- a/gtk/gtkinvisible.c +++ b/gtk/gtkinvisible.c @@ -26,9 +26,9 @@ #include <config.h> #include <gdk/gdk.h> -#include "gtkalias.h" #include "gtkinvisible.h" #include "gtkintl.h" +#include "gtkalias.h" enum { PROP_0, @@ -348,3 +348,5 @@ gtk_invisible_constructor (GType type, return object; } +#define __GTK_INVISIBLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c index d645c7aa55..2a822090d6 100644 --- a/gtk/gtkitem.c +++ b/gtk/gtkitem.c @@ -25,9 +25,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkitem.h" #include "gtkmarshalers.h" +#include "gtkalias.h" enum { @@ -202,3 +202,5 @@ gtk_item_leave (GtkWidget *widget, return gtk_widget_event (widget->parent, (GdkEvent*) event); } +#define __GTK_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h index 0cd5fb5e5e..01ca95c190 100644 --- a/gtk/gtkitem.h +++ b/gtk/gtkitem.h @@ -32,10 +32,7 @@ #include <gtk/gtkbin.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_ITEM (gtk_item_get_type ()) #define GTK_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ITEM, GtkItem)) @@ -74,10 +71,6 @@ void gtk_item_select (GtkItem *item); void gtk_item_deselect (GtkItem *item); void gtk_item_toggle (GtkItem *item); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_ITEM_H__ */ diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index bec6ab6739..8f24aaca51 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -29,7 +29,6 @@ #include <config.h> -#include "gtkalias.h" #include "gtkitemfactory.h" #include "gtk/gtkmenubar.h" #include "gtk/gtkmenu.h" @@ -54,6 +53,7 @@ #undef GTK_DISABLE_DEPRECATED #include "gtk/gtkoptionmenu.h" #define GTK_DISABLE_DEPRECATED +#include "gtkalias.h" /* --- defines --- */ #define ITEM_FACTORY_STRING ((gchar*) item_factory_string) @@ -1598,3 +1598,6 @@ gtk_item_factory_set_translate_func (GtkItemFactory *ifactory, ifactory->translate_data = data; ifactory->translate_notify = notify; } + +#define __GTK_ITEM_FACTORY_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h index 9d13df4707..5cae6892a7 100644 --- a/gtk/gtkitemfactory.h +++ b/gtk/gtkitemfactory.h @@ -33,10 +33,7 @@ #include <gtk/gtkwidget.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef gchar * (*GtkTranslateFunc) (const gchar *path, gpointer func_data); @@ -237,10 +234,7 @@ void gtk_item_factories_path_delete (const gchar *ifactory_path, #endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_ITEM_FACTORY_H__ */ diff --git a/gtk/gtkkeyhash.c b/gtk/gtkkeyhash.c index 9d4e41b71c..2741545081 100644 --- a/gtk/gtkkeyhash.c +++ b/gtk/gtkkeyhash.c @@ -19,9 +19,9 @@ * Boston, MA 02111-1307, USA. */ #include <config.h> -#include "gtkalias.h" #include "gtkdebug.h" #include "gtkkeyhash.h" +#include "gtkalias.h" typedef struct _GtkKeyHashEntry GtkKeyHashEntry; diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index f5ba616172..ecfb9682df 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -26,7 +26,6 @@ #include <config.h> #include <math.h> #include <string.h> -#include "gtkalias.h" #include "gtklabel.h" #include "gtkdnd.h" #include "gtkmain.h" @@ -42,6 +41,7 @@ #include "gtknotebook.h" #include "gtkstock.h" #include "gtkbindings.h" +#include "gtkalias.h" #define GTK_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_LABEL, GtkLabelPrivate)) @@ -3951,3 +3951,6 @@ gtk_label_do_popup (GtkLabel *label, popup_position_func, label, 0, gtk_get_current_event_time ()); } + +#define __GTK_LABEL_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index b02f99bead..e8c6309fbf 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -32,10 +32,7 @@ #include <gtk/gtkwindow.h> #include <gtk/gtkmenu.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_LABEL (gtk_label_get_type ()) #define GTK_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LABEL, GtkLabel)) @@ -180,9 +177,6 @@ guint gtk_label_parse_uline (GtkLabel *label, #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_LABEL_H__ */ diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c index 12c44e6d83..b47ff7f674 100644 --- a/gtk/gtklayout.c +++ b/gtk/gtklayout.c @@ -31,11 +31,11 @@ #include <config.h> #include "gdkconfig.h" -#include "gtkalias.h" #include "gtklayout.h" #include "gtkprivate.h" #include "gtkintl.h" #include "gtkmarshalers.h" +#include "gtkalias.h" typedef struct _GtkLayoutChild GtkLayoutChild; @@ -1157,3 +1157,6 @@ gtk_layout_adjustment_changed (GtkAdjustment *adjustment, gdk_window_process_updates (layout->bin_window, TRUE); } } + +#define __GTK_LAYOUT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h index fbe4b50819..ffd8b45daa 100644 --- a/gtk/gtklayout.h +++ b/gtk/gtklayout.h @@ -28,17 +28,14 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_LAYOUT_H -#define __GTK_LAYOUT_H +#ifndef __GTK_LAYOUT_H__ +#define __GTK_LAYOUT_H__ #include <gdk/gdk.h> #include <gtk/gtkcontainer.h> #include <gtk/gtkadjustment.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_LAYOUT (gtk_layout_get_type ()) #define GTK_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LAYOUT, GtkLayout)) @@ -130,8 +127,6 @@ void gtk_layout_freeze (GtkLayout *layout); void gtk_layout_thaw (GtkLayout *layout); #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS -#endif /* __GTK_LAYOUT_H */ +#endif /* __GTK_LAYOUT_H__ */ diff --git a/gtk/gtklist.c b/gtk/gtklist.c index c00875fd08..45f35107e9 100644 --- a/gtk/gtklist.c +++ b/gtk/gtklist.c @@ -29,13 +29,13 @@ #include <config.h> #include <string.h> /* memset */ -#include "gtkalias.h" #include "gtklist.h" #include "gtklistitem.h" #include "gtkmain.h" #include "gtksignal.h" #include "gtklabel.h" #include "gtkmarshalers.h" +#include "gtkalias.h" enum { SELECTION_CHANGED, @@ -2618,3 +2618,6 @@ gtk_list_drag_begin (GtkWidget *widget, } } } + +#define __GTK_LIST_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtklist.h b/gtk/gtklist.h index e4e15bd94b..4023f2e74d 100644 --- a/gtk/gtklist.h +++ b/gtk/gtklist.h @@ -35,10 +35,7 @@ #include <gtk/gtkcontainer.h> #include <gtk/gtklistitem.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_LIST (gtk_list_get_type ()) #define GTK_LIST(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_LIST, GtkList)) @@ -138,10 +135,7 @@ void gtk_list_toggle_row (GtkList *list, void gtk_list_undo_selection (GtkList *list); void gtk_list_end_drag_selection (GtkList *list); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_LIST_H__ */ diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c index 5dec3c2cdb..6edd09c1fe 100644 --- a/gtk/gtklistitem.c +++ b/gtk/gtklistitem.c @@ -27,7 +27,6 @@ #undef GTK_DISABLE_DEPRECATED #include <config.h> -#include "gtkalias.h" #include "gtkbindings.h" #include "gtklabel.h" #include "gtklistitem.h" @@ -35,6 +34,7 @@ #include "gtkmarshalers.h" #include "gtksignal.h" #include <gdk/gdkkeysyms.h> +#include "gtkalias.h" enum @@ -624,3 +624,6 @@ gtk_real_list_item_toggle (GtkItem *item) break; } } + +#define __GTK_LIST_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 36cb4cc4a3..5a06185217 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -20,12 +20,12 @@ #include <config.h> #include <string.h> #include <gobject/gvaluecollector.h> -#include "gtkalias.h" #include "gtktreemodel.h" #include "gtkliststore.h" #include "gtktreedatalist.h" #include "gtktreednd.h" #include "gtksequence.h" +#include "gtkalias.h" #define GTK_LIST_STORE_IS_SORTED(list) (GTK_LIST_STORE (list)->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID) #define VALID_ITER(iter, list_store) ((iter)!= NULL && (iter)->user_data != NULL && list_store->stamp == (iter)->stamp && !_gtk_sequence_ptr_is_end ((iter)->user_data) && _gtk_sequence_ptr_get_sequence ((iter)->user_data) == list_store->seq) @@ -2077,3 +2077,6 @@ gtk_list_store_insert_with_valuesv (GtkListStore *list_store, gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter); gtk_tree_path_free (path); } + +#define __GTK_LIST_STORE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 1a47111308..f47f1eb3ff 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -51,7 +51,6 @@ #include <pango/pango-types.h> /* For pango_language_from_string */ -#include "gtkalias.h" #include "gtkintl.h" #include "gtkaccelmap.h" @@ -68,6 +67,7 @@ #include "gtkwindow.h" #include "gtkprivate.h" #include "gtkdebug.h" +#include "gtkalias.h" /* Private type definitions */ @@ -2287,3 +2287,6 @@ _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint, return continue_emission; } + +#define __GTK_MAIN_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h index 150c10a0e5..9e92d60707 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -35,9 +35,7 @@ #include <gtk/gtkwindow.h> #endif -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* Priorities for redrawing and resizing */ @@ -223,9 +221,6 @@ gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint, gchar *_gtk_get_lc_ctype (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_MAIN_H__ */ diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 1f2d9d13ce..36eafd017c 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -29,7 +29,6 @@ #include <config.h> #include <string.h> /* memset */ #include "gdk/gdkkeysyms.h" -#include "gtkalias.h" #include "gtkaccellabel.h" #include "gtkaccelmap.h" #include "gtkbindings.h" @@ -44,6 +43,7 @@ #include "gtkvscrollbar.h" #include "gtksettings.h" #include "gtkintl.h" +#include "gtkalias.h" #define MENU_ITEM_CLASS(w) GTK_MENU_ITEM_GET_CLASS (w) @@ -4384,3 +4384,5 @@ gtk_menu_get_for_attach_widget (GtkWidget *widget) return list; } +#define __GTK_MENU_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h index f1104c87e8..ba4c8013d4 100644 --- a/gtk/gtkmenu.h +++ b/gtk/gtkmenu.h @@ -33,9 +33,7 @@ #include <gtk/gtkmenushell.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_MENU (gtk_menu_get_type ()) #define GTK_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU, GtkMenu)) @@ -206,9 +204,6 @@ GList* gtk_menu_get_for_attach_widget (GtkWidget *widget); #define gtk_menu_insert(menu,child,pos) gtk_menu_shell_insert ((GtkMenuShell *)(menu),(child),(pos)) #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_MENU_H__ */ diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index f52d00ecfb..235551c55f 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -28,7 +28,6 @@ #include <config.h> #include "gdk/gdkkeysyms.h" -#include "gtkalias.h" #include "gtkbindings.h" #include "gtkmain.h" #include "gtkmarshalers.h" @@ -37,6 +36,7 @@ #include "gtksettings.h" #include "gtkintl.h" #include "gtkwindow.h" +#include "gtkalias.h" #define BORDER_SPACING 0 @@ -955,3 +955,6 @@ void gtk_menu_bar_set_child_pack_direction (GtkMenuBar *menubar, g_object_notify (G_OBJECT (menubar), "child-pack-direction"); } } + +#define __GTK_MENU_BAR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 371f880353..b867b3af96 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -29,7 +29,6 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkaccellabel.h" #include "gtkmain.h" #include "gtkmarshalers.h" @@ -37,6 +36,7 @@ #include "gtkmenubar.h" #include "gtkmenuitem.h" #include "gtkseparatormenuitem.h" +#include "gtkalias.h" #define MENU_ITEM_CLASS(w) GTK_MENU_ITEM_CLASS (GTK_OBJECT (w)->klass) @@ -1457,3 +1457,6 @@ _gtk_menu_item_is_selectable (GtkWidget *menu_item) return TRUE; } + +#define __GTK_MENU_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h index 930d4eed0a..0d7a42e9de 100644 --- a/gtk/gtkmenuitem.h +++ b/gtk/gtkmenuitem.h @@ -32,10 +32,7 @@ #include <gtk/gtkitem.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_MENU_ITEM (gtk_menu_item_get_type ()) #define GTK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItem)) @@ -127,9 +124,6 @@ void _gtk_menu_item_popup_submenu (GtkWidget *menu_item); #define gtk_menu_item_right_justify(menu_item) gtk_menu_item_set_right_justified ((menu_item), TRUE) #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_MENU_ITEM_H__ */ diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 248053334a..f2986ddede 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -28,7 +28,6 @@ #include <config.h> #include "gdk/gdkkeysyms.h" -#include "gtkalias.h" #include "gtkbindings.h" #include "gtkkeyhash.h" #include "gtkmain.h" @@ -39,6 +38,7 @@ #include "gtkmnemonichash.h" #include "gtktearoffmenuitem.h" #include "gtkwindow.h" +#include "gtkalias.h" #define MENU_SHELL_TIMEOUT 500 @@ -1388,3 +1388,5 @@ _gtk_menu_shell_remove_mnemonic (GtkMenuShell *menu_shell, gtk_menu_shell_reset_key_hash (menu_shell); } +#define __GTK_MENU_SHELL_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h index 499fc3175c..a0b48f4317 100644 --- a/gtk/gtkmenushell.h +++ b/gtk/gtkmenushell.h @@ -32,10 +32,7 @@ #include <gtk/gtkcontainer.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_MENU_SHELL (gtk_menu_shell_get_type ()) #define GTK_MENU_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShell)) @@ -125,9 +122,6 @@ void _gtk_menu_shell_remove_mnemonic (GtkMenuShell *menu_shell, guint keyval, GtkWidget *target); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_MENU_SHELL_H__ */ diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index 7881d99d75..745127a326 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -20,7 +20,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkmenutoolbutton.h" #include "gtkintl.h" #include "gtktogglebutton.h" @@ -29,6 +28,7 @@ #include "gtkvbox.h" #include "gtkmenu.h" #include "gtkmain.h" +#include "gtkalias.h" #define GTK_MENU_TOOL_BUTTON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonPrivate)) @@ -621,3 +621,5 @@ gtk_menu_tool_button_set_arrow_tooltip (GtkMenuToolButton *button, gtk_tooltips_set_tip (tooltips, button->priv->arrow_button, tip_text, tip_private); } +#define __GTK_MENU_TOOL_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index fdb1024a52..ca5ad21c74 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -26,7 +26,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkmessagedialog.h" #include "gtklabel.h" #include "gtkhbox.h" @@ -36,6 +35,7 @@ #include "gtkiconfactory.h" #include "gtkintl.h" #include <string.h> +#include "gtkalias.h" #define GTK_MESSAGE_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogPrivate)) @@ -727,3 +727,6 @@ gtk_message_dialog_style_set (GtkWidget *widget, if (GTK_WIDGET_CLASS (parent_class)->style_set) (GTK_WIDGET_CLASS (parent_class)->style_set) (widget, prev_style); } + +#define __GTK_MESSAGE_DIALOG_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h index fc3f6d39f6..3d81dbbce0 100644 --- a/gtk/gtkmessagedialog.h +++ b/gtk/gtkmessagedialog.h @@ -30,9 +30,7 @@ #include <gtk/gtkdialog.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef enum { @@ -110,8 +108,6 @@ void gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message const gchar *message_format, ...) G_GNUC_PRINTF (2, 3); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_MESSAGE_DIALOG_H__ */ diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c index b65382961f..7abb87337e 100644 --- a/gtk/gtkmisc.c +++ b/gtk/gtkmisc.c @@ -25,10 +25,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkcontainer.h" #include "gtkmisc.h" #include "gtkintl.h" +#include "gtkalias.h" enum { @@ -366,3 +366,6 @@ gtk_misc_realize (GtkWidget *widget) gdk_window_set_back_pixmap (widget->window, NULL, TRUE); } } + +#define __GTK_MISC_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h index 198135ba87..3bc638ae9f 100644 --- a/gtk/gtkmisc.h +++ b/gtk/gtkmisc.h @@ -32,10 +32,7 @@ #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_MISC (gtk_misc_get_type ()) #define GTK_MISC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MISC, GtkMisc)) @@ -80,9 +77,6 @@ void gtk_misc_get_padding (GtkMisc *misc, gint *ypad); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_MISC_H__ */ diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index ca05d6e119..9a825de359 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -25,7 +25,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtknotebook.h" #include "gtkmain.h" #include "gtkmenu.h" @@ -36,6 +35,7 @@ #include "gtkintl.h" #include "gtkmarshalers.h" #include "gtkbindings.h" +#include "gtkalias.h" #define TAB_OVERLAP 2 @@ -5436,3 +5436,6 @@ gtk_notebook_reorder_child (GtkNotebook *notebook, gtk_widget_thaw_child_notify (child); } + +#define __GTK_NOTEBOOK_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index 1879145eeb..2482bbd8b7 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -31,11 +31,7 @@ #include <gdk/gdk.h> #include <gtk/gtkcontainer.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_NOTEBOOK (gtk_notebook_get_type ()) #define GTK_NOTEBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_NOTEBOOK, GtkNotebook)) @@ -242,9 +238,6 @@ void gtk_notebook_reorder_child (GtkNotebook *notebook, #define gtk_notebook_set_page gtk_notebook_set_current_page #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_NOTEBOOK_H__ */ diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index 63cb73867a..e2e2b733e6 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -28,10 +28,10 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> -#include "gtkalias.h" #include "gtkobject.h" #include "gtkmarshalers.h" #include "gtksignal.h" +#include "gtkalias.h" enum { @@ -744,3 +744,6 @@ gtk_object_unref (GtkObject *object) g_object_unref ((GObject*) object); } + +#define __GTK_OBJECT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c index 31150978db..24598c8bf3 100644 --- a/gtk/gtkoldeditable.c +++ b/gtk/gtkoldeditable.c @@ -30,13 +30,13 @@ #include <string.h> #include "gdk/gdkkeysyms.h" #include "gdk/gdki18n.h" -#include "gtkalias.h" #include "gtkclipboard.h" #include "gtkoldeditable.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkselection.h" #include "gtksignal.h" +#include "gtkalias.h" #define MIN_EDITABLE_WIDTH 150 #define DRAW_TIMEOUT 20 @@ -846,3 +846,6 @@ gtk_old_editable_changed (GtkOldEditable *old_editable) g_signal_emit_by_name (old_editable, "changed"); } + +#define __GTK_OLD_EDITABLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkoldeditable.h b/gtk/gtkoldeditable.h index d5983d9e29..da6d90c368 100644 --- a/gtk/gtkoldeditable.h +++ b/gtk/gtkoldeditable.h @@ -34,10 +34,7 @@ #include <gtk/gtkeditable.h> #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_OLD_EDITABLE (gtk_old_editable_get_type ()) #define GTK_OLD_EDITABLE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_OLD_EDITABLE, GtkOldEditable)) @@ -124,10 +121,7 @@ void gtk_old_editable_claim_selection (GtkOldEditable *old_editable, guint32 time_); void gtk_old_editable_changed (GtkOldEditable *old_editable); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_OLD_EDITABLE_H__ */ diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index 9791a7ff56..fb4dd65a4d 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -25,7 +25,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkintl.h" #include "gtkmenu.h" #include "gtkmenuitem.h" @@ -36,6 +35,8 @@ #include "gtkoptionmenu.h" #define GTK_DISABLE_DEPRECATED +#include "gtkalias.h" + #define CHILD_LEFT_SPACING 4 #define CHILD_RIGHT_SPACING 1 #define CHILD_TOP_SPACING 1 @@ -1061,3 +1062,6 @@ gtk_option_menu_scroll_event (GtkWidget *widget, return TRUE; } +#define __GTK_OPTION_MENU_C__ +#include "gtkaliasdef.c" + diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h index 41d4d9c482..32f6de9f03 100644 --- a/gtk/gtkoptionmenu.h +++ b/gtk/gtkoptionmenu.h @@ -34,10 +34,7 @@ #include <gtk/gtkbutton.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_OPTION_MENU (gtk_option_menu_get_type ()) #define GTK_OPTION_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_OPTION_MENU, GtkOptionMenu)) @@ -86,10 +83,7 @@ void gtk_option_menu_set_history (GtkOptionMenu *option_menu, guint index_); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_OPTION_MENU_H__ */ diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index f7870af296..8e22df9e2c 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -25,7 +25,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkintl.h" #include "gtkpaned.h" #include "gtkbindings.h" @@ -34,6 +33,7 @@ #include "gtkwindow.h" #include "gtkmain.h" #include "gtkmarshalers.h" +#include "gtkalias.h" enum { PROP_0, @@ -1796,3 +1796,6 @@ gtk_paned_toggle_handle_focus (GtkPaned *paned) return FALSE; } + +#define __GTK_PANED_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h index b79781522d..003316aef7 100644 --- a/gtk/gtkpaned.h +++ b/gtk/gtkpaned.h @@ -30,10 +30,7 @@ #include <gtk/gtkcontainer.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_PANED (gtk_paned_get_type ()) #define GTK_PANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED, GtkPaned)) @@ -138,8 +135,6 @@ void gtk_paned_compute_position (GtkPaned *paned, #define gtk_paned_set_gutter_size(p,s) (void) 0 #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_PANED_H__ */ diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index 737cfc3f3b..f6dbb02c57 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -19,7 +19,6 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkpathbar.h" #include "gtktogglebutton.h" #include "gtkalignment.h" @@ -33,6 +32,7 @@ #include "gtkhbox.h" #include "gtkmain.h" #include "gtkmarshalers.h" +#include "gtkalias.h" enum { PATH_CLICKED, diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c index dd80685a82..63caf65d13 100644 --- a/gtk/gtkpixmap.c +++ b/gtk/gtkpixmap.c @@ -32,9 +32,9 @@ #include <config.h> #include <math.h> -#include "gtkalias.h" #include "gtkcontainer.h" #include "gtkpixmap.h" +#include "gtkalias.h" static void gtk_pixmap_class_init (GtkPixmapClass *klass); @@ -306,4 +306,5 @@ build_insensitive_pixmap (GtkPixmap *gtkpixmap) g_object_unref (G_OBJECT (stated)); } - +#define __GTK_PIXMAP_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkpixmap.h b/gtk/gtkpixmap.h index f9e058de48..1bb4f85434 100644 --- a/gtk/gtkpixmap.h +++ b/gtk/gtkpixmap.h @@ -34,10 +34,7 @@ #include <gtk/gtkmisc.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_PIXMAP (gtk_pixmap_get_type ()) #define GTK_PIXMAP(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP, GtkPixmap)) @@ -81,10 +78,7 @@ void gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap, gboolean build); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_PIXMAP_H__ */ diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index 178b344ebe..45f06e0337 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -25,7 +25,6 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include "gtkalias.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkplug.h" @@ -36,6 +35,8 @@ #include "gtkxembed.h" +#include "gtkalias.h" + static void gtk_plug_class_init (GtkPlugClass *klass); static void gtk_plug_init (GtkPlug *plug); static void gtk_plug_finalize (GObject *object); @@ -1138,3 +1139,6 @@ gtk_plug_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) return GDK_FILTER_CONTINUE; } + +#define __GTK_PLUG_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h index 20df3eaa30..87fe6f92fd 100644 --- a/gtk/gtkplug.h +++ b/gtk/gtkplug.h @@ -32,10 +32,7 @@ #include <gtk/gtkwindow.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_PLUG (gtk_plug_get_type ()) #define GTK_PLUG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PLUG, GtkPlug)) @@ -96,9 +93,6 @@ void _gtk_plug_add_to_socket (GtkPlug *plug, void _gtk_plug_remove_from_socket (GtkPlug *plug, GtkSocket *socket_); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_PLUG_H__ */ diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c index 32eb5aaae5..c26d463565 100644 --- a/gtk/gtkpreview.c +++ b/gtk/gtkpreview.c @@ -36,10 +36,10 @@ #include <sys/param.h> #endif #include "gdk/gdkrgb.h" -#include "gtkalias.h" #include "gtkpreview.h" #include "gtksignal.h" #include "gtkintl.h" +#include "gtkalias.h" #define PREVIEW_CLASS(w) GTK_PREVIEW_CLASS (GTK_OBJECT (w)->klass) @@ -611,3 +611,6 @@ gtk_fill_lookup_array (guchar *array) array[i] = val; } } + +#define __GTK_PREVIEW_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h index d8df2f42c6..515e6d8a2b 100644 --- a/gtk/gtkpreview.h +++ b/gtk/gtkpreview.h @@ -33,10 +33,7 @@ #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_PREVIEW (gtk_preview_get_type ()) #define GTK_PREVIEW(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PREVIEW, GtkPreview)) @@ -136,10 +133,7 @@ GtkPreviewInfo* gtk_preview_get_info (void); void gtk_preview_reset (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_PREVIEW_H__ */ diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c index b183f0d5d0..093816d317 100644 --- a/gtk/gtkprogress.c +++ b/gtk/gtkprogress.c @@ -28,9 +28,9 @@ #include <glib/gprintf.h> #include <math.h> #include <string.h> -#include "gtkalias.h" #include "gtkprogress.h" #include "gtkintl.h" +#include "gtkalias.h" #define EPSILON 1e-5 #define DEFAULT_FORMAT "%P %%" @@ -754,3 +754,6 @@ gtk_progress_set_activity_mode (GtkProgress *progress, g_object_notify (G_OBJECT (progress), "activity_mode"); } } + +#define __GTK_PROGRESS_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkprogress.h b/gtk/gtkprogress.h index 57c9aac66b..4b25942426 100644 --- a/gtk/gtkprogress.h +++ b/gtk/gtkprogress.h @@ -33,9 +33,7 @@ #include <gtk/gtkadjustment.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) @@ -118,9 +116,6 @@ gdouble gtk_progress_get_percentage_from_value (GtkProgress *progress, #endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_PROGRESS_H__ */ diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 1ba4cbf5a3..03ca701aa0 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -34,9 +34,9 @@ # include <stdio.h> #endif -#include "gtkalias.h" #include "gtkprogressbar.h" #include "gtkintl.h" +#include "gtkalias.h" #define MIN_HORIZONTAL_BAR_WIDTH 150 @@ -1271,3 +1271,5 @@ gtk_progress_bar_get_ellipsize (GtkProgressBar *pbar) return pbar->ellipsize; } +#define __GTK_PROGRESS_BAR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h index 49eb9c46a3..2eb3360c18 100644 --- a/gtk/gtkprogressbar.h +++ b/gtk/gtkprogressbar.h @@ -32,10 +32,7 @@ #include <gtk/gtkprogress.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_PROGRESS_BAR (gtk_progress_bar_get_type ()) #define GTK_PROGRESS_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBar)) @@ -166,9 +163,6 @@ void gtk_progress_bar_update (GtkProgressBar *pbar, #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_PROGRESS_BAR_H__ */ diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c index bdf6d302e5..ad078df2e1 100644 --- a/gtk/gtkradioaction.c +++ b/gtk/gtkradioaction.c @@ -30,12 +30,12 @@ #include <config.h> -#include "gtkalias.h" #include "gtkradioaction.h" #include "gtkradiomenuitem.h" #include "gtktoggleactionprivate.h" #include "gtktoggletoolbutton.h" #include "gtkintl.h" +#include "gtkalias.h" #define GTK_RADIO_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_RADIO_ACTION, GtkRadioActionPrivate)) @@ -485,3 +485,6 @@ gtk_radio_action_get_current_value (GtkRadioAction *action) return action->private_data->value; } + +#define __GTK_RADIO_ACTION_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index e4ab2af430..b33b908549 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -25,11 +25,11 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtklabel.h" #include "gtkmarshalers.h" #include "gtkradiobutton.h" #include "gtkintl.h" +#include "gtkalias.h" enum { @@ -740,3 +740,6 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button, x, y, indicator_size, indicator_size); } } + +#define __GTK_RADIO_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h index c5264c58a3..6f7ce3a1ef 100644 --- a/gtk/gtkradiobutton.h +++ b/gtk/gtkradiobutton.h @@ -32,10 +32,7 @@ #include <gtk/gtkcheckbutton.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_RADIO_BUTTON (gtk_radio_button_get_type ()) #define GTK_RADIO_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButton)) @@ -89,9 +86,6 @@ void gtk_radio_button_set_group (GtkRadioButton *radio #define gtk_radio_button_group gtk_radio_button_get_group #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_RADIO_BUTTON_H__ */ diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c index a9ddcf14ba..9aef29f159 100644 --- a/gtk/gtkradiomenuitem.c +++ b/gtk/gtkradiomenuitem.c @@ -25,10 +25,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkaccellabel.h" #include "gtkmarshalers.h" #include "gtkradiomenuitem.h" +#include "gtkalias.h" static void gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass); @@ -434,3 +434,6 @@ gtk_radio_menu_item_activate (GtkMenuItem *menu_item) gtk_widget_queue_draw (GTK_WIDGET (radio_menu_item)); } + +#define __GTK_RADIO_MENU_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkradiotoolbutton.c b/gtk/gtkradiotoolbutton.c index 0bdf033326..cd6a756878 100644 --- a/gtk/gtkradiotoolbutton.c +++ b/gtk/gtkradiotoolbutton.c @@ -21,10 +21,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkradiotoolbutton.h" #include "gtkradiobutton.h" #include "gtkintl.h" +#include "gtkalias.h" enum { PROP_0, @@ -279,3 +279,5 @@ gtk_radio_tool_button_set_group (GtkRadioToolButton *button, gtk_radio_button_set_group (get_radio_button (button), group); } +#define __GTK_RADIO_TOOL_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index d31a6d181d..47052c8e7d 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -28,13 +28,13 @@ #include <config.h> #include <stdio.h> #include <math.h> -#include "gtkalias.h" #include "gtkintl.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkrange.h" #include "gtkintl.h" #include "gtkscrollbar.h" +#include "gtkalias.h" #define SCROLL_INITIAL_DELAY 250 /* must hold button this long before ... */ #define SCROLL_LATER_DELAY 100 /* ... it starts repeating at this rate */ @@ -2544,3 +2544,6 @@ gtk_range_remove_update_timer (GtkRange *range) range->update_timeout_id = 0; } } + +#define __GTK_RANGE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c index a6c68c4f6d..0b83f71282 100644 --- a/gtk/gtkrbtree.c +++ b/gtk/gtkrbtree.c @@ -18,9 +18,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkrbtree.h" #include "gtkdebug.h" +#include "gtkalias.h" static void _gtk_rbnode_validate_allocator (GAllocator *allocator); static GtkRBNode * _gtk_rbnode_new (GtkRBTree *tree, diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 0dd4a52197..1953cd0844 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -39,7 +39,6 @@ #include <stdio.h> #include <stdlib.h> -#include "gtkalias.h" #include <glib.h> #include <glib/gstdio.h> @@ -57,6 +56,8 @@ #include "gtksettings.h" #include "gtkwindow.h" +#include "gtkalias.h" + #ifdef G_OS_WIN32 #include <io.h> #endif @@ -3965,3 +3966,6 @@ gtk_rc_parse (const gchar *filename) } #endif + +#define __GTK_RC_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h index 037eb92775..3fb2d0d352 100644 --- a/gtk/gtkrc.h +++ b/gtk/gtkrc.h @@ -30,9 +30,7 @@ #include <gtk/gtkstyle.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* Forward declarations */ typedef struct _GtkIconFactory GtkIconFactory; @@ -241,9 +239,6 @@ const GtkRcProperty* _gtk_rc_style_lookup_rc_property (GtkRcStyle *rc_style, const gchar* _gtk_rc_context_get_default_font_name (GtkSettings *settings); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_RC_H__ */ diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c index 6c1370104a..161c2b4113 100644 --- a/gtk/gtkruler.c +++ b/gtk/gtkruler.c @@ -25,9 +25,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkruler.h" #include "gtkintl.h" +#include "gtkalias.h" enum { PROP_0, @@ -474,3 +474,6 @@ gtk_ruler_make_pixmap (GtkRuler *ruler) gdk_gc_set_exposures (ruler->non_gr_exp_gc, FALSE); } } + +#define __GTK_RULER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h index e0512ecb8b..7b8fe529e9 100644 --- a/gtk/gtkruler.h +++ b/gtk/gtkruler.h @@ -42,10 +42,7 @@ #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_RULER (gtk_ruler_get_type ()) #define GTK_RULER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RULER, GtkRuler)) @@ -126,9 +123,6 @@ void gtk_ruler_get_range (GtkRuler *ruler, gdouble *position, gdouble *max_size); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_RULER_H__ */ diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 2a9150a4ab..fcded4b24c 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -27,12 +27,12 @@ #include <config.h> #include <math.h> -#include "gtkalias.h" #include "gtkintl.h" #include "gtkscale.h" #include "gtkmarshalers.h" #include "gdk/gdkkeysyms.h" #include "gtkbindings.h" +#include "gtkalias.h" #define MAX_DIGITS (64) /* don't change this, @@ -748,3 +748,5 @@ void _gtk_scale_clear_layout (GtkScale *scale) } } +#define __GTK_SCALE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index 3623142519..b249c290f9 100644 --- a/gtk/gtkscale.h +++ b/gtk/gtkscale.h @@ -32,10 +32,7 @@ #include <gtk/gtkrange.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_SCALE (gtk_scale_get_type ()) #define GTK_SCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE, GtkScale)) @@ -100,9 +97,6 @@ gchar *_gtk_scale_format_value (GtkScale *scale, gdouble value); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_SCALE_H__ */ diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c index e166f81fa9..a7bfcaefb5 100644 --- a/gtk/gtkscrollbar.c +++ b/gtk/gtkscrollbar.c @@ -26,9 +26,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkscrollbar.h" #include "gtkintl.h" +#include "gtkalias.h" static void gtk_scrollbar_class_init (GtkScrollbarClass *klass); static void gtk_scrollbar_init (GtkScrollbar *scrollbar); @@ -165,3 +165,6 @@ gtk_scrollbar_style_set (GtkWidget *widget, (* GTK_WIDGET_CLASS (parent_class)->style_set) (widget, previous); } + +#define __GTK_SCROLLBAR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h index 14a7cea142..2fb94e86f4 100644 --- a/gtk/gtkscrollbar.h +++ b/gtk/gtkscrollbar.h @@ -32,10 +32,7 @@ #include <gtk/gtkrange.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_SCROLLBAR (gtk_scrollbar_get_type ()) #define GTK_SCROLLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbar)) @@ -68,9 +65,6 @@ struct _GtkScrollbarClass GType gtk_scrollbar_get_type (void) G_GNUC_CONST; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_SCROLLBAR_H__ */ diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 6e01ccb6cd..36e385d0d2 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -27,11 +27,11 @@ #include <config.h> #include <math.h> #include <gdk/gdkkeysyms.h> -#include "gtkalias.h" #include "gtkbindings.h" #include "gtkmarshalers.h" #include "gtkscrolledwindow.h" #include "gtkintl.h" +#include "gtkalias.h" /* scrolled window policy and size requisition handling: @@ -1418,3 +1418,6 @@ _gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window) return scrollbar_spacing; } } + +#define __GTK_SCROLLED_WINDOW_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 1d147b9976..bff2a77fe4 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -56,7 +56,6 @@ #include <string.h> #include "gdk.h" -#include "gtkalias.h" #include "gtkmain.h" #include "gtkselection.h" #include "gdk-pixbuf/gdk-pixbuf.h" @@ -65,6 +64,8 @@ #include "x11/gdkx.h" #endif +#include "gtkalias.h" + #undef DEBUG_SELECTION /* Maximum size of a sent chunk, in bytes. Also the default size of @@ -2532,3 +2533,6 @@ gtk_selection_bytes_per_item (gint format) } return 0; } + +#define __GTK_SELECTION_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h index 49e906fa6a..70985b8435 100644 --- a/gtk/gtkselection.h +++ b/gtk/gtkselection.h @@ -32,9 +32,7 @@ #include <gtk/gtkenums.h> #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _GtkTargetList GtkTargetList; typedef struct _GtkTargetEntry GtkTargetEntry; @@ -181,10 +179,6 @@ GtkSelectionData *gtk_selection_data_copy (GtkSelectionData *data); void gtk_selection_data_free (GtkSelectionData *data); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_SELECTION_H__ */ diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c index 192226800b..b371301ba5 100644 --- a/gtk/gtkseparator.c +++ b/gtk/gtkseparator.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkseparator.h" +#include "gtkalias.h" static void gtk_separator_class_init (GtkSeparatorClass *klass); @@ -72,3 +72,6 @@ gtk_separator_init (GtkSeparator *separator) { GTK_WIDGET_SET_FLAGS (separator, GTK_NO_WINDOW); } + +#define __GTK_SEPARATOR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h index c0894fc49b..5ea3564431 100644 --- a/gtk/gtkseparator.h +++ b/gtk/gtkseparator.h @@ -32,10 +32,7 @@ #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_SEPARATOR (gtk_separator_get_type ()) #define GTK_SEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR, GtkSeparator)) @@ -63,8 +60,6 @@ struct _GtkSeparatorClass GType gtk_separator_get_type (void) G_GNUC_CONST; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_SEPARATOR_H__ */ diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c index 09cf39752c..4077b4479c 100644 --- a/gtk/gtkseparatormenuitem.c +++ b/gtk/gtkseparatormenuitem.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkseparatormenuitem.h" +#include "gtkalias.h" G_DEFINE_TYPE(GtkSeparatorMenuItem, gtk_separator_menu_item, GTK_TYPE_MENU_ITEM); @@ -46,3 +46,6 @@ gtk_separator_menu_item_new (void) { return g_object_new (GTK_TYPE_SEPARATOR_MENU_ITEM, NULL); } + +#define __GTK_SEPARATOR_MENU_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h index 1d3a0014a0..fe4f96bf80 100644 --- a/gtk/gtkseparatormenuitem.h +++ b/gtk/gtkseparatormenuitem.h @@ -31,10 +31,7 @@ #include <gtk/gtkmenuitem.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_SEPARATOR_MENU_ITEM (gtk_separator_menu_item_get_type ()) #define GTK_SEPARATOR_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR_MENU_ITEM, GtkSeparatorMenuItem)) @@ -62,9 +59,6 @@ GType gtk_separator_menu_item_get_type (void) G_GNUC_CONST; GtkWidget* gtk_separator_menu_item_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_SEPARATOR_MENU_ITEM_H__ */ diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c index f2c909ac46..afeaf0fe9f 100644 --- a/gtk/gtkseparatortoolitem.c +++ b/gtk/gtkseparatortoolitem.c @@ -22,11 +22,11 @@ #undef GTK_DISABLE_DEPRECATED #include <config.h> -#include "gtkalias.h" #include "gtkseparatormenuitem.h" #include "gtkseparatortoolitem.h" #include "gtkintl.h" #include "gtktoolbar.h" +#include "gtkalias.h" #define MENU_ID "gtk-separator-tool-item-menu-id" @@ -313,3 +313,5 @@ gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *item, } } +#define __GTK_SEPARATOR_TOOL_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index badf30abd1..8207cc3cdf 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -17,12 +17,12 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkmodules.h" #include "gtksettings.h" #include "gtkrc.h" #include "gtkintl.h" #include "gtkwidget.h" +#include "gtkalias.h" typedef struct _GtkSettingsValuePrivate GtkSettingsValuePrivate; @@ -1404,3 +1404,6 @@ settings_update_modules (GtkSettings *settings) g_free (modules); } + +#define __GTK_SETTINGS_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 31c24f01a8..36c1af79ff 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -20,8 +20,8 @@ #undef GTK_DISABLE_DEPRECATED #include <config.h> -#include "gtkalias.h" #include "gtksignal.h" +#include "gtkalias.h" /* the real parameter limit is of course given by GSignal, bu we need * an upper limit for the implementations. so this should be adjusted @@ -389,3 +389,6 @@ gtk_signal_emitv_by_name (GtkObject *object, gtk_signal_emitv (object, g_signal_lookup (name, GTK_OBJECT_TYPE (object)), args); } + +#define __GTK_SIGNAL_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index 2fb738b2e2..ca6cc5d38c 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -19,11 +19,11 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkcontainer.h" #include "gtkintl.h" #include "gtkprivate.h" #include "gtksizegroup.h" +#include "gtkalias.h" enum { PROP_0, @@ -698,3 +698,6 @@ _gtk_size_group_queue_resize (GtkWidget *widget) { queue_resize_on_widget (widget, TRUE); } + +#define __GTK_SIZE_GROUP_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h index 8a94ece83c..4f0c26c260 100644 --- a/gtk/gtksizegroup.h +++ b/gtk/gtksizegroup.h @@ -23,9 +23,7 @@ #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_SIZE_GROUP (gtk_size_group_get_type ()) #define GTK_SIZE_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SIZE_GROUP, GtkSizeGroup)) @@ -98,9 +96,6 @@ void _gtk_size_group_compute_requisition (GtkWidget *widget, GtkRequisition *requisition); void _gtk_size_group_queue_resize (GtkWidget *widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_SIZE_GROUP_H__ */ diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 9a62b9a23e..d3fe2756b4 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -29,7 +29,6 @@ #include <string.h> #include "gdk/gdkkeysyms.h" -#include "gtkalias.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkwindow.h" @@ -41,6 +40,7 @@ #include "x11/gdkx.h" #include "gtkxembed.h" +#include "gtkalias.h" typedef struct _GtkSocketPrivate GtkSocketPrivate; @@ -1479,3 +1479,6 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) return return_val; } + +#define __GTK_SOCKET_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h index a3f4d489ad..c522e5ba09 100644 --- a/gtk/gtksocket.h +++ b/gtk/gtksocket.h @@ -28,10 +28,7 @@ #include <gtk/gtkcontainer.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_SOCKET (gtk_socket_get_type ()) #define GTK_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOCKET, GtkSocket)) @@ -95,9 +92,6 @@ void gtk_socket_steal (GtkSocket *socket_, GdkNativeWindow wid); #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_SOCKET_H__ */ diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index ba21fee6eb..fe6a435b1b 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -34,13 +34,13 @@ #include <string.h> #include <locale.h> #include "gdk/gdkkeysyms.h" -#include "gtkalias.h" #include "gtkbindings.h" #include "gtkspinbutton.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtksettings.h" #include "gtkintl.h" +#include "gtkalias.h" #define MIN_SPIN_BUTTON_WIDTH 30 #define SPIN_BUTTON_INITIAL_TIMER_DELAY 200 @@ -2251,3 +2251,6 @@ spin_button_redraw (GtkSpinButton *spin_button) gdk_window_invalidate_rect (spin_button->panel, NULL, TRUE); } } + +#define __GTK_SPIN_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h index 6804f4e4dd..34b02607fe 100644 --- a/gtk/gtkspinbutton.h +++ b/gtk/gtkspinbutton.h @@ -36,10 +36,7 @@ #include <gtk/gtkadjustment.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_SPIN_BUTTON (gtk_spin_button_get_type ()) #define GTK_SPIN_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPIN_BUTTON, GtkSpinButton)) @@ -190,9 +187,6 @@ void gtk_spin_button_update (GtkSpinButton *spin_button) #define gtk_spin_button_get_value_as_float gtk_spin_button_get_value #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_BEGIN_DECLS #endif /* __GTK_SPIN_BUTTON_H__ */ diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index fed30e6878..407b658f21 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -26,13 +26,13 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkframe.h" #include "gtklabel.h" #include "gtkmarshalers.h" #include "gtkstatusbar.h" #include "gtkwindow.h" #include "gtkintl.h" +#include "gtkalias.h" typedef struct _GtkStatusbarMsg GtkStatusbarMsg; @@ -871,3 +871,6 @@ label_selectable_changed (GtkWidget *label, statusbar->has_resize_grip && statusbar->grip_window) gdk_window_raise (statusbar->grip_window); } + +#define __GTK_STATUSBAR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h index 84026ca449..91f4d15aa3 100644 --- a/gtk/gtkstatusbar.h +++ b/gtk/gtkstatusbar.h @@ -30,10 +30,7 @@ #include <gtk/gtkhbox.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_STATUSBAR (gtk_statusbar_get_type ()) #define GTK_STATUSBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR, GtkStatusbar)) @@ -106,7 +103,6 @@ void gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar, gboolean setting); gboolean gtk_statusbar_get_has_resize_grip (GtkStatusbar *statusbar); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS + #endif /* __GTK_STATUSBAR_H__ */ diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c index 93b3934483..5a4482ea61 100644 --- a/gtk/gtkstock.c +++ b/gtk/gtkstock.c @@ -27,11 +27,11 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkstock.h" #include "gtkiconfactory.h" #include "gtkintl.h" #include <gdk/gdkkeysyms.h> +#include "gtkalias.h" static GHashTable *translate_hash = NULL; static GHashTable *stock_hash = NULL; @@ -489,3 +489,6 @@ init_stock_hash (void) NULL); } } + +#define __GTK_STOCK_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h index d079a1aa21..0aa5211621 100644 --- a/gtk/gtkstock.h +++ b/gtk/gtkstock.h @@ -31,9 +31,7 @@ #include <gdk/gdk.h> #include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _GtkStockItem GtkStockItem; @@ -161,9 +159,6 @@ void gtk_stock_set_translate_func (const gchar *domain, #define GTK_STOCK_ZOOM_IN "gtk-zoom-in" #define GTK_STOCK_ZOOM_OUT "gtk-zoom-out" -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_STOCK_H__ */ diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 8f9adc4d3a..d014c798fb 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -28,7 +28,6 @@ #include <math.h> #include <stdlib.h> #include <string.h> -#include "gtkalias.h" #include "gtkgc.h" #include "gtkmarshalers.h" #include "gtkrc.h" @@ -38,6 +37,7 @@ #include "gtkthemes.h" #include "gtkiconfactory.h" #include "gtksettings.h" /* _gtk_settings_parse_convert() */ +#include "gtkalias.h" #define LIGHTNESS_MULT 1.3 #define DARKNESS_MULT 0.7 @@ -6766,3 +6766,6 @@ gtk_draw_insertion_cursor (GtkWidget *widget, if (area) gdk_gc_set_clip_rectangle (gc, NULL); } + +#define __GTK_STYLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index 967c7ccc1d..4ae3143459 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -32,9 +32,7 @@ #include <gtk/gtkenums.h> #include <pango/pango.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_STYLE (gtk_style_get_type ()) #define GTK_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_STYLE, GtkStyle)) @@ -893,9 +891,6 @@ void gtk_draw_insertion_cursor (GtkWidget *widget, GtkTextDirection direction, gboolean draw_arrow); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_STYLE_H__ */ diff --git a/gtk/gtktable.c b/gtk/gtktable.c index 142882726b..308a88ee93 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -25,9 +25,9 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtktable.h" #include "gtkintl.h" +#include "gtkalias.h" enum { @@ -1666,3 +1666,6 @@ gtk_table_size_allocate_pass2 (GtkTable *table) } } } + +#define __GTK_TABLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktable.h b/gtk/gtktable.h index 24fc2527e2..f925d330da 100644 --- a/gtk/gtktable.h +++ b/gtk/gtktable.h @@ -32,10 +32,7 @@ #include <gtk/gtkcontainer.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_TABLE (gtk_table_get_type ()) #define GTK_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TABLE, GtkTable)) @@ -143,9 +140,6 @@ void gtk_table_set_homogeneous (GtkTable *table, gboolean gtk_table_get_homogeneous (GtkTable *table); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_TABLE_H__ */ diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c index 9df9ea9d90..88a6a466f7 100644 --- a/gtk/gtktearoffmenuitem.c +++ b/gtk/gtktearoffmenuitem.c @@ -26,9 +26,9 @@ #include <config.h> -#include "gtkalias.h" #include "gtkmenu.h" #include "gtktearoffmenuitem.h" +#include "gtkalias.h" #define ARROW_SIZE 10 #define TEAR_LENGTH 5 @@ -285,3 +285,6 @@ gtk_tearoff_menu_item_parent_set (GtkWidget *widget, tearoff_menu_item); } } + +#define __GTK_TEAROFF_MENU_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h index ba5ff76a8a..cd744b0d43 100644 --- a/gtk/gtktearoffmenuitem.h +++ b/gtk/gtktearoffmenuitem.h @@ -24,18 +24,14 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_MENU_TEAROFF_ITEM_H__ -#define __GTK_MENU_TEAROFF_ITEM_H__ +#ifndef __GTK_TEAROFF_MENU_ITEM_H__ +#define __GTK_TEAROFF_MENU_ITEM_H__ #include <gdk/gdk.h> #include <gtk/gtkmenuitem.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_TEAROFF_MENU_ITEM (gtk_tearoff_menu_item_get_type ()) #define GTK_TEAROFF_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItem)) @@ -70,9 +66,6 @@ struct _GtkTearoffMenuItemClass GType gtk_tearoff_menu_item_get_type (void) G_GNUC_CONST; GtkWidget* gtk_tearoff_menu_item_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_TEAROFF_MENU_ITEM_H__ */ diff --git a/gtk/gtktext.c b/gtk/gtktext.c index f78e8ba316..99ece3aeec 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -32,16 +32,18 @@ #include <string.h> #include "gdk/gdkkeysyms.h" #include "gdk/gdki18n.h" -#include "gtkalias.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkselection.h" #include "gtksignal.h" +#include "gtkstyle.h" +#include "gtkobject.h" #define GTK_ENABLE_BROKEN #include "gtktext.h" #include "line-wrap.xbm" #include "line-arrow.xbm" #include "gtkintl.h" +#include "gtkalias.h" #define INITIAL_BUFFER_SIZE 1024 @@ -5540,3 +5542,6 @@ gtk_text_show_props (GtkText *text, g_warning ("incorrect property list length in %s:%d -- bad!", msg, line); } #endif + +#define __GTK_TEXT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktext.h b/gtk/gtktext.h index c3ba9e1293..a2be7faf59 100644 --- a/gtk/gtktext.h +++ b/gtk/gtktext.h @@ -34,10 +34,7 @@ #include <gtk/gtkadjustment.h> #include <gtk/gtkoldeditable.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_TEXT (gtk_text_get_type ()) #define GTK_TEXT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT, GtkText)) @@ -214,10 +211,7 @@ gboolean gtk_text_forward_delete (GtkText *text, : ((index) < (t)->gap_position ? (t)->text.ch[index] : \ (t)->text.ch[(index)+(t)->gap_size])) -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_TEXT_H__ */ diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 8d26eeaed3..ac5a9fc904 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -54,7 +54,6 @@ #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include <config.h> -#include "gtkalias.h" #include "gtktextbtree.h" #include <string.h> #include <stdlib.h> @@ -65,6 +64,7 @@ #include "gtktextiterprivate.h" #include "gtkdebug.h" #include "gtktextmarkprivate.h" +#include "gtkalias.h" /* * Types @@ -7243,4 +7243,5 @@ _gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment * seg) } } - +#define __GTK_TEXT_BTREE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtree.h index 59ef11408a..9881dfd43f 100644 --- a/gtk/gtktextbtree.h +++ b/gtk/gtktextbtree.h @@ -1,5 +1,5 @@ -#ifndef GTK_TEXT_BTREE_H -#define GTK_TEXT_BTREE_H +#ifndef __GTK_TEXT_BTREE_H__ +#define __GTK_TEXT_BTREE_H__ #if 0 #define DEBUG_VALIDATION_AND_SCROLLING @@ -18,9 +18,7 @@ #include <gtk/gtktextsegment.h> #include <gtk/gtktextiter.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS GtkTextBTree *_gtk_text_btree_new (GtkTextTagTable *table, GtkTextBuffer *buffer); @@ -315,9 +313,7 @@ void _gtk_text_btree_release_mark_segment (GtkTextBTree *tree, void _gtk_text_btree_notify_will_remove_tag (GtkTextBTree *tree, GtkTextTag *tag); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 930312adf9..17dafaad79 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -30,7 +30,6 @@ #include <stdarg.h> -#include "gtkalias.h" #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtkclipboard.h" #include "gtkinvisible.h" @@ -39,6 +38,7 @@ #include "gtktextbtree.h" #include "gtktextiterprivate.h" #include "gtkintl.h" +#include "gtkalias.h" typedef struct _ClipboardRequest ClipboardRequest; @@ -3770,3 +3770,6 @@ _gtk_text_buffer_spew (GtkTextBuffer *buffer) { _gtk_text_btree_spew (get_btree (buffer)); } + +#define __GTK_TEXT_BUFFER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h index a944b85944..419ad4d3c3 100644 --- a/gtk/gtktextbuffer.h +++ b/gtk/gtktextbuffer.h @@ -24,8 +24,8 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef GTK_TEXT_BUFFER_H -#define GTK_TEXT_BUFFER_H +#ifndef __GTK_TEXT_BUFFER_H__ +#define __GTK_TEXT_BUFFER_H__ #include <gtk/gtkwidget.h> #include <gtk/gtkclipboard.h> @@ -34,9 +34,7 @@ #include <gtk/gtktextmark.h> #include <gtk/gtktextchild.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * This is the PUBLIC representation of a text buffer. @@ -377,8 +375,6 @@ const PangoLogAttr* _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buff void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer, GtkTextTag *tag); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c index 76c0449240..68f5dd5fbd 100644 --- a/gtk/gtktextchild.c +++ b/gtk/gtktextchild.c @@ -49,10 +49,10 @@ #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include <config.h> -#include "gtkalias.h" #include "gtktextchild.h" #include "gtktextbtree.h" #include "gtktextlayout.h" +#include "gtkalias.h" #define CHECK_IN_BUFFER(anchor) \ G_STMT_START { \ @@ -539,4 +539,5 @@ gtk_text_anchored_child_set_layout (GtkWidget *child, _gtk_anchored_child_set_layout (child, layout); } - +#define __GTK_TEXT_CHILD_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h index de84f7be35..19c3ad9a3f 100644 --- a/gtk/gtktextchild.h +++ b/gtk/gtktextchild.h @@ -24,14 +24,12 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef GTK_TEXT_CHILD_H -#define GTK_TEXT_CHILD_H +#ifndef __GTK_TEXT_CHILD_H__ +#define __GTK_TEXT_CHILD_H__ #include <glib-object.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* A GtkTextChildAnchor is a spot in the buffer where child widgets * can be "anchored" (inserted inline, as if they were characters). @@ -74,8 +72,6 @@ GtkTextChildAnchor* gtk_text_child_anchor_new (void); GList* gtk_text_child_anchor_get_widgets (GtkTextChildAnchor *anchor); gboolean gtk_text_child_anchor_get_deleted (GtkTextChildAnchor *anchor); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktextchildprivate.h b/gtk/gtktextchildprivate.h index 70ce11344e..7ef2e0beec 100644 --- a/gtk/gtktextchildprivate.h +++ b/gtk/gtktextchildprivate.h @@ -47,14 +47,12 @@ * */ -#ifndef GTK_TEXT_CHILD_PRIVATE_H -#define GTK_TEXT_CHILD_PRIVATE_H +#ifndef __GTK_TEXT_CHILD_PRIVATE_H__ +#define __GTK_TEXT_CHILD_PRIVATE_H__ #include <gtk/gtktexttypes.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _GtkTextPixbuf GtkTextPixbuf; @@ -85,8 +83,6 @@ void _gtk_widget_segment_unref (GtkTextLineSegment *widget_seg GtkTextLayout* _gtk_anchored_child_get_layout (GtkWidget *child); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c index 1e0058dc85..94f7a1a8cc 100644 --- a/gtk/gtktextdisplay.c +++ b/gtk/gtktextdisplay.c @@ -76,8 +76,8 @@ #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include <config.h> -#include "gtkalias.h" #include "gtktextdisplay.h" +#include "gtkalias.h" /* DO NOT go putting private headers in here. This file should only * use the semi-public headers, as with gtktextview.c. */ @@ -832,3 +832,6 @@ gtk_text_layout_draw (GtkTextLayout *layout, g_slist_free (line_list); } + +#define __GTK_TEXT_DISPLAY_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktextdisplay.h b/gtk/gtktextdisplay.h index 28735d5763..b93a84c2b2 100644 --- a/gtk/gtktextdisplay.h +++ b/gtk/gtktextdisplay.h @@ -74,14 +74,12 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef GTK_TEXT_DISPLAY_H -#define GTK_TEXT_DISPLAY_H +#ifndef __GTK_TEXT_DISPLAY_H__ +#define __GTK_TEXT_DISPLAY_H__ #include <gtk/gtktextlayout.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* A semi-public header intended for use by code that also * uses GtkTextLayout @@ -109,9 +107,6 @@ void gtk_text_layout_draw (GtkTextLayout *layout, GList **widgets); +G_END_DECLS -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* GTK_TEXT_DISPLAY_H */ +#endif /* __GTK_TEXT_DISPLAY_H__ */ diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index b61f67b637..d0198b31ae 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -26,11 +26,11 @@ #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include <config.h> -#include "gtkalias.h" #include "gtktextiter.h" #include "gtktextbtree.h" #include "gtktextiterprivate.h" #include "gtkdebug.h" +#include "gtkalias.h" #include <string.h> #define FIX_OVERFLOWS(varname) if ((varname) == G_MININT) (varname) = G_MININT + 1 @@ -5446,3 +5446,5 @@ _gtk_text_iter_check (const GtkTextIter *iter) g_error ("Iterator was on last line (past the end iterator)"); } +#define __GTK_TEXT_ITER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h index ba1f883bc4..6816cc222a 100644 --- a/gtk/gtktextiter.h +++ b/gtk/gtktextiter.h @@ -24,15 +24,13 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef GTK_TEXT_ITER_H -#define GTK_TEXT_ITER_H +#ifndef __GTK_TEXT_ITER_H__ +#define __GTK_TEXT_ITER_H__ #include <gtk/gtktexttag.h> #include <gtk/gtktextchild.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef enum { GTK_TEXT_SEARCH_VISIBLE_ONLY = 1 << 0, @@ -291,9 +289,7 @@ gboolean gtk_text_iter_in_range (const GtkTextIter *iter, void gtk_text_iter_order (GtkTextIter *first, GtkTextIter *second); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktextiterprivate.h b/gtk/gtktextiterprivate.h index b0c38662d5..b5b8506bf0 100644 --- a/gtk/gtktextiterprivate.h +++ b/gtk/gtktextiterprivate.h @@ -1,11 +1,9 @@ -#ifndef GTK_TEXT_ITER_PRIVATE_H -#define GTK_TEXT_ITER_PRIVATE_H +#ifndef __GTK_TEXT_ITER_PRIVATE_H__ +#define __GTK_TEXT_ITER_PRIVATE_H__ #include <gtk/gtktextiter.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #include <gtk/gtktextiter.h> #include <gtk/gtktextbtree.h> @@ -23,9 +21,7 @@ gint _gtk_text_iter_get_segment_char (const GtkTextIter /* debug */ void _gtk_text_iter_check (const GtkTextIter *iter); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 3738a93e57..4d619ca49c 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -78,11 +78,11 @@ #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include <config.h> -#include "gtkalias.h" #include "gtkmarshalers.h" #include "gtktextlayout.h" #include "gtktextbtree.h" #include "gtktextiterprivate.h" +#include "gtkalias.h" #include <stdlib.h> #include <string.h> @@ -3272,3 +3272,6 @@ gtk_text_layout_buffer_delete_range (GtkTextBuffer *textbuffer, gtk_text_layout_update_cursor_line (layout); } + +#define __GTK_TEXT_LAYOUT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h index 0e02b1294a..36a6efb51f 100644 --- a/gtk/gtktextlayout.h +++ b/gtk/gtktextlayout.h @@ -76,12 +76,8 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef GTK_TEXT_LAYOUT_H -#define GTK_TEXT_LAYOUT_H - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#ifndef __GTK_TEXT_LAYOUT_H__ +#define __GTK_TEXT_LAYOUT_H__ /* This is a "semi-private" header; it is intended for * use by the text widget, and the text canvas item, @@ -96,6 +92,8 @@ extern "C" { #include <gtk/gtktextbuffer.h> #include <gtk/gtktextiter.h> +G_BEGIN_DECLS + /* forward declarations that have to be here to avoid including * gtktextbtree.h */ @@ -414,8 +412,6 @@ void gtk_text_anchored_child_set_layout (GtkWidget *child, void gtk_text_layout_spew (GtkTextLayout *layout); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS -#endif /* GTK_TEXT_LAYOUT_H */ +#endif /* __GTK_TEXT_LAYOUT_H__ */ diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c index b0ac68e930..52af695bc3 100644 --- a/gtk/gtktextmark.c +++ b/gtk/gtktextmark.c @@ -49,8 +49,8 @@ #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include <config.h> -#include "gtkalias.h" #include "gtktextbtree.h" +#include "gtkalias.h" static void gtk_text_mark_init (GtkTextMark *mark); static void gtk_text_mark_class_init (GtkTextMarkClass *klass); @@ -393,3 +393,6 @@ mark_segment_check_func (GtkTextLineSegment *seg, if (seg->body.mark.line != line) g_error ("mark_segment_check_func: seg->body.mark.line bogus"); } + +#define __GTK_TEXT_MARK_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h index 30eb59af2a..851123c4ac 100644 --- a/gtk/gtktextmark.h +++ b/gtk/gtktextmark.h @@ -47,12 +47,10 @@ * */ -#ifndef GTK_TEXT_MARK_H -#define GTK_TEXT_MARK_H +#ifndef __GTK_TEXT_MARK_H__ +#define __GTK_TEXT_MARK_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* The GtkTextMark data type */ @@ -95,9 +93,7 @@ gboolean gtk_text_mark_get_deleted (GtkTextMark *mark); GtkTextBuffer* gtk_text_mark_get_buffer (GtkTextMark *mark); gboolean gtk_text_mark_get_left_gravity (GtkTextMark *mark); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktextmarkprivate.h b/gtk/gtktextmarkprivate.h index 425b516919..c9043f431e 100644 --- a/gtk/gtktextmarkprivate.h +++ b/gtk/gtktextmarkprivate.h @@ -1,13 +1,11 @@ -#ifndef GTK_TEXT_MARK_PRIVATE_H -#define GTK_TEXT_MARK_PRIVATE_H - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#ifndef __GTK_TEXT_MARK_PRIVATE_H__ +#define __GTK_TEXT_MARK_PRIVATE_H__ #include <gtk/gtktexttypes.h> #include <gtk/gtktextlayout.h> +G_BEGIN_DECLS + #define GTK_IS_TEXT_MARK_SEGMENT(mark) (((GtkTextLineSegment*)mark)->type == >k_text_left_mark_type || \ ((GtkTextLineSegment*)mark)->type == >k_text_right_mark_type) @@ -29,9 +27,7 @@ GtkTextLineSegment *_gtk_mark_segment_new (GtkTextBTree *tree, gboolean left_gravity, const gchar *name); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c index aa5949c6a5..390e14bcfc 100644 --- a/gtk/gtktextsegment.c +++ b/gtk/gtktextsegment.c @@ -52,7 +52,6 @@ #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include <config.h> -#include "gtkalias.h" #include "gtktextbtree.h" #include <string.h> #include <stdlib.h> @@ -62,6 +61,7 @@ #include "gtktextlayout.h" #include "gtktextiterprivate.h" #include "gtkdebug.h" +#include "gtkalias.h" /* *-------------------------------------------------------------- @@ -623,3 +623,6 @@ GtkTextLineSegmentClass gtk_text_toggle_off_type = { toggle_segment_line_change_func, /* lineChangeFunc */ _gtk_toggle_segment_check_func /* checkFunc */ }; + +#define __GTK_TEXT_SEGMENT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktextsegment.h b/gtk/gtktextsegment.h index b28ec9f42d..79bda9a233 100644 --- a/gtk/gtktextsegment.h +++ b/gtk/gtktextsegment.h @@ -1,5 +1,5 @@ -#ifndef GTK_TEXT_SEGMENT_H -#define GTK_TEXT_SEGMENT_H +#ifndef __GTK_TEXT_SEGMENT_H__ +#define __GTK_TEXT_SEGMENT_H__ #include <gtk/gtktexttag.h> #include <gtk/gtktextiter.h> @@ -7,9 +7,7 @@ #include <gtk/gtktextchild.h> #include <gtk/gtktextchildprivate.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * Segments: each line is divided into one or more segments, where each @@ -140,9 +138,7 @@ GtkTextLineSegment *_gtk_toggle_segment_new (GtkTextTagInfo *info gboolean on); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 3774884253..890c74447d 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -48,7 +48,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkmain.h" #include "gtktexttag.h" #include "gtktexttypes.h" @@ -56,6 +55,7 @@ #include "gtkmain.h" #include "gtkintl.h" #include "gtkmarshalers.h" +#include "gtkalias.h" #include <stdlib.h> #include <string.h> @@ -2165,3 +2165,6 @@ _gtk_text_tag_affects_nonsize_appearance (GtkTextTag *tag) tag->strikethrough_set || tag->bg_full_height_set; } + +#define __GTK_TEXT_TAG_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h index 37d10f4403..2074e23d87 100644 --- a/gtk/gtktexttag.h +++ b/gtk/gtktexttag.h @@ -1,5 +1,5 @@ -#ifndef GTK_TEXT_TAG_H -#define GTK_TEXT_TAG_H +#ifndef __GTK_TEXT_TAG_H__ +#define __GTK_TEXT_TAG_H__ #include <glib-object.h> #include <gdk/gdk.h> @@ -8,9 +8,7 @@ /* Not needed, retained for compatibility -Yosh */ #include <gtk/gtkobject.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _GtkTextIter GtkTextIter; typedef struct _GtkTextTagTable GtkTextTagTable; @@ -231,9 +229,7 @@ void gtk_text_attributes_ref (GtkTextAttributes *values); GType gtk_text_attributes_get_type (void) G_GNUC_CONST; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktexttagprivate.h b/gtk/gtktexttagprivate.h index 20c0ae5c54..44fe225016 100644 --- a/gtk/gtktexttagprivate.h +++ b/gtk/gtktexttagprivate.h @@ -1,5 +1,5 @@ -#ifndef GTK_TEXT_TAG_PRIVATE_H -#define GTK_TEXT_TAG_PRIVATE_H +#ifndef __GTK_TEXT_TAG_PRIVATE_H__ +#define __GTK_TEXT_TAG_PRIVATE_H__ #include <gtk/gtktexttag.h> diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c index f7ffc2ed7d..71ad4948e6 100644 --- a/gtk/gtktexttagtable.c +++ b/gtk/gtktexttagtable.c @@ -1,9 +1,9 @@ #include <config.h> -#include "gtkalias.h" #include "gtktexttagtable.h" #include "gtkmarshalers.h" #include "gtktextbuffer.h" /* just for the lame notify_will_remove_tag hack */ +#include "gtkalias.h" #include <stdlib.h> @@ -425,3 +425,6 @@ _gtk_text_tag_table_remove_buffer (GtkTextTagTable *table, table->buffers = g_slist_remove (table->buffers, buffer); } + +#define __GTK_TEXT_TAG_TABLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h index deec3820a4..05b9d02a2f 100644 --- a/gtk/gtktexttagtable.h +++ b/gtk/gtktexttagtable.h @@ -1,11 +1,9 @@ -#ifndef GTK_TEXT_TAG_TABLE_H -#define GTK_TEXT_TAG_TABLE_H +#ifndef __GTK_TEXT_TAG_TABLE_H__ +#define __GTK_TEXT_TAG_TABLE_H__ #include <gtk/gtktexttag.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #include <gtk/gtktexttag.h> @@ -69,9 +67,7 @@ void _gtk_text_tag_table_add_buffer (GtkTextTagTable *table, void _gtk_text_tag_table_remove_buffer (GtkTextTagTable *table, gpointer buffer); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktexttypes.c b/gtk/gtktexttypes.c index 1a126491b6..86a79c2907 100644 --- a/gtk/gtktexttypes.c +++ b/gtk/gtktexttypes.c @@ -1,6 +1,6 @@ #include <config.h> -#include "gtkalias.h" #include "gtktexttypes.h" +#include "gtkalias.h" /* These are used to represent embedded non-character objects * if you return a string representation of a text buffer @@ -18,3 +18,6 @@ gtk_text_byte_begins_utf8_char (const gchar *byte) { return inline_byte_begins_utf8_char (byte); } + +#define __GTK_TEXT_TYPES_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h index 1dad226180..78434d7bb5 100644 --- a/gtk/gtktexttypes.h +++ b/gtk/gtktexttypes.h @@ -1,15 +1,12 @@ -#ifndef GTK_TEXT_TYPES_H -#define GTK_TEXT_TYPES_H - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#ifndef __GTK_TEXT_TYPES_H__ +#define __GTK_TEXT_TYPES_H__ #include <glib.h> #include <gtk/gtktextbuffer.h> #include <gtk/gtktexttagprivate.h> +G_BEGIN_DECLS typedef struct _GtkTextCounter GtkTextCounter; typedef struct _GtkTextLineSegment GtkTextLineSegment; @@ -53,9 +50,7 @@ VARIABLE const gchar gtk_text_unknown_char_utf8[]; gboolean gtk_text_byte_begins_utf8_char (const gchar *byte); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c index 4eea20880b..9d72c18646 100644 --- a/gtk/gtktextutil.c +++ b/gtk/gtktextutil.c @@ -25,10 +25,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtktextutil.h" #include "gtkintl.h" #include "gtkmenuitem.h" +#include "gtkalias.h" typedef struct _GtkUnicodeMenuEntry GtkUnicodeMenuEntry; typedef struct _GtkTextUtilCallbackInfo GtkTextUtilCallbackInfo; diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 64bb6aee1b..5f8bf2ed64 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -27,7 +27,6 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtkbindings.h" #include "gtkdnd.h" @@ -48,6 +47,7 @@ #include "gtksizegroup.h" /* FIXME http://bugzilla.gnome.org/show_bug.cgi?id=72258 */ #include "gtktextutil.h" #include "gtkwindow.h" +#include "gtkalias.h" /* How scrolling, validation, exposes, etc. work. * @@ -8301,3 +8301,6 @@ gtk_text_view_move_visually (GtkTextView *text_view, return gtk_text_layout_move_iter_visually (text_view->layout, iter, count); } + +#define __GTK_TEXT_VIEW_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h index 3ad5cd6feb..ff3a67c800 100644 --- a/gtk/gtktextview.h +++ b/gtk/gtktextview.h @@ -24,17 +24,15 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef GTK_TEXT_VIEW_H -#define GTK_TEXT_VIEW_H +#ifndef __GTK_TEXT_VIEW_H__ +#define __GTK_TEXT_VIEW_H__ #include <gtk/gtkcontainer.h> #include <gtk/gtkimcontext.h> #include <gtk/gtktextbuffer.h> #include <gtk/gtkmenu.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_TEXT_VIEW (gtk_text_view_get_type ()) #define GTK_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_VIEW, GtkTextView)) @@ -363,8 +361,6 @@ PangoTabArray* gtk_text_view_get_tabs (GtkTextView *text_vi /* note that the return value of this changes with the theme */ GtkTextAttributes* gtk_text_view_get_default_attributes (GtkTextView *text_view); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS -#endif /* GTK_TEXT_VIEW_H */ +#endif /* __GTK_TEXT_VIEW_H__ */ diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c index c166c09333..78fbac6d13 100644 --- a/gtk/gtkthemes.c +++ b/gtk/gtkthemes.c @@ -30,10 +30,10 @@ #include <stdio.h> #include <stdlib.h> #include <gmodule.h> -#include "gtkalias.h" #include "gtkthemes.h" #include "gtkrc.h" #include "gtkintl.h" +#include "gtkalias.h" typedef struct _GtkThemeEngineClass GtkThemeEngineClass; @@ -191,3 +191,6 @@ gtk_theme_engine_create_rc_style (GtkThemeEngine *engine) return engine->create_rc_style (); } + +#define __GTK_THEMES_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkthemes.h b/gtk/gtkthemes.h index 8185a7f82d..0991f7d07c 100644 --- a/gtk/gtkthemes.h +++ b/gtk/gtkthemes.h @@ -32,9 +32,7 @@ #include <gtk/gtkstyle.h> #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GTK_TYPE_THEME_ENGINE (gtk_theme_engine_get_type ()) #define GTK_THEME_ENGINE(theme_engine) (G_TYPE_CHECK_INSTANCE_CAST ((theme_engine), GTK_TYPE_THEME_ENGINE, GtkThemeEngine)) @@ -44,9 +42,6 @@ GType gtk_theme_engine_get_type (void) G_GNUC_CONST; GtkThemeEngine *gtk_theme_engine_get (const gchar *name); GtkRcStyle *gtk_theme_engine_create_rc_style (GtkThemeEngine *engine); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_THEMES_H__ */ diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c index ce7931a79b..aee4ffada2 100644 --- a/gtk/gtktipsquery.c +++ b/gtk/gtktipsquery.c @@ -30,13 +30,13 @@ #undef GTK_DISABLE_DEPRECATED #include <config.h> -#include "gtkalias.h" #include "gtktipsquery.h" #include "gtksignal.h" #include "gtktooltips.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkintl.h" +#include "gtkalias.h" @@ -518,3 +518,6 @@ gtk_tips_query_event (GtkWidget *widget, return event_handled; } + +#define __GTK_TIPS_QUERY_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktipsquery.h b/gtk/gtktipsquery.h index d7959788e9..2a09baed14 100644 --- a/gtk/gtktipsquery.h +++ b/gtk/gtktipsquery.h @@ -29,17 +29,14 @@ #ifndef GTK_DISABLE_DEPRECATED -#ifndef __GTKTIPSQUERY_H__ -#define __GTKTIPSQUERY_H__ +#ifndef __GTK_TIPS_QUERY_H__ +#define __GTK_TIPS_QUERY_H__ #include <gtk/gtklabel.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS /* --- type macros --- */ #define GTK_TYPE_TIPS_QUERY (gtk_tips_query_get_type ()) @@ -106,13 +103,8 @@ void gtk_tips_query_set_labels (GtkTipsQuery *tips_query, const gchar *label_inactive, const gchar *label_no_tip); +G_END_DECLS - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GTKTIPSQUERY_H__ */ +#endif /* __GTK_TIPS_QUERY_H__ */ #endif /* GTK_DISABLE_DEPRECATED */ diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c index 92a9793415..ab2cd3871b 100644 --- a/gtk/gtktoggleaction.c +++ b/gtk/gtktoggleaction.c @@ -30,13 +30,13 @@ #include <config.h> -#include "gtkalias.h" #include "gtkintl.h" #include "gtktoggleaction.h" #include "gtktoggleactionprivate.h" #include "gtktoggletoolbutton.h" #include "gtktogglebutton.h" #include "gtkcheckmenuitem.h" +#include "gtkalias.h" enum { @@ -410,3 +410,6 @@ create_menu_item (GtkAction *action) "draw_as_radio", toggle_action->private_data->draw_as_radio, NULL); } + +#define __GTK_TOGGLE_ACTION_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index fd846403bb..be6b3c72a2 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -25,12 +25,12 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtklabel.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtktogglebutton.h" #include "gtkintl.h" +#include "gtkalias.h" #define DEFAULT_LEFT_POS 4 #define DEFAULT_TOP_POS 4 @@ -497,3 +497,6 @@ gtk_toggle_button_update_state (GtkButton *button) _gtk_button_set_depressed (button, depressed); gtk_widget_set_state (GTK_WIDGET (toggle_button), new_state); } + +#define __GTK_TOGGLE_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h index 5ab74ec5f7..c5bb68e3e9 100644 --- a/gtk/gtktogglebutton.h +++ b/gtk/gtktogglebutton.h @@ -31,11 +31,7 @@ #include <gdk/gdk.h> #include <gtk/gtkbutton.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_TOGGLE_BUTTON (gtk_toggle_button_get_type ()) #define GTK_TOGGLE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_BUTTON, GtkToggleButton)) @@ -92,9 +88,6 @@ gboolean gtk_toggle_button_get_inconsistent (GtkToggleButton *toggle_button); #define gtk_toggle_button_set_state gtk_toggle_button_set_active #endif /* GTK_DISABLE_DEPRECATED */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_TOGGLE_BUTTON_H__ */ diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c index e4b57c62be..63312de88e 100644 --- a/gtk/gtktoggletoolbutton.c +++ b/gtk/gtktoggletoolbutton.c @@ -20,7 +20,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtktoggletoolbutton.h" #include "gtkcheckmenuitem.h" #include "gtklabel.h" @@ -28,6 +27,7 @@ #include "gtkstock.h" #include "gtkintl.h" #include "gtkradiotoolbutton.h" +#include "gtkalias.h" #define MENU_ID "gtk-toggle-tool-button-menu-id" @@ -334,3 +334,6 @@ gtk_toggle_tool_button_get_active (GtkToggleToolButton *button) return button->priv->active; } + +#define __GTK_TOGGLE_TOOL_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 0eab9f689d..dd1de9de06 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -32,7 +32,6 @@ #undef GTK_DISABLE_DEPRECATED #include <config.h> -#include "gtkalias.h" #include "gtkarrow.h" #include "gtktoolbar.h" #include "gtkradiotoolbutton.h" @@ -53,6 +52,7 @@ #include "gtkvbox.h" #include "gtkimage.h" #include "gtkseparatormenuitem.h" +#include "gtkalias.h" #include <math.h> typedef struct _ToolbarContent ToolbarContent; @@ -4775,3 +4775,6 @@ _gtk_toolbar_rebuild_menu (GtkToolbar *toolbar) gtk_widget_queue_resize (GTK_WIDGET (toolbar)); } + +#define __GTK_TOOLBAR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 818da4bc68..fd0e697542 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -21,7 +21,6 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtktoolbutton.h" #include "gtkbutton.h" #include "gtkhbox.h" @@ -34,6 +33,7 @@ #include "gtkintl.h" #include "gtktoolbar.h" #include "gtkiconfactory.h" +#include "gtkalias.h" #include <string.h> @@ -949,3 +949,5 @@ _gtk_tool_button_get_button (GtkToolButton *button) return button->priv->button; } +#define __GTK_TOOL_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index dd610dc673..4869f8c876 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -21,13 +21,13 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtktoolitem.h" #include "gtkmarshalers.h" #include "gtktoolbar.h" #include "gtkseparatormenuitem.h" #include "gtkintl.h" #include "gtkmain.h" +#include "gtkalias.h" #include <string.h> @@ -1139,3 +1139,5 @@ _gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item) gtk_widget_queue_resize (GTK_WIDGET (tool_item)); } +#define __GTK_TOOL_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index bb5b345de1..b63f255755 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -29,7 +29,6 @@ #include <string.h> #include <stdio.h> -#include "gtkalias.h" #include "gtklabel.h" #include "gtkmain.h" #include "gtkmenuitem.h" @@ -38,6 +37,7 @@ #include "gtkwindow.h" #include "gtkstyle.h" #include "gtktooltips.h" +#include "gtkalias.h" #define DEFAULT_DELAY 500 /* Default delay in ms */ @@ -795,3 +795,6 @@ gtk_tooltips_get_info_from_tip_window (GtkWindow *tip_window, return has_tips; } + +#define __GTK_TOOLTIPS_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktooltips.h b/gtk/gtktooltips.h index c0ad3b1aa2..75692cb5d0 100644 --- a/gtk/gtktooltips.h +++ b/gtk/gtktooltips.h @@ -31,10 +31,7 @@ #include <gtk/gtkwindow.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_TOOLTIPS (gtk_tooltips_get_type ()) #define GTK_TOOLTIPS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLTIPS, GtkTooltips)) @@ -107,9 +104,6 @@ gboolean gtk_tooltips_get_info_from_tip_window (GtkWindow *tip_window GtkTooltips **tooltips, GtkWidget **current_widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_TOOLTIPS_H__ */ diff --git a/gtk/gtktree.c b/gtk/gtktree.c index 3864d19fca..55bbce15ef 100644 --- a/gtk/gtktree.c +++ b/gtk/gtktree.c @@ -27,7 +27,6 @@ #undef GTK_DISABLE_DEPRECATED #include <config.h> -#include "gtkalias.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtksignal.h" @@ -36,6 +35,7 @@ #define GTK_ENABLE_BROKEN #include "gtktree.h" #include "gtktreeitem.h" +#include "gtkalias.h" enum { SELECTION_CHANGED, @@ -1129,3 +1129,6 @@ gtk_tree_set_view_lines (GtkTree *tree, tree->view_line = flag; } + +#define __GTK_TREE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktree.h b/gtk/gtktree.h index 7aadb31827..7e9da0eb59 100644 --- a/gtk/gtktree.h +++ b/gtk/gtktree.h @@ -36,10 +36,7 @@ #include <gtk/gtkcontainer.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_TREE (gtk_tree_get_type ()) #define GTK_TREE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE, GtkTree)) @@ -128,10 +125,7 @@ void gtk_tree_remove_item (GtkTree *tree, GtkWidget *child); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_TREE_H__ */ diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c index 5f9629487e..a70a53d820 100644 --- a/gtk/gtktreedatalist.c +++ b/gtk/gtktreedatalist.c @@ -21,8 +21,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtktreedatalist.h" +#include "gtkalias.h" #include <string.h> static GMemChunk *tree_chunk = NULL; #define TREE_CHUNK_PREALLOCS 64 diff --git a/gtk/gtktreednd.c b/gtk/gtktreednd.c index 95356c72c7..f6f5380a28 100644 --- a/gtk/gtktreednd.c +++ b/gtk/gtktreednd.c @@ -19,8 +19,8 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtktreednd.h" +#include "gtkalias.h" GType gtk_tree_drag_source_get_type (void) @@ -328,3 +328,6 @@ gtk_tree_get_row_drag_data (GtkSelectionData *selection_data, return TRUE; } + +#define __GTK_TREE_DND_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c index b04edc3387..2c37be54c0 100644 --- a/gtk/gtktreeitem.c +++ b/gtk/gtktreeitem.c @@ -27,7 +27,6 @@ #undef GTK_DISABLE_DEPRECATED #include <config.h> -#include "gtkalias.h" #include "gtklabel.h" #include "gtkeventbox.h" #include "gtkpixmap.h" @@ -37,6 +36,7 @@ #define GTK_ENABLE_BROKEN #include "gtktree.h" #include "gtktreeitem.h" +#include "gtkalias.h" #include "tree_plus.xpm" #include "tree_minus.xpm" @@ -1040,3 +1040,6 @@ gtk_tree_item_forall (GtkContainer *container, if (include_internals && tree_item->pixmaps_box) (* callback) (tree_item->pixmaps_box, callback_data); } + +#define __GTK_TREE_ITEM_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktreeitem.h b/gtk/gtktreeitem.h index beca5321e5..0fef9e21e8 100644 --- a/gtk/gtktreeitem.h +++ b/gtk/gtktreeitem.h @@ -34,10 +34,7 @@ #include <gtk/gtkitem.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_TREE_ITEM (gtk_tree_item_get_type ()) #define GTK_TREE_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItem)) @@ -87,10 +84,7 @@ void gtk_tree_item_expand (GtkTreeItem *tree_item); void gtk_tree_item_collapse (GtkTreeItem *tree_item); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_TREE_ITEM_H__ */ diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 033c5cfc46..f33b3396fc 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -23,11 +23,11 @@ #include <glib.h> #include <glib/gprintf.h> #include <gobject/gvaluecollector.h> -#include "gtkalias.h" #include "gtktreemodel.h" #include "gtktreeview.h" #include "gtktreeprivate.h" #include "gtkmarshalers.h" +#include "gtkalias.h" #define INITIALIZE_TREE_ITER(Iter) \ @@ -2022,3 +2022,6 @@ gtk_tree_row_reference_reordered (GObject *proxy, gtk_tree_row_ref_reordered ((RowRefList *)g_object_get_data (proxy, ROW_REF_DATA_STRING), path, iter, new_order); } + +#define __GTK_TREE_MODEL_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index 3eb71d5ed2..4a2a1645d6 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -19,10 +19,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtktreemodelfilter.h" #include "gtkintl.h" #include "gtktreednd.h" +#include "gtkalias.h" #include <string.h> /* ITER FORMAT: @@ -2875,3 +2875,6 @@ gtk_tree_model_filter_clear_cache (GtkTreeModelFilter *filter) gtk_tree_model_filter_clear_cache_helper (filter, FILTER_LEVEL (filter->priv->root)); } + +#define __GTK_TREE_MODEL_FILTER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index 61cb405f49..8376369c5e 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -40,13 +40,13 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtktreemodelsort.h" #include "gtktreesortable.h" #include "gtktreestore.h" #include "gtktreedatalist.h" #include "gtkintl.h" #include "gtktreednd.h" +#include "gtkalias.h" typedef struct _SortElt SortElt; typedef struct _SortLevel SortLevel; @@ -100,7 +100,7 @@ enum { #define SORT_ELT(sort_elt) ((SortElt *)sort_elt) #define SORT_LEVEL(sort_level) ((SortLevel *)sort_level) -#define GET_CHILD_ITER(tree_model_sort,child_iter,sort_iter) gtk_tree_model_sort_convert_iter_to_child_iter(GTK_TREE_MODEL_SORT (tree_model_sort), child_iter, sort_iter); +#define GET_CHILD_ITER(tree_model_sort,ch_iter,so_iter) gtk_tree_model_sort_convert_iter_to_child_iter(GTK_TREE_MODEL_SORT (tree_model_sort), ch_iter, so_iter); #define NO_SORT_FUNC ((GtkTreeIterCompareFunc) 0x1) @@ -2502,3 +2502,6 @@ gtk_tree_model_sort_iter_is_valid (GtkTreeModelSort *tree_model_sort, return gtk_tree_model_sort_iter_is_valid_helper (iter, tree_model_sort->root); } + +#define __GTK_TREE_MODEL_SORT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index 3e648fc51c..3b9d686e47 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -19,11 +19,11 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtktreeselection.h" #include "gtktreeprivate.h" #include "gtkrbtree.h" #include "gtkmarshalers.h" +#include "gtkalias.h" static void gtk_tree_selection_init (GtkTreeSelection *selection); static void gtk_tree_selection_class_init (GtkTreeSelectionClass *class); @@ -1543,3 +1543,6 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection, return FALSE; } + +#define __GTK_TREE_SELECTION_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c index 8b0f5d6ac6..9d25879352 100644 --- a/gtk/gtktreesortable.c +++ b/gtk/gtktreesortable.c @@ -19,9 +19,9 @@ #include <config.h> -#include "gtkalias.h" #include "gtktreesortable.h" #include "gtkmarshalers.h" +#include "gtkalias.h" static void gtk_tree_sortable_base_init (gpointer g_class); @@ -237,3 +237,6 @@ gtk_tree_sortable_has_default_sort_func (GtkTreeSortable *sortable) return (* iface->has_default_sort_func) (sortable); } + +#define __GTK_TREE_SORTABLE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 642b74c728..ed247bc767 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -20,11 +20,11 @@ #include <config.h> #include <string.h> #include <gobject/gvaluecollector.h> -#include "gtkalias.h" #include "gtktreemodel.h" #include "gtktreestore.h" #include "gtktreedatalist.h" #include "gtktreednd.h" +#include "gtkalias.h" #define G_NODE(node) ((GNode *)node) #define GTK_TREE_STORE_IS_SORTED(tree) (GTK_TREE_STORE (tree)->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID) @@ -2985,3 +2985,6 @@ validate_gnode (GNode* node) iter = iter->next; } } + +#define __GTK_TREE_STORE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index a81e9e9193..28fde73a87 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -22,7 +22,6 @@ #include <string.h> #include <gdk/gdkkeysyms.h> -#include "gtkalias.h" #include "gtktreeview.h" #include "gtkrbtree.h" #include "gtktreednd.h" @@ -42,6 +41,7 @@ #include "gtkentry.h" #include "gtkframe.h" #include "gtktreemodelsort.h" +#include "gtkalias.h" #define GTK_TREE_VIEW_PRIORITY_VALIDATE (GDK_PRIORITY_REDRAW + 5) #define GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC (GTK_TREE_VIEW_PRIORITY_VALIDATE + 2) @@ -13062,3 +13062,5 @@ gtk_tree_view_grab_notify (GtkWidget *widget, tree_view->priv->pressed_button = -1; } +#define __GTK_TREE_VIEW_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index f0e726d9a2..63e80cc585 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -19,7 +19,6 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtktreeviewcolumn.h" #include "gtktreeview.h" #include "gtktreeprivate.h" @@ -31,6 +30,7 @@ #include "gtkmarshalers.h" #include "gtkarrow.h" #include "gtkintl.h" +#include "gtkalias.h" enum { @@ -3660,3 +3660,5 @@ gtk_tree_view_column_cell_get_position (GtkTreeViewColumn *tree_column, return found_cell; } +#define __GTK_TREE_VIEW_COLUMN_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c index 7f2822ed23..5937cd47e8 100644 --- a/gtk/gtktypeutils.c +++ b/gtk/gtktypeutils.c @@ -29,9 +29,9 @@ #include <config.h> #include <string.h> /* strcmp */ -#include "gtkalias.h" #include "gtktypeutils.h" #include "gtkobject.h" +#include "gtkalias.h" /* --- functions --- */ @@ -198,3 +198,6 @@ gtk_type_flags_find_value (GtkType flags_type, return value; } + +#define __GTK_TYPE_UTILS_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 16c2b31816..8fa029353a 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -31,7 +31,6 @@ #include <config.h> #include <string.h> -#include "gtkalias.h" #include "gtkintl.h" #include "gtkmarshalers.h" #include "gtkmenu.h" @@ -42,6 +41,7 @@ #include "gtktearoffmenuitem.h" #include "gtktoolbar.h" #include "gtkuimanager.h" +#include "gtkalias.h" #undef DEBUG_UI_MANAGER @@ -2799,3 +2799,6 @@ gtk_ui_manager_add_ui_from_file (GtkUIManager *self, } #endif + +#define __GTK_UI_MANAGER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c index ee54fec2c0..3fc0a444e0 100644 --- a/gtk/gtkvbbox.c +++ b/gtk/gtkvbbox.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkvbbox.h" +#include "gtkalias.h" static void gtk_vbutton_box_class_init (GtkVButtonBoxClass *klass); @@ -306,4 +306,5 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget, } } - +#define __GTK_VBBOX_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c index ecea06e375..705e217b9e 100644 --- a/gtk/gtkvbox.c +++ b/gtk/gtkvbox.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkvbox.h" +#include "gtkalias.h" static void gtk_vbox_class_init (GtkVBoxClass *klass); @@ -321,3 +321,6 @@ gtk_vbox_size_allocate (GtkWidget *widget, } } } + +#define __GTK_VBOX_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 73cdf9fbbc..22b2ab35ff 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -25,10 +25,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkviewport.h" #include "gtkintl.h" #include "gtkmarshalers.h" +#include "gtkalias.h" enum { PROP_0, @@ -882,3 +882,6 @@ gtk_viewport_style_set (GtkWidget *widget, gtk_style_set_background (widget->style, widget->window, widget->state); } } + +#define __GTK_VIEWPORT_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c index 1ac7e5db72..d0472a6397 100644 --- a/gtk/gtkvpaned.c +++ b/gtk/gtkvpaned.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkvpaned.h" +#include "gtkalias.h" static void gtk_vpaned_class_init (GtkVPanedClass *klass); static void gtk_vpaned_init (GtkVPaned *vpaned); @@ -231,3 +231,6 @@ gtk_vpaned_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (paned->child2, &child_allocation); } } + +#define __GTK_VPANED_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkvruler.c b/gtk/gtkvruler.c index f967df5b40..648ec96143 100644 --- a/gtk/gtkvruler.c +++ b/gtk/gtkvruler.c @@ -27,8 +27,8 @@ #include <config.h> #include <math.h> #include <string.h> -#include "gtkalias.h" #include "gtkvruler.h" +#include "gtkalias.h" #include <glib/gprintf.h> @@ -333,3 +333,6 @@ gtk_vruler_draw_pos (GtkRuler *ruler) } } } + +#define __GTK_VRULER_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index 2efa586d09..cf43170699 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -28,9 +28,9 @@ #include <math.h> #include <stdio.h> #include <stdlib.h> -#include "gtkalias.h" #include "gtkvscale.h" #include "gtkintl.h" +#include "gtkalias.h" #define VALUE_SPACING 2 @@ -259,3 +259,5 @@ gtk_vscale_get_layout_offsets (GtkScale *scale, *y += widget->allocation.y; } +#define __GTK_VSCALE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c index c8bfc32466..714add7a80 100644 --- a/gtk/gtkvscrollbar.c +++ b/gtk/gtkvscrollbar.c @@ -26,10 +26,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkvscrollbar.h" #include "gdk/gdkkeysyms.h" #include "gtkintl.h" +#include "gtkalias.h" static void gtk_vscrollbar_class_init (GtkVScrollbarClass *klass); static void gtk_vscrollbar_init (GtkVScrollbar *vscrollbar); @@ -89,3 +89,6 @@ gtk_vscrollbar_new (GtkAdjustment *adjustment) return vscrollbar; } + +#define __GTK_VSCROLLBAR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c index 27ced34a80..15798991d7 100644 --- a/gtk/gtkvseparator.c +++ b/gtk/gtkvseparator.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkvseparator.h" +#include "gtkalias.h" static void gtk_vseparator_class_init (GtkVSeparatorClass *klass); @@ -101,3 +101,6 @@ gtk_vseparator_expose (GtkWidget *widget, return FALSE; } + +#define __GTK_VSEPARATOR_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 516c869483..e7b528cbbd 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -28,7 +28,6 @@ #include <stdarg.h> #include <string.h> #include <locale.h> -#include "gtkalias.h" #include "gtkcontainer.h" #include "gtkaccelmap.h" #include "gtkclipboard.h" @@ -53,6 +52,7 @@ #include "gtkaccessible.h" #include "gtktooltips.h" #include "gtkinvisible.h" +#include "gtkalias.h" #define WIDGET_CLASS(w) GTK_WIDGET_GET_CLASS (w) #define INIT_PATH_SIZE (512) @@ -1901,7 +1901,12 @@ gtk_widget_unparent (GtkWidget *widget) if (GTK_WIDGET_REALIZED (widget)) { if (GTK_WIDGET_IN_REPARENT (widget)) - gtk_widget_unmap (widget); +#if 1 + { + g_print ("unmapping!\n"); + gtk_widget_unmap (widget); + } +#endif else gtk_widget_unrealize (widget); } @@ -3735,7 +3740,9 @@ gtk_widget_reparent_subwindows (GtkWidget *widget, parent = gdk_window_get_parent (widget->window); - if (parent) + if (parent == NULL) + gdk_window_reparent (widget->window, new_window, 0, 0); + else { children = gdk_window_get_children (parent); @@ -7602,3 +7609,6 @@ gtk_widget_set_no_show_all (GtkWidget *widget, g_object_notify (G_OBJECT (widget), "no_show_all"); } + +#define __GTK_WIDGET_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkwindow-decorate.c b/gtk/gtkwindow-decorate.c index 6a44a26727..60ef4b3278 100644 --- a/gtk/gtkwindow-decorate.c +++ b/gtk/gtkwindow-decorate.c @@ -22,10 +22,11 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkprivate.h" #include "gtkwindow.h" #include "gtkmain.h" +#include "gtkwindow-decorate.h" +#include "gtkalias.h" #ifdef GDK_WINDOWING_FB @@ -830,4 +831,5 @@ gtk_decorated_window_move_resize_window (GtkWindow *window, #endif - +#define __GTK_WINDOW_DECORATE_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkwindow-decorate.h b/gtk/gtkwindow-decorate.h index 2ce21b3140..9f182f457b 100644 --- a/gtk/gtkwindow-decorate.h +++ b/gtk/gtkwindow-decorate.h @@ -21,6 +21,9 @@ * Authors: Alexander Larsson <alexl@redhat.com> */ +#ifndef __GTK_WINDOW_DECORATE_H__ +#define __GTK_WINDOW_DECORATE_H__ + G_BEGIN_DECLS void gtk_decorated_window_init (GtkWindow *window); @@ -34,3 +37,5 @@ void gtk_decorated_window_move_resize_window (GtkWindow *window, gint height); G_END_DECLS + +#endif /* __GTK_WINDOW_DECORATE_H__ */ diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 2001d6f746..1434ccc06c 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -30,7 +30,6 @@ #include "gdk/gdk.h" #include "gdk/gdkkeysyms.h" -#include "gtkalias.h" #include "gtkprivate.h" #include "gtkrc.h" #include "gtkwindow.h" @@ -44,6 +43,7 @@ #include "gtkintl.h" #include "gtkmarshalers.h" #include "gtkplug.h" +#include "gtkalias.h" #ifdef GDK_WINDOWING_X11 #include "x11/gdkx.h" @@ -7506,3 +7506,6 @@ gtk_window_set_default_icon_from_file (const gchar *filename, } #endif + +#define __GTK_WINDOW_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 54d1388bde..177290f216 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -34,10 +34,7 @@ #include <gtk/gtkenums.h> #include <gtk/gtkwidget.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define GTK_TYPE_WINDOW (gtk_window_get_type ()) #define GTK_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow)) @@ -413,9 +410,6 @@ gboolean _gtk_window_query_nonaccels (GtkWindow *window, guint accel_key, GdkModifierType accel_mods); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_WINDOW_H__ */ diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c index 9246b3a81e..4d084f1401 100644 --- a/gtk/gtkxembed.c +++ b/gtk/gtkxembed.c @@ -19,10 +19,10 @@ */ #include <config.h> -#include "gtkalias.h" #include "gtkmain.h" #include "gtkprivate.h" #include "gtkxembed.h" +#include "gtkalias.h" typedef struct _GtkXEmbedMessage GtkXEmbedMessage; diff --git a/gtk/makegtkalias.pl b/gtk/makegtkalias.pl index b1b76d9560..3011a577cc 100755 --- a/gtk/makegtkalias.pl +++ b/gtk/makegtkalias.pl @@ -1,5 +1,12 @@ #!/usr/bin/perl -w +my $do_def = 0; + +if (($#ARGV >= 0) && ($ARGV[0] eq "-def")) { + shift; + $do_def = 1; +} + print <<EOF; /* Generated by makegtkalias.pl */ @@ -9,45 +16,30 @@ print <<EOF; #ifdef G_HAVE_GNUC_VISIBILITY -#ifdef GTK_ENABLE_BROKEN -#define WAS_BROKEN -#endif -#define GTK_ENABLE_BROKEN - -#ifdef GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API -#define WAS_UNSUPPORTED_TEXT_API +#ifndef GTK_DISABLE_DEPRECATED +#define GTK_DISABLE_DEPRECATED +#define REENABLE_DEPRECATED #endif -#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API -#ifdef GTK_DISABLE_DEPRECATED -#define WAS_NO_DEPR -#endif -#undef GTK_DISABLE_DEPRECATED +EOF -#ifdef G_DISABLE_DEPRECATED -#define WAS_NO_G_DEPR -#endif -#undef G_DISABLE_DEPRECATED +if ($do_def) { + print <<EOF +#undef IN_FILE +#define IN_FILE defined -#include "gtk.h" +#undef IN_HEADER +#define IN_HEADER(x) 1 -#include "gtkfilesystem.h" -#ifdef G_OS_UNIX -#include "gtkfilesystemunix.h" -#endif -#ifdef G_OS_WIN32 -#include "gtkfilesystemwin32.h" -#endif -#include "gtkhsv.h" -#include "gtkpathbar.h" -#include "gtktextdisplay.h" -#include "gtktextlayout.h" -#include "gtktextsegment.h" -#include "gtktexttypes.h" -#include "gtkthemes.h" -#include "gtkwindow-decorate.h" +EOF +} +else { + print <<EOF +#define IN_FILE(x) 1 +#define IN_HEADER defined EOF +} my $in_comment = 0; my $in_skipped_section = 0; @@ -86,7 +78,7 @@ while (<>) { next; } - if ($_ =~ /^\#ifdef\s+INCLUDE_VARIABLES/) + if ($_ =~ /^\#ifdef\s+(INCLUDE_VARIABLES|ALL_FILES)/) { $in_skipped_section = 1; } @@ -96,13 +88,20 @@ while (<>) { next; } - if ($_ =~ /^\#ifdef\s+G/) + if ($_ =~ /^\#ifn?def\s+G/) { print $_; next; } + if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/) + { + print $_; + + next; + } + chop; my $str = $_; my @words; @@ -118,40 +117,28 @@ while (<>) { $attributes = "$attributes $word" unless $word eq "PRIVATE"; } - print <<EOF + if (!$do_def) { + print <<EOF extern __typeof ($str) $alias __attribute((visibility("hidden")))$attributes; -extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default"))); \#define $str $alias EOF + } + else { + print <<EOF +\#undef $str +extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default"))); + +EOF + } } print <<EOF; - -#ifndef WAS_BROKEN -#undef GTK_ENABLE_BROKEN -#else -#undef WAS_BROKEN -#endif - -#ifndef WAS_UNSUPPORTED_TEXT_API -#undef GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API -#else -#undef WAS_UNSUPPORTED_TEXT_API -#endif - -#ifdef WAS_NO_DEPR -#define GTK_DISABLE_DEPRECATED -#undef WAS_NO_DEPR -#endif - -#ifdef WAS_NO_G_DEPR -#define G_DISABLE_DEPRECATED -#undef WAS_NO_G_DEPR +#ifdef REENABLE_DEPRECATED +#undef GTK_DISABLE_DEPRECATED #endif #endif /* G_HAVE_GNUC_VISIBILITY */ - #endif /* DISABLE_VISIBILITY */ EOF |