summaryrefslogtreecommitdiff
path: root/gdk/directfb
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/directfb')
-rw-r--r--gdk/directfb/gdkcolor-directfb.c3
-rw-r--r--gdk/directfb/gdkcursor-directfb.c5
-rw-r--r--gdk/directfb/gdkdisplay-directfb.c6
-rw-r--r--gdk/directfb/gdkdnd-directfb.c4
-rw-r--r--gdk/directfb/gdkdrawable-directfb.c6
-rw-r--r--gdk/directfb/gdkevents-directfb.c9
-rw-r--r--gdk/directfb/gdkgc-directfb.c4
-rw-r--r--gdk/directfb/gdkgeometry-directfb.c4
-rw-r--r--gdk/directfb/gdkglobals-directfb.c4
-rw-r--r--gdk/directfb/gdkimage-directfb.c4
-rw-r--r--gdk/directfb/gdkinput-directfb.c5
-rw-r--r--gdk/directfb/gdkkeys-directfb.c6
-rw-r--r--gdk/directfb/gdkmain-directfb.c4
-rw-r--r--gdk/directfb/gdkpixmap-directfb.c4
-rw-r--r--gdk/directfb/gdkproperty-directfb.c3
-rw-r--r--gdk/directfb/gdkscreen-directfb.c4
-rw-r--r--gdk/directfb/gdkselection-directfb.c4
-rw-r--r--gdk/directfb/gdkspawn-directfb.c4
-rw-r--r--gdk/directfb/gdktestutils-directfb.c4
-rw-r--r--gdk/directfb/gdkvisual-directfb.c4
-rw-r--r--gdk/directfb/gdkwindow-directfb.c5
21 files changed, 1 insertions, 95 deletions
diff --git a/gdk/directfb/gdkcolor-directfb.c b/gdk/directfb/gdkcolor-directfb.c
index 7b2c5df1c1..67d0f7c715 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 f5d9a19801..7abd0cd3b5 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 62c1f285e4..78026bfc0c 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 2c65aab8ee..f4cd256e6c 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 eb859ef4f5..98047e54e5 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 7260547bcb..39363d342e 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 7e419e8774..a69652369e 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 416e1b01af..85a39a2dca 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 fbfd863a51..3e48084e9a 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 8e1ed66c38..fe7b6aa833 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 00e0b4343d..1af568247c 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 7ca259714e..d33c21f12d 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 0e9b873fce..8883f42d8b 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 c1134cc75c..0542533203 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 9ee4cbb72e..9174c42255 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 7f65c88462..bba03a60b0 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 dd3348c24a..7b4306d219 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 a33d9d9d16..0c265b23f0 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 2197f2ffa8..861cd227cb 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 7ae08312bf..fcbb1c30b9 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 5468a8f323..26b6aaedee 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"
-
View Lorry Controller Status