diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-11-12 03:51:40 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-11-12 03:51:40 +0000 |
| commit | 26cbda1b88e5e57533468cde10d51cd5baeeb871 (patch) | |
| tree | d37672f998c57a8027f3b97e478acd36a9454008 | |
| parent | 56c3d75c8f5af9511116fd92f2a7a9b2c33c6627 (diff) | |
| download | gdk-pixbuf-26cbda1b88e5e57533468cde10d51cd5baeeb871.tar.gz | |
Check for uxtheme.h (#157967, J. Ali Harlow)
2004-11-11 Matthias Clasen <mclasen@redhat.com>
* configure.in: Check for uxtheme.h (#157967, J. Ali Harlow)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rwxr-xr-x | modules/engines/ms-windows/xp_theme.c | 8 |
6 files changed, 32 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2004-11-11 Matthias Clasen <mclasen@redhat.com> + * configure.in: Check for uxtheme.h (#157967, J. Ali Harlow) + + * modules/engines/ms-windows/xp_theme.c: Use HAVE_UXTHEME_H + to protect the #include <uxtheme.h> + * docs/tools/Makefile.am: Don't try to build doc-shooter on Windows. (#157979, J. Ali Harlow) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 855e36466..91efdf2b1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2004-11-11 Matthias Clasen <mclasen@redhat.com> + * configure.in: Check for uxtheme.h (#157967, J. Ali Harlow) + + * modules/engines/ms-windows/xp_theme.c: Use HAVE_UXTHEME_H + to protect the #include <uxtheme.h> + * docs/tools/Makefile.am: Don't try to build doc-shooter on Windows. (#157979, J. Ali Harlow) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 855e36466..91efdf2b1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2004-11-11 Matthias Clasen <mclasen@redhat.com> + * configure.in: Check for uxtheme.h (#157967, J. Ali Harlow) + + * modules/engines/ms-windows/xp_theme.c: Use HAVE_UXTHEME_H + to protect the #include <uxtheme.h> + * docs/tools/Makefile.am: Don't try to build doc-shooter on Windows. (#157979, J. Ali Harlow) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 855e36466..91efdf2b1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2004-11-11 Matthias Clasen <mclasen@redhat.com> + * configure.in: Check for uxtheme.h (#157967, J. Ali Harlow) + + * modules/engines/ms-windows/xp_theme.c: Use HAVE_UXTHEME_H + to protect the #include <uxtheme.h> + * docs/tools/Makefile.am: Don't try to build doc-shooter on Windows. (#157979, J. Ali Harlow) diff --git a/configure.in b/configure.in index 3fa4a4ad7..712f1b0b0 100644 --- a/configure.in +++ b/configure.in @@ -639,6 +639,14 @@ fi AC_MSG_RESULT($gdk_working_wctype) AC_SUBST(GDK_WLIBS) +# Check for uxtheme.h (for MS-Windows Engine) +AC_MSG_CHECKING(for uxtheme.h) +AC_TRY_CPP([#include <uxtheme.h>], gtk_uxtheme_h=yes, gtk_uxtheme_h=no) +if test $gtk_uxtheme_h = yes; then + AC_DEFINE(HAVE_UXTHEME_H,1,[Have uxtheme.h include file]) +fi +AC_MSG_RESULT($gtk_uxtheme_h) + ################################################## # Checks for gdk-pixbuf diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c index 7d7af293b..9ba01a812 100755 --- a/modules/engines/ms-windows/xp_theme.c +++ b/modules/engines/ms-windows/xp_theme.c @@ -22,6 +22,7 @@ #include "xp_theme.h" +#include <config.h> #include <windows.h> #include <math.h> #include <string.h> @@ -29,12 +30,11 @@ #include "gdk/win32/gdkwin32.h" - -#ifdef DONT_HAVE_UXTHEME_H -#include "xp_theme_defs.h" -#else +#ifdef HAVE_UXTHEME_H #include <uxtheme.h> #include <tmschema.h> +#else +#include "xp_theme_defs.h" #endif #ifndef TMT_CAPTIONFONT |