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)
This commit is contained in:
Matthias Clasen 2004-11-12 03:51:40 +00:00 committed by Matthias Clasen
parent 56c3d75c8f
commit 26cbda1b88
6 changed files with 32 additions and 4 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -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