gdk/: fully remove gdkalias hacks

https://bugzilla.gnome.org/show_bug.cgi?id=623845

docs/reference/gdk/Makefile.am

@@ -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		\

gdk/Makefile.am

@@ -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 )
 

gdk/directfb/gdkcolor-directfb.c

@@ -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"

gdk/directfb/gdkcursor-directfb.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"
-

gdk/directfb/gdkdisplay-directfb.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"
-

gdk/directfb/gdkdnd-directfb.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"

gdk/directfb/gdkdrawable-directfb.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"

gdk/directfb/gdkevents-directfb.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"

gdk/directfb/gdkgc-directfb.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"

gdk/directfb/gdkgeometry-directfb.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"

gdk/directfb/gdkglobals-directfb.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"

gdk/directfb/gdkimage-directfb.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"

gdk/directfb/gdkinput-directfb.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"

gdk/directfb/gdkkeys-directfb.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"

gdk/directfb/gdkmain-directfb.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"

gdk/directfb/gdkpixmap-directfb.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"

gdk/directfb/gdkproperty-directfb.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"

gdk/directfb/gdkscreen-directfb.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"

gdk/directfb/gdkselection-directfb.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"

gdk/directfb/gdkspawn-directfb.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"

gdk/directfb/gdktestutils-directfb.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"

gdk/directfb/gdkvisual-directfb.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"

gdk/directfb/gdkwindow-directfb.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"
-

gdk/gdk.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"

gdk/gdkapplaunchcontext.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"

gdk/gdkcairo.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"

gdk/gdkcolor.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"

gdk/gdkcursor.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"

gdk/gdkdevice.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"

gdk/gdkdevicemanager.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"

gdk/gdkdisplay.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"

gdk/gdkdisplaymanager.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"

gdk/gdkdnd.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"

gdk/gdkdraw.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"

gdk/gdkenumtypes.c.template

 /*** 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 ***/

gdk/gdkevents.c

@@ -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"

gdk/gdkgc.c

@@ -33,7 +33,7 @@
 #include "gdkpixmap.h"
 #include "gdkrgb.h"
 #include "gdkprivate.h"
-#include "gdkalias.h"
+
 
 static void gdk_gc_finalize   (GObject      *object);