diff --git a/configure.ac b/configure.ac
index 90c36e6ef..d84ea9f8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,8 +165,8 @@ AC_SUBST(LIB_PREFIX)
AC_SUBST(LIB_SUFFIX)
AC_SUBST(GENERATED_SOURCES)
-GTK_REQUIRED_VERSION=2.99.0
-GLIB_REQUIRED_VERSION=2.27.90
+GTK_REQUIRED_VERSION=3.0.0
+GLIB_REQUIRED_VERSION=2.28.0
PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GLIB_REQUIRED_VERSION)
AC_SUBST(GLIB_CFLAGS)
diff --git a/gdk/gdk-api.raw b/gdk/gdk-api.raw
index 51e5db752..b675b8c3f 100644
--- a/gdk/gdk-api.raw
+++ b/gdk/gdk-api.raw
@@ -125,10 +125,10 @@
+
-
@@ -871,10 +871,7 @@
-
-
-
@@ -1027,33 +1024,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1128,7 +1102,7 @@
-
+
@@ -1169,14 +1143,6 @@
-
-
-
-
-
-
-
-
@@ -1930,12 +1896,6 @@
-
-
-
-
-
-
@@ -2395,6 +2355,12 @@
+
+
+
+
+
+
@@ -2977,14 +2943,6 @@
-
-
-
-
-
-
-
-
@@ -3072,7 +3030,7 @@
-
+
@@ -3114,7 +3072,7 @@
-
+
@@ -3156,7 +3114,6 @@
-
@@ -3267,14 +3224,6 @@
-
-
-
-
-
-
-
-
@@ -3408,8 +3357,8 @@
-
-
+
+
@@ -3424,8 +3373,8 @@
-
-
+
+
@@ -3477,14 +3426,6 @@
-
-
-
-
-
-
-
-
@@ -3642,27 +3583,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3830,20 +3750,20 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
@@ -3996,7 +3916,7 @@
-
+
@@ -4007,7 +3927,7 @@
-
+
diff --git a/gdk/gdk-symbols.xml b/gdk/gdk-symbols.xml
index 8c87a4c34..963247bd0 100644
--- a/gdk/gdk-symbols.xml
+++ b/gdk/gdk-symbols.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/gtk/Plug.custom b/gtk/Plug.custom
index 117d26622..460dff7ca 100644
--- a/gtk/Plug.custom
+++ b/gtk/Plug.custom
@@ -22,28 +22,28 @@
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gtk_plug_new(uint socket_id);
+ static extern IntPtr gtk_plug_new(UIntPtr socket_id);
- public Plug (uint socket_id) : base (IntPtr.Zero)
+ public Plug (ulong socket_id) : base (IntPtr.Zero)
{
if (GetType () != typeof (Plug)) {
CreateNativeObject (new string [0], new GLib.Value [0]);
Construct (socket_id);
return;
}
- Raw = gtk_plug_new(socket_id);
+ Raw = gtk_plug_new (new UIntPtr (socket_id));
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gtk_plug_new_for_display(IntPtr display, uint socket_id);
+ static extern IntPtr gtk_plug_new_for_display(IntPtr display, UIntPtr socket_id);
- public Plug (Gdk.Display display, uint socket_id) : base (IntPtr.Zero)
+ public Plug (Gdk.Display display, ulong socket_id) : base (IntPtr.Zero)
{
if (GetType () != typeof (Plug)) {
CreateNativeObject (new string [0], new GLib.Value [0]);
ConstructForDisplay (display, socket_id);
return;
}
- Raw = gtk_plug_new_for_display(display.Handle, socket_id);
+ Raw = gtk_plug_new_for_display (display.Handle, new UIntPtr (socket_id));
}
diff --git a/gtk/gtk-api.raw b/gtk/gtk-api.raw
index 524eb6ccc..bdb514a83 100644
--- a/gtk/gtk-api.raw
+++ b/gtk/gtk-api.raw
@@ -1672,8 +1672,8 @@
-
-
+
+
@@ -1691,8 +1691,8 @@
-
-
+
+
@@ -4321,6 +4321,10 @@
+
+
+
+
+
+
@@ -16024,6 +16078,9 @@
+
+
+
@@ -16823,11 +16880,11 @@
-
+
-
+
@@ -17154,6 +17211,8 @@
+
+
@@ -17221,6 +17280,12 @@
+
+
+
+
+
+
@@ -17896,6 +17961,10 @@
+
+
+
+
@@ -17904,6 +17973,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17932,6 +18013,12 @@
+
+
+
+
+
+
@@ -18130,6 +18217,14 @@
+
+
+
+
+
+
+
+
@@ -18177,8 +18272,24 @@
-
-
-
-
-
-
@@ -23917,6 +24044,12 @@
+
+
+
+
+
+
@@ -24373,7 +24506,7 @@
-
+
@@ -24437,6 +24570,13 @@
+
+
+
+
+
+
+
@@ -24683,7 +24823,7 @@
-
+
@@ -25215,6 +25355,12 @@
+
+
+
+
+
+
@@ -25419,7 +25565,6 @@
-
@@ -25518,7 +25663,7 @@
-
+
@@ -25567,11 +25712,9 @@
-
-
-
-
-
+
+
+
@@ -25891,30 +26034,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -26511,15 +26636,13 @@
-
+
-
-
@@ -26591,11 +26714,6 @@
-
-
-
-
-
diff --git a/gtk/gtk-sharp.dll.config.in b/gtk/gtk-sharp.dll.config.in
index a81347478..6c0723158 100644
--- a/gtk/gtk-sharp.dll.config.in
+++ b/gtk/gtk-sharp.dll.config.in
@@ -2,5 +2,5 @@
-
+
diff --git a/sources/.gitignore b/sources/.gitignore
index 051a6c299..053775a5f 100644
--- a/sources/.gitignore
+++ b/sources/.gitignore
@@ -1,5 +1,5 @@
atk-1.32.0/
gdk-pixbuf-2.22.1/
-glib-2.27.90/
-gtk+-2.99.0/
+glib-2.28.0/
+gtk+-3.0.0/
pango-1.28.3/
diff --git a/sources/Makefile.am b/sources/Makefile.am
index 12bdd0de4..d2051468e 100644
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@@ -3,14 +3,14 @@ EXTRA_DIST = \
sources.xml \
gtk_tree_model_signal_fix.patch
-TARGET_GTK_VERSION=2.99.0
+TARGET_GTK_VERSION=3.0.0
GTK_DOWNLOADS = \
- http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-2.27.90.tar.bz2 \
+ http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-2.28.0.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/pango-1.28.3.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/sources/atk/1.32/atk-1.32.0.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-2.22.1.tar.bz2 \
- http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.99/gtk+-$(TARGET_GTK_VERSION).tar.bz2
+ http://ftp.gnome.org/pub/GNOME/sources/gtk+/3.0/gtk+-$(TARGET_GTK_VERSION).tar.bz2
api:
PATH=../parser:$$PATH $(RUNTIME) ../parser/gapi-parser.exe sources.xml
diff --git a/sources/sources.xml b/sources/sources.xml
index 18b7f1f16..3aadf897c 100644
--- a/sources/sources.xml
+++ b/sources/sources.xml
@@ -2,7 +2,7 @@
-
+
gasynchelper.h
gcontenttypeprivate.h
gdelayedsettingsbackend.h
@@ -90,7 +90,7 @@
-
+
gdkalias.h
gdkwindowimpl.h
keyname-table.h
@@ -114,7 +114,7 @@
-
+
gtkalias.h
gtkappchooseronline.h