2005-05-04 Mike Kestner <mkestner@novell.com>

* autogen.sh : error out with bootstrap help message. * bootstrap : replaces autogen.sh for the 2.5.x release line. * bootstrap-2.4 : replaces autogen.sh for the 1.9.x release line. * configure.in.in : renamed from configure.in and added substitution for version, dependencies, CFLAGS and CSFLAGS. * README : bootstrap docs * */*-api.raw : moved to api-2.6.raw for bootstrapping. * */*-api-2.4.raw : added 2.4 api files for bootstrapping. * */glue/Makefile.am : add GTK_SHARP_VERSION_CFLAGS. * pango/Attribute.cs : add a #if GTK_SHARP_2_6 block. * pango/glue/attribute.c : add a couple #ifdef GTK_SHARP_2_6 blocks. * sample/GtkDemo/* : make the 2.6 demos conditional. svn path=/trunk/gtk-sharp/; revision=44047
2005-05-04 20:53:02 +00:00 · 2005-05-04 20:53:02 +00:00 · 09c61ee026
commit 09c61ee026
parent b957224b9f d06abde608 b7e4cc507e
26 changed files with 27534 additions and 212 deletions
--- a/15
+++ b/15
@ -1,3 +1,18 @@
+2005-05-04  Mike Kestner  <mkestner@novell.com>
+
+	* autogen.sh : error out with bootstrap help message.
+	* bootstrap : replaces autogen.sh for the 2.5.x release line.
+	* bootstrap-2.4 : replaces autogen.sh for the 1.9.x release line.
+	* configure.in.in : renamed from configure.in and added substitution
+	for version, dependencies, CFLAGS and CSFLAGS.
+	* README : bootstrap docs
+	* */*-api.raw : moved to api-2.6.raw for bootstrapping.
+	* */*-api-2.4.raw : added 2.4 api files for bootstrapping.
+	* */glue/Makefile.am : add GTK_SHARP_VERSION_CFLAGS.
+	* pango/Attribute.cs : add a #if GTK_SHARP_2_6 block.
+	* pango/glue/attribute.c : add a couple #ifdef GTK_SHARP_2_6 blocks.
+	* sample/GtkDemo/* : make the 2.6 demos conditional.
+
 2005-05-04  Mike Kestner  <mkestner@novell.com>

 	* glib/Signal.cs : s/DestroyNotify/SignalDestroyNotify to fix mcs 1.0
--- a/5
+++ b/5
@ -32,8 +32,9 @@ Building & Installing Gtk#:
    which was used for Mono.  This might have been "/usr", "/usr/local", or
    something similar.)

-    If you are compiling from CVS, you will need libtool and the auto* tools
-    and will need to replace the configure above with autogen.sh.
+    If you are compiling from SVN, you will need libtool and the auto* tools
+    and will need to replace the configure above with bootstrap for the 2.5.x
+    version or bootstrap-2.4 for the 1.9.x version.


 Discussion & Support:
--- a/atk/atk-api-2.4.raw
+++ b/atk/atk-api-2.4.raw
--- a/atk/atk-api-2.6.raw
+++ b/atk/atk-api-2.6.raw
@ -7,19 +7,19 @@

 -->
  <namespace name="Atk" library="libatk-1.0-0.dll">
-    <enum name="CoordType" cname="AtkCoordType" gtype="atk_coord_type_get_type" type="enum">
+    <enum name="CoordType" cname="AtkCoordType" type="enum">
      <member cname="ATK_XY_SCREEN" name="Screen" />
      <member cname="ATK_XY_WINDOW" name="Window" />
    </enum>
-    <enum name="HyperlinkStateFlags" cname="AtkHyperlinkStateFlags" gtype="atk_hyperlink_state_flags_get_type" type="flags">
+    <enum name="HyperlinkStateFlags" cname="AtkHyperlinkStateFlags" type="flags">
      <member cname="ATK_HYPERLINK_IS_INLINE" name="Inline" value="1 &lt;&lt; 0" />
    </enum>
-    <enum name="KeyEventType" cname="AtkKeyEventType" gtype="atk_key_event_type_get_type" type="enum">
+    <enum name="KeyEventType" cname="AtkKeyEventType" type="enum">
      <member cname="ATK_KEY_EVENT_PRESS" name="Press" />
      <member cname="ATK_KEY_EVENT_RELEASE" name="Release" />
      <member cname="ATK_KEY_EVENT_LAST_DEFINED" name="LastDefined" />
    </enum>
-    <enum name="Layer" cname="AtkLayer" gtype="atk_layer_get_type" type="enum">
+    <enum name="Layer" cname="AtkLayer" type="enum">
      <member cname="ATK_LAYER_INVALID" name="Invalid" />
      <member cname="ATK_LAYER_BACKGROUND" name="Background" />
      <member cname="ATK_LAYER_CANVAS" name="Canvas" />
@ -29,7 +29,7 @@
      <member cname="ATK_LAYER_OVERLAY" name="Overlay" />
      <member cname="ATK_LAYER_WINDOW" name="Window" />
    </enum>
-    <enum name="RelationType" cname="AtkRelationType" gtype="atk_relation_type_get_type" type="enum">
+    <enum name="RelationType" cname="AtkRelationType" type="enum">
      <member cname="ATK_RELATION_NULL" name="Null" />
      <member cname="ATK_RELATION_CONTROLLED_BY" name="ControlledBy" />
      <member cname="ATK_RELATION_CONTROLLER_FOR" name="ControllerFor" />
@ -46,7 +46,7 @@
      <member cname="ATK_RELATION_PARENT_WINDOW_OF" name="ParentWindowOf" />
      <member cname="ATK_RELATION_LAST_DEFINED" name="LastDefined" />
    </enum>
-    <enum name="Role" cname="AtkRole" gtype="atk_role_get_type" type="enum">
+    <enum name="Role" cname="AtkRole" type="enum">
      <member cname="ATK_ROLE_INVALID" name="Invalid" />
      <member cname="ATK_ROLE_ACCEL_LABEL" name="AccelLabel" />
      <member cname="ATK_ROLE_ALERT" name="Alert" />
@ -126,7 +126,7 @@
      <member cname="ATK_ROLE_EMBEDDED" name="Embedded" />
      <member cname="ATK_ROLE_LAST_DEFINED" name="LastDefined" />
    </enum>
-    <enum name="StateType" cname="AtkStateType" gtype="atk_state_type_get_type" type="enum">
+    <enum name="StateType" cname="AtkStateType" type="enum">
      <member cname="ATK_STATE_INVALID" name="Invalid" />
      <member cname="ATK_STATE_ACTIVE" name="Active" />
      <member cname="ATK_STATE_ARMED" name="Armed" />
@ -161,7 +161,7 @@
      <member cname="ATK_STATE_TRUNCATED" name="Truncated" />
      <member cname="ATK_STATE_LAST_DEFINED" name="LastDefined" />
    </enum>
-    <enum name="TextAttribute" cname="AtkTextAttribute" gtype="atk_text_attribute_get_type" type="enum">
+    <enum name="TextAttribute" cname="AtkTextAttribute" type="enum">
      <member cname="ATK_TEXT_ATTR_INVALID" name="Invalid" />
      <member cname="ATK_TEXT_ATTR_LEFT_MARGIN" name="LeftMargin" />
      <member cname="ATK_TEXT_ATTR_RIGHT_MARGIN" name="RightMargin" />
@ -192,7 +192,7 @@
      <member cname="ATK_TEXT_ATTR_STYLE" name="Style" />
      <member cname="ATK_TEXT_ATTR_LAST_DEFINED" name="LastDefined" />
    </enum>
-    <enum name="TextBoundary" cname="AtkTextBoundary" gtype="atk_text_boundary_get_type" type="enum">
+    <enum name="TextBoundary" cname="AtkTextBoundary" type="enum">
      <member cname="ATK_TEXT_BOUNDARY_CHAR" name="Char" />
      <member cname="ATK_TEXT_BOUNDARY_WORD_START" name="WordStart" />
      <member cname="ATK_TEXT_BOUNDARY_WORD_END" name="WordEnd" />
@ -201,7 +201,7 @@
      <member cname="ATK_TEXT_BOUNDARY_LINE_START" name="LineStart" />
      <member cname="ATK_TEXT_BOUNDARY_LINE_END" name="LineEnd" />
    </enum>
-    <enum name="TextClipType" cname="AtkTextClipType" gtype="atk_text_clip_type_get_type" type="enum">
+    <enum name="TextClipType" cname="AtkTextClipType" type="enum">
      <member cname="ATK_TEXT_CLIP_NONE" name="None" />
      <member cname="ATK_TEXT_CLIP_MIN" name="Min" />
      <member cname="ATK_TEXT_CLIP_MAX" name="Max" />
--- a/atk/glue/Makefile.am
+++ b/atk/glue/Makefile.am
@ -11,7 +11,7 @@ libatksharpglue_2_la_SOURCES = 	\

 libatksharpglue_2_la_LIBADD = $(BASE_DEPENDENCIES_LIBS)

-INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir)
+INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)

 libatksharpglue.dll: $(libatksharpglue_2_la_OBJECTS) libatksharpglue.rc libatksharpglue.def
 	./build-dll libatksharpglue-2 $(VERSION)
--- a/autogen.sh
+++ b/autogen.sh
@ -1,110 +1,4 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-# Ripped off from GNOME macros version
-
-DIE=0
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`autoconf' installed to compile Gtk#."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-if [ -z "$LIBTOOL" ]; then
-  LIBTOOL=`which glibtool 2>/dev/null` 
-  if [ ! -x "$LIBTOOL" ]; then
-    LIBTOOL=`which libtool`
-  fi
-fi
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
-  ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`libtool' installed to compile Gtk#."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-  }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`automake' installed to compile Gtk#."
-  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-  echo "(or a newer version if it is available)"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
-  echo "installed doesn't appear recent enough."
-  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-  echo "(or a newer version if it is available)"
-  DIE=1
-}
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-
-if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
-  if test -z "$NO_LIBTOOLIZE" ; then 
-    echo "Running libtoolize..."
-    libtoolize --force --copy
-  fi
-fi
-
-echo "Running aclocal $ACLOCAL_FLAGS ..."
-aclocal $ACLOCAL_FLAGS || {
-  echo
-  echo "**Error**: aclocal failed. This may mean that you have not"
-  echo "installed all of the packages you need, or you may need to"
-  echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
-  echo "for the prefix where you installed the packages whose"
-  echo "macros were not found"
-  exit 1
-}
-
-if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
-  echo "Running autoheader..."
-  autoheader || { echo "**Error**: autoheader failed."; exit 1; }
-fi
-
-echo "Running automake --gnu $am_opt ..."
-automake --add-missing --gnu $am_opt ||
-  { echo "**Error**: automake failed."; exit 1; }
-echo "Running autoconf ..."
-autoconf || { echo "**Error**: autoconf failed."; exit 1; }
-
-
-conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile $PKG_NAME || exit 1
-else
-  echo Skipping configure process.
-fi
+echo
+echo "**Error**: autogen.sh has been replaced by bootstrap for the 2.5.x release."
+echo "To bootstrap a 1.9.x build run bootstrap-2.4."
+DIE=1
--- a/118
+++ b/118
@ -0,0 +1,118 @@
+#!/bin/sh
+# Run this to set configure.in up for an API version.
+
+GTK_SHARP_VERSION=2.5.4
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+sed -e "s/@GTK_SHARP_VERSION@/$GTK_SHARP_VERSION/" -e 's/@GTK_REQUIRED_VERSION@/2.6.0/' -e 's/@VERSIONCSDEFINES@/-define:GTK_SHARP_2_6/' -e 's/@VERSIONCFLAGS@/-DGTK_SHARP_2_6/' $srcdir/configure.in.in > $srcdir/configure.in
+
+cp $srcdir/pango/pango-api-2.6.raw $srcdir/pango/pango-api.raw
+cp $srcdir/atk/atk-api-2.6.raw $srcdir/atk/atk-api.raw
+cp $srcdir/gdk/gdk-api-2.6.raw $srcdir/gdk/gdk-api.raw
+cp $srcdir/gtk/gtk-api-2.6.raw $srcdir/gtk/gtk-api.raw
+
+DIE=0
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have \`autoconf' installed to compile Gtk#."
+  echo "Download the appropriate package for your distribution,"
+  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+}
+
+if [ -z "$LIBTOOL" ]; then
+  LIBTOOL=`which glibtool 2>/dev/null` 
+  if [ ! -x "$LIBTOOL" ]; then
+    LIBTOOL=`which libtool`
+  fi
+fi
+
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+  ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "**Error**: You must have \`libtool' installed to compile Gtk#."
+    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
+    echo "(or a newer version if it is available)"
+    DIE=1
+  }
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have \`automake' installed to compile Gtk#."
+  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+  echo "(or a newer version if it is available)"
+  DIE=1
+  NO_AUTOMAKE=yes
+}
+
+
+# if no automake, don't bother testing for aclocal
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
+  echo "installed doesn't appear recent enough."
+  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+  echo "(or a newer version if it is available)"
+  DIE=1
+}
+
+if test "$DIE" -eq 1; then
+  exit 1
+fi
+
+if test -z "$*"; then
+  echo "**Warning**: I am going to run \`configure' with no arguments."
+  echo "If you wish to pass any to it, please specify them on the"
+  echo \`$0\'" command line."
+  echo
+fi
+
+case $CC in
+xlc )
+  am_opt=--include-deps;;
+esac
+
+
+if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+  if test -z "$NO_LIBTOOLIZE" ; then 
+    echo "Running libtoolize..."
+    libtoolize --force --copy
+  fi
+fi
+
+echo "Running aclocal $ACLOCAL_FLAGS ..."
+aclocal $ACLOCAL_FLAGS || {
+  echo
+  echo "**Error**: aclocal failed. This may mean that you have not"
+  echo "installed all of the packages you need, or you may need to"
+  echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
+  echo "for the prefix where you installed the packages whose"
+  echo "macros were not found"
+  exit 1
+}
+
+if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+  echo "Running autoheader..."
+  autoheader || { echo "**Error**: autoheader failed."; exit 1; }
+fi
+
+echo "Running automake --gnu $am_opt ..."
+automake --add-missing --gnu $am_opt ||
+  { echo "**Error**: automake failed."; exit 1; }
+echo "Running autoconf ..."
+autoconf || { echo "**Error**: autoconf failed."; exit 1; }
+
+
+conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+
+if test x$NOCONFIGURE = x; then
+  echo Running $srcdir/configure $conf_flags "$@" ...
+  $srcdir/configure $conf_flags "$@" \
+  && echo Now type \`make\' to compile $PKG_NAME || exit 1
+else
+  echo Skipping configure process.
+fi
--- a/bootstrap-2.4
+++ b/bootstrap-2.4
@ -0,0 +1,118 @@
+#!/bin/sh
+# Run this to set configure.in up for an API version.
+
+GTK_SHARP_VERSION=1.9.4
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+sed -e "s/@GTK_SHARP_VERSION@/$GTK_SHARP_VERSION/" -e 's/@GTK_REQUIRED_VERSION@/2.4.0/' -e 's/@VERSIONCSDEFINES@//' -e 's/@VERSIONCFLAGS@//' $srcdir/configure.in.in > $srcdir/configure.in
+
+cp $srcdir/pango/pango-api-2.4.raw $srcdir/pango/pango-api.raw
+cp $srcdir/atk/atk-api-2.4.raw $srcdir/atk/atk-api.raw
+cp $srcdir/gdk/gdk-api-2.4.raw $srcdir/gdk/gdk-api.raw
+cp $srcdir/gtk/gtk-api-2.4.raw $srcdir/gtk/gtk-api.raw
+
+DIE=0
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have \`autoconf' installed to compile Gtk#."
+  echo "Download the appropriate package for your distribution,"
+  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+}
+
+if [ -z "$LIBTOOL" ]; then
+  LIBTOOL=`which glibtool 2>/dev/null` 
+  if [ ! -x "$LIBTOOL" ]; then
+    LIBTOOL=`which libtool`
+  fi
+fi
+
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+  ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "**Error**: You must have \`libtool' installed to compile Gtk#."
+    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
+    echo "(or a newer version if it is available)"
+    DIE=1
+  }
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have \`automake' installed to compile Gtk#."
+  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+  echo "(or a newer version if it is available)"
+  DIE=1
+  NO_AUTOMAKE=yes
+}
+
+
+# if no automake, don't bother testing for aclocal
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
+  echo "installed doesn't appear recent enough."
+  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+  echo "(or a newer version if it is available)"
+  DIE=1
+}
+
+if test "$DIE" -eq 1; then
+  exit 1
+fi
+
+if test -z "$*"; then
+  echo "**Warning**: I am going to run \`configure' with no arguments."
+  echo "If you wish to pass any to it, please specify them on the"
+  echo \`$0\'" command line."
+  echo
+fi
+
+case $CC in
+xlc )
+  am_opt=--include-deps;;
+esac
+
+
+if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+  if test -z "$NO_LIBTOOLIZE" ; then 
+    echo "Running libtoolize..."
+    libtoolize --force --copy
+  fi
+fi
+
+echo "Running aclocal $ACLOCAL_FLAGS ..."
+aclocal $ACLOCAL_FLAGS || {
+  echo
+  echo "**Error**: aclocal failed. This may mean that you have not"
+  echo "installed all of the packages you need, or you may need to"
+  echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
+  echo "for the prefix where you installed the packages whose"
+  echo "macros were not found"
+  exit 1
+}
+
+if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+  echo "Running autoheader..."
+  autoheader || { echo "**Error**: autoheader failed."; exit 1; }
+fi
+
+echo "Running automake --gnu $am_opt ..."
+automake --add-missing --gnu $am_opt ||
+  { echo "**Error**: automake failed."; exit 1; }
+echo "Running autoconf ..."
+autoconf || { echo "**Error**: autoconf failed."; exit 1; }
+
+
+conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+
+if test x$NOCONFIGURE = x; then
+  echo Running $srcdir/configure $conf_flags "$@" ...
+  $srcdir/configure $conf_flags "$@" \
+  && echo Now type \`make\' to compile $PKG_NAME || exit 1
+else
+  echo Skipping configure process.
+fi
--- a/configure.in.in
+++ b/configure.in.in
@ -2,7 +2,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gtk-sharp, 2.5.0)
+AM_INIT_AUTOMAKE(gtk-sharp, @GTK_SHARP_VERSION@)
 AM_MAINTAINER_MODE

 API_VERSION=2.0.0.0
@ -39,11 +39,18 @@ AC_CHECK_SIZEOF(void *, 4)

 CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'

+DEBUG_FLAGS=
 AC_ARG_ENABLE(debug, [  --enable-debug          Build debugger (.mdb) files for dlls],
-	CSFLAGS='-g'
+	DEBUG_FLAGS='-g'
 )
+
+CSDEFINES='@VERSIONCSDEFINES@'
+CSFLAGS="$DEBUG_FLAGS $CSDEFINES"
 AC_SUBST(CSFLAGS)

+GTK_SHARP_VERSION_CFLAGS='@VERSIONCFLAGS@'
+AC_SUBST(GTK_SHARP_VERSION_CFLAGS)
+
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
 	AC_MSG_ERROR([You need to install pkg-config])
@ -122,21 +129,22 @@ AC_SUBST(LIB_PREFIX)
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(GENERATED_SOURCES)

-PKG_CHECK_MODULES(GLIB, gobject-2.0 >= 2.6)
+GTK_REQUIRED_VERSION=@GTK_REQUIRED_VERSION@
+
+PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GTK_REQUIRED_VERSION)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)

-PKG_CHECK_MODULES(PANGO, pango >= 1.8)
+PKG_CHECK_MODULES(PANGO, pango)
 AC_SUBST(PANGO_CFLAGS)
 AC_SUBST(PANGO_LIBS)

-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)

 ## Versions of dependencies
 GNOME_REQUIRED_VERSION=2.6.0
-GTK_REQUIRED_VERSION=2.6.0
 ART_REQUIRED_VERSION=2.3.16

 PKG_CHECK_MODULES(LIBART, libart-2.0 >= $ART_REQUIRED_VERSION, enable_libart=yes, enable_libart=no)
--- a/gdk/gdk-api-2.4.raw
+++ b/gdk/gdk-api-2.4.raw
--- a/gdk/gdk-api-2.6.raw
+++ b/gdk/gdk-api-2.6.raw
--- a/gdk/glue/Makefile.am
+++ b/gdk/glue/Makefile.am
@ -15,7 +15,7 @@ libgdksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined

 libgdksharpglue_2_la_LIBADD = $(GTK_LIBS)

-INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)
+INCLUDES = $(GTK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)

 libgdksharpglue.dll: $(libgdksharpglue_2_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def
 	./build-dll libgdksharpglue-2 $(VERSION)
--- a/glade/glue/Makefile.am
+++ b/glade/glue/Makefile.am
@ -13,7 +13,7 @@ libgladesharpglue_2_la_SOURCES = 	\

 libgladesharpglue_2_la_LIBADD = $(GLADE_LIBS)

-INCLUDES = $(GLADE_CFLAGS) -I$(top_srcdir)
+INCLUDES = $(GLADE_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)

 libgladesharpglue.dll: $(libgladesharpglue_2_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def
 	./build-dll libgladesharpglue-2 $(VERSION)
--- a/glib/glue/Makefile.am
+++ b/glib/glue/Makefile.am
@ -17,7 +17,7 @@ libglibsharpglue_2_la_SOURCES = 	\

 libglibsharpglue_2_la_LIBADD = $(GLIB_LIBS)

-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+INCLUDES = $(GLIB_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)

 libgtksharpglue.dll: $(libgtksharpglue_2_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
 	./build-dll libgtksharpglue-2 $(VERSION)
--- a/gnome/glue/Makefile.am
+++ b/gnome/glue/Makefile.am
@ -18,7 +18,7 @@ libgnomesharpglue_2_la_SOURCES = 	\

 libgnomesharpglue_2_la_LIBADD = $(GNOME_LIBS)

-INCLUDES = $(GNOME_CFLAGS) -I$(top_srcdir)
+INCLUDES = $(GNOME_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)

 libgnomesharpglue.dll: $(libgnomesharpglue_2_la_OBJECTS) libgnomesharpglue.rc libgnomesharpglue.def
 	./build-dll libgnomesharpglue-2 $(VERSION)
--- a/gtk/glue/Makefile.am
+++ b/gtk/glue/Makefile.am
@ -27,7 +27,7 @@ libgtksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined

 libgtksharpglue_2_la_LIBADD = $(GTK_LIBS)

-INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)
+INCLUDES = $(GTK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)

 libgtksharpglue.dll: $(libgtksharpglue_2_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
 	./build-dll libgtksharpglue-2 $(VERSION)
--- a/gtk/gtk-api-2.4.raw
+++ b/gtk/gtk-api-2.4.raw
--- a/gtk/gtk-api-2.6.raw
+++ b/gtk/gtk-api-2.6.raw
@ -7,12 +7,12 @@

 -->
  <namespace name="Gtk" library="libgtk-win32-2.0-0.dll">
-    <enum name="AccelFlags" cname="GtkAccelFlags" gtype="gtk_accel_flags_get_type" type="flags">
+    <enum name="AccelFlags" cname="GtkAccelFlags" type="flags">
      <member cname="GTK_ACCEL_VISIBLE" name="Visible" value="1 &lt;&lt; 0" />
      <member cname="GTK_ACCEL_LOCKED" name="Locked" value="1 &lt;&lt; 1" />
      <member cname="GTK_ACCEL_MASK" name="Mask" value="0x07" />
    </enum>
-    <enum name="AnchorType" cname="GtkAnchorType" gtype="gtk_anchor_type_get_type" type="enum">
+    <enum name="AnchorType" cname="GtkAnchorType" type="enum">
      <member cname="GTK_ANCHOR_CENTER" name="Center" />
      <member cname="GTK_ANCHOR_NORTH" name="North" />
      <member cname="GTK_ANCHOR_NORTH_WEST" name="NorthWest" />
@ -31,32 +31,32 @@
      <member cname="GTK_ANCHOR_W" name="W" />
      <member cname="GTK_ANCHOR_E" name="E" />
    </enum>
-    <enum name="ArgFlags" cname="GtkArgFlags" deprecated="1" gtype="gtk_arg_flags_get_type" type="flags">
+    <enum name="ArgFlags" cname="GtkArgFlags" deprecated="1" type="flags">
      <member cname="GTK_ARG_READABLE" name="Readable" />
      <member cname="GTK_ARG_WRITABLE" name="Writable" />
      <member cname="GTK_ARG_CONSTRUCT" name="Construct" />
      <member cname="GTK_ARG_CONSTRUCT_ONLY" name="ConstructOnly" />
      <member cname="GTK_ARG_CHILD_ARG" name="ChildArg" value="1 &lt;&lt; 4" />
    </enum>
-    <enum name="ArrowType" cname="GtkArrowType" gtype="gtk_arrow_type_get_type" type="enum">
+    <enum name="ArrowType" cname="GtkArrowType" type="enum">
      <member cname="GTK_ARROW_UP" name="Up" />
      <member cname="GTK_ARROW_DOWN" name="Down" />
      <member cname="GTK_ARROW_LEFT" name="Left" />
      <member cname="GTK_ARROW_RIGHT" name="Right" />
    </enum>
-    <enum name="AttachOptions" cname="GtkAttachOptions" gtype="gtk_attach_options_get_type" type="flags">
+    <enum name="AttachOptions" cname="GtkAttachOptions" type="flags">
      <member cname="GTK_EXPAND" name="Expand" value="1 &lt;&lt; 0" />
      <member cname="GTK_SHRINK" name="Shrink" value="1 &lt;&lt; 1" />
      <member cname="GTK_FILL" name="Fill" value="1 &lt;&lt; 2" />
    </enum>
-    <enum name="ButtonBoxStyle" cname="GtkButtonBoxStyle" gtype="gtk_button_box_style_get_type" type="enum">
+    <enum name="ButtonBoxStyle" cname="GtkButtonBoxStyle" type="enum">
      <member cname="GTK_BUTTONBOX_DEFAULT_STYLE" name="DefaultStyle" />
      <member cname="GTK_BUTTONBOX_SPREAD" name="Spread" />
      <member cname="GTK_BUTTONBOX_EDGE" name="Edge" />
      <member cname="GTK_BUTTONBOX_START" name="Start" />
      <member cname="GTK_BUTTONBOX_END" name="End" />
    </enum>
-    <enum name="ButtonsType" cname="GtkButtonsType" gtype="gtk_buttons_type_get_type" type="enum">
+    <enum name="ButtonsType" cname="GtkButtonsType" type="enum">
      <member cname="GTK_BUTTONS_NONE" name="None" />
      <member cname="GTK_BUTTONS_OK" name="Ok" />
      <member cname="GTK_BUTTONS_CLOSE" name="Close" />
@ -64,37 +64,37 @@
      <member cname="GTK_BUTTONS_YES_NO" name="YesNo" />
      <member cname="GTK_BUTTONS_OK_CANCEL" name="OkCancel" />
    </enum>
-    <enum name="CalendarDisplayOptions" cname="GtkCalendarDisplayOptions" gtype="gtk_calendar_display_options_get_type" type="flags">
+    <enum name="CalendarDisplayOptions" cname="GtkCalendarDisplayOptions" type="flags">
      <member cname="GTK_CALENDAR_SHOW_HEADING" name="ShowHeading" value="1 &lt;&lt; 0" />
      <member cname="GTK_CALENDAR_SHOW_DAY_NAMES" name="ShowDayNames" value="1 &lt;&lt; 1" />
      <member cname="GTK_CALENDAR_NO_MONTH_CHANGE" name="NoMonthChange" value="1 &lt;&lt; 2" />
      <member cname="GTK_CALENDAR_SHOW_WEEK_NUMBERS" name="ShowWeekNumbers" value="1 &lt;&lt; 3" />
      <member cname="GTK_CALENDAR_WEEK_START_MONDAY" name="WeekStartMonday" value="1 &lt;&lt; 4" />
    </enum>
-    <enum name="CellRendererMode" cname="GtkCellRendererMode" gtype="gtk_cell_renderer_mode_get_type" type="enum">
+    <enum name="CellRendererMode" cname="GtkCellRendererMode" type="enum">
      <member cname="GTK_CELL_RENDERER_MODE_INERT" name="Inert" />
      <member cname="GTK_CELL_RENDERER_MODE_ACTIVATABLE" name="Activatable" />
      <member cname="GTK_CELL_RENDERER_MODE_EDITABLE" name="Editable" />
    </enum>
-    <enum name="CellRendererState" cname="GtkCellRendererState" gtype="gtk_cell_renderer_state_get_type" type="flags">
+    <enum name="CellRendererState" cname="GtkCellRendererState" type="flags">
      <member cname="GTK_CELL_RENDERER_SELECTED" name="Selected" value="1 &lt;&lt; 0" />
      <member cname="GTK_CELL_RENDERER_PRELIT" name="Prelit" value="1 &lt;&lt; 1" />
      <member cname="GTK_CELL_RENDERER_INSENSITIVE" name="Insensitive" value="1 &lt;&lt; 2" />
      <member cname="GTK_CELL_RENDERER_SORTED" name="Sorted" value="1 &lt;&lt; 3" />
      <member cname="GTK_CELL_RENDERER_FOCUSED" name="Focused" value="1 &lt;&lt; 4" />
    </enum>
-    <enum name="CornerType" cname="GtkCornerType" gtype="gtk_corner_type_get_type" type="enum">
+    <enum name="CornerType" cname="GtkCornerType" type="enum">
      <member cname="GTK_CORNER_TOP_LEFT" name="TopLeft" />
      <member cname="GTK_CORNER_BOTTOM_LEFT" name="BottomLeft" />
      <member cname="GTK_CORNER_TOP_RIGHT" name="TopRight" />
      <member cname="GTK_CORNER_BOTTOM_RIGHT" name="BottomRight" />
    </enum>
-    <enum name="CurveType" cname="GtkCurveType" gtype="gtk_curve_type_get_type" type="enum">
+    <enum name="CurveType" cname="GtkCurveType" type="enum">
      <member cname="GTK_CURVE_TYPE_LINEAR" name="Linear" />
      <member cname="GTK_CURVE_TYPE_SPLINE" name="Spline" />
      <member cname="GTK_CURVE_TYPE_FREE" name="Free" />
    </enum>
-    <enum name="DeleteType" cname="GtkDeleteType" gtype="gtk_delete_type_get_type" type="enum">
+    <enum name="DeleteType" cname="GtkDeleteType" type="enum">
      <member cname="GTK_DELETE_CHARS" name="Chars" />
      <member cname="GTK_DELETE_WORD_ENDS" name="WordEnds" />
      <member cname="GTK_DELETE_WORDS" name="Words" />
@ -104,18 +104,18 @@
      <member cname="GTK_DELETE_PARAGRAPHS" name="Paragraphs" />
      <member cname="GTK_DELETE_WHITESPACE" name="Whitespace" />
    </enum>
-    <enum name="DestDefaults" cname="GtkDestDefaults" gtype="gtk_dest_defaults_get_type" type="flags">
+    <enum name="DestDefaults" cname="GtkDestDefaults" type="flags">
      <member cname="GTK_DEST_DEFAULT_MOTION" name="Motion" value="1 &lt;&lt; 0" />
      <member cname="GTK_DEST_DEFAULT_HIGHLIGHT" name="Highlight" value="1 &lt;&lt; 1" />
      <member cname="GTK_DEST_DEFAULT_DROP" name="Drop" value="1 &lt;&lt; 2" />
      <member cname="GTK_DEST_DEFAULT_ALL" name="All" value="0x07" />
    </enum>
-    <enum name="DialogFlags" cname="GtkDialogFlags" gtype="gtk_dialog_flags_get_type" type="flags">
+    <enum name="DialogFlags" cname="GtkDialogFlags" type="flags">
      <member cname="GTK_DIALOG_MODAL" name="Modal" value="1 &lt;&lt; 0" />
      <member cname="GTK_DIALOG_DESTROY_WITH_PARENT" name="DestroyWithParent" value="1 &lt;&lt; 1" />
      <member cname="GTK_DIALOG_NO_SEPARATOR" name="NoSeparator" value="1 &lt;&lt; 2" />
    </enum>
-    <enum name="DirectionType" cname="GtkDirectionType" gtype="gtk_direction_type_get_type" type="enum">
+    <enum name="DirectionType" cname="GtkDirectionType" type="enum">
      <member cname="GTK_DIR_TAB_FORWARD" name="TabForward" />
      <member cname="GTK_DIR_TAB_BACKWARD" name="TabBackward" />
      <member cname="GTK_DIR_UP" name="Up" />
@ -123,23 +123,23 @@
      <member cname="GTK_DIR_LEFT" name="Left" />
      <member cname="GTK_DIR_RIGHT" name="Right" />
    </enum>
-    <enum name="ExpanderStyle" cname="GtkExpanderStyle" gtype="gtk_expander_style_get_type" type="enum">
+    <enum name="ExpanderStyle" cname="GtkExpanderStyle" type="enum">
      <member cname="GTK_EXPANDER_COLLAPSED" name="Collapsed" />
      <member cname="GTK_EXPANDER_SEMI_COLLAPSED" name="SemiCollapsed" />
      <member cname="GTK_EXPANDER_SEMI_EXPANDED" name="SemiExpanded" />
      <member cname="GTK_EXPANDER_EXPANDED" name="Expanded" />
    </enum>
-    <enum name="FileChooserAction" cname="GtkFileChooserAction" gtype="gtk_file_chooser_action_get_type" type="enum">
+    <enum name="FileChooserAction" cname="GtkFileChooserAction" type="enum">
      <member cname="GTK_FILE_CHOOSER_ACTION_OPEN" name="Open" />
      <member cname="GTK_FILE_CHOOSER_ACTION_SAVE" name="Save" />
      <member cname="GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER" name="SelectFolder" />
      <member cname="GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER" name="CreateFolder" />
    </enum>
-    <enum name="FileChooserError" cname="GtkFileChooserError" gtype="gtk_file_chooser_error_get_type" type="enum">
+    <enum name="FileChooserError" cname="GtkFileChooserError" type="enum">
      <member cname="GTK_FILE_CHOOSER_ERROR_NONEXISTENT" name="Nonexistent" />
      <member cname="GTK_FILE_CHOOSER_ERROR_BAD_FILENAME" name="BadFilename" />
    </enum>
-    <enum name="FileFilterFlags" cname="GtkFileFilterFlags" gtype="gtk_file_filter_flags_get_type" type="flags">
+    <enum name="FileFilterFlags" cname="GtkFileFilterFlags" type="flags">
      <member cname="GTK_FILE_FILTER_FILENAME" name="Filename" value="1 &lt;&lt; 0" />
      <member cname="GTK_FILE_FILTER_URI" name="Uri" value="1 &lt;&lt; 1" />
      <member cname="GTK_FILE_FILTER_DISPLAY_NAME" name="DisplayName" value="1 &lt;&lt; 2" />
@ -155,12 +155,12 @@
      <member cname="GTK_IM_STATUS_CALLBACK" name="Callback" />
      <member cname="GTK_IM_STATUS_NONE" name="None" />
    </enum>
-    <enum name="IconLookupFlags" cname="GtkIconLookupFlags" gtype="gtk_icon_lookup_flags_get_type" type="flags">
+    <enum name="IconLookupFlags" cname="GtkIconLookupFlags" type="flags">
      <member cname="GTK_ICON_LOOKUP_NO_SVG" name="NoSvg" value="1 &lt;&lt; 0" />
      <member cname="GTK_ICON_LOOKUP_FORCE_SVG" name="ForceSvg" value="1 &lt;&lt; 1" />
      <member cname="GTK_ICON_LOOKUP_USE_BUILTIN" name="UseBuiltin" value="1 &lt;&lt; 2" />
    </enum>
-    <enum name="IconSize" cname="GtkIconSize" gtype="gtk_icon_size_get_type" type="enum">
+    <enum name="IconSize" cname="GtkIconSize" type="enum">
      <member cname="GTK_ICON_SIZE_INVALID" name="Invalid" />
      <member cname="GTK_ICON_SIZE_MENU" name="Menu" />
      <member cname="GTK_ICON_SIZE_SMALL_TOOLBAR" name="SmallToolbar" />
@ -169,11 +169,11 @@
      <member cname="GTK_ICON_SIZE_DND" name="Dnd" />
      <member cname="GTK_ICON_SIZE_DIALOG" name="Dialog" />
    </enum>
-    <enum name="IconThemeError" cname="GtkIconThemeError" gtype="gtk_icon_theme_error_get_type" type="enum">
+    <enum name="IconThemeError" cname="GtkIconThemeError" type="enum">
      <member cname="GTK_ICON_THEME_NOT_FOUND" name="NotFound" />
      <member cname="GTK_ICON_THEME_FAILED" name="Failed" />
    </enum>
-    <enum name="ImageType" cname="GtkImageType" gtype="gtk_image_type_get_type" type="enum">
+    <enum name="ImageType" cname="GtkImageType" type="enum">
      <member cname="GTK_IMAGE_EMPTY" name="Empty" />
      <member cname="GTK_IMAGE_PIXMAP" name="Pixmap" />
      <member cname="GTK_IMAGE_IMAGE" name="Image" />
@ -183,13 +183,13 @@
      <member cname="GTK_IMAGE_ANIMATION" name="Animation" />
      <member cname="GTK_IMAGE_ICON_NAME" name="IconName" />
    </enum>
-    <enum name="Justification" cname="GtkJustification" gtype="gtk_justification_get_type" type="enum">
+    <enum name="Justification" cname="GtkJustification" type="enum">
      <member cname="GTK_JUSTIFY_LEFT" name="Left" />
      <member cname="GTK_JUSTIFY_RIGHT" name="Right" />
      <member cname="GTK_JUSTIFY_CENTER" name="Center" />
      <member cname="GTK_JUSTIFY_FILL" name="Fill" />
    </enum>
-    <enum name="MatchType" cname="GtkMatchType" deprecated="1" gtype="gtk_match_type_get_type" type="enum">
+    <enum name="MatchType" cname="GtkMatchType" deprecated="1" type="enum">
      <member cname="GTK_MATCH_ALL" name="All" />
      <member cname="GTK_MATCH_ALL_TAIL" name="AllTail" />
      <member cname="GTK_MATCH_HEAD" name="Head" />
@ -197,24 +197,24 @@
      <member cname="GTK_MATCH_EXACT" name="Exact" />
      <member cname="GTK_MATCH_LAST" name="Last" />
    </enum>
-    <enum name="MenuDirectionType" cname="GtkMenuDirectionType" gtype="gtk_menu_direction_type_get_type" type="enum">
+    <enum name="MenuDirectionType" cname="GtkMenuDirectionType" type="enum">
      <member cname="GTK_MENU_DIR_PARENT" name="Parent" />
      <member cname="GTK_MENU_DIR_CHILD" name="Child" />
      <member cname="GTK_MENU_DIR_NEXT" name="Next" />
      <member cname="GTK_MENU_DIR_PREV" name="Prev" />
    </enum>
-    <enum name="MessageType" cname="GtkMessageType" gtype="gtk_message_type_get_type" type="enum">
+    <enum name="MessageType" cname="GtkMessageType" type="enum">
      <member cname="GTK_MESSAGE_INFO" name="Info" />
      <member cname="GTK_MESSAGE_WARNING" name="Warning" />
      <member cname="GTK_MESSAGE_QUESTION" name="Question" />
      <member cname="GTK_MESSAGE_ERROR" name="Error" />
    </enum>
-    <enum name="MetricType" cname="GtkMetricType" gtype="gtk_metric_type_get_type" type="enum">
+    <enum name="MetricType" cname="GtkMetricType" type="enum">
      <member cname="GTK_PIXELS" name="Pixels" />
      <member cname="GTK_INCHES" name="Inches" />
      <member cname="GTK_CENTIMETERS" name="Centimeters" />
    </enum>
-    <enum name="MovementStep" cname="GtkMovementStep" gtype="gtk_movement_step_get_type" type="enum">
+    <enum name="MovementStep" cname="GtkMovementStep" type="enum">
      <member cname="GTK_MOVEMENT_LOGICAL_POSITIONS" name="LogicalPositions" />
      <member cname="GTK_MOVEMENT_VISUAL_POSITIONS" name="VisualPositions" />
      <member cname="GTK_MOVEMENT_WORDS" name="Words" />
@ -226,25 +226,25 @@
      <member cname="GTK_MOVEMENT_BUFFER_ENDS" name="BufferEnds" />
      <member cname="GTK_MOVEMENT_HORIZONTAL_PAGES" name="HorizontalPages" />
    </enum>
-    <enum name="NotebookTab" cname="GtkNotebookTab" gtype="gtk_notebook_tab_get_type" type="enum">
+    <enum name="NotebookTab" cname="GtkNotebookTab" type="enum">
      <member cname="GTK_NOTEBOOK_TAB_FIRST" name="First" />
      <member cname="GTK_NOTEBOOK_TAB_LAST" name="Last" />
    </enum>
-    <enum name="ObjectFlags" cname="GtkObjectFlags" gtype="gtk_object_flags_get_type" type="flags">
+    <enum name="ObjectFlags" cname="GtkObjectFlags" type="flags">
      <member cname="GTK_IN_DESTRUCTION" name="InDestruction" value="1 &lt;&lt; 0" />
      <member cname="GTK_FLOATING" name="Floating" value="1 &lt;&lt; 1" />
      <member cname="GTK_RESERVED_1" name="Reserved1" value="1 &lt;&lt; 2" />
      <member cname="GTK_RESERVED_2" name="Reserved2" value="1 &lt;&lt; 3" />
    </enum>
-    <enum name="Orientation" cname="GtkOrientation" gtype="gtk_orientation_get_type" type="enum">
+    <enum name="Orientation" cname="GtkOrientation" type="enum">
      <member cname="GTK_ORIENTATION_HORIZONTAL" name="Horizontal" />
      <member cname="GTK_ORIENTATION_VERTICAL" name="Vertical" />
    </enum>
-    <enum name="PackType" cname="GtkPackType" gtype="gtk_pack_type_get_type" type="enum">
+    <enum name="PackType" cname="GtkPackType" type="enum">
      <member cname="GTK_PACK_START" name="Start" />
      <member cname="GTK_PACK_END" name="End" />
    </enum>
-    <enum name="PathPriorityType" cname="GtkPathPriorityType" gtype="gtk_path_priority_type_get_type" type="enum">
+    <enum name="PathPriorityType" cname="GtkPathPriorityType" type="enum">
      <member cname="GTK_PATH_PRIO_LOWEST" name="Lowest" />
      <member cname="GTK_PATH_PRIO_GTK" name="Gtk" value="4" />
      <member cname="GTK_PATH_PRIO_APPLICATION" name="Application" value="8" />
@ -252,43 +252,43 @@
      <member cname="GTK_PATH_PRIO_RC" name="Rc" value="12" />
      <member cname="GTK_PATH_PRIO_HIGHEST" name="Highest" value="15" />
    </enum>
-    <enum name="PathType" cname="GtkPathType" gtype="gtk_path_type_get_type" type="enum">
+    <enum name="PathType" cname="GtkPathType" type="enum">
      <member cname="GTK_PATH_WIDGET" name="Widget" />
      <member cname="GTK_PATH_WIDGET_CLASS" name="WidgetClass" />
      <member cname="GTK_PATH_CLASS" name="Class" />
    </enum>
-    <enum name="PolicyType" cname="GtkPolicyType" gtype="gtk_policy_type_get_type" type="enum">
+    <enum name="PolicyType" cname="GtkPolicyType" type="enum">
      <member cname="GTK_POLICY_ALWAYS" name="Always" />
      <member cname="GTK_POLICY_AUTOMATIC" name="Automatic" />
      <member cname="GTK_POLICY_NEVER" name="Never" />
    </enum>
-    <enum name="PositionType" cname="GtkPositionType" gtype="gtk_position_type_get_type" type="enum">
+    <enum name="PositionType" cname="GtkPositionType" type="enum">
      <member cname="GTK_POS_LEFT" name="Left" />
      <member cname="GTK_POS_RIGHT" name="Right" />
      <member cname="GTK_POS_TOP" name="Top" />
      <member cname="GTK_POS_BOTTOM" name="Bottom" />
    </enum>
-    <enum name="PreviewType" cname="GtkPreviewType" deprecated="1" gtype="gtk_preview_type_get_type" type="enum">
+    <enum name="PreviewType" cname="GtkPreviewType" deprecated="1" type="enum">
      <member cname="GTK_PREVIEW_COLOR" name="Color" />
      <member cname="GTK_PREVIEW_GRAYSCALE" name="Grayscale" />
    </enum>
-    <enum name="ProgressBarOrientation" cname="GtkProgressBarOrientation" gtype="gtk_progress_bar_orientation_get_type" type="enum">
+    <enum name="ProgressBarOrientation" cname="GtkProgressBarOrientation" type="enum">
      <member cname="GTK_PROGRESS_LEFT_TO_RIGHT" name="LeftToRight" />
      <member cname="GTK_PROGRESS_RIGHT_TO_LEFT" name="RightToLeft" />
      <member cname="GTK_PROGRESS_BOTTOM_TO_TOP" name="BottomToTop" />
      <member cname="GTK_PROGRESS_TOP_TO_BOTTOM" name="TopToBottom" />
    </enum>
-    <enum name="ProgressBarStyle" cname="GtkProgressBarStyle" gtype="gtk_progress_bar_style_get_type" type="enum">
+    <enum name="ProgressBarStyle" cname="GtkProgressBarStyle" type="enum">
      <member cname="GTK_PROGRESS_CONTINUOUS" name="Continuous" />
      <member cname="GTK_PROGRESS_DISCRETE" name="Discrete" />
    </enum>
-    <enum name="RcFlags" cname="GtkRcFlags" gtype="gtk_rc_flags_get_type" type="flags">
+    <enum name="RcFlags" cname="GtkRcFlags" type="flags">
      <member cname="GTK_RC_FG" name="Fg" value="1 &lt;&lt; 0" />
      <member cname="GTK_RC_BG" name="Bg" value="1 &lt;&lt; 1" />
      <member cname="GTK_RC_TEXT" name="Text" value="1 &lt;&lt; 2" />
      <member cname="GTK_RC_BASE" name="Base" value="1 &lt;&lt; 3" />
    </enum>
-    <enum name="RcTokenType" cname="GtkRcTokenType" gtype="gtk_rc_token_type_get_type" type="enum">
+    <enum name="RcTokenType" cname="GtkRcTokenType" type="enum">
      <member cname="GTK_RC_TOKEN_INVALID" name="Invalid" />
      <member cname="GTK_RC_TOKEN_INCLUDE" name="Include" />
      <member cname="GTK_RC_TOKEN_NORMAL" name="Normal" />
@ -328,17 +328,17 @@
      <member cname="GTK_RC_TOKEN_RTL" name="Rtl" />
      <member cname="GTK_RC_TOKEN_LAST" name="Last" />
    </enum>
-    <enum name="ReliefStyle" cname="GtkReliefStyle" gtype="gtk_relief_style_get_type" type="enum">
+    <enum name="ReliefStyle" cname="GtkReliefStyle" type="enum">
      <member cname="GTK_RELIEF_NORMAL" name="Normal" />
      <member cname="GTK_RELIEF_HALF" name="Half" />
      <member cname="GTK_RELIEF_NONE" name="None" />
    </enum>
-    <enum name="ResizeMode" cname="GtkResizeMode" gtype="gtk_resize_mode_get_type" type="enum">
+    <enum name="ResizeMode" cname="GtkResizeMode" type="enum">
      <member cname="GTK_RESIZE_PARENT" name="Parent" />
      <member cname="GTK_RESIZE_QUEUE" name="Queue" />
      <member cname="GTK_RESIZE_IMMEDIATE" name="Immediate" />
    </enum>
-    <enum name="ResponseType" cname="GtkResponseType" gtype="gtk_response_type_get_type" type="enum">
+    <enum name="ResponseType" cname="GtkResponseType" type="enum">
      <member cname="GTK_RESPONSE_NONE" name="None" value="-1" />
      <member cname="GTK_RESPONSE_REJECT" name="Reject" value="-2" />
      <member cname="GTK_RESPONSE_ACCEPT" name="Accept" value="-3" />
@ -351,7 +351,7 @@
      <member cname="GTK_RESPONSE_APPLY" name="Apply" value="-10" />
      <member cname="GTK_RESPONSE_HELP" name="Help" value="-11" />
    </enum>
-    <enum name="ScrollStep" cname="GtkScrollStep" gtype="gtk_scroll_step_get_type" type="enum">
+    <enum name="ScrollStep" cname="GtkScrollStep" type="enum">
      <member cname="GTK_SCROLL_STEPS" name="Steps" />
      <member cname="GTK_SCROLL_PAGES" name="Pages" />
      <member cname="GTK_SCROLL_ENDS" name="Ends" />
@ -359,7 +359,7 @@
      <member cname="GTK_SCROLL_HORIZONTAL_PAGES" name="HorizontalPages" />
      <member cname="GTK_SCROLL_HORIZONTAL_ENDS" name="HorizontalEnds" />
    </enum>
-    <enum name="ScrollType" cname="GtkScrollType" gtype="gtk_scroll_type_get_type" type="enum">
+    <enum name="ScrollType" cname="GtkScrollType" type="enum">
      <member cname="GTK_SCROLL_NONE" name="None" />
      <member cname="GTK_SCROLL_JUMP" name="Jump" />
      <member cname="GTK_SCROLL_STEP_BACKWARD" name="StepBackward" />
@ -377,27 +377,27 @@
      <member cname="GTK_SCROLL_START" name="Start" />
      <member cname="GTK_SCROLL_END" name="End" />
    </enum>
-    <enum name="SelectionMode" cname="GtkSelectionMode" gtype="gtk_selection_mode_get_type" type="enum">
+    <enum name="SelectionMode" cname="GtkSelectionMode" type="enum">
      <member cname="GTK_SELECTION_NONE" name="None" />
      <member cname="GTK_SELECTION_SINGLE" name="Single" />
      <member cname="GTK_SELECTION_BROWSE" name="Browse" />
      <member cname="GTK_SELECTION_MULTIPLE" name="Multiple" />
      <member cname="GTK_SELECTION_EXTENDED" name="Extended" />
    </enum>
-    <enum name="ShadowType" cname="GtkShadowType" gtype="gtk_shadow_type_get_type" type="enum">
+    <enum name="ShadowType" cname="GtkShadowType" type="enum">
      <member cname="GTK_SHADOW_NONE" name="None" />
      <member cname="GTK_SHADOW_IN" name="In" />
      <member cname="GTK_SHADOW_OUT" name="Out" />
      <member cname="GTK_SHADOW_ETCHED_IN" name="EtchedIn" />
      <member cname="GTK_SHADOW_ETCHED_OUT" name="EtchedOut" />
    </enum>
-    <enum name="SideType" cname="GtkSideType" deprecated="1" gtype="gtk_side_type_get_type" type="enum">
+    <enum name="SideType" cname="GtkSideType" deprecated="1" type="enum">
      <member cname="GTK_SIDE_TOP" name="Top" />
      <member cname="GTK_SIDE_BOTTOM" name="Bottom" />
      <member cname="GTK_SIDE_LEFT" name="Left" />
      <member cname="GTK_SIDE_RIGHT" name="Right" />
    </enum>
-    <enum name="SignalRunType" cname="GtkSignalRunType" deprecated="1" gtype="gtk_signal_run_type_get_type" type="enum">
+    <enum name="SignalRunType" cname="GtkSignalRunType" deprecated="1" type="enum">
      <member cname="GTK_RUN_FIRST" name="First" />
      <member cname="GTK_RUN_LAST" name="Last" />
      <member cname="GTK_RUN_BOTH" name="Both" />
@ -405,21 +405,21 @@
      <member cname="GTK_RUN_ACTION" name="Action" />
      <member cname="GTK_RUN_NO_HOOKS" name="NoHooks" />
    </enum>
-    <enum name="SizeGroupMode" cname="GtkSizeGroupMode" gtype="gtk_size_group_mode_get_type" type="enum">
+    <enum name="SizeGroupMode" cname="GtkSizeGroupMode" type="enum">
      <member cname="GTK_SIZE_GROUP_NONE" name="None" />
      <member cname="GTK_SIZE_GROUP_HORIZONTAL" name="Horizontal" />
      <member cname="GTK_SIZE_GROUP_VERTICAL" name="Vertical" />
      <member cname="GTK_SIZE_GROUP_BOTH" name="Both" />
    </enum>
-    <enum name="SortType" cname="GtkSortType" gtype="gtk_sort_type_get_type" type="enum">
+    <enum name="SortType" cname="GtkSortType" type="enum">
      <member cname="GTK_SORT_ASCENDING" name="Ascending" />
      <member cname="GTK_SORT_DESCENDING" name="Descending" />
    </enum>
-    <enum name="SpinButtonUpdatePolicy" cname="GtkSpinButtonUpdatePolicy" gtype="gtk_spin_button_update_policy_get_type" type="enum">
+    <enum name="SpinButtonUpdatePolicy" cname="GtkSpinButtonUpdatePolicy" type="enum">
      <member cname="GTK_UPDATE_ALWAYS" name="Always" />
      <member cname="GTK_UPDATE_IF_VALID" name="IfValid" />
    </enum>
-    <enum name="SpinType" cname="GtkSpinType" gtype="gtk_spin_type_get_type" type="enum">
+    <enum name="SpinType" cname="GtkSpinType" type="enum">
      <member cname="GTK_SPIN_STEP_FORWARD" name="StepForward" />
      <member cname="GTK_SPIN_STEP_BACKWARD" name="StepBackward" />
      <member cname="GTK_SPIN_PAGE_FORWARD" name="PageForward" />
@ -428,35 +428,35 @@
      <member cname="GTK_SPIN_END" name="End" />
      <member cname="GTK_SPIN_USER_DEFINED" name="UserDefined" />
    </enum>
-    <enum name="StateType" cname="GtkStateType" gtype="gtk_state_type_get_type" type="enum">
+    <enum name="StateType" cname="GtkStateType" type="enum">
      <member cname="GTK_STATE_NORMAL" name="Normal" />
      <member cname="GTK_STATE_ACTIVE" name="Active" />
      <member cname="GTK_STATE_PRELIGHT" name="Prelight" />
      <member cname="GTK_STATE_SELECTED" name="Selected" />
      <member cname="GTK_STATE_INSENSITIVE" name="Insensitive" />
    </enum>
-    <enum name="SubmenuDirection" cname="GtkSubmenuDirection" deprecated="1" gtype="gtk_submenu_direction_get_type" type="enum">
+    <enum name="SubmenuDirection" cname="GtkSubmenuDirection" deprecated="1" type="enum">
      <member cname="GTK_DIRECTION_LEFT" name="Left" />
      <member cname="GTK_DIRECTION_RIGHT" name="Right" />
    </enum>
-    <enum name="SubmenuPlacement" cname="GtkSubmenuPlacement" deprecated="1" gtype="gtk_submenu_placement_get_type" type="enum">
+    <enum name="SubmenuPlacement" cname="GtkSubmenuPlacement" deprecated="1" type="enum">
      <member cname="GTK_TOP_BOTTOM" name="TopBottom" />
      <member cname="GTK_LEFT_RIGHT" name="LeftRight" />
    </enum>
-    <enum name="TargetFlags" cname="GtkTargetFlags" gtype="gtk_target_flags_get_type" type="flags">
+    <enum name="TargetFlags" cname="GtkTargetFlags" type="flags">
      <member cname="GTK_TARGET_SAME_APP" name="App" value="1 &lt;&lt; 0" />
      <member cname="GTK_TARGET_SAME_WIDGET" name="Widget" value="1 &lt;&lt; 1" />
    </enum>
-    <enum name="TextDirection" cname="GtkTextDirection" gtype="gtk_text_direction_get_type" type="enum">
+    <enum name="TextDirection" cname="GtkTextDirection" type="enum">
      <member cname="GTK_TEXT_DIR_NONE" name="None" />
      <member cname="GTK_TEXT_DIR_LTR" name="Ltr" />
      <member cname="GTK_TEXT_DIR_RTL" name="Rtl" />
    </enum>
-    <enum name="TextSearchFlags" cname="GtkTextSearchFlags" gtype="gtk_text_search_flags_get_type" type="flags">
+    <enum name="TextSearchFlags" cname="GtkTextSearchFlags" type="flags">
      <member cname="GTK_TEXT_SEARCH_VISIBLE_ONLY" name="VisibleOnly" value="1 &lt;&lt; 0" />
      <member cname="GTK_TEXT_SEARCH_TEXT_ONLY" name="TextOnly" value="1 &lt;&lt; 1" />
    </enum>
-    <enum name="TextWindowType" cname="GtkTextWindowType" gtype="gtk_text_window_type_get_type" type="enum">
+    <enum name="TextWindowType" cname="GtkTextWindowType" type="enum">
      <member cname="GTK_TEXT_WINDOW_PRIVATE" name="Private" />
      <member cname="GTK_TEXT_WINDOW_WIDGET" name="Widget" />
      <member cname="GTK_TEXT_WINDOW_TEXT" name="Text" />
@ -465,33 +465,33 @@
      <member cname="GTK_TEXT_WINDOW_TOP" name="Top" />
      <member cname="GTK_TEXT_WINDOW_BOTTOM" name="Bottom" />
    </enum>
-    <enum name="ToolbarChildType" cname="GtkToolbarChildType" deprecated="1" gtype="gtk_toolbar_child_type_get_type" type="enum">
+    <enum name="ToolbarChildType" cname="GtkToolbarChildType" deprecated="1" type="enum">
      <member cname="GTK_TOOLBAR_CHILD_SPACE" name="Space" />
      <member cname="GTK_TOOLBAR_CHILD_BUTTON" name="Button" />
      <member cname="GTK_TOOLBAR_CHILD_TOGGLEBUTTON" name="Togglebutton" />
      <member cname="GTK_TOOLBAR_CHILD_RADIOBUTTON" name="Radiobutton" />
      <member cname="GTK_TOOLBAR_CHILD_WIDGET" name="Widget" />
    </enum>
-    <enum name="ToolbarSpaceStyle" cname="GtkToolbarSpaceStyle" gtype="gtk_toolbar_space_style_get_type" type="enum">
+    <enum name="ToolbarSpaceStyle" cname="GtkToolbarSpaceStyle" type="enum">
      <member cname="GTK_TOOLBAR_SPACE_EMPTY" name="Empty" />
      <member cname="GTK_TOOLBAR_SPACE_LINE" name="Line" />
    </enum>
-    <enum name="ToolbarStyle" cname="GtkToolbarStyle" gtype="gtk_toolbar_style_get_type" type="enum">
+    <enum name="ToolbarStyle" cname="GtkToolbarStyle" type="enum">
      <member cname="GTK_TOOLBAR_ICONS" name="Icons" />
      <member cname="GTK_TOOLBAR_TEXT" name="Text" />
      <member cname="GTK_TOOLBAR_BOTH" name="Both" />
      <member cname="GTK_TOOLBAR_BOTH_HORIZ" name="BothHoriz" />
    </enum>
-    <enum name="TreeModelFlags" cname="GtkTreeModelFlags" gtype="gtk_tree_model_flags_get_type" type="flags">
+    <enum name="TreeModelFlags" cname="GtkTreeModelFlags" type="flags">
      <member cname="GTK_TREE_MODEL_ITERS_PERSIST" name="ItersPersist" value="1 &lt;&lt; 0" />
      <member cname="GTK_TREE_MODEL_LIST_ONLY" name="ListOnly" value="1 &lt;&lt; 1" />
    </enum>
-    <enum name="TreeViewColumnSizing" cname="GtkTreeViewColumnSizing" gtype="gtk_tree_view_column_sizing_get_type" type="enum">
+    <enum name="TreeViewColumnSizing" cname="GtkTreeViewColumnSizing" type="enum">
      <member cname="GTK_TREE_VIEW_COLUMN_GROW_ONLY" name="GrowOnly" />
      <member cname="GTK_TREE_VIEW_COLUMN_AUTOSIZE" name="Autosize" />
      <member cname="GTK_TREE_VIEW_COLUMN_FIXED" name="Fixed" />
    </enum>
-    <enum name="TreeViewDropPosition" cname="GtkTreeViewDropPosition" gtype="gtk_tree_view_drop_position_get_type" type="enum">
+    <enum name="TreeViewDropPosition" cname="GtkTreeViewDropPosition" type="enum">
      <member cname="GTK_TREE_VIEW_DROP_BEFORE" name="Before" />
      <member cname="GTK_TREE_VIEW_DROP_AFTER" name="After" />
      <member cname="GTK_TREE_VIEW_DROP_INTO_OR_BEFORE" name="IntoOrBefore" />
@ -509,17 +509,17 @@
      <member cname="GTK_UI_MANAGER_SEPARATOR" name="Separator" value="1 &lt;&lt; 7" />
      <member cname="GTK_UI_MANAGER_ACCELERATOR" name="Accelerator" value="1 &lt;&lt; 8" />
    </enum>
-    <enum name="UpdateType" cname="GtkUpdateType" gtype="gtk_update_type_get_type" type="enum">
+    <enum name="UpdateType" cname="GtkUpdateType" type="enum">
      <member cname="GTK_UPDATE_CONTINUOUS" name="Continuous" />
      <member cname="GTK_UPDATE_DISCONTINUOUS" name="Discontinuous" />
      <member cname="GTK_UPDATE_DELAYED" name="Delayed" />
    </enum>
-    <enum name="Visibility" cname="GtkVisibility" gtype="gtk_visibility_get_type" type="enum">
+    <enum name="Visibility" cname="GtkVisibility" type="enum">
      <member cname="GTK_VISIBILITY_NONE" name="None" />
      <member cname="GTK_VISIBILITY_PARTIAL" name="Partial" />
      <member cname="GTK_VISIBILITY_FULL" name="Full" />
    </enum>
-    <enum name="WidgetFlags" cname="GtkWidgetFlags" gtype="gtk_widget_flags_get_type" type="flags">
+    <enum name="WidgetFlags" cname="GtkWidgetFlags" type="flags">
      <member cname="GTK_TOPLEVEL" name="Toplevel" value="1 &lt;&lt; 4" />
      <member cname="GTK_NO_WINDOW" name="NoWindow" value="1 &lt;&lt; 5" />
      <member cname="GTK_REALIZED" name="Realized" value="1 &lt;&lt; 6" />
@ -540,22 +540,22 @@
      <member cname="GTK_DOUBLE_BUFFERED" name="DoubleBuffered" value="1 &lt;&lt; 21" />
      <member cname="GTK_NO_SHOW_ALL" name="NoShowAll" value="1 &lt;&lt; 22" />
    </enum>
-    <enum name="WidgetHelpType" cname="GtkWidgetHelpType" gtype="gtk_widget_help_type_get_type" type="enum">
+    <enum name="WidgetHelpType" cname="GtkWidgetHelpType" type="enum">
      <member cname="GTK_WIDGET_HELP_TOOLTIP" name="Tooltip" />
      <member cname="GTK_WIDGET_HELP_WHATS_THIS" name="WhatsThis" />
    </enum>
-    <enum name="WindowPosition" cname="GtkWindowPosition" gtype="gtk_window_position_get_type" type="enum">
+    <enum name="WindowPosition" cname="GtkWindowPosition" type="enum">
      <member cname="GTK_WIN_POS_NONE" name="None" />
      <member cname="GTK_WIN_POS_CENTER" name="Center" />
      <member cname="GTK_WIN_POS_MOUSE" name="Mouse" />
      <member cname="GTK_WIN_POS_CENTER_ALWAYS" name="CenterAlways" />
      <member cname="GTK_WIN_POS_CENTER_ON_PARENT" name="CenterOnParent" />
    </enum>
-    <enum name="WindowType" cname="GtkWindowType" gtype="gtk_window_type_get_type" type="enum">
+    <enum name="WindowType" cname="GtkWindowType" type="enum">
      <member cname="GTK_WINDOW_TOPLEVEL" name="Toplevel" />
      <member cname="GTK_WINDOW_POPUP" name="Popup" />
    </enum>
-    <enum name="WrapMode" cname="GtkWrapMode" gtype="gtk_wrap_mode_get_type" type="enum">
+    <enum name="WrapMode" cname="GtkWrapMode" type="enum">
      <member cname="GTK_WRAP_NONE" name="None" />
      <member cname="GTK_WRAP_CHAR" name="Char" />
      <member cname="GTK_WRAP_WORD" name="Word" />
--- a/pango/Attribute.cs
+++ b/pango/Attribute.cs
@ -68,12 +68,14 @@ namespace Pango {
 				return new AttrScale (raw);
 			case Pango.AttrType.Fallback:
 				return new AttrFallback (raw);
+#if GTK_SHARP_2_6
 			case Pango.AttrType.LetterSpacing:
 				return new AttrLetterSpacing (raw);
 			case Pango.AttrType.UnderlineColor:
 				return new AttrUnderlineColor (raw);
 			case Pango.AttrType.StrikethroughColor:
 				return new AttrStrikethroughColor (raw);
+#endif
 			default:
 				return new Attribute (raw);
 			}
--- a/pango/glue/Makefile.am
+++ b/pango/glue/Makefile.am
@ -11,7 +11,7 @@ libpangosharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined

 libpangosharpglue_2_la_LIBADD = $(PANGO_LIBS)

-INCLUDES = $(PANGO_CFLAGS) -I$(top_srcdir)
+INCLUDES = $(PANGO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)

 libpangosharpglue.dll: $(libpangosharpglue_2_la_OBJECTS) libpangosharpglue.rc libpangosharpglue.def
 	./build-dll libpangosharpglue-2 $(VERSION)
--- a/pango/glue/attribute.c
+++ b/pango/glue/attribute.c
@ -34,8 +34,10 @@ double pangosharp_attr_float_get_value (PangoAttrFloat *attr);
 PangoFontDescription *pangosharp_attr_font_desc_get_desc (PangoAttrFontDesc *attr);
 PangoRectangle pangosharp_attr_shape_get_ink_rect (PangoAttrShape *attr);
 PangoRectangle pangosharp_attr_shape_get_logical_rect (PangoAttrShape *attr);
+#ifdef GTK_SHARP_2_6
 int pangosharp_attr_size_get_size (PangoAttrSize *attr);
 gboolean pangosharp_attr_size_get_absolute (PangoAttrSize *attr);
+#endif
 /* */

 PangoAttrType
@ -116,6 +118,7 @@ pangosharp_attr_shape_get_logical_rect (PangoAttrShape *attr)
 	return attr->logical_rect;
 }

+#ifdef GTK_SHARP_2_6
 int 
 pangosharp_attr_size_get_size (PangoAttrSize *attr)
 {
@ -127,4 +130,5 @@ pangosharp_attr_size_get_absolute (PangoAttrSize *attr)
 {
 	return attr->absolute;
 }
+#endif

--- a/pango/pango-api-2.4.raw
+++ b/pango/pango-api-2.4.raw
--- a/pango/pango-api-2.6.raw
+++ b/pango/pango-api-2.6.raw
--- a/sample/GtkDemo/DemoIconView.cs
+++ b/sample/GtkDemo/DemoIconView.cs
@ -2,6 +2,7 @@ using System;
 using System.IO;
 using Gtk;

+#if GTK_SHARP_2_6
 namespace GtkDemo
 {
 	[Demo ("Icon View", "DemoIconView.cs")]
@ -159,4 +160,5 @@ namespace GtkDemo
 		}
 	}
 }
+#endif

--- a/sample/GtkDemo/DemoRotatedText.cs
+++ b/sample/GtkDemo/DemoRotatedText.cs
@ -2,6 +2,7 @@ using System;
 using Gtk;
 using Pango;

+#if GTK_SHARP_2_6
 namespace GtkDemo
 {
 	[Demo ("Rotated Text", "DemoRotatedText.cs")]
@ -91,4 +92,5 @@ namespace GtkDemo
 		}
 	}
 }
+#endif

--- a/sample/GtkDemo/Makefile.am
+++ b/sample/GtkDemo/Makefile.am
@ -68,5 +68,5 @@ build_images = $(addprefix $(srcdir)/, $(images))
 resources = $(addprefix /resource:, $(build_sources), $(build_images))

 GtkDemo.exe: $(build_sources) $(assemblies)
-	$(CSC) /debug /out:GtkDemo.exe $(build_sources) $(references) $(resources)
+	$(CSC) $(CSFLAGS) /out:GtkDemo.exe $(build_sources) $(references) $(resources)