forked from AuroraMiddleware/gtk
gdk/: fully remove gdkalias hacks
https://bugzilla.gnome.org/show_bug.cgi?id=623845
This commit is contained in:
Javier Jardón
parent
7cabad6b77
commit
404e7d0e00
@ -21,7 +21,6 @@ CFILE_GLOB=$(top_srcdir)/gdk/*.c
|
||||
|
||||
# Header files to ignore when scanning
|
||||
IGNORE_HFILES= \
|
||||
gdkalias.h \
|
||||
gdkintl.h \
|
||||
gdkmarshalers.h \
|
||||
gdkkeysyms.h \
|
||||
|
||||
@ -26,11 +26,9 @@ EXTRA_DIST += \
|
||||
makeenums.pl \
|
||||
makefile.msc \
|
||||
gdk.symbols \
|
||||
makegdkalias.pl \
|
||||
gdkenumtypes.c.template \
|
||||
gdkenumtypes.h.template \
|
||||
abicheck.sh \
|
||||
pltcheck.sh
|
||||
abicheck.sh
|
||||
|
||||
INCLUDES = \
|
||||
-DG_LOG_DOMAIN=\"Gdk\" \
|
||||
@ -105,9 +103,6 @@ gdk_public_h_sources = \
|
||||
gdk_built_public_sources = \
|
||||
gdkenumtypes.h
|
||||
|
||||
gdk_built_private_headers = \
|
||||
gdkalias.h
|
||||
|
||||
gdk_private_headers = \
|
||||
gdkinternals.h \
|
||||
gdkdeviceprivate.h \
|
||||
@ -147,12 +142,10 @@ gdk_c_sources = \
|
||||
gdkwindowimpl.c
|
||||
|
||||
gdk_built_sources = \
|
||||
gdkaliasdef.c \
|
||||
gdkenumtypes.c \
|
||||
gdkmarshalers.h \
|
||||
gdkmarshalers.c \
|
||||
$(gdk_built_public_sources) \
|
||||
$(gdk_built_private_headers)
|
||||
$(gdk_built_public_sources)
|
||||
|
||||
#
|
||||
# setup GDK sources and their dependencies
|
||||
@ -256,15 +249,9 @@ endif
|
||||
gdk.def: gdk.symbols
|
||||
(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') > $(srcdir)/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
|
||||
|
||||
TESTS_ENVIRONMENT = srcdir="$(srcdir)"
|
||||
if OS_LINUX
|
||||
TESTS = abicheck.sh pltcheck.sh
|
||||
TESTS = abicheck.sh
|
||||
endif
|
||||
|
||||
|
||||
@ -320,7 +307,7 @@ gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
|
||||
&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
|
||||
|| ( rm -f gdkmarshalers-h.tmp && exit 1)
|
||||
gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
|
||||
(echo "#include \"gdkalias.h\""; $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp \
|
||||
$(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp \
|
||||
&& mv gdkmarshalers-c.tmp gdkmarshalers.c \
|
||||
|| ( rm -f gdkmarshalers-c.tmp && exit 1 )
|
||||
|
||||
|
||||
@ -42,7 +42,6 @@
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkdirectfb.h"
|
||||
#include "gdkprivate-directfb.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
typedef struct {
|
||||
@ -510,5 +509,3 @@ gdk_directfb_allocate_color_key (GdkColormap *colormap)
|
||||
|
||||
private->info[255].ref_count++;
|
||||
}
|
||||
#define __GDK_COLOR_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
#include "gdkdirectfb.h"
|
||||
#include "gdkprivate-directfb.h"
|
||||
#include "gdkcursor.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
#include "x-cursors.xbm"
|
||||
|
||||
@ -545,7 +544,3 @@ gdk_display_supports_cursor_color (GdkDisplay *display)
|
||||
g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#define __GDK_CURSOR_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
|
||||
@ -32,7 +32,6 @@
|
||||
#include "gdkprivate-directfb.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkdisplaymanager.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
extern void _gdk_visual_init (void);
|
||||
@ -540,8 +539,3 @@ gdk_display_supports_composite (GdkDisplay *display)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
#define __GDK_DISPLAY_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
|
||||
@ -37,7 +37,6 @@
|
||||
|
||||
#include "gdkdnd.h"
|
||||
#include "gdkproperty.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
|
||||
|
||||
@ -633,6 +632,3 @@ gdk_drag_get_selection (GdkDragContext *context)
|
||||
else
|
||||
return GDK_NONE;
|
||||
}
|
||||
|
||||
#define __GDK_DND_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -43,9 +43,6 @@
|
||||
|
||||
#include "gdkinternals.h"
|
||||
|
||||
|
||||
#include "gdkalias.h"
|
||||
|
||||
#include "cairo-directfb.h"
|
||||
|
||||
|
||||
@ -1634,6 +1631,3 @@ gdk_directfb_ref_cairo_surface (GdkDrawable *drawable)
|
||||
g_assert (impl->cairo_surface != NULL);
|
||||
return impl->cairo_surface;
|
||||
}
|
||||
|
||||
#define __GDK_DRAWABLE_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -47,16 +47,10 @@
|
||||
gboolean gdk_net_wm_supports (GdkAtom property);
|
||||
#endif
|
||||
|
||||
#include "gdkalias.h"
|
||||
|
||||
#define EventBuffer _gdk_display->buffer
|
||||
#define DirectFB _gdk_display->directfb
|
||||
|
||||
|
||||
|
||||
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
/*********************************************
|
||||
* Functions for maintaining the event queue *
|
||||
*********************************************/
|
||||
@ -967,6 +961,3 @@ void
|
||||
_gdk_windowing_event_data_free (GdkEvent *event)
|
||||
{
|
||||
}
|
||||
|
||||
#define __GDK_EVENTS_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -43,8 +43,6 @@
|
||||
#include "gdkgc.h"
|
||||
#include "gdkpixmap.h"
|
||||
|
||||
#include "gdkalias.h"
|
||||
|
||||
static void gdk_directfb_gc_get_values (GdkGC *gc,
|
||||
GdkGCValues *values);
|
||||
static void gdk_directfb_gc_set_values (GdkGC *gc,
|
||||
@ -386,5 +384,3 @@ gdk_gc_get_screen (GdkGC *gc)
|
||||
|
||||
return _gdk_screen;
|
||||
}
|
||||
#define __GDK_GC_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -37,7 +37,6 @@
|
||||
#include "gdkprivate-directfb.h"
|
||||
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
void
|
||||
@ -253,6 +252,3 @@ _gdk_directfb_window_move_region (GdkWindow *window,
|
||||
cairo_region_destroy (src_region);
|
||||
cairo_region_destroy (dest_region);
|
||||
}
|
||||
|
||||
#define __GDK_GEOMETRY_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -36,8 +36,6 @@
|
||||
#include "gdkdirectfb.h"
|
||||
#include "gdkprivate-directfb.h"
|
||||
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
GdkDisplayDFB *_gdk_display = NULL;
|
||||
GdkScreen * _gdk_screen = NULL;
|
||||
@ -58,5 +56,3 @@ GdkEventMask _gdk_directfb_keyboard_grab_events = 0;
|
||||
GdkCursor * _gdk_directfb_pointer_grab_cursor = NULL;
|
||||
|
||||
GdkAtom _gdk_selection_property = 0;
|
||||
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -40,7 +40,6 @@
|
||||
#include "gdkinternals.h"
|
||||
|
||||
#include "gdkimage.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static GList *image_list = NULL;
|
||||
@ -404,6 +403,3 @@ _gdk_windowing_get_bits_for_depth (GdkDisplay *display,
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define __GDK_IMAGE_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -40,7 +40,6 @@
|
||||
|
||||
#include "gdkinput.h"
|
||||
#include "gdkkeysyms.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static GdkDeviceAxis gdk_input_core_axes[] =
|
||||
@ -326,7 +325,3 @@ gdk_device_set_source (GdkDevice *device,
|
||||
g_return_if_fail (device != NULL);
|
||||
device->source = source;
|
||||
}
|
||||
|
||||
#define __GDK_INPUT_NONE_C__
|
||||
#define __GDK_INPUT_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -36,12 +36,11 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
#include "gdkdirectfb.h"
|
||||
#include "gdkprivate-directfb.h"
|
||||
|
||||
#include "gdkkeysyms.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static struct gdk_key *gdk_keys_by_name = NULL;
|
||||
|
||||
@ -2031,6 +2030,3 @@ gdk_keymap_map_virtual_modifiers (GdkKeymap *keymap,
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#define __GDK_KEYS_DIRECTFB_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -53,7 +53,6 @@
|
||||
#include "gdkinput-directfb.h"
|
||||
|
||||
#include "gdkintl.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
void
|
||||
@ -416,6 +415,3 @@ _gdk_windowing_pointer_grab (GdkWindow *window,
|
||||
|
||||
return GDK_GRAB_SUCCESS;
|
||||
}
|
||||
|
||||
#define __GDK_MAIN_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -43,7 +43,6 @@
|
||||
#include "gdkinternals.h"
|
||||
|
||||
#include "gdkpixmap.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static void gdk_pixmap_impl_directfb_init (GdkPixmapImplDirectFB *pixmap);
|
||||
@ -336,6 +335,3 @@ GdkPixmap* gdk_pixmap_lookup_for_display (GdkDisplay *display,GdkNativeWindow an
|
||||
{
|
||||
return gdk_pixmap_lookup (anid);
|
||||
}
|
||||
|
||||
#define __GDK_PIXMAP_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -42,7 +42,6 @@
|
||||
|
||||
#include "gdkinternals.h"
|
||||
|
||||
#include "gdkalias.h"
|
||||
|
||||
static GHashTable *names_to_atoms;
|
||||
static GPtrArray *atoms_to_names;
|
||||
@ -396,5 +395,3 @@ gdk_property_change (GdkWindow *window,
|
||||
event->property.state = GDK_PROPERTY_NEW_VALUE;
|
||||
}
|
||||
}
|
||||
#define __GDK_PROPERTY_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -38,7 +38,6 @@
|
||||
#include "gdkprivate-directfb.h"
|
||||
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static GdkColormap *default_colormap = NULL;
|
||||
@ -247,6 +246,3 @@ gdk_screen_is_composited (GdkScreen *screen)
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#define __GDK_SCREEN_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -40,7 +40,6 @@
|
||||
#include "gdkproperty.h"
|
||||
#include "gdkselection.h"
|
||||
#include "gdkprivate.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
typedef struct _OwnerInfo OwnerInfo;
|
||||
@ -493,6 +492,3 @@ gdk_text_property_to_utf8_list_for_display (GdkDisplay *display,
|
||||
return count;
|
||||
}
|
||||
}
|
||||
|
||||
#define __GDK_SELECTION_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
#include "gdk.h"
|
||||
#include "gdkspawn.h"
|
||||
#include "gdkprivate.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
gboolean
|
||||
@ -103,6 +102,3 @@ gdk_spawn_command_line_on_screen (GdkScreen *screen,
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
#define __GDK_SPAWN_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
|
||||
#include <gdk/gdktestutils.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static DFBInputDeviceKeySymbol
|
||||
@ -262,6 +261,3 @@ gdk_test_simulate_button (GdkWindow *window,
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#define __GDK_TEST_UTILS_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -37,7 +37,6 @@
|
||||
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkvisual.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
struct _GdkVisualClass
|
||||
@ -492,6 +491,3 @@ gdk_directfb_visual_create (DFBSurfacePixelFormat pixelformat)
|
||||
|
||||
return (GdkVisualDirectFB *) visual;
|
||||
}
|
||||
|
||||
#define __GDK_VISUAL_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -41,7 +41,6 @@
|
||||
#include "gdkdisplay-directfb.h"
|
||||
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
#include "cairo.h"
|
||||
#include <assert.h>
|
||||
|
||||
@ -2890,7 +2889,3 @@ gdk_window_impl_iface_init (GdkWindowImplIface *iface)
|
||||
iface->queue_translation = gdk_directfb_window_queue_translation;
|
||||
iface->destroy = gdk_directfb_window_destroy;
|
||||
}
|
||||
|
||||
#define __GDK_WINDOW_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
|
||||
@ -36,7 +36,6 @@
|
||||
#ifndef HAVE_XCONVERTCASE
|
||||
#include "gdkkeysyms.h"
|
||||
#endif
|
||||
#include "gdkalias.h"
|
||||
|
||||
typedef struct _GdkPredicate GdkPredicate;
|
||||
|
||||
@ -809,6 +808,3 @@ gdk_enable_multidevice (void)
|
||||
|
||||
_gdk_enable_multidevice = TRUE;
|
||||
}
|
||||
|
||||
#define __GDK_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkintl.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static void gdk_app_launch_context_finalize (GObject *object);
|
||||
@ -287,6 +286,3 @@ gdk_app_launch_context_new (void)
|
||||
{
|
||||
return g_object_new (GDK_TYPE_APP_LAUNCH_CONTEXT, NULL);
|
||||
}
|
||||
|
||||
#define __GDK_APP_LAUNCH_CONTEXT_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
#include "gdkcairo.h"
|
||||
#include "gdkdrawable.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
/**
|
||||
* gdk_cairo_create:
|
||||
@ -287,7 +287,3 @@ gdk_cairo_set_source_pixmap (cairo_t *cr,
|
||||
cairo_set_source_surface (cr, surface, pixmap_x, pixmap_y);
|
||||
cairo_surface_destroy (surface);
|
||||
}
|
||||
|
||||
|
||||
#define __GDK_CAIRO_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkcolor.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
/**
|
||||
@ -247,6 +246,3 @@ gdk_colormap_get_system (void)
|
||||
{
|
||||
return gdk_screen_get_system_colormap (gdk_screen_get_default ());
|
||||
}
|
||||
|
||||
#define __GDK_COLOR_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
#include "gdkcursor.h"
|
||||
#include "gdkdisplay.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
GType
|
||||
gdk_cursor_get_type (void)
|
||||
@ -97,6 +97,3 @@ 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"
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
#include "gdkdeviceprivate.h"
|
||||
#include "gdkintl.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
typedef struct _GdkAxisInfo GdkAxisInfo;
|
||||
|
||||
@ -1394,6 +1394,3 @@ _gdk_device_translate_axis (GdkDevice *device,
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#define __GDK_DEVICE_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
#include "gdkdevicemanager.h"
|
||||
#include "gdkintl.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
/**
|
||||
* SECTION:gdkdevicemanager
|
||||
@ -320,7 +320,3 @@ gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager)
|
||||
|
||||
return GDK_DEVICE_MANAGER_GET_CLASS (device_manager)->get_client_pointer (device_manager);
|
||||
}
|
||||
|
||||
|
||||
#define __GDK_DEVICE_MANAGER_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkmarshalers.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
enum {
|
||||
OPENED,
|
||||
@ -1813,6 +1813,3 @@ gdk_display_get_device_manager (GdkDisplay *display)
|
||||
|
||||
return display->device_manager;
|
||||
}
|
||||
|
||||
#define __GDK_DISPLAY_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
|
||||
#include "gdkintl.h"
|
||||
|
||||
#include "gdkalias.h"
|
||||
|
||||
struct _GdkDisplayManager
|
||||
{
|
||||
@ -259,6 +258,3 @@ gdk_display_manager_list_displays (GdkDisplayManager *display_manager)
|
||||
{
|
||||
return g_slist_copy (_gdk_displays);
|
||||
}
|
||||
|
||||
#define __GDK_DISPLAY_MANAGER_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
#include <gdkdnd.h>
|
||||
#include <gdkdrawable.h>
|
||||
#include <gdkdisplay.h>
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
/**
|
||||
* SECTION:dnd
|
||||
@ -183,6 +183,3 @@ gdk_drag_context_get_source_window (GdkDragContext *context)
|
||||
|
||||
return context->source_window;
|
||||
}
|
||||
|
||||
#define __GDK_DND_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
#include "gdkwindow.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkpixbuf.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static GdkImage* gdk_drawable_real_get_image (GdkDrawable *drawable,
|
||||
gint x,
|
||||
@ -1730,7 +1730,3 @@ _gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
|
||||
return GDK_DRAWABLE_GET_CLASS (drawable)->create_cairo_surface (drawable,
|
||||
width, height);
|
||||
}
|
||||
|
||||
|
||||
#define __GDK_DRAW_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
/*** BEGIN file-header ***/
|
||||
#define GDK_ENABLE_BROKEN
|
||||
#include "gdk.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
/*** END file-header ***/
|
||||
|
||||
@ -33,6 +32,5 @@ GType
|
||||
/*** END value-tail ***/
|
||||
|
||||
/*** BEGIN file-tail ***/
|
||||
#define __GDK_ENUM_TYPES_C__
|
||||
#include "gdkaliasdef.c"
|
||||
/**/
|
||||
/*** END file-tail ***/
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
#include "gdk.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
typedef struct _GdkIOClosure GdkIOClosure;
|
||||
|
||||
@ -1541,6 +1541,3 @@ gdk_setting_get (const gchar *name,
|
||||
{
|
||||
return gdk_screen_get_setting (gdk_screen_get_default (), name, value);
|
||||
}
|
||||
|
||||
#define __GDK_EVENTS_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
#include "gdkpixmap.h"
|
||||
#include "gdkrgb.h"
|
||||
#include "gdkprivate.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static void gdk_gc_finalize (GObject *object);
|
||||
|
||||
@ -1458,7 +1458,3 @@ _gdk_gc_update_context (GdkGC *gc,
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
#define __GDK_GC_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
#include "gdktypes.h"
|
||||
#include "gdkprivate.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
guint _gdk_debug_flags = 0;
|
||||
gint _gdk_error_code = 0;
|
||||
|
||||
@ -32,7 +32,6 @@
|
||||
#include "gdkimage.h"
|
||||
#include "gdkprivate.h"
|
||||
#include "gdkinternals.h" /* For scratch_image code */
|
||||
#include "gdkalias.h"
|
||||
|
||||
/**
|
||||
* gdk_image_set_colormap:
|
||||
@ -565,6 +564,3 @@ 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"
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
|
||||
#include "gdkkeysyms.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
/* Key handling not part of the keymap */
|
||||
|
||||
@ -101,6 +100,3 @@ gdk_keyval_from_name (const gchar *keyval_name)
|
||||
else
|
||||
return GDK_VoidSymbol;
|
||||
}
|
||||
|
||||
#define __GDK_KEYNAMES_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
#include "gdkdisplay.h"
|
||||
#include "gdkkeys.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
enum {
|
||||
DIRECTION_CHANGED,
|
||||
@ -311,6 +311,3 @@ gdk_keymap_get_default (void)
|
||||
{
|
||||
return gdk_keymap_get_for_display (gdk_display_get_default ());
|
||||
}
|
||||
|
||||
#define __GDK_KEYS_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
#include "config.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.
|
||||
@ -1695,6 +1695,3 @@ gdk_unicode_to_keyval (guint32 wc)
|
||||
*/
|
||||
return wc | 0x01000000;
|
||||
}
|
||||
|
||||
#define __GDK_KEYUNI_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
#include "gdkgc.h"
|
||||
#include "gdkcolor.h"
|
||||
#include "gdkcursor.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
/* LIMITATIONS:
|
||||
*
|
||||
@ -1228,6 +1228,3 @@ gdk_offscreen_window_impl_iface_init (GdkWindowImplIface *iface)
|
||||
iface->get_device_state = gdk_offscreen_window_get_device_state;
|
||||
iface->destroy = gdk_offscreen_window_destroy;
|
||||
}
|
||||
|
||||
#define __GDK_OFFSCREEN_WINDOW_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#include "gdkprivate.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkintl.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
#define GDK_INFO_KEY "gdk-info"
|
||||
|
||||
@ -1478,6 +1478,3 @@ gdk_pango_context_get_for_screen (GdkScreen *screen)
|
||||
|
||||
return context;
|
||||
}
|
||||
|
||||
#define __GDK_PANGO_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
#include "gdkpixbuf.h"
|
||||
#include "gdkpixmap.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
/* Some convenient names
|
||||
*/
|
||||
@ -1413,6 +1413,3 @@ gdk_pixbuf_get_from_image (GdkPixbuf *dest,
|
||||
|
||||
return dest;
|
||||
}
|
||||
|
||||
#define __GDK_PIXBUF_DRAWABLE_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -26,9 +26,7 @@
|
||||
#include "gdkpixbuf.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* gdk_pixbuf_render_threshold_alpha:
|
||||
@ -253,7 +251,3 @@ gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf,
|
||||
*mask_return = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
#define __GDK_PIXBUF_RENDER_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkpixbuf.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static GdkGC *gdk_pixmap_create_gc (GdkDrawable *drawable,
|
||||
GdkGCValues *values,
|
||||
@ -774,6 +774,3 @@ gdk_pixmap_real_get_screen (GdkDrawable *drawable)
|
||||
{
|
||||
return gdk_drawable_get_screen (GDK_PIXMAP_OBJECT (drawable)->impl);
|
||||
}
|
||||
|
||||
#define __GDK_PIXMAP_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
#include "config.h"
|
||||
#include <gdk/gdk.h>
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
/**
|
||||
* gdk_rectangle_union:
|
||||
@ -132,7 +132,3 @@ gdk_rectangle_get_type (void)
|
||||
(GBoxedFreeFunc)g_free);
|
||||
return our_type;
|
||||
}
|
||||
|
||||
|
||||
#define __GDK_RECTANGLE_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -40,7 +40,6 @@
|
||||
|
||||
#include "gdkrgb.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkalias.h"
|
||||
#include <glib/gprintf.h>
|
||||
|
||||
typedef struct _GdkRgbInfo GdkRgbInfo;
|
||||
@ -3710,6 +3709,3 @@ gdk_rgb_get_visual (void)
|
||||
{
|
||||
return gdk_screen_get_rgb_visual (gdk_screen_get_default ());
|
||||
}
|
||||
|
||||
#define __GDK_RGB_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#include "gdkwindow.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkintl.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static void gdk_screen_dispose (GObject *object);
|
||||
static void gdk_screen_finalize (GObject *object);
|
||||
@ -540,6 +540,3 @@ gdk_screen_set_property (GObject *object,
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#define __GDK_SCREEN_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
#include "gdkproperty.h"
|
||||
#include "gdkdisplay.h"
|
||||
#include "gdkselection.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
gboolean
|
||||
gdk_selection_owner_set (GdkWindow *owner,
|
||||
@ -134,6 +134,3 @@ gdk_utf8_to_compound_text (const gchar *str,
|
||||
str, encoding, format,
|
||||
ctext, length);
|
||||
}
|
||||
|
||||
#define __GDK_SELECTION_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
#include "config.h"
|
||||
#include "gdkvisual.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
/**
|
||||
* gdk_list_visuals:
|
||||
@ -248,6 +248,3 @@ gdk_visual_get_blue_pixel_details (GdkVisual *visual,
|
||||
if (precision)
|
||||
*precision = visual->blue_prec;
|
||||
}
|
||||
|
||||
#define __GDK_VISUAL_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -45,8 +45,6 @@
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkwindowimpl.h"
|
||||
|
||||
#include "gdkalias.h"
|
||||
|
||||
#undef DEBUG_WINDOW_PRINTING
|
||||
|
||||
|
||||
@ -11762,7 +11760,3 @@ _gdk_window_get_input_window_for_event (GdkWindow *native_window,
|
||||
|
||||
return event_win;
|
||||
}
|
||||
|
||||
|
||||
#define __GDK_WINDOW_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
#include "gdkwindowimpl.h"
|
||||
#include "gdkinternals.h"
|
||||
|
||||
#include "gdkalias.h"
|
||||
|
||||
GType
|
||||
gdk_window_impl_get_type (void)
|
||||
@ -46,7 +45,3 @@ gdk_window_impl_get_type (void)
|
||||
|
||||
return gtype;
|
||||
}
|
||||
|
||||
#define __GDK_WINDOW_IMPL_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
|
||||
@ -51,8 +51,6 @@ gdk-win32-backend :
|
||||
all: \
|
||||
..\config.h \
|
||||
gdkconfig.h \
|
||||
gdkalias.h \
|
||||
gdkaliasdef.c \
|
||||
gdkenumtypes.h \
|
||||
gdkenumtypes.c \
|
||||
gdkmarshalers.h \
|
||||
@ -138,12 +136,6 @@ gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
|
||||
gdkconfig.h : gdkconfig.h.win32
|
||||
copy gdkconfig.h.win32 gdkconfig.h
|
||||
|
||||
gdkalias.h: gdk.symbols
|
||||
perl makegdkalias.pl < gdk.symbols > gdkalias.h
|
||||
|
||||
gdkaliasdef.c: gdk.symbols
|
||||
perl makegdkalias.pl -def < gdk.symbols > gdkaliasdef.c
|
||||
|
||||
gdk.def: gdk.symbols
|
||||
echo EXPORTS > gdk.def
|
||||
cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 -DALL_FILES \
|
||||
|
||||
@ -1,138 +0,0 @@
|
||||
#!/usr/bin/perl -w
|
||||
|
||||
exit 0;
|
||||
|
||||
my $do_def = 0;
|
||||
|
||||
if (($#ARGV >= 0) && ($ARGV[0] eq "-def")) {
|
||||
shift;
|
||||
$do_def = 1;
|
||||
}
|
||||
|
||||
print <<EOF;
|
||||
/* Generated by makegdkalias.pl */
|
||||
|
||||
#ifndef DISABLE_VISIBILITY
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#ifdef G_HAVE_GNUC_VISIBILITY
|
||||
|
||||
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;
|
||||
|
||||
while (<>) {
|
||||
|
||||
# ignore empty lines
|
||||
next if /^\s*$/;
|
||||
|
||||
# skip comments
|
||||
if ($_ =~ /^\s*\/\*/)
|
||||
{
|
||||
$in_comment = 1;
|
||||
}
|
||||
|
||||
if ($in_comment)
|
||||
{
|
||||
if ($_ =~ /\*\/\s$/)
|
||||
{
|
||||
$in_comment = 0;
|
||||
}
|
||||
|
||||
next;
|
||||
}
|
||||
|
||||
# handle ifdefs
|
||||
if ($_ =~ /^\#endif/)
|
||||
{
|
||||
if (!$in_skipped_section)
|
||||
{
|
||||
print $_;
|
||||
}
|
||||
|
||||
$in_skipped_section = 0;
|
||||
|
||||
next;
|
||||
}
|
||||
|
||||
if ($_ =~ /^\#ifdef\s+(INCLUDE_VARIABLES|INCLUDE_INTERNAL_SYMBOLS|ALL_FILES)/)
|
||||
{
|
||||
$in_skipped_section = 1;
|
||||
}
|
||||
|
||||
if ($in_skipped_section)
|
||||
{
|
||||
next;
|
||||
}
|
||||
|
||||
if ($_ =~ /^\#ifn?def/)
|
||||
{
|
||||
print $_;
|
||||
|
||||
next;
|
||||
}
|
||||
|
||||
if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/)
|
||||
{
|
||||
print $_;
|
||||
|
||||
next;
|
||||
}
|
||||
|
||||
chop;
|
||||
my $str = $_;
|
||||
my @words;
|
||||
my $attributes = "";
|
||||
|
||||
@words = split(/ /, $str);
|
||||
$str = shift(@words);
|
||||
chomp($str);
|
||||
my $alias = "IA__".$str;
|
||||
|
||||
# Drop any Win32 specific .def file syntax, but keep attributes
|
||||
foreach $word (@words) {
|
||||
$attributes = "$attributes $word" unless $word eq "PRIVATE";
|
||||
}
|
||||
|
||||
if (!$do_def) {
|
||||
print <<EOF
|
||||
extern __typeof ($str) $alias __attribute((visibility("hidden")))$attributes;
|
||||
\#define $str $alias
|
||||
|
||||
EOF
|
||||
}
|
||||
else {
|
||||
print <<EOF
|
||||
\#undef $str
|
||||
extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
|
||||
|
||||
EOF
|
||||
}
|
||||
}
|
||||
|
||||
print <<EOF;
|
||||
|
||||
#endif /* G_HAVE_GNUC_VISIBILITY */
|
||||
#endif /* DISABLE_VISIBILITY */
|
||||
EOF
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
LANG=C
|
||||
|
||||
status=0
|
||||
|
||||
if ! which readelf 2>/dev/null >/dev/null; then
|
||||
echo "'readelf' not found; skipping test"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for so in .libs/lib*.so; do
|
||||
echo Checking $so for local PLT entries
|
||||
readelf -r $so | grep 'JU\?MP_SLOT' | grep -v 'gdk_pixbuf' | grep gdk && status=1
|
||||
done
|
||||
|
||||
exit $status
|
||||
@ -20,7 +20,7 @@
|
||||
#include <gdk/gdktestutils.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <win32/gdkwin32.h>
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
void
|
||||
gdk_test_render_sync (GdkWindow *window)
|
||||
|
||||
@ -33,7 +33,6 @@
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkintl.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static char *
|
||||
|
||||
@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <X11/Xlibint.h>
|
||||
#include "gdkasync.h"
|
||||
#include "gdkx.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
typedef struct _ChildInfoChildState ChildInfoChildState;
|
||||
typedef struct _ChildInfoState ChildInfoState;
|
||||
@ -840,6 +840,3 @@ _gdk_x11_roundtrip_async (GdkDisplay *display,
|
||||
UnlockDisplay(dpy);
|
||||
SyncHandle();
|
||||
}
|
||||
|
||||
#define __GDK_ASYNC_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
#include "gdkx.h"
|
||||
#include "gdkprivate-x11.h"
|
||||
#include "gdkscreen-x11.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
typedef struct _GdkColormapPrivateX11 GdkColormapPrivateX11;
|
||||
|
||||
@ -1301,6 +1301,3 @@ gdk_colormap_get_screen (GdkColormap *cmap)
|
||||
|
||||
return GDK_COLORMAP_PRIVATE_DATA (cmap)->screen;
|
||||
}
|
||||
|
||||
#define __GDK_COLOR_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -45,7 +45,6 @@
|
||||
#include "gdkx.h"
|
||||
#include <gdk/gdkpixmap.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
#include "gdkalias.h"
|
||||
|
||||
static guint theme_serial = 0;
|
||||
|
||||
@ -1058,6 +1057,3 @@ gdk_display_get_maximal_cursor_size (GdkDisplay *display,
|
||||
GDK_WINDOW_XWINDOW (window),
|
||||
128, 128, width, height);
|
||||
}
|
||||
|
||||
#define __GDK_CURSOR_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
#include "gdkkeysyms.h"
|
||||
#include "gdkprivate-x11.h"
|
||||
#include "gdkx.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
#ifdef HAVE_XKB
|
||||
#include <X11/XKBlib.h>
|
||||
@ -910,6 +909,3 @@ gdk_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager)
|
||||
device_manager_core = (GdkDeviceManagerCore *) device_manager;
|
||||
return device_manager_core->core_pointer;
|
||||
}
|
||||
|
||||
#define __GDK_DEVICE_MANAGER_CORE_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -25,8 +25,6 @@
|
||||
#include "gdkintl.h"
|
||||
#include "gdkx.h"
|
||||
|
||||
#include "gdkalias.h"
|
||||
|
||||
#include <X11/extensions/XInput.h>
|
||||
|
||||
|
||||
@ -656,6 +654,3 @@ gdk_device_manager_xi_list_devices (GdkDeviceManager *device_manager,
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#define __GDK_DEVICE_MANAGER_XI_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
#include "gdkkeysyms.h"
|
||||
#include "gdkprivate-x11.h"
|
||||
#include "gdkx.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
#define HAS_FOCUS(toplevel) ((toplevel)->has_focus || (toplevel)->has_pointer_focus)
|
||||
|
||||
@ -1168,6 +1167,3 @@ gdk_device_manager_xi2_select_window_events (GdkEventTranslator *translator,
|
||||
_gdk_device_manager_xi2_select_events (device_manager, window, &event_mask);
|
||||
g_free (event_mask.mask);
|
||||
}
|
||||
|
||||
#define __GDK_DEVICE_MANAGER_XI2_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -42,7 +42,6 @@
|
||||
#include "gdkdeviceprivate.h"
|
||||
#include "gdkdevicemanager.h"
|
||||
#include "xsettings-client.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
#include <X11/Xatom.h>
|
||||
|
||||
@ -2666,6 +2665,3 @@ gdk_x11_register_standard_event_type (GdkDisplay *display,
|
||||
|
||||
display_x11->event_types = g_slist_prepend (display_x11->event_types, event_type);
|
||||
}
|
||||
|
||||
#define __GDK_DISPLAY_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -42,7 +42,6 @@
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkscreen-x11.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
typedef struct _GdkDragContextPrivateX11 GdkDragContextPrivateX11;
|
||||
|
||||
@ -4012,6 +4011,3 @@ gdk_drag_drop_succeeded (GdkDragContext *context)
|
||||
|
||||
return !private->drop_failed;
|
||||
}
|
||||
|
||||
#define __GDK_DND_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -47,7 +47,6 @@
|
||||
#include "gdkscreen-x11.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
|
||||
#include "gdkalias.h"
|
||||
|
||||
static void gdk_x11_draw_rectangle (GdkDrawable *drawable,
|
||||
GdkGC *gc,
|
||||
@ -1477,6 +1476,3 @@ gdk_x11_ref_cairo_surface (GdkDrawable *drawable)
|
||||
|
||||
return impl->cairo_surface;
|
||||
}
|
||||
|
||||
#define __GDK_DRAWABLE_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
#include "gdkeventsource.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkx.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
static gboolean gdk_event_source_prepare (GSource *source,
|
||||
gint *timeout);
|
||||
@ -427,6 +427,3 @@ gdk_events_pending (void)
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#define __GDK_EVENT_SOURCE_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#include "gdkeventtranslator.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
GType
|
||||
gdk_event_translator_get_type (void)
|
||||
@ -95,6 +95,3 @@ gdk_event_translator_select_window_events (GdkEventTranslator *translator,
|
||||
if (iface->select_window_events)
|
||||
iface->select_window_events (translator, window, event_mask);
|
||||
}
|
||||
|
||||
#define __GDK_EVENT_TRANSLATOR_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
#include "gdkgc.h"
|
||||
#include "gdkprivate-x11.h"
|
||||
#include "gdkx.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
@ -696,6 +695,3 @@ gdk_x11_gc_get_xgc (GdkGC *gc)
|
||||
|
||||
return gc_x11->xgc;
|
||||
}
|
||||
|
||||
#define __GDK_GC_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#include "gdkscreen-x11.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
#include "gdkwindow-x11.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
typedef struct _GdkWindowQueueItem GdkWindowQueueItem;
|
||||
typedef struct _GdkWindowParentPos GdkWindowParentPos;
|
||||
@ -317,6 +317,3 @@ _gdk_window_process_expose (GdkWindow *window,
|
||||
|
||||
cairo_region_destroy (invalidate_region);
|
||||
}
|
||||
|
||||
#define __GDK_GEOMETRY_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
#include "gdktypes.h"
|
||||
#include "gdkprivate-x11.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
gboolean _gdk_use_xshm = TRUE; /* used as a cmd line arg */
|
||||
Display *gdk_display = NULL;
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
#include "gdkpixmap.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
/* If this variable is FALSE, it indicates that we should
|
||||
@ -103,6 +102,3 @@ gdk_set_locale (void)
|
||||
|
||||
return setlocale (LC_ALL, NULL);
|
||||
}
|
||||
|
||||
#define __GDK_IM_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
#include "gdkprivate-x11.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
#include "gdkscreen-x11.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
typedef struct _GdkImagePrivateX11 GdkImagePrivateX11;
|
||||
|
||||
@ -752,7 +752,3 @@ _gdk_windowing_get_bits_for_depth (GdkDisplay *display,
|
||||
g_assert_not_reached ();
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
#define __GDK_IMAGE_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
#include "gdkscreen-x11.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
#include "gdkwindow.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
/* Addition used for extension_events mask */
|
||||
#define GDK_ALL_DEVICES_MASK (1<<30)
|
||||
@ -229,6 +229,3 @@ _gdk_input_check_extension_events (GdkDevice *device)
|
||||
_gdk_input_select_device_events (input_window->impl_window, device);
|
||||
}
|
||||
}
|
||||
|
||||
#define __GDK_INPUT_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -40,7 +40,6 @@
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
#include "gdkkeysyms.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
#ifdef HAVE_XKB
|
||||
#include <X11/XKBlib.h>
|
||||
@ -1845,7 +1844,3 @@ gdk_keymap_map_virtual_modifiers (GdkKeymap *keymap,
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
||||
#define __GDK_KEYS_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -49,7 +49,6 @@
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkprivate-x11.h"
|
||||
#include "gdkintl.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
#include <gdk/gdkdeviceprivate.h>
|
||||
|
||||
@ -623,6 +622,3 @@ void
|
||||
_gdk_windowing_event_data_free (GdkEvent *event)
|
||||
{
|
||||
}
|
||||
|
||||
#define __GDK_MAIN_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
#include "gdkdisplay-x11.h"
|
||||
|
||||
#include <gdk/gdkinternals.h>
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
@ -457,6 +457,3 @@ 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"
|
||||
|
||||
@ -37,7 +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;
|
||||
@ -757,6 +757,3 @@ 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"
|
||||
|
||||
@ -32,7 +32,6 @@
|
||||
#include "gdkdisplay.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
#include "gdkx.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
#include <X11/Xatom.h>
|
||||
|
||||
@ -2091,6 +2090,3 @@ gdk_x11_screen_get_window_manager_name (GdkScreen *screen)
|
||||
|
||||
return GDK_SCREEN_X11 (screen)->window_manager_name;
|
||||
}
|
||||
|
||||
#define __GDK_SCREEN_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
#include "gdkprivate.h"
|
||||
#include "gdkprivate-x11.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
typedef struct _OwnerInfo OwnerInfo;
|
||||
|
||||
@ -887,6 +887,3 @@ void gdk_free_compound_text (guchar *ctext)
|
||||
if (ctext)
|
||||
XFree (ctext);
|
||||
}
|
||||
|
||||
#define __GDK_SELECTION_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -27,8 +27,8 @@
|
||||
|
||||
#include <glib.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
|
||||
typedef struct {
|
||||
char *display;
|
||||
GSpawnChildSetupFunc child_setup;
|
||||
@ -213,6 +213,3 @@ gdk_spawn_command_line_on_screen (GdkScreen *screen,
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
#define __GDK_SPAWN_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
#include <gdk/gdktestutils.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <x11/gdkx.h>
|
||||
#include "gdkalias.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
@ -242,6 +241,3 @@ gdk_test_simulate_button (GdkWindow *window,
|
||||
success &= 0 == gdk_error_trap_pop();
|
||||
return success;
|
||||
}
|
||||
|
||||
#define __GDK_TEST_UTILS_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
#include "gdkprivate-x11.h"
|
||||
#include "gdkscreen-x11.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
|
||||
struct _GdkVisualClass
|
||||
{
|
||||
@ -672,6 +672,3 @@ gdk_visual_get_screen (GdkVisual *visual)
|
||||
|
||||
return ((GdkVisualPrivate*) visual)->screen;
|
||||
}
|
||||
|
||||
#define __GDK_VISUAL_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -51,7 +51,6 @@
|
||||
#include "gdkwindow-x11.h"
|
||||
#include "gdkdeviceprivate.h"
|
||||
#include "gdkeventsource.h"
|
||||
#include "gdkalias.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
@ -5622,6 +5621,3 @@ gdk_x11_get_server_time (GdkWindow *window)
|
||||
|
||||
return xevent.xproperty.time;
|
||||
}
|
||||
|
||||
#define __GDK_WINDOW_X11_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
#include "gdkx.h"
|
||||
#include "gdkprivate-x11.h"
|
||||
#include "gdkdisplay-x11.h"
|
||||
#include "gdkalias.h"
|
||||
#include <stdio.h>
|
||||
|
||||
static guint gdk_xid_hash (XID *xid);
|
||||
@ -132,6 +131,3 @@ gdk_xid_equal (XID *a,
|
||||
{
|
||||
return (*a == *b);
|
||||
}
|
||||
|
||||
#define __GDK_XID_C__
|
||||
#include "gdkaliasdef.c"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user