795e0f1cd5
2009-11-26 09:30:10 +0100 msc r277648 : #100000 fix urgent testscript error 2009-11-25 10:27:56 +0100 msc r277625 : #i100000 fix urgent testscript error 2009-11-17 22:16:46 +0100 fs r277544 : CWS-TOOLING: rebase CWS dba32j to branches/OOO320@277531 (milestone: OOO320:m5) 2009-11-17 14:26:47 +0100 fs r277535 : ooops, didn't mean to commit this uncommented line 2009-11-14 20:50:29 +0100 fs r277505 : add a --disable-pango switch to SM's configure options, and add a patch which makes certain code respect it (well, respect it better than currently, by not using some pango_x_* functions, which are not always available, even when pango itself is present) 2009-11-14 20:47:41 +0100 fs r277504 : spelling 2009-11-13 14:04:00 +0100 fs r277502 : #i100764# (commit approved by ab@openoffice.org): getModelFromBasic: do not start with the parent's parent when looking for ThisComponent, but walk up the anchestor chain, starting with the immediate parent 2009-11-13 11:04:15 +0100 fs r277496 : #i100764# better heuristics for determining whether or not to participate in the ThisComponent game 2009-11-13 11:02:30 +0100 fs r277495 : #i100764# set the WB_EXT_DOCUMENT style at the backing component's container window, when creating it without the TaskCreator (which would normally do this) 2009-11-11 13:49:11 +0100 fs r277452 : #i106816# 2009-11-11 13:48:53 +0100 fs r277451 : fix the CREATETARBAL target, which is expected to create the zips used as prebuilts. The *inc.zip missed the NSS files in case NSS was built externally 2009-11-11 12:15:34 +0100 fs r277449 : update ignore list 2009-11-11 12:09:23 +0100 fs r277448 : add a link to the Mozilla build tools download location 2009-11-11 12:07:16 +0100 fs r277447 : add a link to the Mozilla build tools download location 2009-11-06 16:23:12 +0100 fs r277393 : #i106643# 2009-11-03 23:20:29 +0100 fs r277328 : #i106574# reverted the recent fix for issue #i105235#, and implemented a better one. 2009-11-02 12:59:48 +0100 fs r277294 : #i106550# errorOccured: also display the error when we're not in a nested form action - form actions are allowed to be triggered by other instances as well
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
--- misc/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp 2006-02-28 15:55:35.000000000 +0100
|
|
+++ misc/build/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp 2009-11-13 15:12:24.000000000 +0100
|
|
@@ -66,10 +66,12 @@
|
|
#endif /* MOZ_WIDGET_GTK */
|
|
|
|
#ifdef MOZ_WIDGET_GTK2
|
|
+#ifdef MOZ_ENABLE_PANGO
|
|
#include <pango/pango.h>
|
|
#include <pango/pangox.h>
|
|
#include <pango/pango-fontmap.h>
|
|
#endif
|
|
+#endif
|
|
|
|
#ifdef MOZ_ENABLE_XFT
|
|
#include "nsFontMetricsUtils.h"
|
|
@@ -963,9 +965,11 @@
|
|
#ifdef MOZ_WIDGET_GTK2
|
|
|
|
#ifdef MOZ_ENABLE_COREXFONTS
|
|
+#ifdef MOZ_ENABLE_PANGO
|
|
static void xlfd_from_pango_font_description(GtkWidget *aWidget,
|
|
const PangoFontDescription *aFontDesc,
|
|
nsString& aFontName);
|
|
+#endif
|
|
#endif /* MOZ_ENABLE_COREXFONTS */
|
|
|
|
nsresult
|
|
@@ -997,10 +1001,12 @@
|
|
#endif /* MOZ_ENABLE_XFT */
|
|
|
|
#ifdef MOZ_ENABLE_COREXFONTS
|
|
+#ifdef MOZ_ENABLE_PANGO
|
|
// if name already set by Xft, do nothing
|
|
if (!aFont->name.Length()) {
|
|
xlfd_from_pango_font_description(aWidget, desc, aFont->name);
|
|
}
|
|
+#endif /* MOZ_ENABLE_PANGO */
|
|
#endif /* MOZ_ENABLE_COREXFONTS */
|
|
aFont->weight = pango_font_description_get_weight(desc);
|
|
|
|
@@ -1104,6 +1110,7 @@
|
|
#endif /* MOZ_ENABLE_XFT */
|
|
|
|
#if defined(MOZ_WIDGET_GTK2) && defined(MOZ_ENABLE_COREXFONTS)
|
|
+#ifdef MOZ_ENABLE_PANGO
|
|
// xlfd_from_pango_font_description copied from vte, which was
|
|
// written by nalin@redhat.com, and added some codes.
|
|
static void
|
|
@@ -1226,4 +1233,5 @@
|
|
g_free(spec);
|
|
g_object_unref(font);
|
|
}
|
|
+#endif
|
|
#endif /* MOZ_WIDGET_GTK2 && MOZ_ENABLE_COREXFONTS */
|