diff options
author | Matthias Clasen <mclasen@redhat.com> | 2010-12-08 23:07:00 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2010-12-21 12:06:55 -0500 |
commit | 07d49ee56a4ce86d9d6154e00ff6b10bd3bdc2a4 (patch) | |
tree | 1b90702b472ced7ca391f34df2c110f8d0e6aaa7 /gtk/gtkdnd-quartz.c | |
parent | ae146a281750926eee6c5fafb88414999ffa6821 (diff) | |
download | gtk+-07d49ee56a4ce86d9d6154e00ff6b10bd3bdc2a4.tar.gz |
Merge libgdk and libgtk
This commit does a number of things:
- remove some dead wchar configury from configure.ac and gdkconfig.h
- repurpose gdkconfig.h as header that contains GDK_WINDOWING_foo
macros for each included backend, include it in gdk.h and install
it in $includedir instead of below $libdir
- drop the backend from the library names
- build libgdk-3.0.la as a convenience lib and include it in libgtk-3.0.la
It does not yet enable building multiple backends at the same time.
Diffstat (limited to 'gtk/gtkdnd-quartz.c')
-rw-r--r-- | gtk/gtkdnd-quartz.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c index 0f35cbadfc..858f9c2d34 100644 --- a/gtk/gtkdnd-quartz.c +++ b/gtk/gtkdnd-quartz.c @@ -29,9 +29,7 @@ #include <stdlib.h> #include <string.h> -#include "gdkconfig.h" - -#include "gdk/gdkkeysyms.h" +#include "gdk/gdk.h" #include "gtkdnd.h" #include "gtkiconfactory.h" |