Update gdk -> ydk header location (omnibus commit)

This commit is contained in:
Robin Gareus 2025-02-01 13:37:48 +01:00
parent eff811d437
commit 07866caf1e
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
228 changed files with 324 additions and 327 deletions

View file

@ -59,7 +59,7 @@
#include "opts.h" #include "opts.h"
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h> #include <ydk/gdkx.h>
#endif #endif
#include "pbd/i18n.h" #include "pbd/i18n.h"

View file

@ -24,7 +24,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <gtkmm/button.h> #include <gtkmm/button.h>
#include <gtkmm/comboboxtext.h> #include <gtkmm/comboboxtext.h>
#include <gdk/gdkquartz.h> #include <ydk/gdkquartz.h>
#include "pbd/convert.h" #include "pbd/convert.h"
#include "pbd/error.h" #include "pbd/error.h"

View file

@ -26,7 +26,7 @@
#include <pbd/error.h> #include <pbd/error.h>
#include <gtkmm2ext/gtkapplication.h> #include <gtkmm2ext/gtkapplication.h>
#include <gdk/gdkquartz.h> #include <ydk/gdkquartz.h>
#undef check #undef check
#undef YES #undef YES

View file

@ -22,7 +22,7 @@
#pragma once #pragma once
#include <sys/types.h> #include <sys/types.h>
#include <gdk/gdkevents.h> #include <ydk/gdkevents.h>
#include "ardour/automation_list.h" #include "ardour/automation_list.h"

View file

@ -29,7 +29,7 @@
#include <list> #include <list>
#include <vector> #include <vector>
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include <stdint.h> #include <stdint.h>
#include "ardour/tempo.h" #include "ardour/tempo.h"

View file

@ -24,7 +24,7 @@
#include "ardour/linux_vst_support.h" #include "ardour/linux_vst_support.h"
#include "lxvst_plugin_ui.h" #include "lxvst_plugin_ui.h"
#include <gdk/gdkx.h> /* must come later than glibmm/object.h */ #include <ydk/gdkx.h> /* must come later than glibmm/object.h */
#define LXVST_H_FIDDLE 40 #define LXVST_H_FIDDLE 40

View file

@ -18,7 +18,7 @@
#include <gtkmm.h> #include <gtkmm.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkquartz.h> #include <ydk/gdkquartz.h>
#include "gui_thread.h" #include "gui_thread.h"
#include "ardour/plugin_insert.h" #include "ardour/plugin_insert.h"

View file

@ -80,7 +80,7 @@
#endif #endif
#ifdef LXVST_SUPPORT #ifdef LXVST_SUPPORT
#include <gdk/gdkx.h> #include <ydk/gdkx.h>
#endif #endif
using namespace std; using namespace std;

View file

@ -27,7 +27,7 @@
#include <pango/pango.h> #include <pango/pango.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <gdk/gdkkeysyms.h> #include <ydk/gdkkeysyms.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/keyboard.h"

View file

@ -36,7 +36,7 @@
#include <string> #include <string>
#include <glib.h> #include <glib.h>
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include <gtkmm/window.h> #include <gtkmm/window.h>
#include <gtkmm/actiongroup.h> #include <gtkmm/actiongroup.h>

View file

@ -68,7 +68,7 @@ ARDOUR_UI_UTILS::inhibit_screensaver (bool inhibit)
#include "ardour_ui.h" #include "ardour_ui.h"
#include "ardour/system_exec.h" #include "ardour/system_exec.h"
#include <gdk/gdkx.h> #include <ydk/gdkx.h>
static sigc::connection glib_timer; static sigc::connection glib_timer;

View file

@ -22,7 +22,7 @@
#include <string> #include <string>
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include <sigc++/trackable.h> #include <sigc++/trackable.h>
#include "pbd/signals.h" #include "pbd/signals.h"

View file

@ -25,7 +25,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include <gdkmm/color.h> #include <gdkmm/color.h>
#include <pangomm/fontdescription.h> #include <pangomm/fontdescription.h>
#include "ardour/types.h" #include "ardour/types.h"

View file

@ -30,7 +30,7 @@
#include "vst3_hwnd_plugin_ui.h" #include "vst3_hwnd_plugin_ui.h"
#include <gdk/gdkwin32.h> #include <ydk/gdkwin32.h>
using namespace ARDOUR; using namespace ARDOUR;
using namespace Steinberg; using namespace Steinberg;

View file

@ -22,7 +22,7 @@
#include <gtkmm.h> #include <gtkmm.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkquartz.h> #include <ydk/gdkquartz.h>
#include "pbd/convert.h" #include "pbd/convert.h"
#include "pbd/error.h" #include "pbd/error.h"

View file

@ -31,7 +31,7 @@
#include "vst3_x11_plugin_ui.h" #include "vst3_x11_plugin_ui.h"
#include <gdk/gdkx.h> /* must come later than glibmm/object.h */ #include <ydk/gdkx.h> /* must come later than glibmm/object.h */
using namespace ARDOUR; using namespace ARDOUR;
using namespace Steinberg; using namespace Steinberg;

View file

@ -28,11 +28,11 @@
#include "vst_plugin_ui.h" #include "vst_plugin_ui.h"
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
#include <gdk/gdkwin32.h> #include <ydk/gdkwin32.h>
#elif defined __APPLE__ #elif defined __APPLE__
// TODO // TODO
#else #else
#include <gdk/gdkx.h> #include <ydk/gdkx.h>
#endif #endif
VSTPluginUI::VSTPluginUI (std::shared_ptr<ARDOUR::PlugInsertBase> pib, std::shared_ptr<ARDOUR::VSTPlugin> plugin) VSTPluginUI::VSTPluginUI (std::shared_ptr<ARDOUR::PlugInsertBase> pib, std::shared_ptr<ARDOUR::VSTPlugin> plugin)

View file

@ -28,11 +28,11 @@
#include "windows_vst_plugin_ui.h" #include "windows_vst_plugin_ui.h"
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
#include <gdk/gdkwin32.h> #include <ydk/gdkwin32.h>
#elif defined __APPLE__ #elif defined __APPLE__
// TODO // TODO
#else #else
#include <gdk/gdkx.h> #include <ydk/gdkx.h>
#endif #endif
using namespace Gtk; using namespace Gtk;

View file

@ -45,7 +45,7 @@
#include "canvas/scroll_group.h" #include "canvas/scroll_group.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include "gtkmm2ext/nsglview.h" #include "gtkmm2ext/nsglview.h"
#endif #endif

View file

@ -23,7 +23,7 @@
#include <stdint.h> #include <stdint.h>
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include <cairomm/context.h> #include <cairomm/context.h>

View file

@ -20,7 +20,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <iostream> #include <iostream>
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include "canvas/debug.h" #include "canvas/debug.h"
using namespace std; using namespace std;

View file

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include <cairomm/cairomm.h> #include <cairomm/cairomm.h>
#include <gtkmm/window.h> #include <gtkmm/window.h>

View file

@ -5,7 +5,7 @@
#include "clearlooks_style.h" #include "clearlooks_style.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include <cairo.h> #include <cairo.h>

View file

@ -23,7 +23,7 @@
#include "gtkmm2ext/rgb_macros.h" #include "gtkmm2ext/rgb_macros.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include "gtkmm2ext/nsglview.h" #include "gtkmm2ext/nsglview.h"
#endif #endif

View file

@ -17,7 +17,7 @@
*/ */
#include <algorithm> #include <algorithm>
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include <pangomm/layout.h> #include <pangomm/layout.h>
#include "gtkmm2ext/emscale.h" #include "gtkmm2ext/emscale.h"

View file

@ -29,7 +29,7 @@
#include <string.h> #include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <ydk/gdkkeysyms.h>
#include <gtkmm2ext/gtkapplication.h> #include <gtkmm2ext/gtkapplication.h>
#include <gtkmm2ext/gtkapplication-private.h> #include <gtkmm2ext/gtkapplication-private.h>

View file

@ -26,7 +26,7 @@
#include <stdint.h> #include <stdint.h>
#include <gdk/gdkkeysyms.h> #include <ydk/gdkkeysyms.h>
#include <gtkmm/action.h> #include <gtkmm/action.h>
#include <gtkmm/radioaction.h> #include <gtkmm/radioaction.h>
#include <gtkmm/toggleaction.h> #include <gtkmm/toggleaction.h>

View file

@ -24,7 +24,7 @@
#undef interface #undef interface
#endif #endif
#include <gdk/gdkevents.h> #include <ydk/gdkevents.h>
#include <glibmm/main.h> #include <glibmm/main.h>
#include "gtkmm2ext/visibility.h" #include "gtkmm2ext/visibility.h"

View file

@ -19,7 +19,7 @@
#ifndef __CANVAS_NSGLVIEW_H__ #ifndef __CANVAS_NSGLVIEW_H__
#define __CANVAS_NSGLVIEW_H__ #define __CANVAS_NSGLVIEW_H__
#include <gdk/gdk.h> #include <ydk/gdk.h>
namespace Gtkmm2ext namespace Gtkmm2ext
{ {

View file

@ -19,7 +19,7 @@
#ifndef __libgtkmm2ext_visibility_tracker__ #ifndef __libgtkmm2ext_visibility_tracker__
#define __libgtkmm2ext_visibility_tracker__ #define __libgtkmm2ext_visibility_tracker__
#include <gdk/gdkevents.h> #include <ydk/gdkevents.h>
#include "gtkmm2ext/visibility.h" #include "gtkmm2ext/visibility.h"
#include "gtkmm2ext/visibility_tracker.h" #include "gtkmm2ext/visibility_tracker.h"

View file

@ -29,7 +29,7 @@
#include "pbd/gstdio_compat.h" #include "pbd/gstdio_compat.h"
#include <gdk/gdkkeysyms.h> #include <ydk/gdkkeysyms.h>
#include <gtkmm/accelmap.h> #include <gtkmm/accelmap.h>
#include <gtkmm/widget.h> #include <gtkmm/widget.h>
#include <gtkmm/window.h> #include <gtkmm/window.h>

View file

@ -23,7 +23,7 @@
#include "gtkmm2ext/nsglview.h" #include "gtkmm2ext/nsglview.h"
#include "gtkmm2ext/rgb_macros.h" #include "gtkmm2ext/rgb_macros.h"
#include <gdk/gdkquartz.h> #include <ydk/gdkquartz.h>
//#define NSVIEW_PROFILE //#define NSVIEW_PROFILE
//#define DEBUG_NSVIEW_EXPOSURE //#define DEBUG_NSVIEW_EXPOSURE

View file

@ -23,7 +23,7 @@
*/ */
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <ydk/gdkkeysyms.h>
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>

View file

@ -21,7 +21,7 @@
#include "lv2/urid/urid.h" #include "lv2/urid/urid.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkquartz.h> #include <ydk/gdkquartz.h>
#include <string.h> #include <string.h>

View file

@ -20,7 +20,7 @@
#include "lv2/urid/urid.h" #include "lv2/urid/urid.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkwin32.h> #include <ydk/gdkwin32.h>
#ifndef WM_MOUSEWHEEL #ifndef WM_MOUSEWHEEL
# define WM_MOUSEWHEEL 0x020A # define WM_MOUSEWHEEL 0x020A

View file

@ -26,8 +26,8 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include <gdk/gdkx.h> #include <ydk/gdkx.h>
#include <glib-object.h> #include <glib-object.h>
#include <glib.h> #include <glib.h>
#include <gobject/gclosure.h> #include <gobject/gclosure.h>

View file

@ -21,7 +21,7 @@
*/ */
#include "config.h" #include "config.h"
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#include "gdkpixbuf.h" #include "gdkpixbuf.h"
#include "gdkscreen.h" #include "gdkscreen.h"

View file

@ -25,7 +25,7 @@
*/ */
#include "config.h" #include "config.h"
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include "gdkalias.h" #include "gdkalias.h"
/** /**

View file

@ -26,8 +26,8 @@
#include "gdkprivate-x11.h" #include "gdkprivate-x11.h"
#include "xsettings-client.h" #include "xsettings-client.h"
#include <gdk/gdkscreen.h> #include <ydk/gdkscreen.h>
#include <gdk/gdkvisual.h> #include <ydk/gdkvisual.h>
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>

View file

@ -24,7 +24,7 @@
#include "gdkspawn.h" #include "gdkspawn.h"
#include <glib.h> #include <glib.h>
#include <gdk/gdk.h> #include <ydk/gdk.h>
gboolean gboolean
gdk_spawn_on_screen (GdkScreen *screen, gdk_spawn_on_screen (GdkScreen *screen,

View file

@ -18,9 +18,9 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#include <gdk/gdktestutils.h> #include <ydk/gdktestutils.h>
#include <gdk/gdkkeysyms.h> #include <ydk/gdkkeysyms.h>
#include <gdk/gdkinternals.h> #include <ydk/gdkinternals.h>
/** /**
* gdk_test_render_sync * gdk_test_render_sync

View file

@ -22,7 +22,7 @@
#define __GDK_QUARTZ_H__ #define __GDK_QUARTZ_H__
#include <AppKit/AppKit.h> #include <AppKit/AppKit.h>
#include <gdk/gdkprivate.h> #include <ydk/gdkprivate.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -86,7 +86,7 @@
#include <shlobj.h> #include <shlobj.h>
#include <shlguid.h> #include <shlguid.h>
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
typedef struct _GdkDragContextPrivateWin32 GdkDragContextPrivateWin32; typedef struct _GdkDragContextPrivateWin32 GdkDragContextPrivateWin32;

View file

@ -35,10 +35,10 @@
#define _WIN32_WINNT WINVER #define _WIN32_WINNT WINVER
#endif #endif
#include <gdk/gdkprivate.h> #include <ydk/gdkprivate.h>
#include <gdk/gdkwindow-win32.h> #include <ydk/gdkwindow-win32.h>
#include <gdk/gdkpixmap-win32.h> #include <ydk/gdkpixmap-win32.h>
#include <gdk/gdkwin32keys.h> #include <ydk/gdkwin32keys.h>
#include "gdkinternals.h" #include "gdkinternals.h"

View file

@ -24,7 +24,7 @@
#include "gdkspawn.h" #include "gdkspawn.h"
#include <glib.h> #include <glib.h>
#include <gdk/gdk.h> #include <ydk/gdk.h>
gboolean gboolean
gdk_spawn_on_screen (GdkScreen *screen, gdk_spawn_on_screen (GdkScreen *screen,

View file

@ -17,8 +17,8 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <gdk/gdktestutils.h> #include <ydk/gdktestutils.h>
#include <gdk/gdkkeysyms.h> #include <ydk/gdkkeysyms.h>
#include <win32/gdkwin32.h> #include <win32/gdkwin32.h>
#include "gdkalias.h" #include "gdkalias.h"

View file

@ -25,7 +25,7 @@
*/ */
#include "config.h" #include "config.h"
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include "gdkprivate-win32.h" #include "gdkprivate-win32.h"

View file

@ -27,8 +27,8 @@
#ifndef __GDK_DRAWABLE_WIN32_H__ #ifndef __GDK_DRAWABLE_WIN32_H__
#define __GDK_DRAWABLE_WIN32_H__ #define __GDK_DRAWABLE_WIN32_H__
#include <gdk/gdkdrawable.h> #include <ydk/gdkdrawable.h>
#include <gdk/gdkwin32.h> #include <ydk/gdkwin32.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -27,8 +27,8 @@
#ifndef __GDK_PIXMAP_WIN32_H__ #ifndef __GDK_PIXMAP_WIN32_H__
#define __GDK_PIXMAP_WIN32_H__ #define __GDK_PIXMAP_WIN32_H__
#include <gdk/gdkdrawable-win32.h> #include <ydk/gdkdrawable-win32.h>
#include <gdk/gdkpixmap.h> #include <ydk/gdkpixmap.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -27,7 +27,7 @@
#ifndef __GDK_WIN32_H__ #ifndef __GDK_WIN32_H__
#define __GDK_WIN32_H__ #define __GDK_WIN32_H__
#include <gdk/gdkprivate.h> #include <ydk/gdkprivate.h>
#ifndef STRICT #ifndef STRICT
#define STRICT /* We want strict type checks */ #define STRICT /* We want strict type checks */

View file

@ -19,7 +19,7 @@
#define __GDK_WIN32_KEYS_H__ #define __GDK_WIN32_KEYS_H__
#include <gdk/gdk.h> #include <ydk/gdk.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -27,7 +27,7 @@
#ifndef __GDK_WINDOW_WIN32_H__ #ifndef __GDK_WINDOW_WIN32_H__
#define __GDK_WINDOW_WIN32_H__ #define __GDK_WINDOW_WIN32_H__
#include <gdk/gdkdrawable-win32.h> #include <ydk/gdkdrawable-win32.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -168,8 +168,8 @@ def configure(conf):
def build(bld): def build(bld):
obj = bld.shlib(features = 'c cshlib') obj = bld.shlib(features = 'c cshlib')
obj.cflags = [ bld.env['compiler_flags_dict']['pic'], '-w' ] obj.cflags = [ bld.env['compiler_flags_dict']['pic'], '-w' ]
obj.export_includes = ['ydk'] obj.export_includes = ['.', 'ydk']
obj.includes = ['.', '..', 'ydk', 'ydk/gdk'] obj.includes = ['.', 'ydk']
obj.name = 'libydk' obj.name = 'libydk'
obj.target = 'ydk' obj.target = 'ydk'
obj.use = [ 'libztk', 'libydk-pixbuf' ] obj.use = [ 'libztk', 'libydk-pixbuf' ]
@ -184,23 +184,20 @@ def build(bld):
obj.source = libydk_sources + libydk_quartz_sources obj.source = libydk_sources + libydk_quartz_sources
obj.cflags += ['-xobjective-c'] obj.cflags += ['-xobjective-c']
obj.uselib += ' OSX' # -framework Cocoa -framework CoreFoundation -framework ApplicationServices obj.uselib += ' OSX' # -framework Cocoa -framework CoreFoundation -framework ApplicationServices
obj.includes += ['ydk/quartz', 'ydk/quartz/gdk', 'ydk/gdk/quartz'] obj.includes += ['quartz', 'quartz/ydk', 'ydk/quartz']
obj.export_includes += ['ydk/gdk'] obj.export_includes += ['quartz']
obj.export_includes += ['ydk/quartz']
elif bld.env['build_target'] == 'mingw': elif bld.env['build_target'] == 'mingw':
obj.source = libydk_sources + libydk_win32_sources obj.source = libydk_sources + libydk_win32_sources
obj.cflags += ['-mms-bitfields', '-Wl,--export-all-symbols'] obj.cflags += ['-mms-bitfields', '-Wl,--export-all-symbols']
obj.uselib += ' GIO-WINDOWS' obj.uselib += ' GIO-WINDOWS'
obj.defines += [ 'INSIDE_GDK_WIN32', 'DLL_EXPORT', 'PIC' ] obj.defines += [ 'INSIDE_GDK_WIN32', 'DLL_EXPORT', 'PIC' ]
obj.includes += ['ydk/win32/gdk', 'ydk/win32'] obj.includes += ['win32', 'win32/ydk']
obj.export_includes += ['ydk/gdk'] obj.export_includes += ['win32']
obj.export_includes += ['ydk/win32']
obj.linkflags = ['-Wl,--export-all-symbols'] obj.linkflags = ['-Wl,--export-all-symbols']
obj.ldflags = '-limm32 -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid' obj.ldflags = '-limm32 -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid'
else: else:
obj.source = libydk_sources + libydk_x11_sources obj.source = libydk_sources + libydk_x11_sources
obj.uselib += ' GIO-UNIX X11 XEXT XINERAMA RANDR DL' obj.uselib += ' GIO-UNIX X11 XEXT XINERAMA RANDR DL'
obj.includes += ['ydk/x11/gdk', 'ydk/gdk/x11'] obj.includes += ['x11', 'x11/ydk', 'ydk/x11']
obj.export_includes += ['ydk/gdk'] obj.export_includes += ['x11']
obj.export_includes += ['ydk/x11']

View file

@ -44,7 +44,7 @@
#include "gdkdisplay-x11.h" #include "gdkdisplay-x11.h"
#include "gdkpixmap-x11.h" #include "gdkpixmap-x11.h"
#include "gdkx.h" #include "gdkx.h"
#include <gdk/gdkpixmap.h> #include <ydk/gdkpixmap.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#include "gdkalias.h" #include "gdkalias.h"

View file

@ -39,7 +39,7 @@
#include "gdkscreen-x11.h" #include "gdkscreen-x11.h"
#include "gdkdisplay-x11.h" #include "gdkdisplay-x11.h"
#include <gdk/gdkinternals.h> #include <ydk/gdkinternals.h>
#include "gdkalias.h" #include "gdkalias.h"
typedef struct typedef struct

View file

@ -26,7 +26,7 @@
#include "gdkspawn.h" #include "gdkspawn.h"
#include <glib.h> #include <glib.h>
#include <gdk/gdk.h> #include <ydk/gdk.h>
#include "gdkalias.h" #include "gdkalias.h"
typedef struct { typedef struct {

View file

@ -17,8 +17,8 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <gdk/gdktestutils.h> #include <ydk/gdktestutils.h>
#include <gdk/gdkkeysyms.h> #include <ydk/gdkkeysyms.h>
#include <x11/gdkx.h> #include <x11/gdkx.h>
#include "gdkalias.h" #include "gdkalias.h"

View file

@ -31,12 +31,12 @@
#ifndef __GDK_PRIVATE_X11_H__ #ifndef __GDK_PRIVATE_X11_H__
#define __GDK_PRIVATE_X11_H__ #define __GDK_PRIVATE_X11_H__
#include <gdk/gdkcursor.h> #include <ydk/gdkcursor.h>
#include <gdk/gdkprivate.h> #include <ydk/gdkprivate.h>
#include <gdk/x11/gdkwindow-x11.h> #include <ydk/x11/gdkwindow-x11.h>
#include <gdk/x11/gdkpixmap-x11.h> #include <ydk/x11/gdkpixmap-x11.h>
#include <gdk/x11/gdkdisplay-x11.h> #include <ydk/x11/gdkdisplay-x11.h>
#include <gdk/gdkinternals.h> #include <ydk/gdkinternals.h>
#define GDK_TYPE_GC_X11 (_gdk_gc_x11_get_type ()) #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)) #define GDK_GC_X11(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_GC_X11, GdkGCX11))

View file

@ -27,7 +27,7 @@
#ifndef __GDK_X_H__ #ifndef __GDK_X_H__
#define __GDK_X_H__ #define __GDK_X_H__
#include <gdk/gdkprivate.h> #include <ydk/gdkprivate.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>

View file

@ -29,34 +29,34 @@
#define __GDK_H_INSIDE__ #define __GDK_H_INSIDE__
#include <gdk/gdkapplaunchcontext.h> #include <ydk/gdkapplaunchcontext.h>
#include <gdk/gdkcairo.h> #include <ydk/gdkcairo.h>
#include <gdk/gdkcolor.h> #include <ydk/gdkcolor.h>
#include <gdk/gdkcursor.h> #include <ydk/gdkcursor.h>
#include <gdk/gdkdisplay.h> #include <ydk/gdkdisplay.h>
#include <gdk/gdkdisplaymanager.h> #include <ydk/gdkdisplaymanager.h>
#include <gdk/gdkdnd.h> #include <ydk/gdkdnd.h>
#include <gdk/gdkdrawable.h> #include <ydk/gdkdrawable.h>
#include <gdk/gdkenumtypes.h> #include <ydk/gdkenumtypes.h>
#include <gdk/gdkevents.h> #include <ydk/gdkevents.h>
#include <gdk/gdkfont.h> #include <ydk/gdkfont.h>
#include <gdk/gdkgc.h> #include <ydk/gdkgc.h>
#include <gdk/gdkimage.h> #include <ydk/gdkimage.h>
#include <gdk/gdkinput.h> #include <ydk/gdkinput.h>
#include <gdk/gdkkeys.h> #include <ydk/gdkkeys.h>
#include <gdk/gdkpango.h> #include <ydk/gdkpango.h>
#include <gdk/gdkpixbuf.h> #include <ydk/gdkpixbuf.h>
#include <gdk/gdkpixmap.h> #include <ydk/gdkpixmap.h>
#include <gdk/gdkproperty.h> #include <ydk/gdkproperty.h>
#include <gdk/gdkregion.h> #include <ydk/gdkregion.h>
#include <gdk/gdkrgb.h> #include <ydk/gdkrgb.h>
#include <gdk/gdkscreen.h> #include <ydk/gdkscreen.h>
#include <gdk/gdkselection.h> #include <ydk/gdkselection.h>
#include <gdk/gdkspawn.h> #include <ydk/gdkspawn.h>
#include <gdk/gdktestutils.h> #include <ydk/gdktestutils.h>
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <gdk/gdkvisual.h> #include <ydk/gdkvisual.h>
#include <gdk/gdkwindow.h> #include <ydk/gdkwindow.h>
#undef __GDK_H_INSIDE__ #undef __GDK_H_INSIDE__

View file

@ -24,11 +24,11 @@
#define __GDK_APP_LAUNCH_CONTEXT_H__ #define __GDK_APP_LAUNCH_CONTEXT_H__
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gio/gio.h> #include <gio/gio.h>
#include <gdk/gdkscreen.h> #include <ydk/gdkscreen.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -21,11 +21,11 @@
#define __GDK_CAIRO_H__ #define __GDK_CAIRO_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdkcolor.h> #include <ydk/gdkcolor.h>
#include <gdk/gdkpixbuf.h> #include <ydk/gdkpixbuf.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,11 +28,11 @@
#define __GDK_COLOR_H__ #define __GDK_COLOR_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <cairo.h> #include <cairo.h>
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,10 +28,10 @@
#define __GDK_CURSOR_H__ #define __GDK_CURSOR_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -25,11 +25,11 @@
#define __GDK_DISPLAY_H__ #define __GDK_DISPLAY_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <gdk/gdkevents.h> #include <ydk/gdkevents.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,11 +28,11 @@
#define __GDK_DISPLAY_MANAGER_H__ #define __GDK_DISPLAY_MANAGER_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <gdk/gdkdisplay.h> #include <ydk/gdkdisplay.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,10 +28,10 @@
#define __GDK_DND_H__ #define __GDK_DND_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,12 +28,12 @@
#define __GDK_DRAWABLE_H__ #define __GDK_DRAWABLE_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <gdk/gdkgc.h> #include <ydk/gdkgc.h>
#include <gdk/gdkrgb.h> #include <ydk/gdkrgb.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#include <cairo.h> #include <cairo.h>

View file

@ -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. */ /* 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) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#ifndef __GDK_ENUM_TYPES_H__ #ifndef __GDK_ENUM_TYPES_H__

View file

@ -28,13 +28,13 @@
#define __GDK_EVENTS_H__ #define __GDK_EVENTS_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdkcolor.h> #include <ydk/gdkcolor.h>
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <gdk/gdkdnd.h> #include <ydk/gdkdnd.h>
#include <gdk/gdkinput.h> #include <ydk/gdkinput.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -29,7 +29,7 @@
#ifndef __GDK_FONT_H__ #ifndef __GDK_FONT_H__
#define __GDK_FONT_H__ #define __GDK_FONT_H__
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <pango/pango.h> #include <pango/pango.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,11 +28,11 @@
#define __GDK_GC_H__ #define __GDK_GC_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdkcolor.h> #include <ydk/gdkcolor.h>
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,10 +28,10 @@
#define __GDK_IMAGE_H__ #define __GDK_IMAGE_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,10 +28,10 @@
#define __GDK_INPUT_H__ #define __GDK_INPUT_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -30,11 +30,11 @@
#define __GDK_INTERNALS_H__ #define __GDK_INTERNALS_H__
#include <gio/gio.h> #include <gio/gio.h>
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <gdk/gdkwindow.h> #include <ydk/gdkwindow.h>
#include <gdk/gdkprivate.h> #include <ydk/gdkprivate.h>
#ifdef USE_MEDIALIB #ifdef USE_MEDIALIB
#include <gdk/gdkmedialib.h> #include <ydk/gdkmedialib.h>
#endif #endif
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,10 +28,10 @@
#define __GDK_KEYS_H__ #define __GDK_KEYS_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -39,7 +39,7 @@
/* For GTK 2, we include compatibility defines by default. */ /* For GTK 2, we include compatibility defines by default. */
#ifndef __G_IR_SCANNER__ #ifndef __G_IR_SCANNER__
#include <gdk/gdkkeysyms-compat.h> #include <ydk/gdkkeysyms-compat.h>
#endif #endif
#define GDK_KEY_VoidSymbol 0xffffff #define GDK_KEY_VoidSymbol 0xffffff

View file

@ -21,10 +21,10 @@
#define __GDK_PANGO_H__ #define __GDK_PANGO_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,12 +28,12 @@
#define __GDK_PIXBUF_H__ #define __GDK_PIXBUF_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <cairo.h> #include <cairo.h>
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <gdk/gdkrgb.h> #include <ydk/gdkrgb.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,11 +28,11 @@
#define __GDK_PIXMAP_H__ #define __GDK_PIXMAP_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
#include <gdk/gdkdrawable.h> #include <ydk/gdkdrawable.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -27,7 +27,7 @@
#ifndef __GDK_PRIVATE_H__ #ifndef __GDK_PRIVATE_H__
#define __GDK_PRIVATE_H__ #define __GDK_PRIVATE_H__
#include <gdk/gdk.h> #include <ydk/gdk.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -28,10 +28,10 @@
#define __GDK_PROPERTY_H__ #define __GDK_PROPERTY_H__
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly." #error "Only <ydk/gdk.h> can be included directly."
#endif #endif
#include <gdk/gdktypes.h> #include <ydk/gdktypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS

Some files were not shown because too many files have changed in this diff Show more