diff options
62 files changed, 1218 insertions, 528 deletions
@@ -1,3 +1,18 @@ +2005-03-15 Matthias Clasen <mclasen@redhat.com> + + Make PLT-reduction work with gcc4, and don't include + everything in gdkalias.h: + + * gdk/gdk.symbols: Group symbols by header and source file. + * gdk/makegdkalias.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 makegdkalias.pl -def + * gdk/Makefile.am (gdkaliasdef.c): Add a rule to generate this + file. + * gdk/*.c, gdk/x11/*.c: Include gdkalias.h after the other + headers, include gdkaliasdef.c at the bottom. + 2005-03-16 Tor Lillqvist <tml@novell.com> * gdk/win32/gdkdisplay-win32.c (_win32_on_clipboard_change): Print diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f2b34ad19..f8256a1a4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +2005-03-15 Matthias Clasen <mclasen@redhat.com> + + Make PLT-reduction work with gcc4, and don't include + everything in gdkalias.h: + + * gdk/gdk.symbols: Group symbols by header and source file. + * gdk/makegdkalias.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 makegdkalias.pl -def + * gdk/Makefile.am (gdkaliasdef.c): Add a rule to generate this + file. + * gdk/*.c, gdk/x11/*.c: Include gdkalias.h after the other + headers, include gdkaliasdef.c at the bottom. + 2005-03-16 Tor Lillqvist <tml@novell.com> * gdk/win32/gdkdisplay-win32.c (_win32_on_clipboard_change): Print diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f2b34ad19..f8256a1a4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +2005-03-15 Matthias Clasen <mclasen@redhat.com> + + Make PLT-reduction work with gcc4, and don't include + everything in gdkalias.h: + + * gdk/gdk.symbols: Group symbols by header and source file. + * gdk/makegdkalias.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 makegdkalias.pl -def + * gdk/Makefile.am (gdkaliasdef.c): Add a rule to generate this + file. + * gdk/*.c, gdk/x11/*.c: Include gdkalias.h after the other + headers, include gdkaliasdef.c at the bottom. + 2005-03-16 Tor Lillqvist <tml@novell.com> * gdk/win32/gdkdisplay-win32.c (_win32_on_clipboard_change): Print diff --git a/gdk/Makefile.am b/gdk/Makefile.am index e6e7898df..a66938a7a 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -177,11 +177,14 @@ uninstall-ms-lib: endif gdk.def: gdk.symbols - (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gdk.def + (echo -e EXPORTS; $(CPP) -P -DALL_FILES -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gdk.def gdkalias.h: gdk.symbols $(PERL) $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h +gdkaliasdef.c: gdk.symbols + $(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c + if OS_LINUX TESTS = abicheck.sh endif @@ -215,6 +218,7 @@ endif #note: not gdkconfig.h BUILT_SOURCES = \ gdkalias.h \ + gdkaliasdef.c \ gdkenumtypes.h \ gdkenumtypes.c \ gdkmarshalers.h \ @@ -235,8 +239,9 @@ stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile && echo timestamp > $(@F) gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile ( cd $(srcdir) && glib-mkenums \ - --fhead "#define GDK_ENABLE_BROKEN\n#include \"gdkalias.h\"\n#include \"gdk.h\"" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ + --fhead "#define GDK_ENABLE_BROKEN\n#include \"gdk.h\"\n#include \"gdkalias.h\"\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --ftail "\n#define __GDK_ENUM_TYPES_C__\n#include \"gdkaliasdef.c\"\n" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh index c902d5f8f..c03f9302b 100755 --- a/gdk/abicheck.sh +++ b/gdk/abicheck.sh @@ -1,5 +1,5 @@ #! /bin/sh -cpp -P -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort > expected-abi +cpp -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort > expected-abi nm -D .libs/libgdk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi diff -u expected-abi actual-abi && rm expected-abi actual-abi @@ -29,7 +29,6 @@ #include <string.h> #include <stdlib.h> -#include "gdkalias.h" #include "gdk.h" #include "gdkinternals.h" #include "gdkintl.h" @@ -37,6 +36,7 @@ #ifndef HAVE_XCONVERTCASE #include "gdkkeysyms.h" #endif +#include "gdkalias.h" typedef struct _GdkPredicate GdkPredicate; @@ -455,3 +455,6 @@ gdk_set_program_class (const char *program_class) gdk_progclass = g_strdup (program_class); } + +#define __GDK_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index e4f5cf3de..2b7b7df04 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -1,125 +1,513 @@ +/* This file lists all exported symbols. It is used to generate + * the gdk.def file used to control exports on Windows and the + * gdkalias.h/gdkaliasdef.c files used to avoid PLT entries for + * internal uses of exported functions (see makegdkalias.pl). + * + * 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. + * + * (This would be much easier if there was a rational 1-1 + * relation between headers and source files.) + */ +#ifdef ALL_FILES +#define IN_FILE(x) 1 +#define IN_HEADER(x) 1 +#endif + +#if IN_HEADER(__GDK_EVENTS_H__) +#if IN_FILE(__GDK_EVENTS_X11_C__) gdk_add_client_message_filter +gdk_event_get_graphics_expose +gdk_events_pending +#endif +#endif + +#if IN_HEADER(__GDK_EVENTS_H__) +#if IN_FILE(__GDK_EVENTS_C__) +gdk_event_copy +gdk_event_free +gdk_event_get +gdk_event_get_axis +gdk_event_get_coords +gdk_event_get_root_coords +gdk_event_get_screen +gdk_event_get_state +gdk_event_get_time +gdk_event_get_type G_GNUC_CONST +gdk_event_handler_set +gdk_event_new +gdk_event_peek +gdk_event_put +gdk_event_set_screen +gdk_get_show_events +gdk_set_show_events +gdk_setting_get +#endif +#endif + +#if IN_HEADER(__GDK_H__) +#if IN_FILE(__GDK_MAIN_X11_C__) +gdk_error_trap_pop +gdk_error_trap_push +gdk_get_display +#ifndef GDK_DISABLE_DEPRECATED +gdk_get_use_xshm +gdk_set_use_xshm +#endif +gdk_keyboard_grab +gdk_keyboard_grab_info_libgtk_only +gdk_pointer_grab +gdk_pointer_grab_info_libgtk_only +#endif +#endif + + +#if IN_HEADER(__GDK_H__) +#if IN_FILE(__GDK_DISPLAY_C__) +gdk_beep +gdk_set_pointer_hooks +gdk_keyboard_ungrab +gdk_pointer_is_grabbed +gdk_pointer_ungrab +gdk_event_send_client_message +gdk_event_send_clientmessage_toall +#endif +#endif + +#if IN_HEADER(__GDK_H__) +#if IN_FILE(__GDK_IM_X11_C__) +#ifndef GDK_DISABLE_DEPRECATED +gdk_mbstowcs +gdk_wcstombs +#endif +gdk_set_locale +#endif +#endif + +#if IN_HEADER(__GDK_H__) +#if IN_FILE(__GDK_EVENTS_X11_C__) +gdk_event_send_client_message_for_display +gdk_flush +#endif +#endif + +#if IN_HEADER(__GDK_H__) +#if IN_FILE(__GDK_DISPLAY_X11_C__) +gdk_notify_startup_complete +#endif +#endif + +#if IN_HEADER(__GDK_H__) +#if IN_FILE(__GDK_RECTANGLE_C__) +gdk_rectangle_get_type +gdk_rectangle_intersect +gdk_rectangle_union +#endif +#endif + +#if IN_HEADER(__GDK_H__) +#if IN_FILE(__GDK_EVENTS_C__) +gdk_set_double_click_time +#endif +#endif + +#if IN_HEADER(__GDK_H__) +#if IN_FILE(__GDK_C__) gdk_add_option_entries_libgtk_only +gdk_get_display_arg_name +gdk_get_program_class +gdk_init +gdk_init_check +#ifndef GDK_DISABLE_DEPRECATED +gdk_exit +#endif +gdk_pre_parse_libgtk_only +gdk_parse_args +gdk_set_program_class +gdk_threads_enter +gdk_threads_init +gdk_threads_leave +gdk_threads_set_lock_functions +#endif +#endif + +#if IN_HEADER(__GDK_H__) +#if IN_FILE(__GDK_INPUT_C__) +#ifndef GDK_DISABLE_DEPRECATED +gdk_input_add +gdk_input_remove +gdk_input_add_full +#endif +#ifdef GTK_COMPILATION +gdk_input_add_full +#endif +#endif +#endif + +#if IN_HEADER(__GDK_H__) +#if IN_FILE(__GDK_SCREEN_C__) +gdk_screen_width G_GNUC_CONST +gdk_screen_width_mm G_GNUC_CONST +gdk_screen_height G_GNUC_CONST +gdk_screen_height_mm G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_PROPERTY_H__) +#if IN_FILE(__GDK_SELECTION_C__) +gdk_string_to_compound_text +gdk_text_property_to_text_list +gdk_text_property_to_utf8_list +gdk_utf8_to_compound_text +#endif +#endif + +#if IN_HEADER(__GDK_PROPERTY_H__) +#if IN_FILE(__GDK_PROPERTY_X11_C__) gdk_atom_intern gdk_atom_name +gdk_property_change +gdk_property_delete +gdk_property_get +#endif +#endif + +#if IN_HEADER(__GDK_PROPERTY_H__) +#if IN_FILE(__GDK_SELECTION_X11_C__) +gdk_free_compound_text +gdk_free_text_list +gdk_string_to_compound_text_for_display +gdk_text_property_to_text_list_for_display +gdk_text_property_to_utf8_list_for_display +gdk_utf8_to_string_target +gdk_utf8_to_compound_text_for_display +#endif +#endif + +#if IN_HEADER(__GDK_ENUM_TYPES_H__) +#if IN_FILE(__GDK_ENUM_TYPES_C__) +gdk_rgb_dither_get_type G_GNUC_CONST +gdk_drag_protocol_get_type G_GNUC_CONST +gdk_input_source_get_type G_GNUC_CONST +gdk_input_condition_get_type G_GNUC_CONST +gdk_input_mode_get_type G_GNUC_CONST gdk_axis_use_get_type G_GNUC_CONST -gdk_beep -gdk_bitmap_create_from_data gdk_byte_order_get_type G_GNUC_CONST gdk_cap_style_get_type G_GNUC_CONST -gdk_char_height -gdk_char_measure +gdk_crossing_mode_get_type G_GNUC_CONST +gdk_extension_mode_get_type G_GNUC_CONST +gdk_event_mask_get_type G_GNUC_CONST +gdk_event_type_get_type G_GNUC_CONST +gdk_fill_get_type G_GNUC_CONST +gdk_fill_rule_get_type G_GNUC_CONST +gdk_filter_return_get_type G_GNUC_CONST +gdk_function_get_type G_GNUC_CONST +gdk_grab_status_get_type G_GNUC_CONST +gdk_gravity_get_type G_GNUC_CONST +gdk_join_style_get_type G_GNUC_CONST +gdk_line_style_get_type G_GNUC_CONST +gdk_modifier_type_get_type G_GNUC_CONST +gdk_notify_type_get_type G_GNUC_CONST +gdk_overlap_type_get_type G_GNUC_CONST +gdk_owner_change_get_type G_GNUC_CONST +gdk_property_state_get_type G_GNUC_CONST +gdk_prop_mode_get_type G_GNUC_CONST +gdk_scroll_direction_get_type G_GNUC_CONST +gdk_setting_action_get_type G_GNUC_CONST +gdk_status_get_type G_GNUC_CONST +gdk_subwindow_mode_get_type G_GNUC_CONST +gdk_visibility_state_get_type G_GNUC_CONST +gdk_wm_decoration_get_type G_GNUC_CONST +gdk_wm_function_get_type G_GNUC_CONST +gdk_font_type_get_type G_GNUC_CONST +gdk_cursor_type_get_type G_GNUC_CONST +gdk_drag_action_get_type G_GNUC_CONST +gdk_gc_values_mask_get_type G_GNUC_CONST +gdk_window_attributes_type_get_type G_GNUC_CONST +gdk_window_class_get_type G_GNUC_CONST +gdk_window_edge_get_type G_GNUC_CONST +gdk_window_hints_get_type G_GNUC_CONST +gdk_window_state_get_type G_GNUC_CONST +gdk_window_type_get_type G_GNUC_CONST +gdk_window_type_hint_get_type G_GNUC_CONST +gdk_image_type_get_type G_GNUC_CONST +gdk_visual_type_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_PIXMAP_H__) +#if IN_FILE(__GDK_PIXMAP_X11_C__) +gdk_bitmap_create_from_data +#endif +#endif + +#if IN_HEADER(__GDK_FONT_H__) +#if IN_FILE(__GDK_FONT_C__) +#ifndef GDK_DISABLE_DEPRECATED +gdk_font_from_description +#endif +gdk_font_get_type G_GNUC_CONST +gdk_font_ref +gdk_font_unref +#ifndef GDK_DISABLE_DEPRECATED +gdk_font_load +gdk_string_width gdk_char_width gdk_char_width_wc -gdk_color_alloc +gdk_string_measure +gdk_text_measure +gdk_char_measure +gdk_string_height +gdk_text_height +gdk_char_height +gdk_string_extents +#endif +#endif +#endif + +#if IN_HEADER(__GDK_FONT_H__) +#if IN_FILE(__GDK_FONT_X11_C__) +#ifndef GDK_DISABLE_DEPRECATED +gdk_text_extents +gdk_text_extents_wc +gdk_text_width +gdk_text_width_wc +gdk_font_get_display +gdk_fontset_load +#endif +gdk_font_id +gdk_font_equal +gdk_font_load_for_display +gdk_font_from_description_for_display +gdk_fontset_load_for_display +#endif +#endif + +#if IN_HEADER(__GDK_COLOR_H__) +#if IN_FILE(__GDK_COLOR_C__) +#ifndef GDK_DISABLE_DEPRECATED +gdk_colors_store +gdk_color_white gdk_color_black -gdk_color_change +gdk_color_alloc +#endif gdk_color_copy gdk_color_equal gdk_color_free gdk_color_get_type G_GNUC_CONST gdk_color_hash gdk_colormap_alloc_color -gdk_colormap_alloc_colors -gdk_colormap_change -gdk_colormap_free_colors -gdk_colormap_get_screen gdk_colormap_get_system -gdk_colormap_get_system_size -gdk_colormap_get_type G_GNUC_CONST gdk_colormap_get_visual -gdk_colormap_new -gdk_colormap_query_color +#ifndef GDK_DISABLE_DEPRECATED gdk_colormap_ref gdk_colormap_unref +#endif gdk_color_parse +#endif +#endif + +#if IN_HEADER(__GDK_COLOR_H__) +#if IN_FILE(__GDK_COLOR_X11_C__) +gdk_colormap_new +gdk_colormap_get_type G_GNUC_CONST +gdk_colormap_change gdk_colors_alloc gdk_colors_free -gdk_colors_store -gdk_color_white -gdk_crossing_mode_get_type G_GNUC_CONST -gdk_cursor_get_display +#ifndef GDK_DISABLE_DEPRECATED +gdk_colormap_get_system_size +gdk_color_change +#endif +gdk_colormap_alloc_colors +gdk_colormap_free_colors +gdk_colormap_query_color +gdk_colormap_get_screen +#endif +#endif + +#if IN_HEADER(__GDK_CURSOR_H__) +#if IN_FILE(__GDK_CURSOR_C__) gdk_cursor_get_type G_GNUC_CONST gdk_cursor_new +gdk_cursor_ref +gdk_cursor_unref +#endif +#endif + +#if IN_HEADER(__GDK_CURSOR_H__) +#if IN_FILE(__GDK_CURSOR_X11_C__) +gdk_cursor_get_display gdk_cursor_new_for_display gdk_cursor_new_from_pixbuf gdk_cursor_new_from_pixmap -gdk_cursor_ref -gdk_cursor_type_get_type G_GNUC_CONST -gdk_cursor_unref +#endif +#endif + +#if IN_HEADER(__GDK_INPUT_H__) +#if IN_FILE(__GDK_INPUT_C__) gdk_device_free_history gdk_device_get_axis -gdk_device_get_core_pointer gdk_device_get_history -gdk_device_get_state gdk_device_get_type G_GNUC_CONST gdk_device_set_axis_use gdk_device_set_key -gdk_device_set_mode gdk_device_set_source gdk_devices_list +gdk_input_set_extension_events +#endif +#endif + +#if IN_HEADER(__GDK_INPUT_H__) +#if IN_FILE(__GDK_DISPLAY_C__) +gdk_device_get_core_pointer +#endif +#endif + +#if IN_HEADER(__GDK_INPUT_H__) +#if IN_FILE(__GDK_INPUT_X11_C__) +gdk_device_get_state +gdk_device_set_mode +#endif +#endif + +#if IN_HEADER(__GDK_DISPLAY_H__) +#if IN_FILE(__GDK_EVENTS_X11_C__) gdk_display_add_client_message_filter -gdk_display_beep +#endif +#endif + +#if IN_HEADER(__GDK_DISPLAY_H__) +#if IN_FILE(__GDK_DISPLAY_C__) gdk_display_close -gdk_display_flush gdk_display_get_core_pointer +gdk_display_get_event +gdk_display_get_pointer +gdk_display_get_type G_GNUC_CONST +gdk_display_get_window_at_pointer +gdk_display_peek_event +gdk_display_put_event +gdk_display_set_pointer_hooks +#endif +#endif + +#if IN_HEADER(__GDK_DISPLAY_H__) +#if IN_FILE(__GDK_WINDOW_X11_C__) +gdk_display_warp_pointer +#endif +#endif + +#if IN_HEADER(__GDK_DISPLAY_H__) +#if IN_FILE(__GDK_DISPLAY_MANAGER_C__) gdk_display_get_default +#endif +#endif + +#if IN_HEADER(__GDK_DISPLAY_H__) +#if IN_FILE(__GDK_CURSOR_X11_C__) gdk_display_get_default_cursor_size +gdk_display_get_maximal_cursor_size +gdk_display_supports_cursor_alpha +gdk_display_supports_cursor_color +#endif +#endif + +#if IN_HEADER(__GDK_DISPLAY_H__) +#if IN_FILE(__GDK_DISPLAY_X11_C__) +gdk_display_beep +gdk_display_sync +gdk_display_flush gdk_display_get_default_group gdk_display_get_default_screen -gdk_display_get_event -gdk_display_get_maximal_cursor_size gdk_display_get_name gdk_display_get_n_screens -gdk_display_get_pointer gdk_display_get_screen -gdk_display_get_type G_GNUC_CONST -gdk_display_get_window_at_pointer -gdk_display_keyboard_ungrab -gdk_display_list_devices -gdk_display_manager_get -gdk_display_manager_get_default_display -gdk_display_manager_get_type G_GNUC_CONST -gdk_display_manager_list_displays -gdk_display_manager_set_default_display -gdk_display_open -gdk_display_open_default_libgtk_only -gdk_display_peek_event gdk_display_pointer_is_grabbed gdk_display_pointer_ungrab -gdk_display_put_event +gdk_display_keyboard_ungrab +gdk_display_open gdk_display_request_selection_notification -gdk_display_set_double_click_distance -gdk_display_set_double_click_time -gdk_display_set_pointer_hooks gdk_display_store_clipboard gdk_display_supports_clipboard_persistence -gdk_display_supports_cursor_alpha -gdk_display_supports_cursor_color gdk_display_supports_selection_notification -gdk_display_sync -gdk_display_warp_pointer +#endif +#endif + +#if IN_HEADER(__GDK_DISPLAY_H__) +#if IN_FILE(__GDK_INPUT_C__) +gdk_display_list_devices +#endif +#endif + +#if IN_HEADER(__GDK_DISPLAY_H__) +#if IN_FILE(__GDK_C__) +gdk_display_open_default_libgtk_only +#endif +#endif + +#if IN_HEADER(__GDK_DISPLAY_H__) +#if IN_FILE(__GDK_EVENTS_C__) +gdk_display_set_double_click_distance +gdk_display_set_double_click_time +#endif +#endif + +#if IN_HEADER(__GDK_DISPLAY_MANAGER_H__) +#if IN_FILE(__GDK_DISPLAY_MANAGER_C__) +gdk_display_manager_get +gdk_display_manager_get_type G_GNUC_CONST +gdk_display_manager_list_displays +gdk_display_manager_set_default_display +gdk_display_manager_get_default_display +#endif +#endif + +#if IN_HEADER(__GDK_DND_H__) +#if IN_FILE(__GDK_DND_X11_C__) gdk_drag_abort -gdk_drag_action_get_type G_GNUC_CONST gdk_drag_begin gdk_drag_context_get_type G_GNUC_CONST gdk_drag_context_new +#ifndef GDK_DISABLE_DEPRECATED gdk_drag_context_ref gdk_drag_context_unref +#endif gdk_drag_drop gdk_drag_drop_succeeded -gdk_drag_find_window gdk_drag_find_window_for_screen -gdk_drag_get_protocol gdk_drag_get_protocol_for_display gdk_drag_get_selection gdk_drag_motion -gdk_drag_protocol_get_type G_GNUC_CONST gdk_drag_status +gdk_drop_finish +gdk_drop_reply +#endif +#endif + +#if IN_HEADER(__GDK_DND_H__) +#if IN_FILE(__GDK_DND_C__) +gdk_drag_find_window +gdk_drag_get_protocol +#endif +#endif + +#if IN_HEADER(__GDK_DRAWABLE_H__) +#if IN_FILE(__GDK_DRAW_C__) +gdk_drawable_set_cairo_target gdk_drawable_copy_to_image gdk_drawable_get_clip_region gdk_drawable_get_colormap +#ifndef GDK_DISABLE_DEPRECATED gdk_drawable_get_data +gdk_drawable_set_data +gdk_drawable_ref +gdk_drawable_unref +gdk_draw_string +#endif gdk_drawable_get_depth gdk_drawable_get_display gdk_drawable_get_image @@ -128,21 +516,12 @@ gdk_drawable_get_size gdk_drawable_get_type G_GNUC_CONST gdk_drawable_get_visible_region gdk_drawable_get_visual -gdk_drawable_ref gdk_drawable_set_colormap -gdk_drawable_set_data -gdk_drawable_unref gdk_draw_arc gdk_draw_drawable gdk_draw_glyphs gdk_draw_glyphs_transformed -gdk_draw_gray_image gdk_draw_image -gdk_draw_indexed_image -gdk_draw_layout -gdk_draw_layout_line -gdk_draw_layout_line_with_colors -gdk_draw_layout_with_colors gdk_draw_line gdk_draw_lines gdk_draw_pixbuf @@ -150,162 +529,298 @@ gdk_draw_point gdk_draw_points gdk_draw_polygon gdk_draw_rectangle -gdk_draw_rectangle_alpha_libgtk_only -gdk_draw_rgb_32_image -gdk_draw_rgb_32_image_dithalign -gdk_draw_rgb_image -gdk_draw_rgb_image_dithalign gdk_draw_segments -gdk_draw_string gdk_draw_text gdk_draw_text_wc gdk_draw_trapezoids -gdk_drop_finish -gdk_drop_reply -gdk_error_trap_pop -gdk_error_trap_push -gdk_event_copy -gdk_event_free -gdk_event_get -gdk_event_get_axis -gdk_event_get_coords -gdk_event_get_graphics_expose -gdk_event_get_root_coords -gdk_event_get_screen -gdk_event_get_state -gdk_event_get_time -gdk_event_get_type G_GNUC_CONST -gdk_event_handler_set -gdk_event_mask_get_type G_GNUC_CONST -gdk_event_new -gdk_event_peek -gdk_event_put -gdk_event_send_client_message -gdk_event_send_client_message_for_display -gdk_event_send_clientmessage_toall -gdk_event_set_screen -gdk_events_pending -gdk_event_type_get_type G_GNUC_CONST -gdk_exit -gdk_extension_mode_get_type G_GNUC_CONST -gdk_fill_get_type G_GNUC_CONST -gdk_fill_rule_get_type G_GNUC_CONST -gdk_filter_return_get_type G_GNUC_CONST -gdk_flush -gdk_font_equal -gdk_font_from_description -gdk_font_from_description_for_display -gdk_font_get_display -gdk_font_get_type G_GNUC_CONST -gdk_font_id -gdk_font_load -gdk_font_load_for_display -gdk_font_ref -gdk_fontset_load -gdk_fontset_load_for_display -gdk_font_type_get_type G_GNUC_CONST -gdk_font_unref -gdk_free_compound_text -gdk_free_text_list -gdk_function_get_type G_GNUC_CONST -gdk_gc_copy -gdk_gc_get_colormap -gdk_gc_get_screen -gdk_gc_get_type G_GNUC_CONST -gdk_gc_get_values +#endif +#endif + +#if IN_HEADER(__GDK_DRAWABLE_H__) +#if IN_FILE(__GDK_DRAWABLE_X11_C__) +gdk_draw_rectangle_alpha_libgtk_only +#endif +#endif + +#if IN_HEADER(__GDK_DRAWABLE_H__) +#if IN_FILE(__GDK_PANGO_C__) +gdk_draw_layout +gdk_draw_layout_line +gdk_draw_layout_line_with_colors +gdk_draw_layout_with_colors +#endif +#endif + +#if IN_HEADER(__GDK_GC_H__) +#if IN_FILE(__GDK_GC_C__) gdk_gc_new +gdk_gc_get_type G_GNUC_CONST gdk_gc_new_with_values -gdk_gc_offset +#ifndef GDK_DISABLE_DEPRECATED gdk_gc_ref -gdk_gc_set_background -gdk_gc_set_clip_mask -gdk_gc_set_clip_origin -gdk_gc_set_clip_rectangle -gdk_gc_set_clip_region -gdk_gc_set_colormap -gdk_gc_set_dashes -gdk_gc_set_exposures -gdk_gc_set_fill +gdk_gc_unref gdk_gc_set_font +#endif +gdk_gc_get_values +gdk_gc_set_values gdk_gc_set_foreground +gdk_gc_set_background gdk_gc_set_function +gdk_gc_set_fill +gdk_gc_set_tile +gdk_gc_set_stipple +gdk_gc_set_ts_origin +gdk_gc_set_clip_origin +gdk_gc_set_clip_mask +gdk_gc_set_subwindow +gdk_gc_set_exposures gdk_gc_set_line_attributes +gdk_gc_set_dashes +gdk_gc_offset +gdk_gc_get_colormap +gdk_gc_set_colormap gdk_gc_set_rgb_bg_color gdk_gc_set_rgb_fg_color -gdk_gc_set_stipple -gdk_gc_set_subwindow -gdk_gc_set_tile -gdk_gc_set_ts_origin -gdk_gc_set_values -gdk_gc_unref -gdk_gc_values_mask_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_GC_H__) +#if IN_FILE(__GDK_GC_X11_C__) +gdk_gc_copy +gdk_gc_get_screen +gdk_gc_set_clip_rectangle +gdk_gc_set_clip_region +#endif +#endif + +#if IN_HEADER(__GDK_WINDOW_X11_H__) +#if IN_FILE(__GDK_WINDOW_X11_C__) +#ifdef GDK_WINDOWING_X11 +gdk_window_impl_x11_get_type G_GNUC_CONST +#endif +#endif +#endif + +#if IN_HEADER(__GDK_WINDOW_H__) +#if IN_FILE(__GDK_WINDOW_C__) gdk_get_default_root_window -gdk_get_display -gdk_get_display_arg_name -gdk_get_program_class -gdk_get_show_events -gdk_get_use_xshm -gdk_grab_status_get_type G_GNUC_CONST -gdk_gravity_get_type G_GNUC_CONST +gdk_window_add_filter +gdk_window_at_pointer +gdk_window_begin_paint_rect +gdk_window_begin_paint_region +gdk_window_clear +gdk_window_clear_area +gdk_window_clear_area_e +gdk_window_constrain_size +gdk_window_destroy +#ifndef GDK_DISABLE_DEPRECATED +gdk_window_destroy_notify +#endif +gdk_window_end_paint +gdk_window_foreign_new +gdk_window_freeze_updates +gdk_window_get_children +gdk_window_get_internal_paint_info +gdk_window_get_parent +gdk_window_get_pointer +gdk_window_get_position +gdk_window_get_state +gdk_window_get_toplevel +gdk_window_get_toplevels +gdk_window_get_update_area +gdk_window_get_user_data +gdk_window_get_window_type +gdk_window_invalidate_maybe_recurse +gdk_window_invalidate_rect +gdk_window_invalidate_region +gdk_window_is_viewable +gdk_window_is_visible +gdk_window_object_get_type G_GNUC_CONST +gdk_window_peek_children +gdk_window_process_all_updates +gdk_window_process_updates +gdk_window_remove_filter +gdk_window_set_debug_updates +gdk_window_set_user_data +gdk_window_thaw_updates +#endif +#endif + +#if IN_HEADER(__GDK_WINDOW_H__) +#if IN_FILE(__GDK_DND_X11_C__) +gdk_window_register_dnd +#endif +#endif + +#if IN_HEADER(__GDK_WINDOW_H__) +#if IN_FILE(__GDK_GEOMETRY_X11_C__) +gdk_window_scroll +#endif +#endif + +#if IN_HEADER(__GDK_WINDOW_H__) +#if IN_FILE(__GDK_WINDOW_X11_C__) +gdk_window_new +gdk_window_foreign_new_for_display +gdk_window_lookup +gdk_window_lookup_for_display +gdk_window_show_unraised +gdk_window_show +gdk_window_hide +gdk_window_withdraw +gdk_window_move +gdk_window_resize +gdk_window_move_resize +gdk_window_reparent +gdk_window_raise +gdk_window_lower +gdk_window_focus +#ifndef GDK_DISABLE_DEPRECATED +gdk_window_set_hints +gdk_window_get_deskrelative_origin +#endif +gdk_window_set_type_hint +gdk_window_set_modal_hint +gdk_window_set_skip_taskbar_hint +gdk_window_set_skip_pager_hint +gdk_window_set_geometry_hints +gdk_window_set_title +gdk_window_set_role +gdk_window_set_transient_for +gdk_window_set_background +gdk_window_set_back_pixmap +gdk_window_set_cursor +gdk_window_get_geometry +gdk_window_get_origin +gdk_window_get_root_origin +gdk_window_get_frame_extents +gdk_window_get_events +gdk_window_set_events +gdk_window_shape_combine_mask +gdk_window_shape_combine_region +gdk_window_set_override_redirect +gdk_window_set_accept_focus +gdk_window_set_focus_on_map +gdk_window_set_icon_list +gdk_window_set_icon +gdk_window_set_icon_name +gdk_window_iconify +gdk_window_deiconify +gdk_window_stick +gdk_window_unstick +gdk_window_maximize +gdk_window_unmaximize +gdk_window_fullscreen +gdk_window_unfullscreen +gdk_window_set_keep_above +gdk_window_set_keep_below +gdk_window_get_group +gdk_window_set_group +gdk_window_get_decorations +gdk_window_set_decorations +gdk_window_set_functions +gdk_window_set_child_shapes +gdk_window_merge_child_shapes +gdk_window_set_static_gravities +gdk_window_begin_move_drag +gdk_window_begin_resize_drag +gdk_window_enable_synchronized_configure +gdk_window_configure_finished +#endif +#endif + +#if IN_HEADER(__GDK_IMAGE_H__) +#if IN_FILE(__GDK_IMAGE_C__) +#ifndef GDK_DISABLE_DEPRECATED +gdk_image_ref +gdk_image_unref gdk_image_get +#endif +gdk_image_set_colormap gdk_image_get_colormap -gdk_image_get_pixel -gdk_image_get_type G_GNUC_CONST gdk_image_new +#endif +#endif + +#if IN_HEADER(__GDK_IMAGE_H__) +#if IN_FILE(__GDK_IMAGE_X11_C__) +#ifdef GDK_ENABLE_BROKEN gdk_image_new_bitmap +#endif +gdk_image_get_pixel gdk_image_put_pixel -gdk_image_ref -gdk_image_set_colormap -gdk_image_type_get_type G_GNUC_CONST -gdk_image_unref -gdk_init -gdk_init_check -gdk_input_add -gdk_input_add_full -gdk_input_condition_get_type G_GNUC_CONST -gdk_input_mode_get_type G_GNUC_CONST -gdk_input_remove -gdk_input_set_extension_events -gdk_input_source_get_type G_GNUC_CONST -gdk_join_style_get_type G_GNUC_CONST -gdk_keyboard_grab -gdk_keyboard_grab_info_libgtk_only -gdk_keyboard_ungrab +gdk_image_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_KEYS_H__) +#if IN_FILE(__GDK_KEYS_C__) gdk_keymap_get_default +gdk_keymap_get_type G_GNUC_CONST +gdk_keyval_is_lower G_GNUC_CONST +gdk_keyval_is_upper G_GNUC_CONST +gdk_keyval_to_lower G_GNUC_CONST +gdk_keyval_to_upper G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_KEYS_H__) +#if IN_FILE(__GDK_KEYUNI_C__) +gdk_keyval_to_unicode G_GNUC_CONST +gdk_unicode_to_keyval G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_KEYS_H__) +#if IN_FILE(__GDK_KEYS_X11_C__) gdk_keymap_get_direction gdk_keymap_get_entries_for_keycode gdk_keymap_get_entries_for_keyval gdk_keymap_get_for_display -gdk_keymap_get_type G_GNUC_CONST gdk_keymap_lookup_key gdk_keymap_translate_keyboard_state gdk_keyval_convert_case gdk_keyval_from_name -gdk_keyval_is_lower G_GNUC_CONST -gdk_keyval_is_upper G_GNUC_CONST gdk_keyval_name G_GNUC_CONST -gdk_keyval_to_lower G_GNUC_CONST -gdk_keyval_to_unicode G_GNUC_CONST -gdk_keyval_to_upper G_GNUC_CONST -gdk_line_style_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_VISUAL_H__) +#if IN_FILE(__GDK_VISUAL_C__) gdk_list_visuals -gdk_mbstowcs -gdk_modifier_type_get_type G_GNUC_CONST -#ifdef GDK_WINDOWING_X11 -gdk_net_wm_supports +gdk_visual_get_system #endif -#ifdef GDK_WINDOWING_WIN32 +#endif + +#if IN_HEADER(__GDK_VISUAL_H__) +#if IN_FILE(__GDK_VISUAL_X11_C__) +gdk_query_depths +gdk_query_visual_types +gdk_visual_get_best +gdk_visual_get_best_depth +gdk_visual_get_best_type +gdk_visual_get_best_with_both +gdk_visual_get_best_with_depth +gdk_visual_get_best_with_type +gdk_visual_get_screen +gdk_visual_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_X_H__) +#if IN_FILE(__GDK_EVENTS_X11_C__) gdk_net_wm_supports #endif -gdk_notify_startup_complete -gdk_notify_type_get_type G_GNUC_CONST -gdk_overlap_type_get_type G_GNUC_CONST -gdk_owner_change_get_type G_GNUC_CONST +#endif + +#if IN_HEADER(__GDK_PANGO_H__) +#if IN_FILE(__GDK_PANGO_C__) gdk_pango_attr_embossed_new gdk_pango_attr_stipple_new gdk_pango_context_get -gdk_pango_context_get_for_screen +#ifndef GDK_DISABLE_DEPRECATED gdk_pango_context_set_colormap +#endif gdk_pango_layout_get_clip_region gdk_pango_layout_line_get_clip_region gdk_pango_renderer_get_default @@ -315,40 +830,57 @@ gdk_pango_renderer_set_drawable gdk_pango_renderer_set_gc gdk_pango_renderer_set_override_color gdk_pango_renderer_set_stipple -gdk_parse_args +#endif +#endif + +#if IN_HEADER(__GDK_PANGO_H__) +#if IN_FILE(__GDK_PANGO_X11_C__) +gdk_pango_context_get_for_screen +#endif +#endif + +#if IN_HEADER(__GDK_PIXBUF_H__) +#if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__) gdk_pixbuf_get_from_drawable gdk_pixbuf_get_from_image +#endif +#endif + +#if IN_HEADER(__GDK_PIXBUF_H__) +#if IN_FILE(__GDK_PIXBUF_RENDER_C__) gdk_pixbuf_render_pixmap_and_mask gdk_pixbuf_render_pixmap_and_mask_for_colormap gdk_pixbuf_render_threshold_alpha +#ifndef GDK_DISABLE_DEPRECATED gdk_pixbuf_render_to_drawable gdk_pixbuf_render_to_drawable_alpha +#endif +#endif +#endif + +#if IN_HEADER(__GDK_PIXMAP_H__) +#if IN_FILE(__GDK_PIXMAP_C__) gdk_pixmap_colormap_create_from_xpm -gdk_pixmap_colormap_create_from_xpm_d -gdk_pixmap_create_from_data gdk_pixmap_create_from_xpm +gdk_pixmap_colormap_create_from_xpm_d gdk_pixmap_create_from_xpm_d +gdk_pixmap_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_PIXMAP_H__) +#if IN_FILE(__GDK_PIXMAP_X11_C__) +gdk_pixmap_create_from_data gdk_pixmap_foreign_new gdk_pixmap_foreign_new_for_display -gdk_pixmap_get_type G_GNUC_CONST gdk_pixmap_lookup gdk_pixmap_lookup_for_display gdk_pixmap_new -gdk_pointer_grab -gdk_pointer_grab_info_libgtk_only -gdk_pointer_is_grabbed -gdk_pointer_ungrab -gdk_pre_parse_libgtk_only -gdk_property_change -gdk_property_delete -gdk_property_get -gdk_property_state_get_type G_GNUC_CONST -gdk_prop_mode_get_type G_GNUC_CONST -gdk_query_depths -gdk_query_visual_types -gdk_rectangle_get_type G_GNUC_CONST -gdk_rectangle_intersect -gdk_rectangle_union +#endif +#endif + +#if IN_HEADER(__GDK_REGION_H__) +#if IN_FILE(__GDK_REGION_GENERIC_C__) gdk_region_copy gdk_region_destroy gdk_region_empty @@ -359,7 +891,6 @@ gdk_region_intersect gdk_region_new gdk_region_offset gdk_region_point_in -gdk_region_polygon gdk_region_rectangle gdk_region_rect_in gdk_region_shrink @@ -368,279 +899,262 @@ gdk_region_subtract gdk_region_union gdk_region_union_with_rect gdk_region_xor +#endif +#endif + +#if IN_HEADER(__GDK_REGION_H__) +#if IN_FILE(__GDK_POLYREG_GENERIC_C__) +gdk_region_polygon +#endif +#endif + +#if IN_HEADER(__GDK_RGB_H__) +#if IN_FILE(__GDK_RGB_C__) gdk_rgb_cmap_free gdk_rgb_cmap_new gdk_rgb_colormap_ditherable gdk_rgb_ditherable -gdk_rgb_dither_get_type G_GNUC_CONST gdk_rgb_find_color -gdk_rgb_gc_set_background -gdk_rgb_gc_set_foreground gdk_rgb_get_colormap gdk_rgb_get_visual +#ifndef GDK_DISABLE_DEPRECATED gdk_rgb_init +gdk_rgb_xpixel_from_rgb G_GNUC_CONST +gdk_rgb_gc_set_background +gdk_rgb_gc_set_foreground +#endif gdk_rgb_set_install gdk_rgb_set_min_colors gdk_rgb_set_verbose -gdk_rgb_xpixel_from_rgb G_GNUC_CONST -gdk_screen_broadcast_client_message -gdk_screen_get_default -gdk_screen_get_default_colormap -gdk_screen_get_display -gdk_screen_get_height -gdk_screen_get_height_mm +gdk_draw_gray_image +gdk_draw_indexed_image +gdk_draw_rgb_32_image +gdk_draw_rgb_32_image_dithalign +gdk_draw_rgb_image +gdk_draw_rgb_image_dithalign +#endif +#endif + +#if IN_HEADER(__GDK_SCREEN_H__) +#if IN_FILE(__GDK_SCREEN_C__) +gdk_screen_get_type G_GNUC_CONST gdk_screen_get_monitor_at_point gdk_screen_get_monitor_at_window -gdk_screen_get_monitor_geometry -gdk_screen_get_n_monitors -gdk_screen_get_number +#endif +#endif + +#if IN_HEADER(__GDK_SCREEN_H__) +#if IN_FILE(__GDK_DISPLAY_MANAGER_C__) +gdk_screen_get_default +#endif +#endif + +#if IN_HEADER(__GDK_SCREEN_H__) +#if IN_FILE(__GDK_RGB_C__) gdk_screen_get_rgb_colormap gdk_screen_get_rgb_visual -gdk_screen_get_root_window +#endif +#endif + +#if IN_HEADER(__GDK_SCREEN_H__) +#if IN_FILE(__GDK_EVENTS_X11_C__) gdk_screen_get_setting -gdk_screen_get_system_colormap +gdk_screen_broadcast_client_message +#endif +#endif + +#if IN_HEADER(__GDK_SCREEN_H__) +#if IN_FILE(__GDK_VISUAL_X11_C__) gdk_screen_get_system_visual +gdk_screen_list_visuals +#endif +#endif + +#if IN_HEADER(__GDK_SCREEN_H__) +#if IN_FILE(__GDK_WINDOW_C__) gdk_screen_get_toplevel_windows -gdk_screen_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_SCREEN_H__) +#if IN_FILE(__GDK_SCREEN_X11_C__) +gdk_screen_get_display gdk_screen_get_width gdk_screen_get_width_mm -gdk_screen_height G_GNUC_CONST -gdk_screen_height_mm G_GNUC_CONST -gdk_screen_list_visuals -gdk_screen_make_display_name +gdk_screen_get_height +gdk_screen_get_height_mm +gdk_screen_get_number +gdk_screen_get_root_window +gdk_screen_get_default_colormap gdk_screen_set_default_colormap -gdk_screen_width G_GNUC_CONST -gdk_screen_width_mm G_GNUC_CONST -gdk_scroll_direction_get_type G_GNUC_CONST -gdk_selection_convert +gdk_screen_get_n_monitors +gdk_screen_get_monitor_geometry +gdk_screen_make_display_name +#endif +#endif + +#if IN_HEADER(__GDK_SCREEN_H__) +#if IN_FILE(__GDK_COLOR_X11_C__) +gdk_screen_get_system_colormap +#endif +#endif + +#if IN_HEADER(__GDK_SELECTION_H__) +#if IN_FILE(__GDK_SELECTION_C__) +gdk_selection_owner_set gdk_selection_owner_get +gdk_selection_send_notify +#endif +#endif + +#if IN_HEADER(__GDK_SELECTION_H__) +#if IN_FILE(__GDK_SELECTION_X11_C__) +gdk_selection_convert gdk_selection_owner_get_for_display -gdk_selection_owner_set gdk_selection_owner_set_for_display gdk_selection_property_get -gdk_selection_send_notify gdk_selection_send_notify_for_display -gdk_set_double_click_time -gdk_set_locale -gdk_set_pointer_hooks -gdk_set_program_class -gdk_set_show_events +#endif +#endif + +#if IN_HEADER(__GDK_WINDOW_H__) +#if IN_FILE(__GDK_DISPLAY_C__) gdk_set_sm_client_id -gdk_setting_action_get_type G_GNUC_CONST -gdk_setting_get -gdk_set_use_xshm +#endif +#endif + +#if IN_HEADER(__GDK_SPAWN_H__) +#if IN_FILE(__GDK_SPAWN_X11_C__) gdk_spawn_command_line_on_screen gdk_spawn_on_screen gdk_spawn_on_screen_with_pipes -gdk_status_get_type G_GNUC_CONST -gdk_string_extents -gdk_string_height -gdk_string_measure -gdk_string_to_compound_text -gdk_string_to_compound_text_for_display -gdk_string_width -gdk_subwindow_mode_get_type G_GNUC_CONST +#endif +#endif + +#if IN_HEADER(__GDK_PRIVATE_H__) +#if IN_FILE(__GDK_EVENTS_C__) gdk_synthesize_window_state -gdk_text_extents -gdk_text_extents_wc -gdk_text_height -gdk_text_measure -gdk_text_property_to_text_list -gdk_text_property_to_text_list_for_display -gdk_text_property_to_utf8_list -gdk_text_property_to_utf8_list_for_display -gdk_text_width -gdk_text_width_wc -gdk_threads_enter -gdk_threads_init -gdk_threads_leave -#ifdef INCLUDE_VARIABLES -gdk_threads_mutex -gdk_threads_lock -gdk_threads_unlock #endif -gdk_threads_set_lock_functions -gdk_unicode_to_keyval G_GNUC_CONST -gdk_utf8_to_compound_text -gdk_utf8_to_compound_text_for_display -gdk_utf8_to_string_target -gdk_visibility_state_get_type G_GNUC_CONST -gdk_visual_get_best -gdk_visual_get_best_depth -gdk_visual_get_best_type -gdk_visual_get_best_with_both -gdk_visual_get_best_with_depth -gdk_visual_get_best_with_type -gdk_visual_get_screen -gdk_visual_get_system -gdk_visual_get_type G_GNUC_CONST -gdk_visual_type_get_type G_GNUC_CONST -gdk_wcstombs +#endif + #ifdef GDK_WINDOWING_WIN32 -gdk_win32_drawable_get_handle +#if IN_HEADER(__GDK_WIN32_H__) +#if IN_FILE(__GDK_WIN32ID_C__) gdk_win32_handle_table_lookup +#endif +#endif + +#if IN_HEADER(__GDK_WIN32_H__) +#if IN_FILE(__GDK_DRAWABLE_WIN32_C__) +gdk_win32_drawable_get_handle +#endif +#endif + +#if IN_HEADER(__GDK_WIN32_H__) +#if IN_FILE(__GDK_GC_WIN32_C__) gdk_win32_hdc_get gdk_win32_hdc_release #endif -gdk_window_add_filter -gdk_window_at_pointer -gdk_window_attributes_type_get_type G_GNUC_CONST -gdk_window_begin_move_drag -gdk_window_begin_paint_rect -gdk_window_begin_paint_region -gdk_window_begin_resize_drag -gdk_window_class_get_type G_GNUC_CONST -gdk_window_clear -gdk_window_clear_area -gdk_window_clear_area_e -gdk_window_configure_finished -gdk_window_constrain_size -gdk_window_deiconify -gdk_window_destroy -gdk_window_destroy_notify -gdk_window_edge_get_type G_GNUC_CONST -gdk_window_enable_synchronized_configure -gdk_window_end_paint -gdk_window_focus -gdk_window_foreign_new -gdk_window_foreign_new_for_display -gdk_window_freeze_updates -gdk_window_fullscreen -gdk_window_get_children -gdk_window_get_decorations -gdk_window_get_deskrelative_origin -gdk_window_get_events -gdk_window_get_frame_extents -gdk_window_get_geometry -gdk_window_get_group -gdk_window_get_internal_paint_info -gdk_window_get_origin -gdk_window_get_parent -gdk_window_get_pointer -gdk_window_get_position -gdk_window_get_root_origin -gdk_window_get_state -gdk_window_get_toplevel -gdk_window_get_toplevels -gdk_window_get_update_area -gdk_window_get_user_data -gdk_window_get_window_type -gdk_window_hide -gdk_window_hints_get_type G_GNUC_CONST -gdk_window_iconify -#ifdef GDK_WINDOWING_X11 -gdk_window_impl_x11_get_type G_GNUC_CONST #endif -gdk_window_invalidate_maybe_recurse -gdk_window_invalidate_rect -gdk_window_invalidate_region -gdk_window_is_viewable -gdk_window_is_visible -gdk_window_lookup -gdk_window_lookup_for_display -gdk_window_lower -gdk_window_maximize -gdk_window_merge_child_shapes -gdk_window_move -gdk_window_move_resize -gdk_window_new -gdk_window_object_get_type G_GNUC_CONST -gdk_window_peek_children -gdk_window_process_all_updates -gdk_window_process_updates -gdk_window_raise -gdk_window_register_dnd -gdk_window_remove_filter -gdk_window_reparent -gdk_window_resize -gdk_window_scroll -gdk_window_set_accept_focus -gdk_window_set_background -gdk_window_set_back_pixmap -gdk_window_set_child_shapes -gdk_window_set_cursor -gdk_window_set_debug_updates -gdk_window_set_decorations -gdk_window_set_events -gdk_window_set_focus_on_map -gdk_window_set_functions -gdk_window_set_geometry_hints -gdk_window_set_group -gdk_window_set_hints -gdk_window_set_icon -gdk_window_set_icon_list -gdk_window_set_icon_name -gdk_window_set_keep_above -gdk_window_set_keep_below -gdk_window_set_modal_hint -gdk_window_set_override_redirect -gdk_window_set_role -gdk_window_set_skip_pager_hint -gdk_window_set_skip_taskbar_hint -gdk_window_set_static_gravities -gdk_window_set_title -gdk_window_set_transient_for -gdk_window_set_type_hint -gdk_window_set_user_data -gdk_window_shape_combine_mask -gdk_window_shape_combine_region -gdk_window_show -gdk_window_show_unraised -gdk_window_state_get_type G_GNUC_CONST -gdk_window_stick -gdk_window_thaw_updates -gdk_window_type_get_type G_GNUC_CONST -gdk_window_type_hint_get_type G_GNUC_CONST -gdk_window_unfullscreen -gdk_window_unmaximize -gdk_window_unstick -gdk_window_withdraw -gdk_wm_decoration_get_type G_GNUC_CONST -gdk_wm_function_get_type G_GNUC_CONST +#endif + #ifdef GDK_WINDOWING_X11 +#if IN_HEADER(__GDK_X_H__) +#if IN_FILE(__GDK_PROPERTY_X11_C__) gdk_x11_atom_to_xatom gdk_x11_atom_to_xatom_for_display +gdk_x11_get_xatom_by_name +gdk_x11_get_xatom_by_name_for_display +gdk_x11_get_xatom_name +gdk_x11_get_xatom_name_for_display +gdk_x11_xatom_to_atom +gdk_x11_xatom_to_atom_for_display +#endif + +#if IN_FILE(__GDK_COLOR_X11_C__) gdk_x11_colormap_foreign_new gdk_x11_colormap_get_xcolormap gdk_x11_colormap_get_xdisplay +#ifdef GDK_ENABLE_BROKEN +gdkx_colormap_get +#endif +#endif + +#if IN_FILE(__GDK_CURSOR_X11_C__) gdk_x11_cursor_get_xcursor gdk_x11_cursor_get_xdisplay +#endif + +#if IN_FILE(__GDK_DISPLAY_X11_C__) gdk_x11_display_get_user_time gdk_x11_display_get_xdisplay gdk_x11_display_grab gdk_x11_display_ungrab +gdk_x11_lookup_xdisplay +#endif + +#if IN_FILE(__GDK_DRAWABLE_X11_C__) gdk_x11_drawable_get_xdisplay gdk_x11_drawable_get_xid +#endif + +#if IN_FILE(__GDK_FONT_X11_C__) +#ifndef GDK_DISABLE_DEPRECATED gdk_x11_font_get_name gdk_x11_font_get_xdisplay +#endif gdk_x11_font_get_xfont +#endif + +#if IN_FILE(__GDK_GC_X11_C__) gdk_x11_gc_get_xdisplay gdk_x11_gc_get_xgc +#endif + +#if IN_FILE(__GDK_MAIN_X11_C__) gdk_x11_get_default_root_xwindow gdk_x11_get_default_screen gdk_x11_get_default_xdisplay -gdk_x11_get_server_time -gdk_x11_get_xatom_by_name -gdk_x11_get_xatom_by_name_for_display -gdk_x11_get_xatom_name -gdk_x11_get_xatom_name_for_display gdk_x11_grab_server +gdk_x11_ungrab_server +#endif + +#if IN_FILE(__GDK_EVENTS_X11_C__) +gdk_x11_get_server_time +gdk_x11_register_standard_event_type +gdk_x11_screen_get_window_manager_name +gdk_x11_screen_supports_net_wm_hint +#endif + +#if IN_FILE(__GDK_IMAGE_X11_C__) gdk_x11_image_get_xdisplay gdk_x11_image_get_ximage -gdk_x11_lookup_xdisplay -gdk_x11_register_standard_event_type +#endif + +#if IN_FILE(__GDK_SCREEN_X11_C__) gdk_x11_screen_get_screen_number -gdk_x11_screen_get_window_manager_name gdk_x11_screen_get_xscreen +#endif + +#if IN_FILE(__GDK_VISUAL_X11_C__) gdk_x11_screen_lookup_visual -gdk_x11_screen_supports_net_wm_hint -gdk_x11_ungrab_server gdk_x11_visual_get_xvisual +gdkx_visual_get +#endif + +#if IN_FILE(__GDK_WINDOW_X11_C__) gdk_x11_window_set_user_time -gdk_x11_xatom_to_atom -gdk_x11_xatom_to_atom_for_display -gdkx_colormap_get +#endif + +#if IN_FILE(__GDK_XID_C__) gdk_xid_table_lookup gdk_xid_table_lookup_for_display -gdkx_visual_get +#endif +#endif +#endif + +#ifdef INCLUDE_VARIABLES +gdk_threads_mutex +gdk_threads_lock +gdk_threads_unlock #endif diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c index 56bd84851..d2a4a55ca 100644 --- a/gdk/gdkcolor.c +++ b/gdk/gdkcolor.c @@ -27,10 +27,10 @@ #include <config.h> #include <time.h> -#include "gdkalias.h" #include "gdkscreen.h" #include "gdkcolor.h" #include "gdkinternals.h" +#include "gdkalias.h" /** * gdk_colormap_ref: @@ -371,3 +371,5 @@ gdk_colormap_get_system (void) return gdk_screen_get_system_colormap (gdk_screen_get_default ()); } +#define __GDK_COLOR_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c index 2329a7a46..1038d7347 100644 --- a/gdk/gdkcursor.c +++ b/gdk/gdkcursor.c @@ -25,10 +25,10 @@ */ #include <config.h> -#include "gdkalias.h" #include "gdkcursor.h" #include "gdkdisplay.h" #include "gdkinternals.h" +#include "gdkalias.h" GType gdk_cursor_get_type (void) @@ -98,3 +98,6 @@ gdk_cursor_new (GdkCursorType cursor_type) { return gdk_cursor_new_for_display (gdk_display_get_default(), cursor_type); } + +#define __GDK_CURSOR_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index f115c7cb2..463c98e9f 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -23,12 +23,12 @@ #include <config.h> #include <glib.h> -#include "gdkalias.h" #include "gdk.h" /* gdk_event_send_client_message() */ #include "gdkdisplay.h" #include "gdkinternals.h" #include "gdkmarshalers.h" #include "gdkscreen.h" +#include "gdkalias.h" enum { CLOSED, @@ -647,4 +647,5 @@ gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks) return (GdkPointerHooks *)result; } - +#define __GDK_DISPLAY_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index 8079ca792..afc3ab455 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -26,7 +26,7 @@ #include <config.h> -#include "gdkalias.h" +#include "gdkscreen.h" #include "gdkdisplay.h" #include "gdkdisplaymanager.h" @@ -35,6 +35,8 @@ #include "gdkintl.h" +#include "gdkalias.h" + struct _GdkDisplayManager { GObject parent_instance; @@ -277,3 +279,5 @@ gdk_display_manager_list_displays (GdkDisplayManager *display_manager) return g_slist_copy (_gdk_displays); } +#define __GDK_DISPLAY_MANAGER_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index 6c45678ad..87d18a5c4 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -25,10 +25,10 @@ */ #include <config.h> -#include "gdkalias.h" #include <gdkdnd.h> #include <gdkdrawable.h> #include <gdkdisplay.h> +#include "gdkalias.h" /** * gdk_drag_find_window: @@ -77,6 +77,5 @@ gdk_drag_get_protocol (guint32 xid, return gdk_drag_get_protocol_for_display (gdk_display_get_default (), xid, protocol); } - - - +#define __GDK_DND_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index 63951a024..b8a653d43 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -26,13 +26,13 @@ #include <config.h> #include <math.h> -#include "gdkalias.h" #include "gdkdrawable.h" #include "gdkinternals.h" #include "gdkwindow.h" #include "gdkscreen.h" #include "gdk-pixbuf-private.h" #include "gdkpixbuf.h" +#include "gdkalias.h" static GdkImage* gdk_drawable_real_get_image (GdkDrawable *drawable, gint x, @@ -1965,3 +1965,6 @@ _gdk_drawable_get_scratch_gc (GdkDrawable *drawable, return screen->normal_gcs[depth]; } } + +#define __GDK_DRAW_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 778d5b77e..a54abde8a 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -27,9 +27,9 @@ #include <config.h> #include <string.h> /* For memset() */ -#include "gdkalias.h" #include "gdk.h" #include "gdkinternals.h" +#include "gdkalias.h" typedef struct _GdkIOClosure GdkIOClosure; @@ -1221,3 +1221,6 @@ gdk_setting_get (const gchar *name, { return gdk_screen_get_setting (gdk_screen_get_default (), name, value); } + +#define __GDK_EVENTS_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkfont.c b/gdk/gdkfont.c index 1bc2cc94f..dd90c975d 100644 --- a/gdk/gdkfont.c +++ b/gdk/gdkfont.c @@ -27,10 +27,10 @@ #undef GDK_DISABLE_DEPRECATED #include <config.h> -#include "gdkalias.h" #include "gdkdisplay.h" #include "gdkfont.h" #include "gdkinternals.h" +#include "gdkalias.h" GType gdk_font_get_type (void) @@ -355,4 +355,5 @@ gdk_font_load (const gchar *font_name) return gdk_font_load_for_display (gdk_display_get_default(), font_name); } - +#define __GDK_FONT_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c index d436f93ac..c51b43338 100644 --- a/gdk/gdkgc.c +++ b/gdk/gdkgc.c @@ -27,10 +27,10 @@ #include <config.h> #include <string.h> -#include "gdkalias.h" #include "gdkgc.h" #include "gdkrgb.h" #include "gdkprivate.h" +#include "gdkalias.h" static void gdk_gc_class_init (GObjectClass *class); static void gdk_gc_finalize (GObject *object); @@ -723,3 +723,6 @@ gdk_gc_set_rgb_bg_color (GdkGC *gc, gdk_rgb_find_color (cmap, &tmp_color); gdk_gc_set_background (gc, &tmp_color); } + +#define __GDK_GC_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c index ca8ccc4b4..3a033caf3 100644 --- a/gdk/gdkglobals.c +++ b/gdk/gdkglobals.c @@ -28,7 +28,6 @@ #include <stdio.h> -#include "gdkalias.h" #include "gdktypes.h" #include "gdkprivate.h" diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c index 0b85f6125..a2744261a 100644 --- a/gdk/gdkimage.c +++ b/gdk/gdkimage.c @@ -28,11 +28,11 @@ #include <stdlib.h> #include <sys/types.h> -#include "gdkalias.h" #include "gdk.h" /* For gdk_flush() */ #include "gdkimage.h" #include "gdkprivate.h" #include "gdkinternals.h" /* For scratch_image code */ +#include "gdkalias.h" /** * gdk_image_ref: @@ -423,3 +423,6 @@ gdk_image_new (GdkImageType type, return _gdk_image_new_for_depth (gdk_visual_get_screen (visual), type, visual, width, height, -1); } + +#define __GDK_IMAGE_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c index 8d9124d75..00dd75882 100644 --- a/gdk/gdkkeynames.c +++ b/gdk/gdkkeynames.c @@ -29,9 +29,9 @@ #include <stdlib.h> #include <string.h> -#include "gdkalias.h" #include "gdkkeysyms.h" #include "gdkinternals.h" +#include "gdkalias.h" /* Key handling not part of the keymap */ @@ -102,3 +102,5 @@ gdk_keyval_from_name (const gchar *keyval_name) return GDK_VoidSymbol; } +#define __GDK_KEYNAMES_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c index 435ede8af..754dee38c 100644 --- a/gdk/gdkkeys.c +++ b/gdk/gdkkeys.c @@ -26,9 +26,9 @@ #include <config.h> -#include "gdkalias.h" #include "gdkdisplay.h" #include "gdkkeys.h" +#include "gdkalias.h" enum { DIRECTION_CHANGED, @@ -313,3 +313,6 @@ gdk_keymap_get_default (void) { return gdk_keymap_get_for_display (gdk_display_get_default ()); } + +#define __GDK_KEYS_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c index 83bf1791b..6ab269e8d 100644 --- a/gdk/gdkkeyuni.c +++ b/gdk/gdkkeyuni.c @@ -1,6 +1,6 @@ #include <config.h> -#include "gdkalias.h" #include "gdk.h" +#include "gdkalias.h" /* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode * mapping functions, from the xterm sources. @@ -1669,3 +1669,6 @@ gdk_unicode_to_keyval (guint32 wc) */ return wc | 0x01000000; } + +#define __GDK_KEYUNI_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index 374d90d6d..d317b0faa 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -19,13 +19,13 @@ #include <config.h> #include <math.h> -#include "gdkalias.h" #include "gdkcolor.h" #include "gdkgc.h" #include "gdkpango.h" #include "gdkrgb.h" #include "gdkprivate.h" #include "gdkscreen.h" +#include "gdkalias.h" /* This is for P_() ... a bit non-kosher, but works fine */ #include "gtk/gtkintl.h" @@ -1418,3 +1418,6 @@ gdk_pango_context_get (void) { return gdk_pango_context_get_for_screen (gdk_screen_get_default ()); } + +#define __GDK_PANGO_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c index d78f9d4fb..c1f69ab0e 100644 --- a/gdk/gdkpixbuf-drawable.c +++ b/gdk/gdkpixbuf-drawable.c @@ -25,7 +25,6 @@ #include <config.h> #include <stdio.h> #include <string.h> -#include "gdkalias.h" #include "gdkcolor.h" #include "gdkimage.h" #include "gdkvisual.h" @@ -34,6 +33,7 @@ #include "gdkpixmap.h" #include "gdk-pixbuf-private.h" #include "gdkinternals.h" +#include "gdkalias.h" /* Some convenient names */ @@ -1412,3 +1412,6 @@ gdk_pixbuf_get_from_image (GdkPixbuf *dest, return dest; } + +#define __GDK_PIXBUF_DRAWABLE_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c index a0cae704f..e4fe24bf8 100644 --- a/gdk/gdkpixbuf-render.c +++ b/gdk/gdkpixbuf-render.c @@ -21,12 +21,12 @@ */ #include <config.h> -#include "gdkalias.h" #include <gdk/gdk.h> #include "gdk-pixbuf-private.h" #include "gdkpixbuf.h" #include "gdkscreen.h" #include "gdkinternals.h" +#include "gdkalias.h" @@ -328,3 +328,6 @@ gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf, *mask_return = NULL; } } + +#define __GDK_PIXBUF_RENDER_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index d3012eb64..f4c0d05eb 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -25,11 +25,11 @@ */ #include <config.h> -#include "gdkalias.h" #include "gdkpixmap.h" #include "gdkinternals.h" #include "gdkpixbuf.h" #include "gdkscreen.h" +#include "gdkalias.h" static GdkGC *gdk_pixmap_create_gc (GdkDrawable *drawable, GdkGCValues *values, @@ -683,3 +683,6 @@ gdk_pixmap_real_get_screen (GdkDrawable *drawable) { return gdk_drawable_get_screen (GDK_PIXMAP_OBJECT (drawable)->impl); } + +#define __GDK_PIXMAP_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkpolyreg-generic.c b/gdk/gdkpolyreg-generic.c index 8c9ca2d7d..e26908411 100644 --- a/gdk/gdkpolyreg-generic.c +++ b/gdk/gdkpolyreg-generic.c @@ -47,10 +47,10 @@ SOFTWARE. #define SMALL_COORDINATE -LARGE_COORDINATE #include <config.h> -#include "gdkalias.h" #include <gdkregion.h> #include "gdkregion-generic.h" #include "gdkpoly-generic.h" +#include "gdkalias.h" /* * InsertEdgeInET @@ -618,3 +618,6 @@ gdk_region_polygon(GdkPoint *Pts, gint Count, GdkFillRule rule) g_free (pETEs); return(region); } + +#define __GDK_POLYREG_GENERIC_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c index eb3e9d95b..d79bdf6b1 100644 --- a/gdk/gdkrectangle.c +++ b/gdk/gdkrectangle.c @@ -25,8 +25,8 @@ */ #include <config.h> -#include "gdkalias.h" #include <gdk/gdk.h> +#include "gdkalias.h" void gdk_rectangle_union (GdkRectangle *src1, @@ -105,3 +105,6 @@ gdk_rectangle_get_type (void) return our_type; } + +#define __GDK_RECTANGLE_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkregion-generic.c b/gdk/gdkregion-generic.c index 0307272c9..1dbdc32fb 100644 --- a/gdk/gdkregion-generic.c +++ b/gdk/gdkregion-generic.c @@ -71,9 +71,9 @@ SOFTWARE. #include <config.h> #include <stdlib.h> #include <string.h> -#include "gdkalias.h" #include <gdkregion.h> #include "gdkregion-generic.h" +#include "gdkalias.h" #ifdef DEBUG #include <stdio.h> @@ -1776,3 +1776,6 @@ gdk_region_spans_intersect_foreach (GdkRegion *region, pbox++; } } + +#define __GDK_REGION_GENERIC_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c index b312f9b7d..e8c1e5360 100644 --- a/gdk/gdkrgb.c +++ b/gdk/gdkrgb.c @@ -36,12 +36,12 @@ #define ENABLE_GRAYSCALE -#include "gdkalias.h" #include "gdkprivate.h" #include "gdkinternals.h" /* _gdk_windowing_get_bits_for_depth() */ #include "gdkrgb.h" #include "gdkscreen.h" +#include "gdkalias.h" #include <glib/gprintf.h> typedef struct _GdkRgbInfo GdkRgbInfo; @@ -3695,3 +3695,6 @@ gdk_rgb_get_visual (void) { return gdk_screen_get_rgb_visual (gdk_screen_get_default ()); } + +#define __GDK_RGB_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c index 6185700c5..8e08e5363 100644 --- a/gdk/gdkscreen.c +++ b/gdk/gdkscreen.c @@ -22,11 +22,11 @@ */ #include <config.h> -#include "gdkalias.h" #include "gdk.h" /* For gdk_rectangle_intersect() */ #include "gdkcolor.h" #include "gdkwindow.h" #include "gdkscreen.h" +#include "gdkalias.h" static void gdk_screen_class_init (GdkScreenClass *klass); static void gdk_screen_dispose (GObject *object); @@ -316,3 +316,6 @@ gdk_screen_height_mm (void) { return gdk_screen_get_height_mm (gdk_screen_get_default ()); } + +#define __GDK_SCREEN_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkselection.c b/gdk/gdkselection.c index e601c41a7..d509a27aa 100644 --- a/gdk/gdkselection.c +++ b/gdk/gdkselection.c @@ -1,8 +1,8 @@ #include <config.h> -#include "gdkalias.h" #include "gdkproperty.h" #include "gdkdisplay.h" #include "gdkselection.h" +#include "gdkalias.h" gboolean gdk_selection_owner_set (GdkWindow *owner, @@ -109,3 +109,5 @@ gdk_utf8_to_compound_text (const gchar *str, ctext, length); } +#define __GDK_SELECTION_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c index 929db2d56..907fc6284 100644 --- a/gdk/gdkvisual.c +++ b/gdk/gdkvisual.c @@ -22,9 +22,9 @@ */ #include <config.h> -#include "gdkalias.h" #include "gdkvisual.h" #include "gdkscreen.h" +#include "gdkalias.h" /** * gdk_list_visuals: @@ -59,3 +59,6 @@ gdk_visual_get_system (void) { return gdk_screen_get_system_visual (gdk_screen_get_default()); } + +#define __GDK_VISUAL_C__ +#include "gdkaliasdef.c" diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 4a27988c6..e509f3b37 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -25,7 +25,6 @@ */ #include <config.h> -#include "gdkalias.h" #include "gdkwindow.h" #include "gdkinternals.h" #include "gdk.h" /* For gdk_rectangle_union() */ @@ -33,6 +32,7 @@ #include "gdkdrawable.h" #include "gdkpixmap.h" #include "gdkscreen.h" +#include "gdkalias.h" #define USE_BACKING_STORE /* Appears to work on Win32, too, now. */ @@ -2883,3 +2883,5 @@ gdk_window_foreign_new (GdkNativeWindow anid) return gdk_window_foreign_new_for_display (gdk_display_get_default (), anid); } +#define __GDK_WINDOW_C__ +#include "gdkaliasdef.c" diff --git a/gdk/makegdkalias.pl b/gdk/makegdkalias.pl index 3b745e178..8f0665dd9 100755 --- a/gdk/makegdkalias.pl +++ b/gdk/makegdkalias.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 makegdkalias.pl */ @@ -9,39 +16,25 @@ print <<EOF; #ifdef G_HAVE_GNUC_VISIBILITY -#ifdef GDK_ENABLE_BROKEN -#define WAS_BROKEN -#endif -#define GDK_ENABLE_BROKEN - -#ifdef GDK_MULTIHEAD_SAFE -#define WAS_MULTIHEAD -#endif -#undef GDK_MULTIHEAD_SAVE - -#ifdef GDK_DISABLE_DEPRECATED -#define WAS_NO_DEPR -#endif -#undef GDK_DISABLE_DEPRECATED - -#ifdef G_DISABLE_DEPRECATED -#define WAS_NO_G_DEPR -#endif -#undef G_DISABLE_DEPRECATED - -#include "gdk.h" - -#ifdef GDK_WINDOWING_X11 -#include "x11/gdkx.h" -#endif -#ifdef GDK_WINDOWING_WIN32 -#include "win32/gdkwin32.h" -#endif -#ifdef GDK_WINDOWING_FB -#include "linux-fb/gdkfb.h" -#endif +EOF + +if ($do_def) { + print <<EOF +#undef IN_FILE +#define IN_FILE defined + +#undef IN_HEADER +#define IN_HEADER(x) 1 EOF +} +else { + print <<EOF +#define IN_FILE(x) 1 +#define IN_HEADER defined + +EOF +} my $in_comment = 0; my $in_skipped_section = 0; @@ -80,7 +73,7 @@ while (<>) { next; } - if ($_ =~ /^\#ifdef\s+INCLUDE_VARIABLES/) + if ($_ =~ /^\#ifdef\s+(INCLUDE_VARIABLES|INCLUDE_INTERNAL_SYMBOLS|ALL_FILES)/) { $in_skipped_section = 1; } @@ -90,7 +83,14 @@ while (<>) { next; } - if ($_ =~ /^\#ifdef\s+G/) + if ($_ =~ /^\#ifn?def\s+G/) + { + print $_; + + next; + } + + if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/) { print $_; @@ -112,39 +112,25 @@ 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 GDK_ENABLE_BROKEN -#else -#undef WAS_BROKEN -#endif - -#ifdef WAS_MULTIHEAD -#define GDK_MULTIHEAD_SAFE -#undef WAS_MULTIHEAD -#endif - -#ifdef WAS_NO_DEPR -#define GDK_DISABLE_DEPRECATED -#undef WAS_NO_DEPR -#endif - -#ifdef WAS_NO_G_DEPR -#define G_DISABLE_DEPRECATED -#undef WAS_NO_G_DEPR -#endif - #endif /* G_HAVE_GNUC_VISIBILITY */ - #endif /* DISABLE_VISIBILITY */ EOF diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c index 61f25fbdf..fc9e15d63 100644 --- a/gdk/x11/gdkasync.c +++ b/gdk/x11/gdkasync.c @@ -48,9 +48,9 @@ in this Software without prior written authorization from The Open Group. #include <X11/extensions/XIproto.h> #endif #include <X11/Xlibint.h> -#include "gdkalias.h" #include "gdkasync.h" #include "gdkx.h" +#include "gdkalias.h" typedef struct _ChildInfoChildState ChildInfoChildState; typedef struct _ChildInfoState ChildInfoState; @@ -724,3 +724,5 @@ _gdk_x11_get_window_child_info (GdkDisplay *display, return !state.have_error; } +#define __GDK_ASYNC_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c index ac212a628..cd264c6de 100644 --- a/gdk/x11/gdkcolor-x11.c +++ b/gdk/x11/gdkcolor-x11.c @@ -27,12 +27,12 @@ #include <config.h> #include <time.h> -#include "gdkalias.h" #include "gdkcolor.h" #include "gdkinternals.h" #include "gdkx.h" #include "gdkprivate-x11.h" #include "gdkscreen-x11.h" +#include "gdkalias.h" typedef struct _GdkColormapPrivateX11 GdkColormapPrivateX11; @@ -1526,3 +1526,6 @@ gdk_colormap_get_screen (GdkColormap *cmap) return GDK_COLORMAP_PRIVATE_DATA (cmap)->screen; } + +#define __GDK_COLOR_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c index 68dc9f1a1..6a7b3335c 100644 --- a/gdk/x11/gdkcursor-x11.c +++ b/gdk/x11/gdkcursor-x11.c @@ -31,13 +31,13 @@ #include <X11/Xcursor/Xcursor.h> #endif -#include "gdkalias.h" #include "gdkprivate-x11.h" #include "gdkcursor.h" #include "gdkpixmap-x11.h" #include "gdkx.h" #include <gdk/gdkpixmap.h> #include <gdk-pixbuf/gdk-pixbuf.h> +#include "gdkalias.h" /** @@ -605,3 +605,5 @@ gdk_display_get_maximal_cursor_size (GdkDisplay *display, 128, 128, width, height); } +#define __GDK_CURSOR_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 77e7f5117..c06603073 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -30,7 +30,6 @@ #include <unistd.h> #include <glib.h> -#include "gdkalias.h" #include "gdkx.h" #include "gdkdisplay.h" #include "gdkdisplay-x11.h" @@ -39,6 +38,7 @@ #include "gdkinternals.h" #include "gdkinputprivate.h" #include "xsettings-client.h" +#include "gdkalias.h" #include <X11/Xatom.h> @@ -1203,3 +1203,6 @@ gdk_x11_display_get_user_time (GdkDisplay *display) { return GDK_DISPLAY_X11 (display)->user_time; } + +#define __GDK_DISPLAY_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 3583e906b..1d844c2fe 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -29,7 +29,6 @@ #include <X11/Xatom.h> #include <string.h> -#include "gdkalias.h" #include "gdk.h" /* For gdk_flush() */ #include "gdkx.h" #include "gdkasync.h" @@ -39,6 +38,7 @@ #include "gdkinternals.h" #include "gdkscreen-x11.h" #include "gdkdisplay-x11.h" +#include "gdkalias.h" typedef struct _GdkDragContextPrivateX11 GdkDragContextPrivateX11; @@ -3808,3 +3808,6 @@ gdk_drag_drop_succeeded (GdkDragContext *context) return !private->drop_failed; } + +#define __GDK_DND_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index d39791188..1af5cc836 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -26,7 +26,6 @@ #include <config.h> -#include "gdkalias.h" #include "gdkx.h" #include "gdkregion-generic.h" @@ -51,6 +50,8 @@ #include "gdkscreen-x11.h" #include "gdkdisplay-x11.h" +#include "gdkalias.h" + static void gdk_x11_draw_rectangle (GdkDrawable *drawable, GdkGC *gc, gboolean filled, @@ -1759,3 +1760,6 @@ _gdk_x11_drawable_draw_xft_glyphs (GdkDrawable *drawable, XftDrawGlyphSpec (draw, &color, xft_font, glyphs, n_glyphs); } } + +#define __GDK_DRAWABLE_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index 82ba467e8..f3327fadc 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -26,7 +26,6 @@ #include <config.h> -#include "gdkalias.h" #include "gdk.h" #include "gdkprivate-x11.h" #include "gdkinternals.h" @@ -43,6 +42,8 @@ #include "gdkinputprivate.h" +#include "gdkalias.h" + #ifdef HAVE_XKB #include <X11/XKBlib.h> #endif @@ -2933,3 +2934,6 @@ gdk_xsettings_watch_cb (Window window, g_object_unref (gdkwin); } } + +#define __GDK_EVENTS_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c index e7ea781a1..d4c67b401 100644 --- a/gdk/x11/gdkfont-x11.c +++ b/gdk/x11/gdkfont-x11.c @@ -31,13 +31,13 @@ #include <X11/Xos.h> #include <locale.h> -#include "gdkalias.h" #include "gdkx.h" #include "gdkfont.h" #include "gdkprivate-x11.h" #include "gdkinternals.h" #include "gdkdisplay-x11.h" #include "gdkscreen-x11.h" +#include "gdkalias.h" typedef struct _GdkFontPrivateX GdkFontPrivateX; @@ -840,3 +840,5 @@ gdk_x11_font_get_name (GdkFont *font) return private->names->data; } +#define __GDK_FONT_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c index 08ffde7bc..c01128de6 100644 --- a/gdk/x11/gdkgc-x11.c +++ b/gdk/x11/gdkgc-x11.c @@ -26,11 +26,11 @@ #include <config.h> -#include "gdkalias.h" #include "gdkgc.h" #include "gdkprivate-x11.h" #include "gdkregion-generic.h" #include "gdkx.h" +#include "gdkalias.h" #include <string.h> @@ -1302,3 +1302,6 @@ _gdk_windowing_gc_get_foreground (GdkGC *gc, else g_warning ("No colormap in _gdk_windowing_gc_get_foreground"); } + +#define __GDK_GC_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c index 8be30c4f9..f0b33c863 100644 --- a/gdk/x11/gdkgeometry-x11.c +++ b/gdk/x11/gdkgeometry-x11.c @@ -130,7 +130,6 @@ */ #include <config.h> -#include "gdkalias.h" #include "gdk.h" /* For gdk_rectangle_intersect */ #include "gdkprivate-x11.h" #include "gdkx.h" @@ -139,6 +138,7 @@ #include "gdkscreen-x11.h" #include "gdkdisplay-x11.h" #include "gdkwindow-x11.h" +#include "gdkalias.h" typedef struct _GdkWindowQueueItem GdkWindowQueueItem; typedef struct _GdkWindowParentPos GdkWindowParentPos; @@ -1102,3 +1102,6 @@ gdk_window_clip_changed (GdkWindow *window, GdkRectangle *old_clip, GdkRectangle gdk_region_destroy (new_clip_region); gdk_region_destroy (old_clip_region); } + +#define __GDK_GEOMETRY_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c index 447aa317c..5332bc5ed 100644 --- a/gdk/x11/gdkglobals-x11.c +++ b/gdk/x11/gdkglobals-x11.c @@ -27,7 +27,6 @@ #include <config.h> #include <stdio.h> -#include "gdkalias.h" #include "gdktypes.h" #include "gdkprivate-x11.h" diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c index f0189cd95..0ee735653 100644 --- a/gdk/x11/gdkim-x11.c +++ b/gdk/x11/gdkim-x11.c @@ -30,13 +30,13 @@ #include <stdlib.h> #include <string.h> -#include "gdkalias.h" #include "gdkx.h" #include "gdk.h" /* For gdk_flush() */ #include "gdkx.h" #include "gdkpixmap.h" #include "gdkinternals.h" #include "gdkdisplay-x11.h" +#include "gdkalias.h" /* If this variable is FALSE, it indicates that we should @@ -251,3 +251,6 @@ gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) return i; } } + +#define __GDK_IM_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c index d1970a163..d6ca24339 100644 --- a/gdk/x11/gdkimage-x11.c +++ b/gdk/x11/gdkimage-x11.c @@ -47,7 +47,6 @@ #include <errno.h> -#include "gdkalias.h" #include "gdk.h" /* For gdk_error_trap_* / gdk_flush_* */ #include "gdkx.h" #include "gdkimage.h" @@ -55,6 +54,7 @@ #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" #include "gdkscreen-x11.h" +#include "gdkalias.h" typedef struct _GdkImagePrivateX11 GdkImagePrivateX11; @@ -840,3 +840,6 @@ _gdk_windowing_get_bits_for_depth (GdkDisplay *display, return -1; } + +#define __GDK_IMAGE_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkinput-none.c b/gdk/x11/gdkinput-none.c index f719b1bdf..0e8cc2c97 100644 --- a/gdk/x11/gdkinput-none.c +++ b/gdk/x11/gdkinput-none.c @@ -18,9 +18,9 @@ */ #include <config.h> -#include "gdkalias.h" #include "gdkinputprivate.h" #include "gdkdisplay-x11.h" +#include "gdkalias.h" /* * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS @@ -127,3 +127,5 @@ gdk_device_set_mode (GdkDevice *device, return FALSE; } +#define __GDK_INPUT_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c index 219e31dd3..64485aab8 100644 --- a/gdk/x11/gdkinput-x11.c +++ b/gdk/x11/gdkinput-x11.c @@ -25,12 +25,12 @@ */ #include <config.h> -#include "gdkalias.h" #include "gdkinputprivate.h" #include "gdkinternals.h" #include "gdkx.h" #include "gdk.h" /* For gdk_error_trap_push()/pop() */ #include "gdkdisplay-x11.h" +#include "gdkalias.h" #include <string.h> @@ -833,3 +833,6 @@ gdk_device_get_state (GdkDevice *device, XFreeDeviceState (state); } } + +#define __GDK_INPUT_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkinput-xfree.c b/gdk/x11/gdkinput-xfree.c index d9cef9bdf..31000f14a 100644 --- a/gdk/x11/gdkinput-xfree.c +++ b/gdk/x11/gdkinput-xfree.c @@ -18,9 +18,9 @@ */ #include <config.h> -#include "gdkalias.h" #include "gdkinputprivate.h" #include "gdkdisplay-x11.h" +#include "gdkalias.h" /* * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c index 343669692..f1c7f7364 100644 --- a/gdk/x11/gdkinput.c +++ b/gdk/x11/gdkinput.c @@ -30,13 +30,13 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "gdkalias.h" #include "gdkx.h" #include "gdkinput.h" #include "gdkprivate.h" #include "gdkinputprivate.h" #include "gdkscreen-x11.h" #include "gdkdisplay-x11.h" +#include "gdkalias.h" static GdkDeviceAxis gdk_input_core_axes[] = { { GDK_AXIS_X, 0, 0 }, @@ -445,3 +445,6 @@ gdk_device_get_axis (GdkDevice *device, return FALSE; } + +#define __GDK_INPUT_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index 2464a5ceb..42e5b4a64 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -33,7 +33,6 @@ #include <limits.h> #include <errno.h> -#include "gdkalias.h" #include "gdk.h" #include "gdkx.h" @@ -41,6 +40,7 @@ #include "gdkinternals.h" #include "gdkdisplay-x11.h" #include "gdkkeysyms.h" +#include "gdkalias.h" #ifdef HAVE_XKB #include <X11/XKBlib.h> @@ -1446,3 +1446,6 @@ _gdk_x11_get_group_for_state (GdkDisplay *display, return (state & keymap_impl->group_switch_mask) ? 1 : 0; } } + +#define __GDK_KEYS_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 287415ebc..21e369abf 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -41,7 +41,6 @@ #include <X11/XKBlib.h> #endif -#include "gdkalias.h" #include "gdk.h" #include "gdkx.h" @@ -50,6 +49,7 @@ #include "gdkintl.h" #include "gdkregion-generic.h" #include "gdkinputprivate.h" +#include "gdkalias.h" typedef struct _GdkPredicate GdkPredicate; typedef struct _GdkErrorTrap GdkErrorTrap; @@ -797,4 +797,5 @@ gdk_x11_get_default_xdisplay (void) return GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); } - +#define __GDK_MAIN_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkpango-x11.c b/gdk/x11/gdkpango-x11.c index 3f9cfca21..9db3f3567 100644 --- a/gdk/x11/gdkpango-x11.c +++ b/gdk/x11/gdkpango-x11.c @@ -20,12 +20,12 @@ #include <config.h> #include <stdlib.h> -#include "gdkalias.h" #include "gdkx.h" #include "gdkdisplay-x11.h" #include "gdkpango.h" #include <pango/pangoxft.h> #include <pango/pangoxft-render.h> +#include "gdkalias.h" #include <math.h> @@ -170,3 +170,5 @@ gdk_pango_context_get_for_screen (GdkScreen *screen) return context; } +#define __GDK_PANGO_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c index 9590aace0..6181bccb5 100644 --- a/gdk/x11/gdkpixmap-x11.c +++ b/gdk/x11/gdkpixmap-x11.c @@ -32,7 +32,6 @@ #include <unistd.h> #include <X11/Xlib.h> -#include "gdkalias.h" #include "gdkx.h" #include "gdkpixmap-x11.h" @@ -41,6 +40,7 @@ #include "gdkdisplay-x11.h" #include <gdk/gdkinternals.h> +#include "gdkalias.h" typedef struct { @@ -436,3 +436,6 @@ gdk_pixmap_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid) g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); return (GdkPixmap*) gdk_xid_table_lookup_for_display (display, anid); } + +#define __GDK_PIXMAP_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index dba6a080e..4069e018a 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -29,7 +29,6 @@ #include <X11/Xatom.h> #include <string.h> -#include "gdkalias.h" #include "gdk.h" /* For gdk_error_trap_push/pop() */ #include "gdkx.h" #include "gdkproperty.h" @@ -38,6 +37,7 @@ #include "gdkdisplay-x11.h" #include "gdkscreen-x11.h" #include "gdkselection.h" /* only from predefined atom */ +#include "gdkalias.h" static GPtrArray *virtual_atom_array; static GHashTable *virtual_atom_hash; @@ -684,3 +684,6 @@ gdk_property_delete (GdkWindow *window, gdk_x11_atom_to_xatom_for_display (GDK_WINDOW_DISPLAY (window), property)); } + +#define __GDK_PROPERTY_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index e62dd46bb..cfe6008b7 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -27,12 +27,12 @@ #include <string.h> #include <glib.h> -#include "gdkalias.h" #include "gdkscreen.h" #include "gdkscreen-x11.h" #include "gdkdisplay.h" #include "gdkdisplay-x11.h" #include "gdkx.h" +#include "gdkalias.h" #ifdef HAVE_SOLARIS_XINERAMA #include <X11/extensions/xinerama.h> @@ -710,3 +710,6 @@ gdk_screen_make_display_name (GdkScreen *screen) return _gdk_windowing_substitute_screen_number (old_display, gdk_screen_get_number (screen)); } + +#define __GDK_SCREEN_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index 641647cbd..12eec95ad 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -29,13 +29,13 @@ #include <X11/Xatom.h> #include <string.h> -#include "gdkalias.h" #include "gdkx.h" #include "gdkproperty.h" #include "gdkselection.h" #include "gdkprivate.h" #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" +#include "gdkalias.h" typedef struct _OwnerInfo OwnerInfo; @@ -880,3 +880,6 @@ void gdk_free_compound_text (guchar *ctext) if (ctext) XFree (ctext); } + +#define __GDK_SELECTION_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkspawn-x11.c b/gdk/x11/gdkspawn-x11.c index daa25aad5..ced2b93e8 100644 --- a/gdk/x11/gdkspawn-x11.c +++ b/gdk/x11/gdkspawn-x11.c @@ -22,11 +22,11 @@ #include <config.h> #include <string.h> -#include "gdkalias.h" #include "gdkspawn.h" #include <glib.h> #include <gdk/gdk.h> +#include "gdkalias.h" extern char **environ; @@ -248,3 +248,6 @@ gdk_spawn_command_line_on_screen (GdkScreen *screen, return retval; } + +#define __GDK_SPAWN_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index 9e403461e..95b2df7a2 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -28,11 +28,12 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "gdkalias.h" +#include "gdkx.h" #include "gdkvisual.h" #include "gdkprivate-x11.h" #include "gdkscreen-x11.h" #include "gdkinternals.h" +#include "gdkalias.h" struct _GdkVisualClass { @@ -665,3 +666,6 @@ gdk_visual_get_screen (GdkVisual *visual) return ((GdkVisualPrivate*) visual)->screen; } + +#define __GDK_VISUAL_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 3c86ba9dc..ac0883b65 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -32,7 +32,6 @@ #include <netinet/in.h> #include <unistd.h> -#include "gdkalias.h" #include "gdk.h" #include "gdkwindow.h" @@ -44,6 +43,7 @@ #include "gdkinternals.h" #include "MwmUtil.h" #include "gdkwindow-x11.h" +#include "gdkalias.h" #include <stdlib.h> #include <stdio.h> @@ -5899,3 +5899,6 @@ gdk_window_configure_finished (GdkWindow *window) } #endif } + +#define __GDK_WINDOW_X11_C__ +#include "gdkaliasdef.c" diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c index 0c1a6051d..b192f8c8b 100644 --- a/gdk/x11/gdkxid.c +++ b/gdk/x11/gdkxid.c @@ -25,9 +25,10 @@ */ #include <config.h> -#include "gdkalias.h" +#include "gdkx.h" #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" +#include "gdkalias.h" #include <stdio.h> static guint gdk_xid_hash (XID *xid); @@ -124,3 +125,6 @@ gdk_xid_equal (XID *a, { return (*a == *b); } + +#define __GDK_XID_C__ +#include "gdkaliasdef.c" |