[gtk+] gdk/: fully remove gdkalias hacks
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk/: fully remove gdkalias hacks
- Date: Sat, 10 Jul 2010 00:55:27 +0000 (UTC)
commit 404e7d0e0013355549578db5c3981943f536c2b9
Author: Javier Jardón <jjardon gnome org>
Date: Fri Jul 9 02:34:45 2010 +0200
gdk/: fully remove gdkalias hacks
https://bugzilla.gnome.org/show_bug.cgi?id=623845
docs/reference/gdk/Makefile.am | 1 -
gdk/Makefile.am | 21 +----
gdk/directfb/gdkcolor-directfb.c | 3 -
gdk/directfb/gdkcursor-directfb.c | 5 -
gdk/directfb/gdkdisplay-directfb.c | 6 --
gdk/directfb/gdkdnd-directfb.c | 4 -
gdk/directfb/gdkdrawable-directfb.c | 6 --
gdk/directfb/gdkevents-directfb.c | 9 --
gdk/directfb/gdkgc-directfb.c | 4 -
gdk/directfb/gdkgeometry-directfb.c | 4 -
gdk/directfb/gdkglobals-directfb.c | 4 -
gdk/directfb/gdkimage-directfb.c | 4 -
gdk/directfb/gdkinput-directfb.c | 5 -
gdk/directfb/gdkkeys-directfb.c | 6 +-
gdk/directfb/gdkmain-directfb.c | 4 -
gdk/directfb/gdkpixmap-directfb.c | 4 -
gdk/directfb/gdkproperty-directfb.c | 3 -
gdk/directfb/gdkscreen-directfb.c | 4 -
gdk/directfb/gdkselection-directfb.c | 4 -
gdk/directfb/gdkspawn-directfb.c | 4 -
gdk/directfb/gdktestutils-directfb.c | 4 -
gdk/directfb/gdkvisual-directfb.c | 4 -
gdk/directfb/gdkwindow-directfb.c | 5 -
gdk/gdk.c | 4 -
gdk/gdkapplaunchcontext.c | 4 -
gdk/gdkcairo.c | 6 +-
gdk/gdkcolor.c | 4 -
gdk/gdkcursor.c | 5 +-
gdk/gdkdevice.c | 5 +-
gdk/gdkdevicemanager.c | 6 +-
gdk/gdkdisplay.c | 5 +-
gdk/gdkdisplaymanager.c | 4 -
gdk/gdkdnd.c | 5 +-
gdk/gdkdraw.c | 6 +-
gdk/gdkenumtypes.c.template | 4 +-
gdk/gdkevents.c | 5 +-
gdk/gdkgc.c | 6 +-
gdk/gdkglobals.c | 2 +-
gdk/gdkimage.c | 4 -
gdk/gdkkeynames.c | 4 -
gdk/gdkkeys.c | 5 +-
gdk/gdkkeyuni.c | 5 +-
gdk/gdkoffscreenwindow.c | 5 +-
gdk/gdkpango.c | 5 +-
gdk/gdkpixbuf-drawable.c | 5 +-
gdk/gdkpixbuf-render.c | 6 --
gdk/gdkpixmap.c | 5 +-
gdk/gdkrectangle.c | 6 +-
gdk/gdkrgb.c | 4 -
gdk/gdkscreen.c | 5 +-
gdk/gdkselection.c | 5 +-
gdk/gdkvisual.c | 5 +-
gdk/gdkwindow.c | 6 --
gdk/gdkwindowimpl.c | 5 -
gdk/makefile.msc | 8 --
gdk/makegdkalias.pl | 138 ----------------------------------
gdk/pltcheck.sh | 17 ----
gdk/win32/gdktestutils-win32.c | 2 +-
gdk/x11/gdkapplaunchcontext-x11.c | 1 -
gdk/x11/gdkasync.c | 5 +-
gdk/x11/gdkcolor-x11.c | 5 +-
gdk/x11/gdkcursor-x11.c | 4 -
gdk/x11/gdkdevicemanager-core.c | 4 -
gdk/x11/gdkdevicemanager-xi.c | 5 -
gdk/x11/gdkdevicemanager-xi2.c | 4 -
gdk/x11/gdkdisplay-x11.c | 4 -
gdk/x11/gdkdnd-x11.c | 4 -
gdk/x11/gdkdrawable-x11.c | 4 -
gdk/x11/gdkeventsource.c | 5 +-
gdk/x11/gdkeventtranslator.c | 5 +-
gdk/x11/gdkgc-x11.c | 4 -
gdk/x11/gdkgeometry-x11.c | 5 +-
gdk/x11/gdkglobals-x11.c | 2 +-
gdk/x11/gdkim-x11.c | 4 -
gdk/x11/gdkimage-x11.c | 6 +-
gdk/x11/gdkinput.c | 5 +-
gdk/x11/gdkkeys-x11.c | 5 -
gdk/x11/gdkmain-x11.c | 4 -
gdk/x11/gdkpixmap-x11.c | 5 +-
gdk/x11/gdkproperty-x11.c | 5 +-
gdk/x11/gdkscreen-x11.c | 4 -
gdk/x11/gdkselection-x11.c | 5 +-
gdk/x11/gdkspawn-x11.c | 7 +-
gdk/x11/gdktestutils-x11.c | 4 -
gdk/x11/gdkvisual-x11.c | 5 +-
gdk/x11/gdkwindow-x11.c | 4 -
gdk/x11/gdkxid.c | 4 -
87 files changed, 41 insertions(+), 521 deletions(-)
---
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 764a967..d726ac2 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/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 \
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 2bfe475..f79edb3 100644
--- a/gdk/Makefile.am
+++ b/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 )
diff --git a/gdk/directfb/gdkcolor-directfb.c b/gdk/directfb/gdkcolor-directfb.c
index 7b2c5df..67d0f7c 100644
--- a/gdk/directfb/gdkcolor-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkcursor-directfb.c b/gdk/directfb/gdkcursor-directfb.c
index f5d9a19..7abd0cd 100644
--- a/gdk/directfb/gdkcursor-directfb.c
+++ b/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"
-
diff --git a/gdk/directfb/gdkdisplay-directfb.c b/gdk/directfb/gdkdisplay-directfb.c
index 62c1f28..78026bf 100644
--- a/gdk/directfb/gdkdisplay-directfb.c
+++ b/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"
-
diff --git a/gdk/directfb/gdkdnd-directfb.c b/gdk/directfb/gdkdnd-directfb.c
index 2c65aab..f4cd256 100644
--- a/gdk/directfb/gdkdnd-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkdrawable-directfb.c b/gdk/directfb/gdkdrawable-directfb.c
index eb859ef..98047e5 100644
--- a/gdk/directfb/gdkdrawable-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkevents-directfb.c b/gdk/directfb/gdkevents-directfb.c
index 7260547..39363d3 100644
--- a/gdk/directfb/gdkevents-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkgc-directfb.c b/gdk/directfb/gdkgc-directfb.c
index 7e419e8..a696523 100644
--- a/gdk/directfb/gdkgc-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkgeometry-directfb.c b/gdk/directfb/gdkgeometry-directfb.c
index 416e1b0..85a39a2 100644
--- a/gdk/directfb/gdkgeometry-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkglobals-directfb.c b/gdk/directfb/gdkglobals-directfb.c
index fbfd863..3e48084 100644
--- a/gdk/directfb/gdkglobals-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkimage-directfb.c b/gdk/directfb/gdkimage-directfb.c
index 8e1ed66..fe7b6aa 100644
--- a/gdk/directfb/gdkimage-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkinput-directfb.c b/gdk/directfb/gdkinput-directfb.c
index 00e0b43..1af5682 100644
--- a/gdk/directfb/gdkinput-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkkeys-directfb.c b/gdk/directfb/gdkkeys-directfb.c
index 7ca2597..d33c21f 100644
--- a/gdk/directfb/gdkkeys-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkmain-directfb.c b/gdk/directfb/gdkmain-directfb.c
index 0e9b873..8883f42 100644
--- a/gdk/directfb/gdkmain-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkpixmap-directfb.c b/gdk/directfb/gdkpixmap-directfb.c
index c1134cc..0542533 100644
--- a/gdk/directfb/gdkpixmap-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkproperty-directfb.c b/gdk/directfb/gdkproperty-directfb.c
index 9ee4cbb..9174c42 100644
--- a/gdk/directfb/gdkproperty-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkscreen-directfb.c b/gdk/directfb/gdkscreen-directfb.c
index 7f65c88..bba03a6 100644
--- a/gdk/directfb/gdkscreen-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkselection-directfb.c b/gdk/directfb/gdkselection-directfb.c
index dd3348c..7b4306d 100644
--- a/gdk/directfb/gdkselection-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkspawn-directfb.c b/gdk/directfb/gdkspawn-directfb.c
index a33d9d9..0c265b2 100644
--- a/gdk/directfb/gdkspawn-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdktestutils-directfb.c b/gdk/directfb/gdktestutils-directfb.c
index 2197f2f..861cd22 100644
--- a/gdk/directfb/gdktestutils-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkvisual-directfb.c b/gdk/directfb/gdkvisual-directfb.c
index 7ae0831..fcbb1c3 100644
--- a/gdk/directfb/gdkvisual-directfb.c
+++ b/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"
diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index 5468a8f..26b6aae 100644
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/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"
-
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 89a4e2f..340efb9 100644
--- a/gdk/gdk.c
+++ b/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"
diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index 1653e97..aa37ca7 100644
--- a/gdk/gdkapplaunchcontext.c
+++ b/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"
diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c
index 4031db7..c5ead4e 100644
--- a/gdk/gdkcairo.c
+++ b/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"
diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 3789436..99307db 100644
--- a/gdk/gdkcolor.c
+++ b/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"
diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index a3677e9..7503f89 100644
--- a/gdk/gdkcursor.c
+++ b/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"
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 6ee68eb..8c03509 100644
--- a/gdk/gdkdevice.c
+++ b/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"
diff --git a/gdk/gdkdevicemanager.c b/gdk/gdkdevicemanager.c
index b93e8a3..c9cf2e2 100644
--- a/gdk/gdkdevicemanager.c
+++ b/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"
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 0b91f88..437ea9e 100644
--- a/gdk/gdkdisplay.c
+++ b/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"
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index c171524..93a632e 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/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"
diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index 31aa250..b080ebe 100644
--- a/gdk/gdkdnd.c
+++ b/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"
diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index cf1fc07..78c8dfe 100644
--- a/gdk/gdkdraw.c
+++ b/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"
diff --git a/gdk/gdkenumtypes.c.template b/gdk/gdkenumtypes.c.template
index bf0c8fc..b94806f 100644
--- a/gdk/gdkenumtypes.c.template
+++ b/gdk/gdkenumtypes.c.template
@@ -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 ***/
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 470c9e9..fb9373a 100644
--- a/gdk/gdkevents.c
+++ b/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"
diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index 4bf2dc5..f20ba51 100644
--- a/gdk/gdkgc.c
+++ b/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);
@@ -1458,7 +1458,3 @@ _gdk_gc_update_context (GdkGC *gc,
}
}
-
-
-#define __GDK_GC_C__
-#include "gdkaliasdef.c"
diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index a805bcc..e92ad48 100644
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -30,7 +30,7 @@
#include "gdktypes.h"
#include "gdkprivate.h"
-#include "gdkalias.h"
+
guint _gdk_debug_flags = 0;
gint _gdk_error_code = 0;
diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c
index 1ef49c9..3cc2cb4 100644
--- a/gdk/gdkimage.c
+++ b/gdk/gdkimage.c
@@ -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"
diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c
index 6b155bc..e1f5a08 100644
--- a/gdk/gdkkeynames.c
+++ b/gdk/gdkkeynames.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"
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index 6953b46..fbaf616 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.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"
diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
index 4282597..05ab843 100644
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.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"
diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c
index 8005d05..b6bc3b4 100644
--- a/gdk/gdkoffscreenwindow.c
+++ b/gdk/gdkoffscreenwindow.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"
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 2a6b1ea..5d4e9aa 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.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"
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index ff85cb7..470d450 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.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"
diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c
index d1216b6..bd94aaf 100644
--- a/gdk/gdkpixbuf-render.c
+++ b/gdk/gdkpixbuf-render.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"
-
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index 2adb33f..06ae850 100644
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.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"
diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index 9ad5509..71a8bbc 100644
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.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"
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 4c7c858..c82f44e 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.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"
diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 4a6e11b..c403a41 100644
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.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"
diff --git a/gdk/gdkselection.c b/gdk/gdkselection.c
index fd8f705..e814e30 100644
--- a/gdk/gdkselection.c
+++ b/gdk/gdkselection.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"
diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c
index ce1bdd7..2be52af 100644
--- a/gdk/gdkvisual.c
+++ b/gdk/gdkvisual.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"
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 8d45b87..dff74a1 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.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"
diff --git a/gdk/gdkwindowimpl.c b/gdk/gdkwindowimpl.c
index 4aef21b..48fe438 100644
--- a/gdk/gdkwindowimpl.c
+++ b/gdk/gdkwindowimpl.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"
-
diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index a2f4be6..2cfea10 100644
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -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 \
diff --git a/gdk/win32/gdktestutils-win32.c b/gdk/win32/gdktestutils-win32.c
index 68972d8..ed9faa7 100644
--- a/gdk/win32/gdktestutils-win32.c
+++ b/gdk/win32/gdktestutils-win32.c
@@ -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)
diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index 4a6f3c5..0d5b10e 100644
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -33,7 +33,6 @@
#include "gdkscreen.h"
#include "gdkinternals.h"
#include "gdkintl.h"
-#include "gdkalias.h"
static char *
diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c
index e412ed2..70bb06f 100644
--- a/gdk/x11/gdkasync.c
+++ b/gdk/x11/gdkasync.c
@@ -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"
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index e71038f..0889d32 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.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"
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 5cfbaa5..6e72373 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.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"
diff --git a/gdk/x11/gdkdevicemanager-core.c b/gdk/x11/gdkdevicemanager-core.c
index 5fb6f2e..d144e88 100644
--- a/gdk/x11/gdkdevicemanager-core.c
+++ b/gdk/x11/gdkdevicemanager-core.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"
diff --git a/gdk/x11/gdkdevicemanager-xi.c b/gdk/x11/gdkdevicemanager-xi.c
index 6190799..e11cb58 100644
--- a/gdk/x11/gdkdevicemanager-xi.c
+++ b/gdk/x11/gdkdevicemanager-xi.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"
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 57eb321..0727f36 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.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"
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index b77c2ce..7195c01 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.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"
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 4486900..fc946cb 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.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"
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index c10513b..68379bf 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.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"
diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c
index 53a1557..d230488 100644
--- a/gdk/x11/gdkeventsource.c
+++ b/gdk/x11/gdkeventsource.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"
diff --git a/gdk/x11/gdkeventtranslator.c b/gdk/x11/gdkeventtranslator.c
index 753dfc8..dadc9fe 100644
--- a/gdk/x11/gdkeventtranslator.c
+++ b/gdk/x11/gdkeventtranslator.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"
diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index 8676d7c..9d0bb8d 100644
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.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"
diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index a7b1484..83a8995 100644
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.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"
diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c
index 63dc166..8852d3b 100644
--- a/gdk/x11/gdkglobals-x11.c
+++ b/gdk/x11/gdkglobals-x11.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;
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index a69b6a7..9fabd77 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -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"
diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index 1c217a0..f0329fb 100644
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.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"
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index c98c3f4..ff69ceb 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.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"
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 0804700..24bb18b 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.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"
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index a3a91cc..cb9ff04 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.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"
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 7e86dbb..5de1679 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.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"
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 1cf54f9..5e8bbe4 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.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"
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 5f91234..8aac075 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.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"
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index f993b5b..7a8d914 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.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"
diff --git a/gdk/x11/gdkspawn-x11.c b/gdk/x11/gdkspawn-x11.c
index d28d883..bee6aa4 100644
--- a/gdk/x11/gdkspawn-x11.c
+++ b/gdk/x11/gdkspawn-x11.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"
diff --git a/gdk/x11/gdktestutils-x11.c b/gdk/x11/gdktestutils-x11.c
index 13677b6..7793a83 100644
--- a/gdk/x11/gdktestutils-x11.c
+++ b/gdk/x11/gdktestutils-x11.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"
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 898543b..2183294 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.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"
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 96562f7..3062007 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.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"
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index a4a2cd8..21d876c 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]