gdk/directfb/gdkcolor-directfb.c small clean ups include order

gdk/directfb/gdkwindow-directfb.c fixed beep compile error
gdk/directfb/Makefile.am removed GDK_PIXBUF_DISABLE_DEPRECATED
     GDK_DISABLE_DEPRECATED to allow compile per Behdad
gdk/quartz/Makefile.am same change as directfb Makefile
gtk/Makefile.am fixed typo that cause socket stubs not to compile
This commit is contained in:
Michael David Emmel 2006-09-14 02:56:01 +00:00
parent 862186a4dc
commit 539414d677
4 changed files with 13 additions and 8 deletions

View File

@ -1,3 +1,12 @@
2006-09-13 Michael Emmel <mike.emmel@gmail.com>
* gdk/directfb/gdkcolor-directfb.c small clean ups include order
* gdk/directfb/gdkwindow-directfb.c fixed beep compile error
* gdk/directfb/Makefile.am removed GDK_PIXBUF_DISABLE_DEPRECATED
GDK_DISABLE_DEPRECATED to allow compile per Behdad
* gdk/quartz/Makefile.am same change as directfb Makefile
* gtk/Makefile.am fixed typo that cause socket stubs not to compile
2006-09-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcolorsel.c: Use a GtkWindow instead of a GtkInvisible

View File

@ -4,12 +4,11 @@ libgdkincludedir = $(includedir)/gtk-2.0/gdk
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk-DirectFB\" \
-DGDK_COMPILATION \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@

View File

@ -38,12 +38,10 @@
#include <stdlib.h>
#include <string.h>
#include "gdkcolor.h"
#include "gdkinternals.h"
#include "gdkdirectfb.h"
#include "gdkprivate-directfb.h"
#include "gdkinternals.h"
#include "gdkcolor.h"
#include "gdkalias.h"
@ -618,6 +616,5 @@ gdk_directfb_allocate_color_key (GdkColormap *colormap)
private->info[255].ref_count++;
}
#define __GDK_COLOR_X11_C__
#include "gdkaliasdef.c"

View File

@ -2993,7 +2993,7 @@ gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface)
void
gdk_window_beep (GdkWindow *window)
{
gdk_display_beep (GDK_WINDOW_DISPLAY (window));
gdk_display_beep (gdk_display_get_default());
}
#define __GDK_WINDOW_X11_C__