From 07866caf1e6ca631b1df2c3a2232925c390046da Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 1 Feb 2025 13:37:48 +0100 Subject: [PATCH] Update gdk -> ydk header location (omnibus commit) --- gtk2_ardour/ardour_ui_dependents.cc | 2 +- gtk2_ardour/au_pluginui.mm | 2 +- gtk2_ardour/cocoacarbon.mm | 2 +- gtk2_ardour/control_point.h | 2 +- gtk2_ardour/editor_drag.h | 2 +- gtk2_ardour/lxvst_plugin_ui.cc | 2 +- gtk2_ardour/mac_vst_plugin_ui.mm | 2 +- gtk2_ardour/main.cc | 2 +- gtk2_ardour/pianokeyboard.cc | 2 +- gtk2_ardour/public_editor.h | 2 +- gtk2_ardour/screensaver.cc | 2 +- gtk2_ardour/step_editor.h | 2 +- gtk2_ardour/time_axis_view_item.h | 2 +- gtk2_ardour/vst3_hwnd_plugin_ui.cc | 2 +- gtk2_ardour/vst3_nsview_plugin_ui.mm | 2 +- gtk2_ardour/vst3_x11_plugin_ui.cc | 2 +- gtk2_ardour/vst_plugin_ui.cc | 4 +- gtk2_ardour/windows_vst_plugin_ui.cc | 4 +- libs/canvas/canvas.cc | 2 +- libs/canvas/canvas/item.h | 2 +- libs/canvas/debug.cc | 2 +- libs/canvas/text.cc | 2 +- libs/clearlooks-newer/clearlooks_draw.h | 2 +- libs/gtkmm2ext/cairo_widget.cc | 2 +- libs/gtkmm2ext/emscale.cc | 2 +- libs/gtkmm2ext/gtkapplication_quartz.mm | 2 +- libs/gtkmm2ext/gtkmm2ext/bindings.h | 2 +- libs/gtkmm2ext/gtkmm2ext/doi.h | 2 +- libs/gtkmm2ext/gtkmm2ext/nsglview.h | 2 +- libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h | 2 +- libs/gtkmm2ext/keyboard.cc | 2 +- libs/gtkmm2ext/nsglview.mm | 2 +- libs/gtkmm2ext/sync-menu.c | 2 +- libs/tk/suil/cocoa_in_gtk2.mm | 2 +- libs/tk/suil/win_in_gtk2.cpp | 2 +- libs/tk/suil/x11_in_gtk2.c | 4 +- libs/tk/ydk/{ydk => }/gdkconfig.h | 0 libs/tk/ydk/gdkpixbuf-render.c | 2 +- libs/tk/ydk/gdkrectangle.c | 2 +- libs/tk/ydk/{ydk => }/gdkscreen-x11.h | 4 +- libs/tk/ydk/quartz/gdkspawn-quartz.c | 2 +- libs/tk/ydk/quartz/gdktestutils-quartz.c | 6 +- .../quartz/gdk => quartz/ydk}/gdkquartz.h | 2 +- libs/tk/ydk/win32/gdkdnd-win32.c | 2 +- libs/tk/ydk/win32/gdkprivate-win32.h | 8 +-- libs/tk/ydk/win32/gdkspawn-win32.c | 2 +- libs/tk/ydk/win32/gdktestutils-win32.c | 4 +- libs/tk/ydk/win32/gdkwin32id.c | 2 +- .../gdk => win32/ydk}/gdkdrawable-win32.h | 4 +- .../win32/gdk => win32/ydk}/gdkinput-win32.h | 0 .../win32/gdk => win32/ydk}/gdkpixmap-win32.h | 4 +- .../{ydk/win32/gdk => win32/ydk}/gdkwin32.h | 2 +- .../win32/gdk => win32/ydk}/gdkwin32keys.h | 2 +- .../win32/gdk => win32/ydk}/gdkwindow-win32.h | 2 +- .../ydk/{ydk/win32/gdk => win32/ydk}/pktdef.h | 0 .../ydk/{ydk/win32/gdk => win32/ydk}/wintab.h | 0 .../{ydk/win32/gdk => win32/ydk}/xcursors.h | 0 libs/tk/ydk/wscript | 19 +++---- libs/tk/ydk/x11/gdkcursor-x11.c | 2 +- libs/tk/ydk/x11/gdkpixmap-x11.c | 2 +- libs/tk/ydk/x11/gdkspawn-x11.c | 2 +- libs/tk/ydk/x11/gdktestutils-x11.c | 4 +- .../tk/ydk/{ydk/x11/gdk => x11/ydk}/MwmUtil.h | 0 .../ydk/{ydk/x11/gdk => x11/ydk}/gdkasync.h | 0 .../x11/gdk => x11/ydk}/gdkinputprivate.h | 0 .../{ydk/x11/gdk => x11/ydk}/gdkprivate-x11.h | 12 ++-- libs/tk/ydk/{ydk/x11/gdk => x11/ydk}/gdkx.h | 2 +- .../x11/gdk => x11/ydk}/xsettings-client.h | 0 .../x11/gdk => x11/ydk}/xsettings-common.h | 0 libs/tk/ydk/ydk/{gdk => }/gdk.h | 56 +++++++++---------- libs/tk/ydk/ydk/{gdk => }/gdkalias.h | 0 .../ydk/ydk/{gdk => }/gdkapplaunchcontext.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkcairo.h | 6 +- libs/tk/ydk/ydk/{gdk => }/gdkcolor.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkcursor.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkdisplay.h | 6 +- libs/tk/ydk/ydk/{gdk => }/gdkdisplaymanager.h | 6 +- libs/tk/ydk/ydk/{gdk => }/gdkdnd.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkdrawable.h | 8 +-- libs/tk/ydk/ydk/{gdk => }/gdkenumtypes.h | 2 +- libs/tk/ydk/ydk/{gdk => }/gdkevents.h | 10 ++-- libs/tk/ydk/ydk/{gdk => }/gdkfont.h | 2 +- libs/tk/ydk/ydk/{gdk => }/gdkgc.h | 6 +- libs/tk/ydk/ydk/{gdk => }/gdki18n.h | 0 libs/tk/ydk/ydk/{gdk => }/gdkimage.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkinput.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkinternals.h | 8 +-- libs/tk/ydk/ydk/{gdk => }/gdkintl.h | 0 libs/tk/ydk/ydk/{gdk => }/gdkkeys.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkkeysyms-compat.h | 0 libs/tk/ydk/ydk/{gdk => }/gdkkeysyms.h | 2 +- libs/tk/ydk/ydk/{gdk => }/gdkmarshalers.h | 0 libs/tk/ydk/ydk/{gdk => }/gdkmedialib.h | 0 libs/tk/ydk/ydk/{gdk => }/gdkpango.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkpixbuf.h | 6 +- libs/tk/ydk/ydk/{gdk => }/gdkpixmap.h | 6 +- libs/tk/ydk/ydk/{gdk => }/gdkpoly-generic.h | 0 libs/tk/ydk/ydk/{gdk => }/gdkprivate.h | 2 +- libs/tk/ydk/ydk/{gdk => }/gdkproperty.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkregion-generic.h | 0 libs/tk/ydk/ydk/{gdk => }/gdkregion.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkrgb.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkscreen.h | 6 +- libs/tk/ydk/ydk/{gdk => }/gdkselection.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkspawn.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdktestutils.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdktypes.h | 2 +- libs/tk/ydk/ydk/{gdk => }/gdkvisual.h | 4 +- libs/tk/ydk/ydk/{gdk => }/gdkwindow.h | 8 +-- libs/tk/ydk/ydk/{gdk => }/gdkwindowimpl.h | 2 +- libs/tk/ydk/ydk/{gdk => }/keyname-table.h | 0 .../ydk/ydk/{gdk => }/quartz/GdkQuartzView.h | 2 +- .../ydk/{gdk => }/quartz/GdkQuartzWindow.h | 0 .../ydk/{gdk => }/quartz/gdkdrawable-quartz.h | 2 +- .../ydk/{gdk => }/quartz/gdkinputprivate.h | 0 .../ydk/{gdk => }/quartz/gdkpixmap-quartz.h | 4 +- .../ydk/{gdk => }/quartz/gdkprivate-quartz.h | 10 ++-- .../ydk/{gdk => }/quartz/gdkscreen-quartz.h | 0 .../ydk/{gdk => }/quartz/gdkwindow-quartz.h | 6 +- libs/tk/ydk/ydk/{gdk => }/quartz/xcursors.h | 0 .../tk/ydk/ydk/{gdk => }/stamp-gdkenumtypes.h | 0 .../tk/ydk/ydk/{gdk => }/x11/gdkdisplay-x11.h | 10 ++-- .../ydk/ydk/{gdk => }/x11/gdkdrawable-x11.h | 2 +- libs/tk/ydk/ydk/{gdk => }/x11/gdkpixmap-x11.h | 4 +- libs/tk/ydk/ydk/{gdk => }/x11/gdkwindow-x11.h | 2 +- libs/tk/ydkmm/bitmap.cc | 2 +- libs/tk/ydkmm/color.cc | 2 +- libs/tk/ydkmm/colormap.cc | 2 +- libs/tk/ydkmm/cursor.cc | 2 +- libs/tk/ydkmm/device.cc | 2 +- libs/tk/ydkmm/display.cc | 4 +- libs/tk/ydkmm/displaymanager.cc | 2 +- libs/tk/ydkmm/dragcontext.cc | 2 +- libs/tk/ydkmm/drawable.cc | 2 +- libs/tk/ydkmm/event.cc | 2 +- libs/tk/ydkmm/gc.cc | 2 +- libs/tk/ydkmm/general.cc | 2 +- libs/tk/ydkmm/pixbuf.cc | 2 +- libs/tk/ydkmm/pixbufanimation.cc | 2 +- libs/tk/ydkmm/pixbufloader.cc | 2 +- libs/tk/ydkmm/pixmap.cc | 2 +- libs/tk/ydkmm/region.cc | 4 +- libs/tk/ydkmm/rgb.cc | 2 +- libs/tk/ydkmm/rgbcmap.cc | 2 +- libs/tk/ydkmm/screen.cc | 2 +- libs/tk/ydkmm/visual.cc | 2 +- libs/tk/ydkmm/window.cc | 2 +- libs/tk/ydkmm/ydkmm/gdkmm/device.h | 2 +- libs/tk/ydkmm/ydkmm/gdkmm/rectangle.h | 2 +- libs/tk/ydkmm/ydkmm/gdkmm/region.h | 2 +- libs/tk/ydkmm/ydkmm/gdkmm/types.h | 2 +- libs/tk/ytk/gtkaboutdialog.c | 2 +- libs/tk/ytk/gtkaccelgroup.c | 2 +- libs/tk/ytk/gtkaccellabel.c | 2 +- libs/tk/ytk/gtkcellrendereraccel.c | 2 +- libs/tk/ytk/gtkcellrendererspin.c | 2 +- libs/tk/ytk/gtkclipboard-quartz.c | 2 +- libs/tk/ytk/gtkclipboard.c | 4 +- libs/tk/ytk/gtkcolorbutton.c | 2 +- libs/tk/ytk/gtkcolorsel.c | 2 +- libs/tk/ytk/gtkcombobox.c | 2 +- libs/tk/ytk/gtkdnd-quartz.c | 4 +- libs/tk/ytk/gtkdnd.c | 4 +- libs/tk/ytk/gtkentry.c | 2 +- libs/tk/ytk/gtkentrybuffer.c | 2 +- libs/tk/ytk/gtkexpander.c | 2 +- libs/tk/ytk/gtkfilechooserdefault.c | 2 +- libs/tk/ytk/gtkfontsel.c | 4 +- libs/tk/ytk/gtkhsv.c | 2 +- libs/tk/ytk/gtkicontheme.c | 2 +- libs/tk/ytk/gtkiconview.c | 2 +- libs/tk/ytk/gtkimcontextsimple.c | 4 +- libs/tk/ytk/gtkinvisible.c | 2 +- libs/tk/ytk/gtklabel.c | 2 +- libs/tk/ytk/gtkmain.c | 4 +- libs/tk/ytk/gtkmenu.c | 2 +- libs/tk/ytk/gtkmenubar.c | 2 +- libs/tk/ytk/gtkmenushell.c | 2 +- libs/tk/ytk/gtkmountoperation-x11.c | 2 +- libs/tk/ytk/gtknotebook.c | 2 +- libs/tk/ytk/gtkoptionmenu.c | 2 +- libs/tk/ytk/gtkpaned.c | 2 +- libs/tk/ytk/gtkplug-win32.c | 2 +- libs/tk/ytk/gtkplug-x11.c | 2 +- libs/tk/ytk/gtkquartz.c | 2 +- libs/tk/ytk/gtkrange.c | 2 +- libs/tk/ytk/gtkscale.c | 2 +- libs/tk/ytk/gtkscalebutton.c | 2 +- libs/tk/ytk/gtkscrolledwindow.c | 2 +- libs/tk/ytk/gtksearchenginequartz.c | 2 +- libs/tk/ytk/gtkselection.c | 4 +- libs/tk/ytk/gtksettings.c | 2 +- libs/tk/ytk/gtkshow.c | 2 +- libs/tk/ytk/gtksocket-win32.c | 2 +- libs/tk/ytk/gtksocket-x11.c | 4 +- libs/tk/ytk/gtksocket.c | 2 +- libs/tk/ytk/gtkspinbutton.c | 2 +- libs/tk/ytk/gtkstock.c | 2 +- libs/tk/ytk/gtktextview.c | 2 +- libs/tk/ytk/gtktoolbar.c | 2 +- libs/tk/ytk/gtktreeview.c | 2 +- libs/tk/ytk/gtkwidget.c | 6 +- libs/tk/ytk/gtkwin32embed.c | 2 +- libs/tk/ytk/gtkwindow.c | 6 +- libs/tk/ytk/ytk/gtk/gtk.h | 2 +- libs/tk/ytk/ytk/gtk/gtkaccelgroup.h | 2 +- libs/tk/ytk/ytk/gtk/gtkadjustment.h | 2 +- libs/tk/ytk/ytk/gtk/gtkbindings.h | 2 +- libs/tk/ytk/ytk/gtk/gtkgc.h | 2 +- libs/tk/ytk/ytk/gtk/gtkiconcache.h | 2 +- libs/tk/ytk/ytk/gtk/gtkiconfactory.h | 2 +- libs/tk/ytk/ytk/gtk/gtkicontheme.h | 2 +- libs/tk/ytk/ytk/gtk/gtkimcontext.h | 2 +- libs/tk/ytk/ytk/gtk/gtkkeyhash.h | 2 +- libs/tk/ytk/ytk/gtk/gtkmain.h | 2 +- libs/tk/ytk/ytk/gtk/gtkmnemonichash.h | 2 +- .../tk/ytk/ytk/gtk/gtkmountoperationprivate.h | 2 +- libs/tk/ytk/ytk/gtk/gtkrecentmanager.h | 2 +- libs/tk/ytk/ytk/gtk/gtkstock.h | 2 +- libs/tk/ytk/ytk/gtk/gtkstyle.h | 2 +- libs/tk/ytk/ytk/gtk/gtktexttag.h | 2 +- libs/tk/ytk/ytk/gtk/gtkwidget.h | 2 +- libs/tk/ytk/ytk/gtk/gtkwin32embedwidget.h | 2 +- libs/tk/ytk/ytk/gtk/gtkxembed.h | 2 +- libs/tk/ytkmm/ytkmm/gtkmm/accelkey.h | 2 +- libs/tk/ytkmm/ytkmm/gtkmm/menu_elems.h | 2 +- libs/tk/ytkmm/ytkmm/gtkmm/menushell.h | 2 +- libs/widgets/widgets/binding_proxy.h | 2 +- 228 files changed, 324 insertions(+), 327 deletions(-) rename libs/tk/ydk/{ydk => }/gdkconfig.h (100%) rename libs/tk/ydk/{ydk => }/gdkscreen-x11.h (98%) rename libs/tk/ydk/{ydk/quartz/gdk => quartz/ydk}/gdkquartz.h (98%) rename libs/tk/ydk/{ydk/win32/gdk => win32/ydk}/gdkdrawable-win32.h (98%) rename libs/tk/ydk/{ydk/win32/gdk => win32/ydk}/gdkinput-win32.h (100%) rename libs/tk/ydk/{ydk/win32/gdk => win32/ydk}/gdkpixmap-win32.h (97%) rename libs/tk/ydk/{ydk/win32/gdk => win32/ydk}/gdkwin32.h (99%) rename libs/tk/ydk/{ydk/win32/gdk => win32/ydk}/gdkwin32keys.h (99%) rename libs/tk/ydk/{ydk/win32/gdk => win32/ydk}/gdkwindow-win32.h (99%) rename libs/tk/ydk/{ydk/win32/gdk => win32/ydk}/pktdef.h (100%) rename libs/tk/ydk/{ydk/win32/gdk => win32/ydk}/wintab.h (100%) rename libs/tk/ydk/{ydk/win32/gdk => win32/ydk}/xcursors.h (100%) rename libs/tk/ydk/{ydk/x11/gdk => x11/ydk}/MwmUtil.h (100%) rename libs/tk/ydk/{ydk/x11/gdk => x11/ydk}/gdkasync.h (100%) rename libs/tk/ydk/{ydk/x11/gdk => x11/ydk}/gdkinputprivate.h (100%) rename libs/tk/ydk/{ydk/x11/gdk => x11/ydk}/gdkprivate-x11.h (97%) rename libs/tk/ydk/{ydk/x11/gdk => x11/ydk}/gdkx.h (99%) rename libs/tk/ydk/{ydk/x11/gdk => x11/ydk}/xsettings-client.h (100%) rename libs/tk/ydk/{ydk/x11/gdk => x11/ydk}/xsettings-common.h (100%) rename libs/tk/ydk/ydk/{gdk => }/gdk.h (90%) rename libs/tk/ydk/ydk/{gdk => }/gdkalias.h (100%) rename libs/tk/ydk/ydk/{gdk => }/gdkapplaunchcontext.h (97%) rename libs/tk/ydk/ydk/{gdk => }/gdkcairo.h (95%) rename libs/tk/ydk/ydk/{gdk => }/gdkcolor.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkcursor.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkdisplay.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkdisplaymanager.h (96%) rename libs/tk/ydk/ydk/{gdk => }/gdkdnd.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkdrawable.h (99%) rename libs/tk/ydk/ydk/{gdk => }/gdkenumtypes.h (99%) rename libs/tk/ydk/ydk/{gdk => }/gdkevents.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkfont.h (99%) rename libs/tk/ydk/ydk/{gdk => }/gdkgc.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdki18n.h (100%) rename libs/tk/ydk/ydk/{gdk => }/gdkimage.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkinput.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkinternals.h (99%) rename libs/tk/ydk/ydk/{gdk => }/gdkintl.h (100%) rename libs/tk/ydk/ydk/{gdk => }/gdkkeys.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkkeysyms-compat.h (100%) rename libs/tk/ydk/ydk/{gdk => }/gdkkeysyms.h (99%) rename libs/tk/ydk/ydk/{gdk => }/gdkmarshalers.h (100%) rename libs/tk/ydk/ydk/{gdk => }/gdkmedialib.h (100%) rename libs/tk/ydk/ydk/{gdk => }/gdkpango.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkpixbuf.h (97%) rename libs/tk/ydk/ydk/{gdk => }/gdkpixmap.h (97%) rename libs/tk/ydk/ydk/{gdk => }/gdkpoly-generic.h (100%) rename libs/tk/ydk/ydk/{gdk => }/gdkprivate.h (99%) rename libs/tk/ydk/ydk/{gdk => }/gdkproperty.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkregion-generic.h (100%) rename libs/tk/ydk/ydk/{gdk => }/gdkregion.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkrgb.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkscreen.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkselection.h (97%) rename libs/tk/ydk/ydk/{gdk => }/gdkspawn.h (96%) rename libs/tk/ydk/ydk/{gdk => }/gdktestutils.h (96%) rename libs/tk/ydk/ydk/{gdk => }/gdktypes.h (99%) rename libs/tk/ydk/ydk/{gdk => }/gdkvisual.h (98%) rename libs/tk/ydk/ydk/{gdk => }/gdkwindow.h (99%) rename libs/tk/ydk/ydk/{gdk => }/gdkwindowimpl.h (99%) rename libs/tk/ydk/ydk/{gdk => }/keyname-table.h (100%) rename libs/tk/ydk/ydk/{gdk => }/quartz/GdkQuartzView.h (98%) rename libs/tk/ydk/ydk/{gdk => }/quartz/GdkQuartzWindow.h (100%) rename libs/tk/ydk/ydk/{gdk => }/quartz/gdkdrawable-quartz.h (98%) rename libs/tk/ydk/ydk/{gdk => }/quartz/gdkinputprivate.h (100%) rename libs/tk/ydk/ydk/{gdk => }/quartz/gdkpixmap-quartz.h (96%) rename libs/tk/ydk/ydk/{gdk => }/quartz/gdkprivate-quartz.h (98%) rename libs/tk/ydk/ydk/{gdk => }/quartz/gdkscreen-quartz.h (100%) rename libs/tk/ydk/ydk/{gdk => }/quartz/gdkwindow-quartz.h (95%) rename libs/tk/ydk/ydk/{gdk => }/quartz/xcursors.h (100%) rename libs/tk/ydk/ydk/{gdk => }/stamp-gdkenumtypes.h (100%) rename libs/tk/ydk/ydk/{gdk => }/x11/gdkdisplay-x11.h (96%) rename libs/tk/ydk/ydk/{gdk => }/x11/gdkdrawable-x11.h (99%) rename libs/tk/ydk/ydk/{gdk => }/x11/gdkpixmap-x11.h (97%) rename libs/tk/ydk/ydk/{gdk => }/x11/gdkwindow-x11.h (99%) diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index e1bb46643b..c4aef2c90a 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -59,7 +59,7 @@ #include "opts.h" #ifdef GDK_WINDOWING_X11 -#include +#include #endif #include "pbd/i18n.h" diff --git a/gtk2_ardour/au_pluginui.mm b/gtk2_ardour/au_pluginui.mm index 65b41bb77d..879f1b09f9 100644 --- a/gtk2_ardour/au_pluginui.mm +++ b/gtk2_ardour/au_pluginui.mm @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "pbd/convert.h" #include "pbd/error.h" diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm index 96bcf7de3a..46da743c04 100644 --- a/gtk2_ardour/cocoacarbon.mm +++ b/gtk2_ardour/cocoacarbon.mm @@ -26,7 +26,7 @@ #include #include -#include +#include #undef check #undef YES diff --git a/gtk2_ardour/control_point.h b/gtk2_ardour/control_point.h index de711556e5..7d1667f8e8 100644 --- a/gtk2_ardour/control_point.h +++ b/gtk2_ardour/control_point.h @@ -22,7 +22,7 @@ #pragma once #include -#include +#include #include "ardour/automation_list.h" diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index d94bfc2221..87328eb9b4 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include "ardour/tempo.h" diff --git a/gtk2_ardour/lxvst_plugin_ui.cc b/gtk2_ardour/lxvst_plugin_ui.cc index d2a0e394d4..d1ac57ccbd 100644 --- a/gtk2_ardour/lxvst_plugin_ui.cc +++ b/gtk2_ardour/lxvst_plugin_ui.cc @@ -24,7 +24,7 @@ #include "ardour/linux_vst_support.h" #include "lxvst_plugin_ui.h" -#include /* must come later than glibmm/object.h */ +#include /* must come later than glibmm/object.h */ #define LXVST_H_FIDDLE 40 diff --git a/gtk2_ardour/mac_vst_plugin_ui.mm b/gtk2_ardour/mac_vst_plugin_ui.mm index 336353d3af..2bfc198141 100644 --- a/gtk2_ardour/mac_vst_plugin_ui.mm +++ b/gtk2_ardour/mac_vst_plugin_ui.mm @@ -18,7 +18,7 @@ #include #include -#include +#include #include "gui_thread.h" #include "ardour/plugin_insert.h" diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index f378dc851a..2236c54d85 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -80,7 +80,7 @@ #endif #ifdef LXVST_SUPPORT -#include +#include #endif using namespace std; diff --git a/gtk2_ardour/pianokeyboard.cc b/gtk2_ardour/pianokeyboard.cc index 16721e6908..886c06e019 100644 --- a/gtk2_ardour/pianokeyboard.cc +++ b/gtk2_ardour/pianokeyboard.cc @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include "gtkmm2ext/keyboard.h" diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 7ed5fbfb9f..781a891f4d 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/gtk2_ardour/screensaver.cc b/gtk2_ardour/screensaver.cc index 55058b64d0..2e9b7fe7d4 100644 --- a/gtk2_ardour/screensaver.cc +++ b/gtk2_ardour/screensaver.cc @@ -68,7 +68,7 @@ ARDOUR_UI_UTILS::inhibit_screensaver (bool inhibit) #include "ardour_ui.h" #include "ardour/system_exec.h" -#include +#include static sigc::connection glib_timer; diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h index 16581f322b..2134cc734f 100644 --- a/gtk2_ardour/step_editor.h +++ b/gtk2_ardour/step_editor.h @@ -22,7 +22,7 @@ #include -#include +#include #include #include "pbd/signals.h" diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h index 1d403c3b91..8d77d930d7 100644 --- a/gtk2_ardour/time_axis_view_item.h +++ b/gtk2_ardour/time_axis_view_item.h @@ -25,7 +25,7 @@ #pragma once #include -#include +#include #include #include #include "ardour/types.h" diff --git a/gtk2_ardour/vst3_hwnd_plugin_ui.cc b/gtk2_ardour/vst3_hwnd_plugin_ui.cc index bb63fcec43..e7f08c07b2 100644 --- a/gtk2_ardour/vst3_hwnd_plugin_ui.cc +++ b/gtk2_ardour/vst3_hwnd_plugin_ui.cc @@ -30,7 +30,7 @@ #include "vst3_hwnd_plugin_ui.h" -#include +#include using namespace ARDOUR; using namespace Steinberg; diff --git a/gtk2_ardour/vst3_nsview_plugin_ui.mm b/gtk2_ardour/vst3_nsview_plugin_ui.mm index 263bbaf187..38703f5c63 100644 --- a/gtk2_ardour/vst3_nsview_plugin_ui.mm +++ b/gtk2_ardour/vst3_nsview_plugin_ui.mm @@ -22,7 +22,7 @@ #include #include -#include +#include #include "pbd/convert.h" #include "pbd/error.h" diff --git a/gtk2_ardour/vst3_x11_plugin_ui.cc b/gtk2_ardour/vst3_x11_plugin_ui.cc index ee54c2d0d6..0532170ed5 100644 --- a/gtk2_ardour/vst3_x11_plugin_ui.cc +++ b/gtk2_ardour/vst3_x11_plugin_ui.cc @@ -31,7 +31,7 @@ #include "vst3_x11_plugin_ui.h" -#include /* must come later than glibmm/object.h */ +#include /* must come later than glibmm/object.h */ using namespace ARDOUR; using namespace Steinberg; diff --git a/gtk2_ardour/vst_plugin_ui.cc b/gtk2_ardour/vst_plugin_ui.cc index cbdadab8eb..f1ca9a7fcc 100644 --- a/gtk2_ardour/vst_plugin_ui.cc +++ b/gtk2_ardour/vst_plugin_ui.cc @@ -28,11 +28,11 @@ #include "vst_plugin_ui.h" #ifdef PLATFORM_WINDOWS -#include +#include #elif defined __APPLE__ // TODO #else -#include +#include #endif VSTPluginUI::VSTPluginUI (std::shared_ptr pib, std::shared_ptr plugin) diff --git a/gtk2_ardour/windows_vst_plugin_ui.cc b/gtk2_ardour/windows_vst_plugin_ui.cc index 17ebb79cf2..3b45302e69 100644 --- a/gtk2_ardour/windows_vst_plugin_ui.cc +++ b/gtk2_ardour/windows_vst_plugin_ui.cc @@ -28,11 +28,11 @@ #include "windows_vst_plugin_ui.h" #ifdef PLATFORM_WINDOWS -#include +#include #elif defined __APPLE__ // TODO #else -#include +#include #endif using namespace Gtk; diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc index b8da484122..e8393ebbcb 100644 --- a/libs/canvas/canvas.cc +++ b/libs/canvas/canvas.cc @@ -45,7 +45,7 @@ #include "canvas/scroll_group.h" #ifdef __APPLE__ -#include +#include #include "gtkmm2ext/nsglview.h" #endif diff --git a/libs/canvas/canvas/item.h b/libs/canvas/canvas/item.h index 9d519a15a2..e8c45e3b0d 100644 --- a/libs/canvas/canvas/item.h +++ b/libs/canvas/canvas/item.h @@ -23,7 +23,7 @@ #include -#include +#include #include diff --git a/libs/canvas/debug.cc b/libs/canvas/debug.cc index 5597a55778..0d9d8994ac 100644 --- a/libs/canvas/debug.cc +++ b/libs/canvas/debug.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include "canvas/debug.h" using namespace std; diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc index 9db7f20d14..22b1c29ac6 100644 --- a/libs/canvas/text.cc +++ b/libs/canvas/text.cc @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include #include #include diff --git a/libs/clearlooks-newer/clearlooks_draw.h b/libs/clearlooks-newer/clearlooks_draw.h index 6fd699fa97..bf3c0bb486 100644 --- a/libs/clearlooks-newer/clearlooks_draw.h +++ b/libs/clearlooks-newer/clearlooks_draw.h @@ -5,7 +5,7 @@ #include "clearlooks_style.h" #include -#include +#include #include diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc index 90063df514..b6f6dfffb1 100644 --- a/libs/gtkmm2ext/cairo_widget.cc +++ b/libs/gtkmm2ext/cairo_widget.cc @@ -23,7 +23,7 @@ #include "gtkmm2ext/rgb_macros.h" #ifdef __APPLE__ -#include +#include #include "gtkmm2ext/nsglview.h" #endif diff --git a/libs/gtkmm2ext/emscale.cc b/libs/gtkmm2ext/emscale.cc index 21cdf9bd12..a8f9ab4ee1 100644 --- a/libs/gtkmm2ext/emscale.cc +++ b/libs/gtkmm2ext/emscale.cc @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include "gtkmm2ext/emscale.h" diff --git a/libs/gtkmm2ext/gtkapplication_quartz.mm b/libs/gtkmm2ext/gtkapplication_quartz.mm index f83180f4c9..aaa9a15f36 100644 --- a/libs/gtkmm2ext/gtkapplication_quartz.mm +++ b/libs/gtkmm2ext/gtkapplication_quartz.mm @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/libs/gtkmm2ext/gtkmm2ext/bindings.h b/libs/gtkmm2ext/gtkmm2ext/bindings.h index 537c077c7e..96562b757f 100644 --- a/libs/gtkmm2ext/gtkmm2ext/bindings.h +++ b/libs/gtkmm2ext/gtkmm2ext/bindings.h @@ -26,7 +26,7 @@ #include -#include +#include #include #include #include diff --git a/libs/gtkmm2ext/gtkmm2ext/doi.h b/libs/gtkmm2ext/gtkmm2ext/doi.h index b8865737fd..bf2835d459 100644 --- a/libs/gtkmm2ext/gtkmm2ext/doi.h +++ b/libs/gtkmm2ext/gtkmm2ext/doi.h @@ -24,7 +24,7 @@ #undef interface #endif -#include +#include #include #include "gtkmm2ext/visibility.h" diff --git a/libs/gtkmm2ext/gtkmm2ext/nsglview.h b/libs/gtkmm2ext/gtkmm2ext/nsglview.h index d678fa858f..38636460fa 100644 --- a/libs/gtkmm2ext/gtkmm2ext/nsglview.h +++ b/libs/gtkmm2ext/gtkmm2ext/nsglview.h @@ -19,7 +19,7 @@ #ifndef __CANVAS_NSGLVIEW_H__ #define __CANVAS_NSGLVIEW_H__ -#include +#include namespace Gtkmm2ext { diff --git a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h index 9bcb7deaac..65c8e18088 100644 --- a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h +++ b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h @@ -19,7 +19,7 @@ #ifndef __libgtkmm2ext_visibility_tracker__ #define __libgtkmm2ext_visibility_tracker__ -#include +#include #include "gtkmm2ext/visibility.h" #include "gtkmm2ext/visibility_tracker.h" diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index bf0a4a47c5..1f7bedec44 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -29,7 +29,7 @@ #include "pbd/gstdio_compat.h" -#include +#include #include #include #include diff --git a/libs/gtkmm2ext/nsglview.mm b/libs/gtkmm2ext/nsglview.mm index 026fabef71..f33bf24015 100644 --- a/libs/gtkmm2ext/nsglview.mm +++ b/libs/gtkmm2ext/nsglview.mm @@ -23,7 +23,7 @@ #include "gtkmm2ext/nsglview.h" #include "gtkmm2ext/rgb_macros.h" -#include +#include //#define NSVIEW_PROFILE //#define DEBUG_NSVIEW_EXPOSURE diff --git a/libs/gtkmm2ext/sync-menu.c b/libs/gtkmm2ext/sync-menu.c index 14933e5119..20fe895633 100644 --- a/libs/gtkmm2ext/sync-menu.c +++ b/libs/gtkmm2ext/sync-menu.c @@ -23,7 +23,7 @@ */ #include -#include +#include #include diff --git a/libs/tk/suil/cocoa_in_gtk2.mm b/libs/tk/suil/cocoa_in_gtk2.mm index 4d3d4be3c1..efcbcb05eb 100644 --- a/libs/tk/suil/cocoa_in_gtk2.mm +++ b/libs/tk/suil/cocoa_in_gtk2.mm @@ -21,7 +21,7 @@ #include "lv2/urid/urid.h" #include -#include +#include #include diff --git a/libs/tk/suil/win_in_gtk2.cpp b/libs/tk/suil/win_in_gtk2.cpp index 147586208b..c91c29f8c8 100644 --- a/libs/tk/suil/win_in_gtk2.cpp +++ b/libs/tk/suil/win_in_gtk2.cpp @@ -20,7 +20,7 @@ #include "lv2/urid/urid.h" #include -#include +#include #ifndef WM_MOUSEWHEEL # define WM_MOUSEWHEEL 0x020A diff --git a/libs/tk/suil/x11_in_gtk2.c b/libs/tk/suil/x11_in_gtk2.c index 1364a40f50..455c7c1e2a 100644 --- a/libs/tk/suil/x11_in_gtk2.c +++ b/libs/tk/suil/x11_in_gtk2.c @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/libs/tk/ydk/ydk/gdkconfig.h b/libs/tk/ydk/gdkconfig.h similarity index 100% rename from libs/tk/ydk/ydk/gdkconfig.h rename to libs/tk/ydk/gdkconfig.h diff --git a/libs/tk/ydk/gdkpixbuf-render.c b/libs/tk/ydk/gdkpixbuf-render.c index cf0121b084..dbd41e0b37 100644 --- a/libs/tk/ydk/gdkpixbuf-render.c +++ b/libs/tk/ydk/gdkpixbuf-render.c @@ -21,7 +21,7 @@ */ #include "config.h" -#include +#include #include #include "gdkpixbuf.h" #include "gdkscreen.h" diff --git a/libs/tk/ydk/gdkrectangle.c b/libs/tk/ydk/gdkrectangle.c index f50fc05897..823a2e7af7 100644 --- a/libs/tk/ydk/gdkrectangle.c +++ b/libs/tk/ydk/gdkrectangle.c @@ -25,7 +25,7 @@ */ #include "config.h" -#include +#include #include "gdkalias.h" /** diff --git a/libs/tk/ydk/ydk/gdkscreen-x11.h b/libs/tk/ydk/gdkscreen-x11.h similarity index 98% rename from libs/tk/ydk/ydk/gdkscreen-x11.h rename to libs/tk/ydk/gdkscreen-x11.h index 3efee6ac9e..01fd79e08b 100644 --- a/libs/tk/ydk/ydk/gdkscreen-x11.h +++ b/libs/tk/ydk/gdkscreen-x11.h @@ -26,8 +26,8 @@ #include "gdkprivate-x11.h" #include "xsettings-client.h" -#include -#include +#include +#include #include #include diff --git a/libs/tk/ydk/quartz/gdkspawn-quartz.c b/libs/tk/ydk/quartz/gdkspawn-quartz.c index 8f0df20963..8d33a70088 100644 --- a/libs/tk/ydk/quartz/gdkspawn-quartz.c +++ b/libs/tk/ydk/quartz/gdkspawn-quartz.c @@ -24,7 +24,7 @@ #include "gdkspawn.h" #include -#include +#include gboolean gdk_spawn_on_screen (GdkScreen *screen, diff --git a/libs/tk/ydk/quartz/gdktestutils-quartz.c b/libs/tk/ydk/quartz/gdktestutils-quartz.c index f62baa4619..1259750fac 100644 --- a/libs/tk/ydk/quartz/gdktestutils-quartz.c +++ b/libs/tk/ydk/quartz/gdktestutils-quartz.c @@ -18,9 +18,9 @@ * Boston, MA 02111-1307, USA. */ #include "config.h" -#include -#include -#include +#include +#include +#include /** * gdk_test_render_sync diff --git a/libs/tk/ydk/ydk/quartz/gdk/gdkquartz.h b/libs/tk/ydk/quartz/ydk/gdkquartz.h similarity index 98% rename from libs/tk/ydk/ydk/quartz/gdk/gdkquartz.h rename to libs/tk/ydk/quartz/ydk/gdkquartz.h index 6f4aa4ab57..602ef2190b 100644 --- a/libs/tk/ydk/ydk/quartz/gdk/gdkquartz.h +++ b/libs/tk/ydk/quartz/ydk/gdkquartz.h @@ -22,7 +22,7 @@ #define __GDK_QUARTZ_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/win32/gdkdnd-win32.c b/libs/tk/ydk/win32/gdkdnd-win32.c index ec2377c0b0..19c2ab4f71 100644 --- a/libs/tk/ydk/win32/gdkdnd-win32.c +++ b/libs/tk/ydk/win32/gdkdnd-win32.c @@ -86,7 +86,7 @@ #include #include -#include +#include #include typedef struct _GdkDragContextPrivateWin32 GdkDragContextPrivateWin32; diff --git a/libs/tk/ydk/win32/gdkprivate-win32.h b/libs/tk/ydk/win32/gdkprivate-win32.h index 1b0eb37d6a..59169995c1 100644 --- a/libs/tk/ydk/win32/gdkprivate-win32.h +++ b/libs/tk/ydk/win32/gdkprivate-win32.h @@ -35,10 +35,10 @@ #define _WIN32_WINNT WINVER #endif -#include -#include -#include -#include +#include +#include +#include +#include #include "gdkinternals.h" diff --git a/libs/tk/ydk/win32/gdkspawn-win32.c b/libs/tk/ydk/win32/gdkspawn-win32.c index 8f0df20963..8d33a70088 100644 --- a/libs/tk/ydk/win32/gdkspawn-win32.c +++ b/libs/tk/ydk/win32/gdkspawn-win32.c @@ -24,7 +24,7 @@ #include "gdkspawn.h" #include -#include +#include gboolean gdk_spawn_on_screen (GdkScreen *screen, diff --git a/libs/tk/ydk/win32/gdktestutils-win32.c b/libs/tk/ydk/win32/gdktestutils-win32.c index b895100dd1..9fc7ed9551 100644 --- a/libs/tk/ydk/win32/gdktestutils-win32.c +++ b/libs/tk/ydk/win32/gdktestutils-win32.c @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include -#include +#include +#include #include #include "gdkalias.h" diff --git a/libs/tk/ydk/win32/gdkwin32id.c b/libs/tk/ydk/win32/gdkwin32id.c index 4ccb399600..2f7229cd67 100644 --- a/libs/tk/ydk/win32/gdkwin32id.c +++ b/libs/tk/ydk/win32/gdkwin32id.c @@ -25,7 +25,7 @@ */ #include "config.h" -#include +#include #include "gdkprivate-win32.h" diff --git a/libs/tk/ydk/ydk/win32/gdk/gdkdrawable-win32.h b/libs/tk/ydk/win32/ydk/gdkdrawable-win32.h similarity index 98% rename from libs/tk/ydk/ydk/win32/gdk/gdkdrawable-win32.h rename to libs/tk/ydk/win32/ydk/gdkdrawable-win32.h index 79539a498e..9a5dfacb7b 100644 --- a/libs/tk/ydk/ydk/win32/gdk/gdkdrawable-win32.h +++ b/libs/tk/ydk/win32/ydk/gdkdrawable-win32.h @@ -27,8 +27,8 @@ #ifndef __GDK_DRAWABLE_WIN32_H__ #define __GDK_DRAWABLE_WIN32_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/win32/gdk/gdkinput-win32.h b/libs/tk/ydk/win32/ydk/gdkinput-win32.h similarity index 100% rename from libs/tk/ydk/ydk/win32/gdk/gdkinput-win32.h rename to libs/tk/ydk/win32/ydk/gdkinput-win32.h diff --git a/libs/tk/ydk/ydk/win32/gdk/gdkpixmap-win32.h b/libs/tk/ydk/win32/ydk/gdkpixmap-win32.h similarity index 97% rename from libs/tk/ydk/ydk/win32/gdk/gdkpixmap-win32.h rename to libs/tk/ydk/win32/ydk/gdkpixmap-win32.h index f714b4cb30..3b87aa61a0 100644 --- a/libs/tk/ydk/ydk/win32/gdk/gdkpixmap-win32.h +++ b/libs/tk/ydk/win32/ydk/gdkpixmap-win32.h @@ -27,8 +27,8 @@ #ifndef __GDK_PIXMAP_WIN32_H__ #define __GDK_PIXMAP_WIN32_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/win32/gdk/gdkwin32.h b/libs/tk/ydk/win32/ydk/gdkwin32.h similarity index 99% rename from libs/tk/ydk/ydk/win32/gdk/gdkwin32.h rename to libs/tk/ydk/win32/ydk/gdkwin32.h index 7f20c944fd..d24587719a 100644 --- a/libs/tk/ydk/ydk/win32/gdk/gdkwin32.h +++ b/libs/tk/ydk/win32/ydk/gdkwin32.h @@ -27,7 +27,7 @@ #ifndef __GDK_WIN32_H__ #define __GDK_WIN32_H__ -#include +#include #ifndef STRICT #define STRICT /* We want strict type checks */ diff --git a/libs/tk/ydk/ydk/win32/gdk/gdkwin32keys.h b/libs/tk/ydk/win32/ydk/gdkwin32keys.h similarity index 99% rename from libs/tk/ydk/ydk/win32/gdk/gdkwin32keys.h rename to libs/tk/ydk/win32/ydk/gdkwin32keys.h index 8c8aed1279..62b6fccc58 100644 --- a/libs/tk/ydk/ydk/win32/gdk/gdkwin32keys.h +++ b/libs/tk/ydk/win32/ydk/gdkwin32keys.h @@ -19,7 +19,7 @@ #define __GDK_WIN32_KEYS_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/win32/gdk/gdkwindow-win32.h b/libs/tk/ydk/win32/ydk/gdkwindow-win32.h similarity index 99% rename from libs/tk/ydk/ydk/win32/gdk/gdkwindow-win32.h rename to libs/tk/ydk/win32/ydk/gdkwindow-win32.h index 01f0430417..ff4fef5b48 100644 --- a/libs/tk/ydk/ydk/win32/gdk/gdkwindow-win32.h +++ b/libs/tk/ydk/win32/ydk/gdkwindow-win32.h @@ -27,7 +27,7 @@ #ifndef __GDK_WINDOW_WIN32_H__ #define __GDK_WINDOW_WIN32_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/win32/gdk/pktdef.h b/libs/tk/ydk/win32/ydk/pktdef.h similarity index 100% rename from libs/tk/ydk/ydk/win32/gdk/pktdef.h rename to libs/tk/ydk/win32/ydk/pktdef.h diff --git a/libs/tk/ydk/ydk/win32/gdk/wintab.h b/libs/tk/ydk/win32/ydk/wintab.h similarity index 100% rename from libs/tk/ydk/ydk/win32/gdk/wintab.h rename to libs/tk/ydk/win32/ydk/wintab.h diff --git a/libs/tk/ydk/ydk/win32/gdk/xcursors.h b/libs/tk/ydk/win32/ydk/xcursors.h similarity index 100% rename from libs/tk/ydk/ydk/win32/gdk/xcursors.h rename to libs/tk/ydk/win32/ydk/xcursors.h diff --git a/libs/tk/ydk/wscript b/libs/tk/ydk/wscript index 63ec73003d..78800578ab 100644 --- a/libs/tk/ydk/wscript +++ b/libs/tk/ydk/wscript @@ -168,8 +168,8 @@ def configure(conf): def build(bld): obj = bld.shlib(features = 'c cshlib') obj.cflags = [ bld.env['compiler_flags_dict']['pic'], '-w' ] - obj.export_includes = ['ydk'] - obj.includes = ['.', '..', 'ydk', 'ydk/gdk'] + obj.export_includes = ['.', 'ydk'] + obj.includes = ['.', 'ydk'] obj.name = 'libydk' obj.target = 'ydk' obj.use = [ 'libztk', 'libydk-pixbuf' ] @@ -184,23 +184,20 @@ def build(bld): obj.source = libydk_sources + libydk_quartz_sources obj.cflags += ['-xobjective-c'] obj.uselib += ' OSX' # -framework Cocoa -framework CoreFoundation -framework ApplicationServices - obj.includes += ['ydk/quartz', 'ydk/quartz/gdk', 'ydk/gdk/quartz'] - obj.export_includes += ['ydk/gdk'] - obj.export_includes += ['ydk/quartz'] + obj.includes += ['quartz', 'quartz/ydk', 'ydk/quartz'] + obj.export_includes += ['quartz'] elif bld.env['build_target'] == 'mingw': obj.source = libydk_sources + libydk_win32_sources obj.cflags += ['-mms-bitfields', '-Wl,--export-all-symbols'] obj.uselib += ' GIO-WINDOWS' obj.defines += [ 'INSIDE_GDK_WIN32', 'DLL_EXPORT', 'PIC' ] - obj.includes += ['ydk/win32/gdk', 'ydk/win32'] - obj.export_includes += ['ydk/gdk'] - obj.export_includes += ['ydk/win32'] + obj.includes += ['win32', 'win32/ydk'] + obj.export_includes += ['win32'] obj.linkflags = ['-Wl,--export-all-symbols'] obj.ldflags = '-limm32 -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid' else: obj.source = libydk_sources + libydk_x11_sources obj.uselib += ' GIO-UNIX X11 XEXT XINERAMA RANDR DL' - obj.includes += ['ydk/x11/gdk', 'ydk/gdk/x11'] - obj.export_includes += ['ydk/gdk'] - obj.export_includes += ['ydk/x11'] + obj.includes += ['x11', 'x11/ydk', 'ydk/x11'] + obj.export_includes += ['x11'] diff --git a/libs/tk/ydk/x11/gdkcursor-x11.c b/libs/tk/ydk/x11/gdkcursor-x11.c index 8f849fb3f6..9a78c8b04c 100644 --- a/libs/tk/ydk/x11/gdkcursor-x11.c +++ b/libs/tk/ydk/x11/gdkcursor-x11.c @@ -44,7 +44,7 @@ #include "gdkdisplay-x11.h" #include "gdkpixmap-x11.h" #include "gdkx.h" -#include +#include #include #include "gdkalias.h" diff --git a/libs/tk/ydk/x11/gdkpixmap-x11.c b/libs/tk/ydk/x11/gdkpixmap-x11.c index 7e86dbb72f..305c328806 100644 --- a/libs/tk/ydk/x11/gdkpixmap-x11.c +++ b/libs/tk/ydk/x11/gdkpixmap-x11.c @@ -39,7 +39,7 @@ #include "gdkscreen-x11.h" #include "gdkdisplay-x11.h" -#include +#include #include "gdkalias.h" typedef struct diff --git a/libs/tk/ydk/x11/gdkspawn-x11.c b/libs/tk/ydk/x11/gdkspawn-x11.c index 16fc987e71..a769787ed6 100644 --- a/libs/tk/ydk/x11/gdkspawn-x11.c +++ b/libs/tk/ydk/x11/gdkspawn-x11.c @@ -26,7 +26,7 @@ #include "gdkspawn.h" #include -#include +#include #include "gdkalias.h" typedef struct { diff --git a/libs/tk/ydk/x11/gdktestutils-x11.c b/libs/tk/ydk/x11/gdktestutils-x11.c index 343a2dd349..05a5a944e3 100644 --- a/libs/tk/ydk/x11/gdktestutils-x11.c +++ b/libs/tk/ydk/x11/gdktestutils-x11.c @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include -#include +#include +#include #include #include "gdkalias.h" diff --git a/libs/tk/ydk/ydk/x11/gdk/MwmUtil.h b/libs/tk/ydk/x11/ydk/MwmUtil.h similarity index 100% rename from libs/tk/ydk/ydk/x11/gdk/MwmUtil.h rename to libs/tk/ydk/x11/ydk/MwmUtil.h diff --git a/libs/tk/ydk/ydk/x11/gdk/gdkasync.h b/libs/tk/ydk/x11/ydk/gdkasync.h similarity index 100% rename from libs/tk/ydk/ydk/x11/gdk/gdkasync.h rename to libs/tk/ydk/x11/ydk/gdkasync.h diff --git a/libs/tk/ydk/ydk/x11/gdk/gdkinputprivate.h b/libs/tk/ydk/x11/ydk/gdkinputprivate.h similarity index 100% rename from libs/tk/ydk/ydk/x11/gdk/gdkinputprivate.h rename to libs/tk/ydk/x11/ydk/gdkinputprivate.h diff --git a/libs/tk/ydk/ydk/x11/gdk/gdkprivate-x11.h b/libs/tk/ydk/x11/ydk/gdkprivate-x11.h similarity index 97% rename from libs/tk/ydk/ydk/x11/gdk/gdkprivate-x11.h rename to libs/tk/ydk/x11/ydk/gdkprivate-x11.h index d1b963bf38..54ad19672c 100644 --- a/libs/tk/ydk/ydk/x11/gdk/gdkprivate-x11.h +++ b/libs/tk/ydk/x11/ydk/gdkprivate-x11.h @@ -31,12 +31,12 @@ #ifndef __GDK_PRIVATE_X11_H__ #define __GDK_PRIVATE_X11_H__ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define GDK_TYPE_GC_X11 (_gdk_gc_x11_get_type ()) #define GDK_GC_X11(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_GC_X11, GdkGCX11)) diff --git a/libs/tk/ydk/ydk/x11/gdk/gdkx.h b/libs/tk/ydk/x11/ydk/gdkx.h similarity index 99% rename from libs/tk/ydk/ydk/x11/gdk/gdkx.h rename to libs/tk/ydk/x11/ydk/gdkx.h index 8d6e74ba4e..8800efaa92 100644 --- a/libs/tk/ydk/ydk/x11/gdk/gdkx.h +++ b/libs/tk/ydk/x11/ydk/gdkx.h @@ -27,7 +27,7 @@ #ifndef __GDK_X_H__ #define __GDK_X_H__ -#include +#include #include #include diff --git a/libs/tk/ydk/ydk/x11/gdk/xsettings-client.h b/libs/tk/ydk/x11/ydk/xsettings-client.h similarity index 100% rename from libs/tk/ydk/ydk/x11/gdk/xsettings-client.h rename to libs/tk/ydk/x11/ydk/xsettings-client.h diff --git a/libs/tk/ydk/ydk/x11/gdk/xsettings-common.h b/libs/tk/ydk/x11/ydk/xsettings-common.h similarity index 100% rename from libs/tk/ydk/ydk/x11/gdk/xsettings-common.h rename to libs/tk/ydk/x11/ydk/xsettings-common.h diff --git a/libs/tk/ydk/ydk/gdk/gdk.h b/libs/tk/ydk/ydk/gdk.h similarity index 90% rename from libs/tk/ydk/ydk/gdk/gdk.h rename to libs/tk/ydk/ydk/gdk.h index e286f77d02..b6f11950f7 100644 --- a/libs/tk/ydk/ydk/gdk/gdk.h +++ b/libs/tk/ydk/ydk/gdk.h @@ -29,34 +29,34 @@ #define __GDK_H_INSIDE__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #undef __GDK_H_INSIDE__ diff --git a/libs/tk/ydk/ydk/gdk/gdkalias.h b/libs/tk/ydk/ydk/gdkalias.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/gdkalias.h rename to libs/tk/ydk/ydk/gdkalias.h diff --git a/libs/tk/ydk/ydk/gdk/gdkapplaunchcontext.h b/libs/tk/ydk/ydk/gdkapplaunchcontext.h similarity index 97% rename from libs/tk/ydk/ydk/gdk/gdkapplaunchcontext.h rename to libs/tk/ydk/ydk/gdkapplaunchcontext.h index 31a414c948..3a9b9b4ac5 100644 --- a/libs/tk/ydk/ydk/gdk/gdkapplaunchcontext.h +++ b/libs/tk/ydk/ydk/gdkapplaunchcontext.h @@ -24,11 +24,11 @@ #define __GDK_APP_LAUNCH_CONTEXT_H__ #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #include -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkcairo.h b/libs/tk/ydk/ydk/gdkcairo.h similarity index 95% rename from libs/tk/ydk/ydk/gdk/gdkcairo.h rename to libs/tk/ydk/ydk/gdkcairo.h index 461e93b2d2..c9b61e9fc0 100644 --- a/libs/tk/ydk/ydk/gdk/gdkcairo.h +++ b/libs/tk/ydk/ydk/gdkcairo.h @@ -21,11 +21,11 @@ #define __GDK_CAIRO_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include -#include +#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkcolor.h b/libs/tk/ydk/ydk/gdkcolor.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkcolor.h rename to libs/tk/ydk/ydk/gdkcolor.h index 6cf13aaf4d..d9041fe2c2 100644 --- a/libs/tk/ydk/ydk/gdk/gdkcolor.h +++ b/libs/tk/ydk/ydk/gdkcolor.h @@ -28,11 +28,11 @@ #define __GDK_COLOR_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #include -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkcursor.h b/libs/tk/ydk/ydk/gdkcursor.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkcursor.h rename to libs/tk/ydk/ydk/gdkcursor.h index 5a9bbcb923..3a86ffc82c 100644 --- a/libs/tk/ydk/ydk/gdk/gdkcursor.h +++ b/libs/tk/ydk/ydk/gdkcursor.h @@ -28,10 +28,10 @@ #define __GDK_CURSOR_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkdisplay.h b/libs/tk/ydk/ydk/gdkdisplay.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkdisplay.h rename to libs/tk/ydk/ydk/gdkdisplay.h index 96bb0572c1..c746cdd8e2 100644 --- a/libs/tk/ydk/ydk/gdk/gdkdisplay.h +++ b/libs/tk/ydk/ydk/gdkdisplay.h @@ -25,11 +25,11 @@ #define __GDK_DISPLAY_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkdisplaymanager.h b/libs/tk/ydk/ydk/gdkdisplaymanager.h similarity index 96% rename from libs/tk/ydk/ydk/gdk/gdkdisplaymanager.h rename to libs/tk/ydk/ydk/gdkdisplaymanager.h index 02d1cf697b..35e843ee29 100644 --- a/libs/tk/ydk/ydk/gdk/gdkdisplaymanager.h +++ b/libs/tk/ydk/ydk/gdkdisplaymanager.h @@ -28,11 +28,11 @@ #define __GDK_DISPLAY_MANAGER_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkdnd.h b/libs/tk/ydk/ydk/gdkdnd.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkdnd.h rename to libs/tk/ydk/ydk/gdkdnd.h index ac24315f8b..15e62a32dd 100644 --- a/libs/tk/ydk/ydk/gdk/gdkdnd.h +++ b/libs/tk/ydk/ydk/gdkdnd.h @@ -28,10 +28,10 @@ #define __GDK_DND_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkdrawable.h b/libs/tk/ydk/ydk/gdkdrawable.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/gdkdrawable.h rename to libs/tk/ydk/ydk/gdkdrawable.h index d20694dac9..2018f6019d 100644 --- a/libs/tk/ydk/ydk/gdk/gdkdrawable.h +++ b/libs/tk/ydk/ydk/gdkdrawable.h @@ -28,12 +28,12 @@ #define __GDK_DRAWABLE_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include -#include -#include +#include +#include +#include #include #include diff --git a/libs/tk/ydk/ydk/gdk/gdkenumtypes.h b/libs/tk/ydk/ydk/gdkenumtypes.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/gdkenumtypes.h rename to libs/tk/ydk/ydk/gdkenumtypes.h index 0fe623891e..97e297e484 100644 --- a/libs/tk/ydk/ydk/gdk/gdkenumtypes.h +++ b/libs/tk/ydk/ydk/gdkenumtypes.h @@ -2,7 +2,7 @@ /* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #ifndef __GDK_ENUM_TYPES_H__ diff --git a/libs/tk/ydk/ydk/gdk/gdkevents.h b/libs/tk/ydk/ydk/gdkevents.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkevents.h rename to libs/tk/ydk/ydk/gdkevents.h index 5dc8e6657d..4a5605925b 100644 --- a/libs/tk/ydk/ydk/gdk/gdkevents.h +++ b/libs/tk/ydk/ydk/gdkevents.h @@ -28,13 +28,13 @@ #define __GDK_EVENTS_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include -#include -#include -#include +#include +#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkfont.h b/libs/tk/ydk/ydk/gdkfont.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/gdkfont.h rename to libs/tk/ydk/ydk/gdkfont.h index fe2e264492..0adb5779be 100644 --- a/libs/tk/ydk/ydk/gdk/gdkfont.h +++ b/libs/tk/ydk/ydk/gdkfont.h @@ -29,7 +29,7 @@ #ifndef __GDK_FONT_H__ #define __GDK_FONT_H__ -#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkgc.h b/libs/tk/ydk/ydk/gdkgc.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkgc.h rename to libs/tk/ydk/ydk/gdkgc.h index 05968199b2..d2d939743b 100644 --- a/libs/tk/ydk/ydk/gdk/gdkgc.h +++ b/libs/tk/ydk/ydk/gdkgc.h @@ -28,11 +28,11 @@ #define __GDK_GC_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdki18n.h b/libs/tk/ydk/ydk/gdki18n.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/gdki18n.h rename to libs/tk/ydk/ydk/gdki18n.h diff --git a/libs/tk/ydk/ydk/gdk/gdkimage.h b/libs/tk/ydk/ydk/gdkimage.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkimage.h rename to libs/tk/ydk/ydk/gdkimage.h index 12c8817bc4..57d971eb6f 100644 --- a/libs/tk/ydk/ydk/gdk/gdkimage.h +++ b/libs/tk/ydk/ydk/gdkimage.h @@ -28,10 +28,10 @@ #define __GDK_IMAGE_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkinput.h b/libs/tk/ydk/ydk/gdkinput.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkinput.h rename to libs/tk/ydk/ydk/gdkinput.h index a8ed6aac91..1494f896be 100644 --- a/libs/tk/ydk/ydk/gdk/gdkinput.h +++ b/libs/tk/ydk/ydk/gdkinput.h @@ -28,10 +28,10 @@ #define __GDK_INPUT_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkinternals.h b/libs/tk/ydk/ydk/gdkinternals.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/gdkinternals.h rename to libs/tk/ydk/ydk/gdkinternals.h index 14548a6bf0..1681642d9b 100644 --- a/libs/tk/ydk/ydk/gdk/gdkinternals.h +++ b/libs/tk/ydk/ydk/gdkinternals.h @@ -30,11 +30,11 @@ #define __GDK_INTERNALS_H__ #include -#include -#include -#include +#include +#include +#include #ifdef USE_MEDIALIB -#include +#include #endif G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkintl.h b/libs/tk/ydk/ydk/gdkintl.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/gdkintl.h rename to libs/tk/ydk/ydk/gdkintl.h diff --git a/libs/tk/ydk/ydk/gdk/gdkkeys.h b/libs/tk/ydk/ydk/gdkkeys.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkkeys.h rename to libs/tk/ydk/ydk/gdkkeys.h index 4a7528fe19..18d5ee0923 100644 --- a/libs/tk/ydk/ydk/gdk/gdkkeys.h +++ b/libs/tk/ydk/ydk/gdkkeys.h @@ -28,10 +28,10 @@ #define __GDK_KEYS_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkkeysyms-compat.h b/libs/tk/ydk/ydk/gdkkeysyms-compat.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/gdkkeysyms-compat.h rename to libs/tk/ydk/ydk/gdkkeysyms-compat.h diff --git a/libs/tk/ydk/ydk/gdk/gdkkeysyms.h b/libs/tk/ydk/ydk/gdkkeysyms.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/gdkkeysyms.h rename to libs/tk/ydk/ydk/gdkkeysyms.h index 26fa1c20a6..cdd02cf7ec 100644 --- a/libs/tk/ydk/ydk/gdk/gdkkeysyms.h +++ b/libs/tk/ydk/ydk/gdkkeysyms.h @@ -39,7 +39,7 @@ /* For GTK 2, we include compatibility defines by default. */ #ifndef __G_IR_SCANNER__ -#include +#include #endif #define GDK_KEY_VoidSymbol 0xffffff diff --git a/libs/tk/ydk/ydk/gdk/gdkmarshalers.h b/libs/tk/ydk/ydk/gdkmarshalers.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/gdkmarshalers.h rename to libs/tk/ydk/ydk/gdkmarshalers.h diff --git a/libs/tk/ydk/ydk/gdk/gdkmedialib.h b/libs/tk/ydk/ydk/gdkmedialib.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/gdkmedialib.h rename to libs/tk/ydk/ydk/gdkmedialib.h diff --git a/libs/tk/ydk/ydk/gdk/gdkpango.h b/libs/tk/ydk/ydk/gdkpango.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkpango.h rename to libs/tk/ydk/ydk/gdkpango.h index 300aae6c03..37c62d54c9 100644 --- a/libs/tk/ydk/ydk/gdk/gdkpango.h +++ b/libs/tk/ydk/ydk/gdkpango.h @@ -21,10 +21,10 @@ #define __GDK_PANGO_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkpixbuf.h b/libs/tk/ydk/ydk/gdkpixbuf.h similarity index 97% rename from libs/tk/ydk/ydk/gdk/gdkpixbuf.h rename to libs/tk/ydk/ydk/gdkpixbuf.h index 66934c76e9..4625dd6cac 100644 --- a/libs/tk/ydk/ydk/gdk/gdkpixbuf.h +++ b/libs/tk/ydk/ydk/gdkpixbuf.h @@ -28,12 +28,12 @@ #define __GDK_PIXBUF_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #include -#include -#include +#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkpixmap.h b/libs/tk/ydk/ydk/gdkpixmap.h similarity index 97% rename from libs/tk/ydk/ydk/gdk/gdkpixmap.h rename to libs/tk/ydk/ydk/gdkpixmap.h index 40927adf7a..6892276fc6 100644 --- a/libs/tk/ydk/ydk/gdk/gdkpixmap.h +++ b/libs/tk/ydk/ydk/gdkpixmap.h @@ -28,11 +28,11 @@ #define __GDK_PIXMAP_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkpoly-generic.h b/libs/tk/ydk/ydk/gdkpoly-generic.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/gdkpoly-generic.h rename to libs/tk/ydk/ydk/gdkpoly-generic.h diff --git a/libs/tk/ydk/ydk/gdk/gdkprivate.h b/libs/tk/ydk/ydk/gdkprivate.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/gdkprivate.h rename to libs/tk/ydk/ydk/gdkprivate.h index 65038627a1..35497452ce 100644 --- a/libs/tk/ydk/ydk/gdk/gdkprivate.h +++ b/libs/tk/ydk/ydk/gdkprivate.h @@ -27,7 +27,7 @@ #ifndef __GDK_PRIVATE_H__ #define __GDK_PRIVATE_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkproperty.h b/libs/tk/ydk/ydk/gdkproperty.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkproperty.h rename to libs/tk/ydk/ydk/gdkproperty.h index c3ad6168bd..7b2ece02a6 100644 --- a/libs/tk/ydk/ydk/gdk/gdkproperty.h +++ b/libs/tk/ydk/ydk/gdkproperty.h @@ -28,10 +28,10 @@ #define __GDK_PROPERTY_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkregion-generic.h b/libs/tk/ydk/ydk/gdkregion-generic.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/gdkregion-generic.h rename to libs/tk/ydk/ydk/gdkregion-generic.h diff --git a/libs/tk/ydk/ydk/gdk/gdkregion.h b/libs/tk/ydk/ydk/gdkregion.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkregion.h rename to libs/tk/ydk/ydk/gdkregion.h index 3596039483..6cf0725426 100644 --- a/libs/tk/ydk/ydk/gdk/gdkregion.h +++ b/libs/tk/ydk/ydk/gdkregion.h @@ -28,10 +28,10 @@ #define __GDK_REGION_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkrgb.h b/libs/tk/ydk/ydk/gdkrgb.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkrgb.h rename to libs/tk/ydk/ydk/gdkrgb.h index d7f0497d7c..8de52190db 100644 --- a/libs/tk/ydk/ydk/gdk/gdkrgb.h +++ b/libs/tk/ydk/ydk/gdkrgb.h @@ -28,10 +28,10 @@ #define __GDK_RGB_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkscreen.h b/libs/tk/ydk/ydk/gdkscreen.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkscreen.h rename to libs/tk/ydk/ydk/gdkscreen.h index 418cecf3ed..94b7b30225 100644 --- a/libs/tk/ydk/ydk/gdk/gdkscreen.h +++ b/libs/tk/ydk/ydk/gdkscreen.h @@ -25,12 +25,12 @@ #define __GDK_SCREEN_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif #include -#include "gdk/gdktypes.h" -#include "gdk/gdkdisplay.h" +#include "ydk/gdktypes.h" +#include "ydk/gdkdisplay.h" G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkselection.h b/libs/tk/ydk/ydk/gdkselection.h similarity index 97% rename from libs/tk/ydk/ydk/gdk/gdkselection.h rename to libs/tk/ydk/ydk/gdkselection.h index c8cae43f84..5c5d5f81ce 100644 --- a/libs/tk/ydk/ydk/gdk/gdkselection.h +++ b/libs/tk/ydk/ydk/gdkselection.h @@ -28,10 +28,10 @@ #define __GDK_SELECTION_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkspawn.h b/libs/tk/ydk/ydk/gdkspawn.h similarity index 96% rename from libs/tk/ydk/ydk/gdk/gdkspawn.h rename to libs/tk/ydk/ydk/gdkspawn.h index 4b0bf82936..6e91800e65 100644 --- a/libs/tk/ydk/ydk/gdk/gdkspawn.h +++ b/libs/tk/ydk/ydk/gdkspawn.h @@ -23,10 +23,10 @@ #define __GDK_SPAWN_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdktestutils.h b/libs/tk/ydk/ydk/gdktestutils.h similarity index 96% rename from libs/tk/ydk/ydk/gdk/gdktestutils.h rename to libs/tk/ydk/ydk/gdktestutils.h index a7d6424706..98b4cc74fd 100644 --- a/libs/tk/ydk/ydk/gdk/gdktestutils.h +++ b/libs/tk/ydk/ydk/gdktestutils.h @@ -22,10 +22,10 @@ #define __GDK_TEST_UTILS_H__ #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdktypes.h b/libs/tk/ydk/ydk/gdktypes.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/gdktypes.h rename to libs/tk/ydk/ydk/gdktypes.h index c72b20b92e..4554d107ae 100644 --- a/libs/tk/ydk/ydk/gdk/gdktypes.h +++ b/libs/tk/ydk/ydk/gdktypes.h @@ -28,7 +28,7 @@ #define __GDK_TYPES_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif /* GDK uses "glib". (And so does GTK). diff --git a/libs/tk/ydk/ydk/gdk/gdkvisual.h b/libs/tk/ydk/ydk/gdkvisual.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/gdkvisual.h rename to libs/tk/ydk/ydk/gdkvisual.h index d255b416c0..39ad0ff89b 100644 --- a/libs/tk/ydk/ydk/gdk/gdkvisual.h +++ b/libs/tk/ydk/ydk/gdkvisual.h @@ -28,10 +28,10 @@ #define __GDK_VISUAL_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkwindow.h b/libs/tk/ydk/ydk/gdkwindow.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/gdkwindow.h rename to libs/tk/ydk/ydk/gdkwindow.h index d060ba0e0a..adb6966008 100644 --- a/libs/tk/ydk/ydk/gdk/gdkwindow.h +++ b/libs/tk/ydk/ydk/gdkwindow.h @@ -28,12 +28,12 @@ #define __GDK_WINDOW_H__ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." +#error "Only can be included directly." #endif -#include -#include -#include +#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/gdkwindowimpl.h b/libs/tk/ydk/ydk/gdkwindowimpl.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/gdkwindowimpl.h rename to libs/tk/ydk/ydk/gdkwindowimpl.h index 3a5029b016..258e20c810 100644 --- a/libs/tk/ydk/ydk/gdk/gdkwindowimpl.h +++ b/libs/tk/ydk/ydk/gdkwindowimpl.h @@ -27,7 +27,7 @@ #ifndef __GDK_WINDOW_IMPL_H__ #define __GDK_WINDOW_IMPL_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/keyname-table.h b/libs/tk/ydk/ydk/keyname-table.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/keyname-table.h rename to libs/tk/ydk/ydk/keyname-table.h diff --git a/libs/tk/ydk/ydk/gdk/quartz/GdkQuartzView.h b/libs/tk/ydk/ydk/quartz/GdkQuartzView.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/quartz/GdkQuartzView.h rename to libs/tk/ydk/ydk/quartz/GdkQuartzView.h index 2f86de71e2..825a4bd0d5 100644 --- a/libs/tk/ydk/ydk/gdk/quartz/GdkQuartzView.h +++ b/libs/tk/ydk/ydk/quartz/GdkQuartzView.h @@ -19,7 +19,7 @@ */ #import -#include "gdk/gdk.h" +#include "ydk/gdk.h" /* Text Input Client */ #define TIC_MARKED_TEXT "tic-marked-text" diff --git a/libs/tk/ydk/ydk/gdk/quartz/GdkQuartzWindow.h b/libs/tk/ydk/ydk/quartz/GdkQuartzWindow.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/quartz/GdkQuartzWindow.h rename to libs/tk/ydk/ydk/quartz/GdkQuartzWindow.h diff --git a/libs/tk/ydk/ydk/gdk/quartz/gdkdrawable-quartz.h b/libs/tk/ydk/ydk/quartz/gdkdrawable-quartz.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/quartz/gdkdrawable-quartz.h rename to libs/tk/ydk/ydk/quartz/gdkdrawable-quartz.h index 1e5c8e8f4f..0056a839bd 100644 --- a/libs/tk/ydk/ydk/gdk/quartz/gdkdrawable-quartz.h +++ b/libs/tk/ydk/ydk/quartz/gdkdrawable-quartz.h @@ -21,7 +21,7 @@ #ifndef __GDK_DRAWABLE_QUARTZ_H__ #define __GDK_DRAWABLE_QUARTZ_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/quartz/gdkinputprivate.h b/libs/tk/ydk/ydk/quartz/gdkinputprivate.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/quartz/gdkinputprivate.h rename to libs/tk/ydk/ydk/quartz/gdkinputprivate.h diff --git a/libs/tk/ydk/ydk/gdk/quartz/gdkpixmap-quartz.h b/libs/tk/ydk/ydk/quartz/gdkpixmap-quartz.h similarity index 96% rename from libs/tk/ydk/ydk/gdk/quartz/gdkpixmap-quartz.h rename to libs/tk/ydk/ydk/quartz/gdkpixmap-quartz.h index 13cb99f406..e696630333 100644 --- a/libs/tk/ydk/ydk/gdk/quartz/gdkpixmap-quartz.h +++ b/libs/tk/ydk/ydk/quartz/gdkpixmap-quartz.h @@ -22,8 +22,8 @@ #define __GDK_PIXMAP_QUARTZ_H__ #include -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/quartz/gdkprivate-quartz.h b/libs/tk/ydk/ydk/quartz/gdkprivate-quartz.h similarity index 98% rename from libs/tk/ydk/ydk/gdk/quartz/gdkprivate-quartz.h rename to libs/tk/ydk/ydk/quartz/gdkprivate-quartz.h index 9f97db3e9a..9eca4075fe 100644 --- a/libs/tk/ydk/ydk/gdk/quartz/gdkprivate-quartz.h +++ b/libs/tk/ydk/ydk/quartz/gdkprivate-quartz.h @@ -24,12 +24,12 @@ #define GDK_QUARTZ_ALLOC_POOL NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init] #define GDK_QUARTZ_RELEASE_POOL [pool release] -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include "gdkinternals.h" diff --git a/libs/tk/ydk/ydk/gdk/quartz/gdkscreen-quartz.h b/libs/tk/ydk/ydk/quartz/gdkscreen-quartz.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/quartz/gdkscreen-quartz.h rename to libs/tk/ydk/ydk/quartz/gdkscreen-quartz.h diff --git a/libs/tk/ydk/ydk/gdk/quartz/gdkwindow-quartz.h b/libs/tk/ydk/ydk/quartz/gdkwindow-quartz.h similarity index 95% rename from libs/tk/ydk/ydk/gdk/quartz/gdkwindow-quartz.h rename to libs/tk/ydk/ydk/quartz/gdkwindow-quartz.h index ed9dfe34eb..acb14af2ad 100644 --- a/libs/tk/ydk/ydk/gdk/quartz/gdkwindow-quartz.h +++ b/libs/tk/ydk/ydk/quartz/gdkwindow-quartz.h @@ -21,9 +21,9 @@ #ifndef __GDK_WINDOW_QUARTZ_H__ #define __GDK_WINDOW_QUARTZ_H__ -#include -#import -#import +#include +#import +#import G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/quartz/xcursors.h b/libs/tk/ydk/ydk/quartz/xcursors.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/quartz/xcursors.h rename to libs/tk/ydk/ydk/quartz/xcursors.h diff --git a/libs/tk/ydk/ydk/gdk/stamp-gdkenumtypes.h b/libs/tk/ydk/ydk/stamp-gdkenumtypes.h similarity index 100% rename from libs/tk/ydk/ydk/gdk/stamp-gdkenumtypes.h rename to libs/tk/ydk/ydk/stamp-gdkenumtypes.h diff --git a/libs/tk/ydk/ydk/gdk/x11/gdkdisplay-x11.h b/libs/tk/ydk/ydk/x11/gdkdisplay-x11.h similarity index 96% rename from libs/tk/ydk/ydk/gdk/x11/gdkdisplay-x11.h rename to libs/tk/ydk/ydk/x11/gdkdisplay-x11.h index 0f6953f76b..27499256ec 100644 --- a/libs/tk/ydk/ydk/gdk/x11/gdkdisplay-x11.h +++ b/libs/tk/ydk/ydk/x11/gdkdisplay-x11.h @@ -27,11 +27,11 @@ #include #include #include -#include -#include -#include -#include -#include /* For gdk_get_program_class() */ +#include +#include +#include +#include +#include /* For gdk_get_program_class() */ G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/x11/gdkdrawable-x11.h b/libs/tk/ydk/ydk/x11/gdkdrawable-x11.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/x11/gdkdrawable-x11.h rename to libs/tk/ydk/ydk/x11/gdkdrawable-x11.h index e7e85c93a7..781b78e0b6 100644 --- a/libs/tk/ydk/ydk/gdk/x11/gdkdrawable-x11.h +++ b/libs/tk/ydk/ydk/x11/gdkdrawable-x11.h @@ -27,7 +27,7 @@ #ifndef __GDK_DRAWABLE_X11_H__ #define __GDK_DRAWABLE_X11_H__ -#include +#include #include #include diff --git a/libs/tk/ydk/ydk/gdk/x11/gdkpixmap-x11.h b/libs/tk/ydk/ydk/x11/gdkpixmap-x11.h similarity index 97% rename from libs/tk/ydk/ydk/gdk/x11/gdkpixmap-x11.h rename to libs/tk/ydk/ydk/x11/gdkpixmap-x11.h index 9da6911093..bacaa6baf1 100644 --- a/libs/tk/ydk/ydk/gdk/x11/gdkpixmap-x11.h +++ b/libs/tk/ydk/ydk/x11/gdkpixmap-x11.h @@ -27,8 +27,8 @@ #ifndef __GDK_PIXMAP_X11_H__ #define __GDK_PIXMAP_X11_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ydk/ydk/gdk/x11/gdkwindow-x11.h b/libs/tk/ydk/ydk/x11/gdkwindow-x11.h similarity index 99% rename from libs/tk/ydk/ydk/gdk/x11/gdkwindow-x11.h rename to libs/tk/ydk/ydk/x11/gdkwindow-x11.h index 90f734b2c5..89ef1b2d03 100644 --- a/libs/tk/ydk/ydk/gdk/x11/gdkwindow-x11.h +++ b/libs/tk/ydk/ydk/x11/gdkwindow-x11.h @@ -27,7 +27,7 @@ #ifndef __GDK_WINDOW_X11_H__ #define __GDK_WINDOW_X11_H__ -#include +#include #ifdef HAVE_XDAMAGE #include diff --git a/libs/tk/ydkmm/bitmap.cc b/libs/tk/ydkmm/bitmap.cc index 701f243a6d..bd5ac4935c 100644 --- a/libs/tk/ydkmm/bitmap.cc +++ b/libs/tk/ydkmm/bitmap.cc @@ -28,7 +28,7 @@ */ #include -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/color.cc b/libs/tk/ydkmm/color.cc index 70c1527727..4ccedba611 100644 --- a/libs/tk/ydkmm/color.cc +++ b/libs/tk/ydkmm/color.cc @@ -30,7 +30,7 @@ */ #include -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/colormap.cc b/libs/tk/ydkmm/colormap.cc index 1de7e516e8..2253219174 100644 --- a/libs/tk/ydkmm/colormap.cc +++ b/libs/tk/ydkmm/colormap.cc @@ -29,7 +29,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/cursor.cc b/libs/tk/ydkmm/cursor.cc index 950dcf969f..bc1c980170 100644 --- a/libs/tk/ydkmm/cursor.cc +++ b/libs/tk/ydkmm/cursor.cc @@ -29,7 +29,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/device.cc b/libs/tk/ydkmm/device.cc index 9b22521cf8..2062984751 100644 --- a/libs/tk/ydkmm/device.cc +++ b/libs/tk/ydkmm/device.cc @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include diff --git a/libs/tk/ydkmm/display.cc b/libs/tk/ydkmm/display.cc index c941176e5e..7b29577715 100644 --- a/libs/tk/ydkmm/display.cc +++ b/libs/tk/ydkmm/display.cc @@ -6,7 +6,7 @@ #include #include -#include +#include // -*- c++ -*- /* $Id: display.ccg,v 1.5 2005/01/05 17:30:16 murrayc Exp $ */ @@ -31,7 +31,7 @@ */ #include -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/displaymanager.cc b/libs/tk/ydkmm/displaymanager.cc index 7ea69b4d5d..ba0400f099 100644 --- a/libs/tk/ydkmm/displaymanager.cc +++ b/libs/tk/ydkmm/displaymanager.cc @@ -29,7 +29,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/dragcontext.cc b/libs/tk/ydkmm/dragcontext.cc index f51e7f2ba9..7b70205840 100644 --- a/libs/tk/ydkmm/dragcontext.cc +++ b/libs/tk/ydkmm/dragcontext.cc @@ -33,7 +33,7 @@ #include #include -#include +#include #include //For ScopedPtr<>. namespace Gdk diff --git a/libs/tk/ydkmm/drawable.cc b/libs/tk/ydkmm/drawable.cc index 835bda491e..592a9f7054 100644 --- a/libs/tk/ydkmm/drawable.cc +++ b/libs/tk/ydkmm/drawable.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/event.cc b/libs/tk/ydkmm/event.cc index 90878f9e37..5a60a50e41 100644 --- a/libs/tk/ydkmm/event.cc +++ b/libs/tk/ydkmm/event.cc @@ -8,7 +8,7 @@ #include #include -#include +#include // -*- c++ -*- /* $Id: event.ccg,v 1.2 2004/02/10 17:29:54 mxpxpod Exp $ */ diff --git a/libs/tk/ydkmm/gc.cc b/libs/tk/ydkmm/gc.cc index 939b1145cf..0eaa51cabc 100644 --- a/libs/tk/ydkmm/gc.cc +++ b/libs/tk/ydkmm/gc.cc @@ -29,7 +29,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include //#include //#include diff --git a/libs/tk/ydkmm/general.cc b/libs/tk/ydkmm/general.cc index 8853f3eb17..0b3a9d3d4f 100644 --- a/libs/tk/ydkmm/general.cc +++ b/libs/tk/ydkmm/general.cc @@ -19,7 +19,7 @@ */ #include -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/pixbuf.cc b/libs/tk/ydkmm/pixbuf.cc index 4d7469d5c6..f52a0f2e0c 100644 --- a/libs/tk/ydkmm/pixbuf.cc +++ b/libs/tk/ydkmm/pixbuf.cc @@ -33,7 +33,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include //Turn off all deprecation warnings, to avoid the warning about diff --git a/libs/tk/ydkmm/pixbufanimation.cc b/libs/tk/ydkmm/pixbufanimation.cc index 9b7da3d9fa..2cabc11368 100644 --- a/libs/tk/ydkmm/pixbufanimation.cc +++ b/libs/tk/ydkmm/pixbufanimation.cc @@ -29,7 +29,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/pixbufloader.cc b/libs/tk/ydkmm/pixbufloader.cc index 4910c8375c..fad5b4bd75 100644 --- a/libs/tk/ydkmm/pixbufloader.cc +++ b/libs/tk/ydkmm/pixbufloader.cc @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ydkmm/pixmap.cc b/libs/tk/ydkmm/pixmap.cc index d9262c3850..d5942bdc5f 100644 --- a/libs/tk/ydkmm/pixmap.cc +++ b/libs/tk/ydkmm/pixmap.cc @@ -29,7 +29,7 @@ #include #include -#include +#include namespace Gdk diff --git a/libs/tk/ydkmm/region.cc b/libs/tk/ydkmm/region.cc index af6c59d7cb..04c2ac44e0 100644 --- a/libs/tk/ydkmm/region.cc +++ b/libs/tk/ydkmm/region.cc @@ -8,7 +8,7 @@ #include #include -#include +#include // -*- c++ -*- /* $Id: region.ccg,v 1.1 2003/01/21 13:38:38 murrayc Exp $ */ @@ -32,7 +32,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/rgb.cc b/libs/tk/ydkmm/rgb.cc index ad9507352f..49d71754fd 100644 --- a/libs/tk/ydkmm/rgb.cc +++ b/libs/tk/ydkmm/rgb.cc @@ -20,7 +20,7 @@ #include #include -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/rgbcmap.cc b/libs/tk/ydkmm/rgbcmap.cc index 9ef04859fb..bea0e570dd 100644 --- a/libs/tk/ydkmm/rgbcmap.cc +++ b/libs/tk/ydkmm/rgbcmap.cc @@ -30,7 +30,7 @@ */ #include -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/screen.cc b/libs/tk/ydkmm/screen.cc index d291a75424..6d5574727e 100644 --- a/libs/tk/ydkmm/screen.cc +++ b/libs/tk/ydkmm/screen.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/visual.cc b/libs/tk/ydkmm/visual.cc index 53f7ff88fa..67036fd19e 100644 --- a/libs/tk/ydkmm/visual.cc +++ b/libs/tk/ydkmm/visual.cc @@ -29,7 +29,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace Gdk { diff --git a/libs/tk/ydkmm/window.cc b/libs/tk/ydkmm/window.cc index fb316d55fb..8f319c27ef 100644 --- a/libs/tk/ydkmm/window.cc +++ b/libs/tk/ydkmm/window.cc @@ -29,7 +29,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include #include diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/device.h b/libs/tk/ydkmm/ydkmm/gdkmm/device.h index 35c7de3202..b8d5566211 100644 --- a/libs/tk/ydkmm/ydkmm/gdkmm/device.h +++ b/libs/tk/ydkmm/ydkmm/gdkmm/device.h @@ -30,7 +30,7 @@ #include //#include -#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/rectangle.h b/libs/tk/ydkmm/ydkmm/gdkmm/rectangle.h index 7e123d1ac1..e5c5bbe360 100644 --- a/libs/tk/ydkmm/ydkmm/gdkmm/rectangle.h +++ b/libs/tk/ydkmm/ydkmm/gdkmm/rectangle.h @@ -29,7 +29,7 @@ */ #include -#include +#include namespace Gdk diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/region.h b/libs/tk/ydkmm/ydkmm/gdkmm/region.h index 94961e511b..eaf917cc85 100644 --- a/libs/tk/ydkmm/ydkmm/gdkmm/region.h +++ b/libs/tk/ydkmm/ydkmm/gdkmm/region.h @@ -46,7 +46,7 @@ #define GTKMM_GSEAL_ENABLE_UNDEFED 1 #endif -#include +#include // Redefine GDK_DISABLE_DEPRECATED if it was defined before we temporarily undefed it: #if defined(GTKMM_GDK_DISABLE_DEPRECATED_UNDEFED) diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/types.h b/libs/tk/ydkmm/ydkmm/gdkmm/types.h index b0a74b2732..3a43ec0073 100644 --- a/libs/tk/ydkmm/ydkmm/gdkmm/types.h +++ b/libs/tk/ydkmm/ydkmm/gdkmm/types.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include /* Shadow ERROR macro (from wingdi.h). diff --git a/libs/tk/ytk/gtkaboutdialog.c b/libs/tk/ytk/gtkaboutdialog.c index 721ea34c29..7475291ef3 100644 --- a/libs/tk/ytk/gtkaboutdialog.c +++ b/libs/tk/ytk/gtkaboutdialog.c @@ -32,7 +32,7 @@ #include -#include +#include #include "gtkaboutdialog.h" #include "gtkbutton.h" diff --git a/libs/tk/ytk/gtkaccelgroup.c b/libs/tk/ytk/gtkaccelgroup.c index 5c1f9a233f..35dd665a59 100644 --- a/libs/tk/ytk/gtkaccelgroup.c +++ b/libs/tk/ytk/gtkaccelgroup.c @@ -33,7 +33,7 @@ #include "gtkaccelmap.h" #include "gtkintl.h" #include "gtkmain.h" /* For _gtk_boolean_handled_accumulator */ -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkmarshalers.h" #include "gtkprivate.h" #include "gtkalias.h" diff --git a/libs/tk/ytk/gtkaccellabel.c b/libs/tk/ytk/gtkaccellabel.c index 6fdb6a3c2f..19b7e0cb6f 100644 --- a/libs/tk/ytk/gtkaccellabel.c +++ b/libs/tk/ytk/gtkaccellabel.c @@ -36,7 +36,7 @@ #include "gtkprivate.h" #include "gtkintl.h" #include "gtkalias.h" -#include +#include /** * SECTION:gtkaccellabel diff --git a/libs/tk/ytk/gtkcellrendereraccel.c b/libs/tk/ytk/gtkcellrendereraccel.c index 4882fafb6d..8e0c580472 100644 --- a/libs/tk/ytk/gtkcellrendereraccel.c +++ b/libs/tk/ytk/gtkcellrendereraccel.c @@ -26,7 +26,7 @@ #include "gtkeventbox.h" #include "gtkmain.h" #include "gtkprivate.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkalias.h" diff --git a/libs/tk/ytk/gtkcellrendererspin.c b/libs/tk/ytk/gtkcellrendererspin.c index 68e5b9aaae..b8d28082ab 100644 --- a/libs/tk/ytk/gtkcellrendererspin.c +++ b/libs/tk/ytk/gtkcellrendererspin.c @@ -21,7 +21,7 @@ */ #include "config.h" -#include +#include #include "gtkintl.h" #include "gtkprivate.h" #include "gtkspinbutton.h" diff --git a/libs/tk/ytk/gtkclipboard-quartz.c b/libs/tk/ytk/gtkclipboard-quartz.c index 78b28e0dd3..5db4773d98 100644 --- a/libs/tk/ytk/gtkclipboard-quartz.c +++ b/libs/tk/ytk/gtkclipboard-quartz.c @@ -23,7 +23,7 @@ #include "config.h" #include -#include "gdk/gdkquartz.h" +#include "ydk/gdkquartz.h" #import /* NSInteger only exists in Leopard and newer. This check has to be diff --git a/libs/tk/ytk/gtkclipboard.c b/libs/tk/ytk/gtkclipboard.c index 7596682ccf..3566f8544c 100644 --- a/libs/tk/ytk/gtkclipboard.c +++ b/libs/tk/ytk/gtkclipboard.c @@ -32,11 +32,11 @@ #include "gtkalias.h" #ifdef GDK_WINDOWING_X11 -#include "gdk/gdkx.h" +#include "ydk/gdkx.h" #endif #ifdef GDK_WINDOWING_WIN32 -#include "gdk/gdkwin32.h" +#include "ydk/gdkwin32.h" #endif enum { diff --git a/libs/tk/ytk/gtkcolorbutton.c b/libs/tk/ytk/gtkcolorbutton.c index 791ec9ac49..370bdc0b34 100644 --- a/libs/tk/ytk/gtkcolorbutton.c +++ b/libs/tk/ytk/gtkcolorbutton.c @@ -31,7 +31,7 @@ #include "config.h" #include "gtkcolorbutton.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gdk-pixbuf/gdk-pixbuf.h" #include "gtkbutton.h" #include "gtkmain.h" diff --git a/libs/tk/ytk/gtkcolorsel.c b/libs/tk/ytk/gtkcolorsel.c index 78a483db65..866e552351 100644 --- a/libs/tk/ytk/gtkcolorsel.c +++ b/libs/tk/ytk/gtkcolorsel.c @@ -30,7 +30,7 @@ #include #include "gdkconfig.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkcolorsel.h" #include "gtkhsv.h" #include "gtkwindow.h" diff --git a/libs/tk/ytk/gtkcombobox.c b/libs/tk/ytk/gtkcombobox.c index e74cd297c2..dbf5769bc1 100644 --- a/libs/tk/ytk/gtkcombobox.c +++ b/libs/tk/ytk/gtkcombobox.c @@ -40,7 +40,7 @@ #include "gtkwindow.h" #include "gtkprivate.h" -#include +#include #include diff --git a/libs/tk/ytk/gtkdnd-quartz.c b/libs/tk/ytk/gtkdnd-quartz.c index ae60ed3315..6a28f4a360 100644 --- a/libs/tk/ytk/gtkdnd-quartz.c +++ b/libs/tk/ytk/gtkdnd-quartz.c @@ -31,7 +31,7 @@ #include "gdkconfig.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkdnd.h" #include "gtkiconfactory.h" @@ -45,7 +45,7 @@ #include "gtkintl.h" #include "gtkquartz.h" #include "gtkalias.h" -#include "gdk/gdkquartz.h" +#include "ydk/gdkquartz.h" typedef struct _GtkDragSourceSite GtkDragSourceSite; typedef struct _GtkDragSourceInfo GtkDragSourceInfo; diff --git a/libs/tk/ytk/gtkdnd.c b/libs/tk/ytk/gtkdnd.c index 3c6e1a0527..a06f08f2d7 100644 --- a/libs/tk/ytk/gtkdnd.c +++ b/libs/tk/ytk/gtkdnd.c @@ -31,12 +31,12 @@ #include "gdkconfig.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #ifdef GDK_WINDOWING_X11 #include #include -#include "gdk/gdkx.h" +#include "ydk/gdkx.h" #endif #include "gtkdnd.h" diff --git a/libs/tk/ytk/gtkentry.c b/libs/tk/ytk/gtkentry.c index 2a51ce4bc3..2088c8a968 100644 --- a/libs/tk/ytk/gtkentry.c +++ b/libs/tk/ytk/gtkentry.c @@ -33,7 +33,7 @@ #include #include -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkalignment.h" #include "gtkbindings.h" #include "gtkcelleditable.h" diff --git a/libs/tk/ytk/gtkentrybuffer.c b/libs/tk/ytk/gtkentrybuffer.c index ced245726c..8bc3965cf6 100644 --- a/libs/tk/ytk/gtkentrybuffer.c +++ b/libs/tk/ytk/gtkentrybuffer.c @@ -26,7 +26,7 @@ #include "gtkwidget.h" #include "gtkalias.h" -#include +#include #include diff --git a/libs/tk/ytk/gtkexpander.c b/libs/tk/ytk/gtkexpander.c index 879f96f51a..478ea1c310 100644 --- a/libs/tk/ytk/gtkexpander.c +++ b/libs/tk/ytk/gtkexpander.c @@ -32,7 +32,7 @@ #include "gtkmain.h" #include "gtkintl.h" #include "gtkprivate.h" -#include +#include #include "gtkdnd.h" #include "gtkalias.h" diff --git a/libs/tk/ytk/gtkfilechooserdefault.c b/libs/tk/ytk/gtkfilechooserdefault.c index b0435f658d..d90e961e1e 100644 --- a/libs/tk/ytk/gtkfilechooserdefault.c +++ b/libs/tk/ytk/gtkfilechooserdefault.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkalignment.h" #include "gtkbindings.h" #include "gtkcelllayout.h" diff --git a/libs/tk/ytk/gtkfontsel.c b/libs/tk/ytk/gtkfontsel.c index c9a8089e44..b27a4714c1 100644 --- a/libs/tk/ytk/gtkfontsel.c +++ b/libs/tk/ytk/gtkfontsel.c @@ -36,8 +36,8 @@ #include -#include "gdk/gdk.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdk.h" +#include "ydk/gdkkeysyms.h" #include "gtkfontsel.h" diff --git a/libs/tk/ytk/gtkhsv.c b/libs/tk/ytk/gtkhsv.c index 3a52cf27eb..869d13dce0 100644 --- a/libs/tk/ytk/gtkhsv.c +++ b/libs/tk/ytk/gtkhsv.c @@ -34,7 +34,7 @@ #include #include -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkhsv.h" #include "gtkbindings.h" diff --git a/libs/tk/ytk/gtkicontheme.c b/libs/tk/ytk/gtkicontheme.c index 83a50344e8..a2bd57027e 100644 --- a/libs/tk/ytk/gtkicontheme.c +++ b/libs/tk/ytk/gtkicontheme.c @@ -35,7 +35,7 @@ #endif #define WIN32_MEAN_AND_LEAN #include -#include "gdk/gdkwin32.h" +#include "ydk/gdkwin32.h" #endif /* G_OS_WIN32 */ #include "gtkicontheme.h" diff --git a/libs/tk/ytk/gtkiconview.c b/libs/tk/ytk/gtkiconview.c index 6babe41f85..5e7ea33489 100644 --- a/libs/tk/ytk/gtkiconview.c +++ b/libs/tk/ytk/gtkiconview.c @@ -22,7 +22,7 @@ #include -#include +#include #include "gtkiconview.h" #include "gtkcelllayout.h" diff --git a/libs/tk/ytk/gtkimcontextsimple.c b/libs/tk/ytk/gtkimcontextsimple.c index 0e7e61f2d3..169e6a8daa 100644 --- a/libs/tk/ytk/gtkimcontextsimple.c +++ b/libs/tk/ytk/gtkimcontextsimple.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include "gtkprivate.h" #include "gtkaccelgroup.h" #include "gtkimcontextsimple.h" @@ -32,7 +32,7 @@ #include "gtkalias.h" #ifdef GDK_WINDOWING_WIN32 -#include +#include #endif typedef struct _GtkComposeTable GtkComposeTable; diff --git a/libs/tk/ytk/gtkinvisible.c b/libs/tk/ytk/gtkinvisible.c index dbe2212f84..30bfbdc7d2 100644 --- a/libs/tk/ytk/gtkinvisible.c +++ b/libs/tk/ytk/gtkinvisible.c @@ -25,7 +25,7 @@ */ #include "config.h" -#include +#include #include "gtkinvisible.h" #include "gtkprivate.h" #include "gtkintl.h" diff --git a/libs/tk/ytk/gtklabel.c b/libs/tk/ytk/gtklabel.c index cf68685536..e0db58d763 100644 --- a/libs/tk/ytk/gtklabel.c +++ b/libs/tk/ytk/gtklabel.c @@ -35,7 +35,7 @@ #include "gtkmarshalers.h" #include "gtkpango.h" #include "gtkwindow.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkclipboard.h" #include "gtkimagemenuitem.h" #include "gtkintl.h" diff --git a/libs/tk/ytk/gtkmain.c b/libs/tk/ytk/gtkmain.c index c152ad3755..e4a4fd8cae 100644 --- a/libs/tk/ytk/gtkmain.c +++ b/libs/tk/ytk/gtkmain.c @@ -65,9 +65,9 @@ #include "gtkdebug.h" #include "gtkalias.h" #include "gtkmenu.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" -#include "gdk/gdkprivate.h" /* for GDK_WINDOW_DESTROYED */ +#include "ydk/gdkprivate.h" /* for GDK_WINDOW_DESTROYED */ #ifdef G_OS_WIN32 diff --git a/libs/tk/ytk/gtkmenu.c b/libs/tk/ytk/gtkmenu.c index ace37cc762..a213c77db5 100644 --- a/libs/tk/ytk/gtkmenu.c +++ b/libs/tk/ytk/gtkmenu.c @@ -27,7 +27,7 @@ #define GTK_MENU_INTERNALS #include "config.h" #include -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkaccellabel.h" #include "gtkaccelmap.h" #include "gtkbindings.h" diff --git a/libs/tk/ytk/gtkmenubar.c b/libs/tk/ytk/gtkmenubar.c index e3b95544a7..526c1ca1e5 100644 --- a/libs/tk/ytk/gtkmenubar.c +++ b/libs/tk/ytk/gtkmenubar.c @@ -27,7 +27,7 @@ #define GTK_MENU_INTERNALS #include "config.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkbindings.h" #include "gtkmain.h" #include "gtkmarshalers.h" diff --git a/libs/tk/ytk/gtkmenushell.c b/libs/tk/ytk/gtkmenushell.c index 81df2eca91..b0ab2b2718 100644 --- a/libs/tk/ytk/gtkmenushell.c +++ b/libs/tk/ytk/gtkmenushell.c @@ -27,7 +27,7 @@ #define GTK_MENU_INTERNALS #include "config.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkbindings.h" #include "gtkkeyhash.h" #include "gtklabel.h" diff --git a/libs/tk/ytk/gtkmountoperation-x11.c b/libs/tk/ytk/gtkmountoperation-x11.c index b8d77ea0fc..303fca7cb1 100644 --- a/libs/tk/ytk/gtkmountoperation-x11.c +++ b/libs/tk/ytk/gtkmountoperation-x11.c @@ -32,7 +32,7 @@ #include #include #include -#include "gdk/gdkx.h" +#include "ydk/gdkx.h" #include #include #include "gtkintl.h" diff --git a/libs/tk/ytk/gtknotebook.c b/libs/tk/ytk/gtknotebook.c index 0770de61cb..21095520a6 100644 --- a/libs/tk/ytk/gtknotebook.c +++ b/libs/tk/ytk/gtknotebook.c @@ -30,7 +30,7 @@ #include #include -#include +#include #undef GTK_DISABLE_DEPRECATED diff --git a/libs/tk/ytk/gtkoptionmenu.c b/libs/tk/ytk/gtkoptionmenu.c index c53018c478..9ed90c86e1 100644 --- a/libs/tk/ytk/gtkoptionmenu.c +++ b/libs/tk/ytk/gtkoptionmenu.c @@ -26,7 +26,7 @@ #include "config.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #undef GTK_DISABLE_DEPRECATED diff --git a/libs/tk/ytk/gtkpaned.c b/libs/tk/ytk/gtkpaned.c index f6225f0f09..b5ae4d00f5 100644 --- a/libs/tk/ytk/gtkpaned.c +++ b/libs/tk/ytk/gtkpaned.c @@ -26,7 +26,7 @@ #include "config.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkbindings.h" #include "gtkmain.h" #include "gtkmarshalers.h" diff --git a/libs/tk/ytk/gtkplug-win32.c b/libs/tk/ytk/gtkplug-win32.c index bd67b1057f..175dd1fa0d 100644 --- a/libs/tk/ytk/gtkplug-win32.c +++ b/libs/tk/ytk/gtkplug-win32.c @@ -30,7 +30,7 @@ #include "gtkplug.h" #include "gtkplugprivate.h" -#include "gdk/gdkwin32.h" +#include "ydk/gdkwin32.h" #include "gtkwin32embed.h" #include "gtkalias.h" diff --git a/libs/tk/ytk/gtkplug-x11.c b/libs/tk/ytk/gtkplug-x11.c index 985efe1745..8553bb4000 100644 --- a/libs/tk/ytk/gtkplug-x11.c +++ b/libs/tk/ytk/gtkplug-x11.c @@ -31,7 +31,7 @@ #include "gtkprivate.h" #include "gtkplugprivate.h" -#include "gdk/gdkx.h" +#include "ydk/gdkx.h" #include "gtkxembed.h" #include "gtkalias.h" diff --git a/libs/tk/ytk/gtkquartz.c b/libs/tk/ytk/gtkquartz.c index e3b8e65fe4..b3941581da 100644 --- a/libs/tk/ytk/gtkquartz.c +++ b/libs/tk/ytk/gtkquartz.c @@ -21,7 +21,7 @@ #include "config.h" #include "gtkquartz.h" -#include +#include #include "gtkalias.h" NSImage * diff --git a/libs/tk/ytk/gtkrange.c b/libs/tk/ytk/gtkrange.c index d39f0457cb..7ca75c5d2b 100644 --- a/libs/tk/ytk/gtkrange.c +++ b/libs/tk/ytk/gtkrange.c @@ -32,7 +32,7 @@ #undef GTK_DISABLE_DEPRECATED -#include +#include #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkorientable.h" diff --git a/libs/tk/ytk/gtkscale.c b/libs/tk/ytk/gtkscale.c index 3c09cd3ae8..6128e2269d 100644 --- a/libs/tk/ytk/gtkscale.c +++ b/libs/tk/ytk/gtkscale.c @@ -30,7 +30,7 @@ #include #include -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkscale.h" #include "gtkiconfactory.h" #include "gtkicontheme.h" diff --git a/libs/tk/ytk/gtkscalebutton.c b/libs/tk/ytk/gtkscalebutton.c index df9b574939..1c3c0f549b 100644 --- a/libs/tk/ytk/gtkscalebutton.c +++ b/libs/tk/ytk/gtkscalebutton.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include "gtkbindings.h" #include "gtkframe.h" diff --git a/libs/tk/ytk/gtkscrolledwindow.c b/libs/tk/ytk/gtkscrolledwindow.c index 2288b2fae3..71285fb94f 100644 --- a/libs/tk/ytk/gtkscrolledwindow.c +++ b/libs/tk/ytk/gtkscrolledwindow.c @@ -26,7 +26,7 @@ #include "config.h" #include -#include +#include #include "gtkbindings.h" #include "gtkmarshalers.h" #include "gtkscrolledwindow.h" diff --git a/libs/tk/ytk/gtksearchenginequartz.c b/libs/tk/ytk/gtksearchenginequartz.c index 4cf4dea6ab..9c9f46010f 100644 --- a/libs/tk/ytk/gtksearchenginequartz.c +++ b/libs/tk/ytk/gtksearchenginequartz.c @@ -17,7 +17,7 @@ */ #include -#include +#include #include "gtksearchenginequartz.h" diff --git a/libs/tk/ytk/gtkselection.c b/libs/tk/ytk/gtkselection.c index 98d03b5fda..429df071f3 100644 --- a/libs/tk/ytk/gtkselection.c +++ b/libs/tk/ytk/gtkselection.c @@ -63,11 +63,11 @@ #include "gdk-pixbuf/gdk-pixbuf.h" #ifdef GDK_WINDOWING_X11 -#include "gdk/gdkx.h" +#include "ydk/gdkx.h" #endif #ifdef GDK_WINDOWING_WIN32 -#include "gdk/gdkwin32.h" +#include "ydk/gdkwin32.h" #endif #include "gtkalias.h" diff --git a/libs/tk/ytk/gtksettings.c b/libs/tk/ytk/gtksettings.c index 76d01498ab..3e8b9366b5 100644 --- a/libs/tk/ytk/gtksettings.c +++ b/libs/tk/ytk/gtksettings.c @@ -31,7 +31,7 @@ #include "gtkalias.h" #ifdef GDK_WINDOWING_X11 -#include "gdk/gdkx.h" +#include "ydk/gdkx.h" #include #endif diff --git a/libs/tk/ytk/gtkshow.c b/libs/tk/ytk/gtkshow.c index 642584bf41..3d79dc35bb 100644 --- a/libs/tk/ytk/gtkshow.c +++ b/libs/tk/ytk/gtkshow.c @@ -22,7 +22,7 @@ #include "config.h" -#include +#include #include "gtkshow.h" diff --git a/libs/tk/ytk/gtksocket-win32.c b/libs/tk/ytk/gtksocket-win32.c index 152d743c33..7d6d40fb5b 100644 --- a/libs/tk/ytk/gtksocket-win32.c +++ b/libs/tk/ytk/gtksocket-win32.c @@ -35,7 +35,7 @@ #include "gtksocket.h" #include "gtksocketprivate.h" -#include "gdk/gdkwin32.h" +#include "ydk/gdkwin32.h" #include "gtkwin32embed.h" #include "gtkalias.h" diff --git a/libs/tk/ytk/gtksocket-x11.c b/libs/tk/ytk/gtksocket-x11.c index d65c9be4a5..f23b769313 100644 --- a/libs/tk/ytk/gtksocket-x11.c +++ b/libs/tk/ytk/gtksocket-x11.c @@ -28,7 +28,7 @@ #include "config.h" #include -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkwindow.h" @@ -38,7 +38,7 @@ #include "gtksocketprivate.h" #include "gtkdnd.h" -#include "gdk/gdkx.h" +#include "ydk/gdkx.h" #ifdef HAVE_XFIXES #include diff --git a/libs/tk/ytk/gtksocket.c b/libs/tk/ytk/gtksocket.c index e16755ac1c..5feeda3a81 100644 --- a/libs/tk/ytk/gtksocket.c +++ b/libs/tk/ytk/gtksocket.c @@ -28,7 +28,7 @@ #include "config.h" #include -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkwindow.h" diff --git a/libs/tk/ytk/gtkspinbutton.c b/libs/tk/ytk/gtkspinbutton.c index aadc7f8750..7b9c6d7759 100644 --- a/libs/tk/ytk/gtkspinbutton.c +++ b/libs/tk/ytk/gtkspinbutton.c @@ -33,7 +33,7 @@ #include #include #include -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkbindings.h" #include "gtkspinbutton.h" #include "gtkentryprivate.h" diff --git a/libs/tk/ytk/gtkstock.c b/libs/tk/ytk/gtkstock.c index 1222ce50fa..b80a50a858 100644 --- a/libs/tk/ytk/gtkstock.c +++ b/libs/tk/ytk/gtkstock.c @@ -31,7 +31,7 @@ #include "gtkstock.h" #include "gtkiconfactory.h" #include "gtkintl.h" -#include +#include #include "gtkprivate.h" #include "gtkalias.h" diff --git a/libs/tk/ytk/gtktextview.c b/libs/tk/ytk/gtktextview.c index d362b92b30..e085f9ee16 100644 --- a/libs/tk/ytk/gtktextview.c +++ b/libs/tk/ytk/gtktextview.c @@ -44,7 +44,7 @@ #include "gtktextdisplay.h" #include "gtktextview.h" #include "gtkimmulticontext.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkprivate.h" #include "gtktextutil.h" #include "gtkwindow.h" diff --git a/libs/tk/ytk/gtktoolbar.c b/libs/tk/ytk/gtktoolbar.c index f774dfaba8..18e8ed98da 100644 --- a/libs/tk/ytk/gtktoolbar.c +++ b/libs/tk/ytk/gtktoolbar.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include "gtkarrow.h" #include "gtkbindings.h" diff --git a/libs/tk/ytk/gtktreeview.c b/libs/tk/ytk/gtktreeview.c index 791e57dc3e..cd765c5c01 100644 --- a/libs/tk/ytk/gtktreeview.c +++ b/libs/tk/ytk/gtktreeview.c @@ -20,7 +20,7 @@ #include "config.h" #include -#include +#include #include "gtktreeview.h" #include "gtkrbtree.h" diff --git a/libs/tk/ytk/gtkwidget.c b/libs/tk/ytk/gtkwidget.c index 8b58c36d2e..8739b1f8d2 100644 --- a/libs/tk/ytk/gtkwidget.c +++ b/libs/tk/ytk/gtkwidget.c @@ -43,11 +43,11 @@ #include "gtkwindow.h" #include "gtkbindings.h" #include "gtkprivate.h" -#include "gdk/gdk.h" -#include "gdk/gdkprivate.h" /* Used in gtk_reset_shapes_recurse to avoid copy */ +#include "ydk/gdk.h" +#include "ydk/gdkprivate.h" /* Used in gtk_reset_shapes_recurse to avoid copy */ #include #include -#include "gdk/gdkkeysyms.h" +#include "ydk/gdkkeysyms.h" #include "gtkaccessible.h" #include "gtktooltip.h" #include "gtkinvisible.h" diff --git a/libs/tk/ytk/gtkwin32embed.c b/libs/tk/ytk/gtkwin32embed.c index 41e2099d82..5b64dde23c 100644 --- a/libs/tk/ytk/gtkwin32embed.c +++ b/libs/tk/ytk/gtkwin32embed.c @@ -22,7 +22,7 @@ #include "config.h" -#include "gdk/gdkwin32.h" +#include "ydk/gdkwin32.h" #include "gtkwin32embed.h" diff --git a/libs/tk/ytk/gtkwindow.c b/libs/tk/ytk/gtkwindow.c index b25d48f40f..61ab7ab1f2 100644 --- a/libs/tk/ytk/gtkwindow.c +++ b/libs/tk/ytk/gtkwindow.c @@ -29,8 +29,8 @@ #include #include #include -#include "gdk/gdk.h" -#include "gdk/gdkkeysyms.h" +#include "ydk/gdk.h" +#include "ydk/gdkkeysyms.h" #include "gtkintl.h" @@ -51,7 +51,7 @@ #include "gtkalias.h" #ifdef GDK_WINDOWING_X11 -#include "gdk/gdkx.h" +#include "ydk/gdkx.h" #endif enum { diff --git a/libs/tk/ytk/ytk/gtk/gtk.h b/libs/tk/ytk/ytk/gtk/gtk.h index c8ce1e2afe..020aafe4e8 100644 --- a/libs/tk/ytk/ytk/gtk/gtk.h +++ b/libs/tk/ytk/ytk/gtk/gtk.h @@ -29,7 +29,7 @@ #define __GTK_H_INSIDE__ -#include +#include #include #include #include diff --git a/libs/tk/ytk/ytk/gtk/gtkaccelgroup.h b/libs/tk/ytk/ytk/gtk/gtkaccelgroup.h index 1bc32b41c7..7ab8e48570 100644 --- a/libs/tk/ytk/ytk/gtk/gtkaccelgroup.h +++ b/libs/tk/ytk/ytk/gtk/gtkaccelgroup.h @@ -32,7 +32,7 @@ #error "Only can be included directly." #endif -#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkadjustment.h b/libs/tk/ytk/ytk/gtk/gtkadjustment.h index f79179bbc2..f4d5f9680b 100644 --- a/libs/tk/ytk/ytk/gtk/gtkadjustment.h +++ b/libs/tk/ytk/ytk/gtk/gtkadjustment.h @@ -32,7 +32,7 @@ #error "Only can be included directly." #endif -#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkbindings.h b/libs/tk/ytk/ytk/gtk/gtkbindings.h index f42422806e..82a35924da 100644 --- a/libs/tk/ytk/ytk/gtk/gtkbindings.h +++ b/libs/tk/ytk/ytk/gtk/gtkbindings.h @@ -35,7 +35,7 @@ #error "Only can be included directly." #endif -#include +#include #include diff --git a/libs/tk/ytk/ytk/gtk/gtkgc.h b/libs/tk/ytk/ytk/gtk/gtkgc.h index af3db0a430..82cdc5351a 100644 --- a/libs/tk/ytk/ytk/gtk/gtkgc.h +++ b/libs/tk/ytk/ytk/gtk/gtkgc.h @@ -32,7 +32,7 @@ #error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkiconcache.h b/libs/tk/ytk/ytk/gtk/gtkiconcache.h index 1b09cb6865..ed2de79d7d 100644 --- a/libs/tk/ytk/ytk/gtk/gtkiconcache.h +++ b/libs/tk/ytk/ytk/gtk/gtkiconcache.h @@ -20,7 +20,7 @@ #define __GTK_ICON_CACHE_H__ #include -#include +#include typedef struct _GtkIconCache GtkIconCache; typedef struct _GtkIconData GtkIconData; diff --git a/libs/tk/ytk/ytk/gtk/gtkiconfactory.h b/libs/tk/ytk/ytk/gtk/gtkiconfactory.h index ea97123bd8..0a0b39a271 100644 --- a/libs/tk/ytk/ytk/gtk/gtkiconfactory.h +++ b/libs/tk/ytk/ytk/gtk/gtkiconfactory.h @@ -31,7 +31,7 @@ #error "Only can be included directly." #endif -#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkicontheme.h b/libs/tk/ytk/ytk/gtk/gtkicontheme.h index 92b2fd2567..e25b62a09d 100644 --- a/libs/tk/ytk/ytk/gtk/gtkicontheme.h +++ b/libs/tk/ytk/ytk/gtk/gtkicontheme.h @@ -25,7 +25,7 @@ #endif #include -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkimcontext.h b/libs/tk/ytk/ytk/gtk/gtkimcontext.h index 4ee0a1456c..168c8fc164 100644 --- a/libs/tk/ytk/ytk/gtk/gtkimcontext.h +++ b/libs/tk/ytk/ytk/gtk/gtkimcontext.h @@ -25,7 +25,7 @@ #error "Only can be included directly." #endif -#include +#include #include diff --git a/libs/tk/ytk/ytk/gtk/gtkkeyhash.h b/libs/tk/ytk/ytk/gtk/gtkkeyhash.h index cbc6679b10..d16ba3cb9f 100644 --- a/libs/tk/ytk/ytk/gtk/gtkkeyhash.h +++ b/libs/tk/ytk/ytk/gtk/gtkkeyhash.h @@ -22,7 +22,7 @@ #ifndef __GTK_KEY_HASH_H__ #define __GTK_KEY_HASH_H__ -#include +#include G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkmain.h b/libs/tk/ytk/ytk/gtk/gtkmain.h index 2f057e5478..48bd9bf7d9 100644 --- a/libs/tk/ytk/ytk/gtk/gtkmain.h +++ b/libs/tk/ytk/ytk/gtk/gtkmain.h @@ -32,7 +32,7 @@ #error "Only can be included directly." #endif -#include +#include #include #ifdef G_PLATFORM_WIN32 #include diff --git a/libs/tk/ytk/ytk/gtk/gtkmnemonichash.h b/libs/tk/ytk/ytk/gtk/gtkmnemonichash.h index 534137f077..bb88fcce82 100644 --- a/libs/tk/ytk/ytk/gtk/gtkmnemonichash.h +++ b/libs/tk/ytk/ytk/gtk/gtkmnemonichash.h @@ -22,7 +22,7 @@ #ifndef __GTK_MNEMONIC_HASH_H__ #define __GTK_MNEMONIC_HASH_H__ -#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkmountoperationprivate.h b/libs/tk/ytk/ytk/gtk/gtkmountoperationprivate.h index 89ce862690..800ad69eff 100644 --- a/libs/tk/ytk/ytk/gtk/gtkmountoperationprivate.h +++ b/libs/tk/ytk/ytk/gtk/gtkmountoperationprivate.h @@ -29,7 +29,7 @@ #define __GTK_MOUNT_OPERATION_PRIVATE_H__ #include -#include +#include #include struct _GtkMountOperationLookupContext; diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentmanager.h b/libs/tk/ytk/ytk/gtk/gtkrecentmanager.h index 5bb97e69ba..aabe9b28db 100644 --- a/libs/tk/ytk/ytk/gtk/gtkrecentmanager.h +++ b/libs/tk/ytk/ytk/gtk/gtkrecentmanager.h @@ -26,7 +26,7 @@ #endif #include -#include +#include #include G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkstock.h b/libs/tk/ytk/ytk/gtk/gtkstock.h index 6f1b08f519..61296fded7 100644 --- a/libs/tk/ytk/ytk/gtk/gtkstock.h +++ b/libs/tk/ytk/ytk/gtk/gtkstock.h @@ -32,7 +32,7 @@ #error "Only can be included directly." #endif -#include +#include #include /* for GtkTranslateFunc */ G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkstyle.h b/libs/tk/ytk/ytk/gtk/gtkstyle.h index 77d3ae1af5..db889b6fcd 100644 --- a/libs/tk/ytk/ytk/gtk/gtkstyle.h +++ b/libs/tk/ytk/ytk/gtk/gtkstyle.h @@ -32,7 +32,7 @@ #error "Only can be included directly." #endif -#include +#include #include diff --git a/libs/tk/ytk/ytk/gtk/gtktexttag.h b/libs/tk/ytk/ytk/gtk/gtktexttag.h index 9976df4c5c..50a9e95559 100644 --- a/libs/tk/ytk/ytk/gtk/gtktexttag.h +++ b/libs/tk/ytk/ytk/gtk/gtktexttag.h @@ -55,7 +55,7 @@ #error "Only can be included directly." #endif -#include +#include #include /* Not needed, retained for compatibility -Yosh */ diff --git a/libs/tk/ytk/ytk/gtk/gtkwidget.h b/libs/tk/ytk/ytk/gtk/gtkwidget.h index 4883cef668..6b7c520831 100644 --- a/libs/tk/ytk/ytk/gtk/gtkwidget.h +++ b/libs/tk/ytk/ytk/gtk/gtkwidget.h @@ -31,7 +31,7 @@ #error "Only can be included directly." #endif -#include +#include #include #include #include diff --git a/libs/tk/ytk/ytk/gtk/gtkwin32embedwidget.h b/libs/tk/ytk/ytk/gtk/gtkwin32embedwidget.h index 024fcc7fb6..e07261c539 100644 --- a/libs/tk/ytk/ytk/gtk/gtkwin32embedwidget.h +++ b/libs/tk/ytk/ytk/gtk/gtkwin32embedwidget.h @@ -28,7 +28,7 @@ #include -#include "gdk/gdkwin32.h" +#include "ydk/gdkwin32.h" G_BEGIN_DECLS diff --git a/libs/tk/ytk/ytk/gtk/gtkxembed.h b/libs/tk/ytk/ytk/gtk/gtkxembed.h index 3a452ffd70..812b3216f9 100644 --- a/libs/tk/ytk/ytk/gtk/gtkxembed.h +++ b/libs/tk/ytk/ytk/gtk/gtkxembed.h @@ -22,7 +22,7 @@ #define __GTK_XEMBED_H__ #include "xembed.h" -#include "gdk/gdkx.h" +#include "ydk/gdkx.h" G_BEGIN_DECLS diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/accelkey.h b/libs/tk/ytkmm/ytkmm/gtkmm/accelkey.h index 82c966eb74..de8fe7eb30 100644 --- a/libs/tk/ytkmm/ytkmm/gtkmm/accelkey.h +++ b/libs/tk/ytkmm/ytkmm/gtkmm/accelkey.h @@ -21,7 +21,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/menu_elems.h b/libs/tk/ytkmm/ytkmm/gtkmm/menu_elems.h index 3efa9fe739..a93a1470a8 100644 --- a/libs/tk/ytkmm/ytkmm/gtkmm/menu_elems.h +++ b/libs/tk/ytkmm/ytkmm/gtkmm/menu_elems.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace Gtk diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/menushell.h b/libs/tk/ytkmm/ytkmm/gtkmm/menushell.h index a96938fe59..63907369b3 100644 --- a/libs/tk/ytkmm/ytkmm/gtkmm/menushell.h +++ b/libs/tk/ytkmm/ytkmm/gtkmm/menushell.h @@ -26,7 +26,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/widgets/widgets/binding_proxy.h b/libs/widgets/widgets/binding_proxy.h index 8f15abe324..c51c9ed74a 100644 --- a/libs/widgets/widgets/binding_proxy.h +++ b/libs/widgets/widgets/binding_proxy.h @@ -25,7 +25,7 @@ #include "pbd/signals.h" -#include "gdk/gdkevents.h" +#include "ydk/gdkevents.h" #include "widgets/visibility.h"