Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use pango_font_family_is_monospace() to enumerate fixed-width fonts if available

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-06 15:32:07 +00:00
parent 00bcc185e4
commit 304205f142
5 changed files with 248 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
configure vendored
View File

@@ -23345,6 +23345,115 @@ echo "$as_me: WARNING: pangoft2 library not found, library will be compiled with
fi fi
fi fi
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
for ac_func in pango_font_family_is_monospace
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
char (*f) () = $ac_func;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != $ac_func;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
else else
if test "$wxUSE_UNICODE" = "yes"; then if test "$wxUSE_UNICODE" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: Unicode configuration not supported with GTK+ 1.x" >&5 { echo "$as_me:$LINENO: WARNING: Unicode configuration not supported with GTK+ 1.x" >&5
@@ -25417,6 +25526,114 @@ echo "$as_me: WARNING: pangoxft library not found, library will be compiled with
fi fi
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$CFLAGS $PANGOX_CFLAGS"
LIBS="$LIBS $PANGOX_LIBS"
for ac_func in pango_font_family_is_monospace
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
char (*f) () = $ac_func;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != $ac_func;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
fi fi
wxUSE_UNIVERSAL="yes" wxUSE_UNIVERSAL="yes"

15
configure.in
View File

@@ -2475,6 +2475,14 @@ equivalent variable and GTK+ is version 1.2.3 or above.
] ]
) )
fi fi
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
AC_CHECK_FUNCS([pango_font_family_is_monospace])
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
else else
if test "$wxUSE_UNICODE" = "yes"; then if test "$wxUSE_UNICODE" = "yes"; then
AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x]) AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x])
@@ -2675,6 +2683,13 @@ equivalent variable and GTK+ is version 1.2.3 or above.
AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support]) AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
] ]
) )
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$CFLAGS $PANGOX_CFLAGS"
LIBS="$LIBS $PANGOX_LIBS"
AC_CHECK_FUNCS([pango_font_family_is_monospace])
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
fi fi
wxUSE_UNIVERSAL="yes" wxUSE_UNIVERSAL="yes"

3
setup.h.in
View File

@@ -1251,6 +1251,9 @@
/* Define this if you have type SPBCDATA */ /* Define this if you have type SPBCDATA */
#undef HAVE_SPBCDATA #undef HAVE_SPBCDATA
/* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
#undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
Win32 adjustments section Win32 adjustments section
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */

3
setup.h_vms
View File

@@ -1302,4 +1302,7 @@
/* Define this if you have type SPBCDATA */ /* Define this if you have type SPBCDATA */
#undef HAVE_SPBCDATA #undef HAVE_SPBCDATA
/* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
#undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
#endif /* __WX_SETUP_H__ */ #endif /* __WX_SETUP_H__ */

14
src/unix/fontenum.cpp
View File

@@ -60,11 +60,13 @@ cmp_families (const void *a, const void *b)
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
bool fixedWidthOnly) bool fixedWidthOnly)
{ {
#ifndef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
if ( fixedWidthOnly ) if ( fixedWidthOnly )
{ {
OnFacename( wxT("monospace") ); OnFacename( wxT("monospace") );
} }
else else
#endif
{ {
PangoFontFamily **families = NULL; PangoFontFamily **families = NULL;
gint n_families = 0; gint n_families = 0;
@@ -79,10 +81,14 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
for (int i=0; i<n_families; i++) for (int i=0; i<n_families; i++)
{ {
const gchar *name = pango_font_family_get_name( families[i] ); #ifdef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
if (!fixedWidthOnly ||
wxString tmp( name, wxConvUTF8 ); pango_font_family_is_monospace(families[i]))
OnFacename( tmp ); #endif
{
const gchar *name = pango_font_family_get_name(families[i]);
OnFacename(wxString(name, wxConvUTF8));
}
} }
} }