use our own font width cache with Qt/Mac

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14128 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt3/qfont_loader.C b/src/frontends/qt3/qfont_loader.C
index 04805c0c89bb116c6ac431bf6a446357adc721da..5c352e744c0f3119250eecb9baac943095da7a32 100644 (file)
--- a/src/frontends/qt3/qfont_loader.C
+++ b/src/frontends/qt3/qfont_loader.C
@@ -359,7 +359,7 @@ QLFontInfo::QLFontInfo(LyXFont const & f)
 }
 
 
 }
 
 

-int QLFontInfo::width(Uchar val) const
+int QLFontInfo::width(Uchar val)

 {
 // Starting with version 3.1.0, Qt/X11 does its own caching of
 // character width, so it is not necessary to provide ours.
 {
 // Starting with version 3.1.0, Qt/X11 does its own caching of
 // character width, so it is not necessary to provide ours.

diff --git a/src/frontends/qt3/qfont_loader.h b/src/frontends/qt3/qfont_loader.h
index 7b564858459dcced6bfb38999614c715374d504b..2376303b4bcaafb6f3efeceba7516714f86f48b4 100644 (file)
--- a/src/frontends/qt3/qfont_loader.h
+++ b/src/frontends/qt3/qfont_loader.h
@@ -18,7 +18,7 @@
 #include <qfont.h>
 #include <qfontmetrics.h>
 
 #include <qfont.h>
 #include <qfontmetrics.h>
 

-#if QT_VERSION < 0x030100
+#if QT_VERSION < 0x030100 || defined(Q_WS_MACX)

 #define USE_LYX_FONTCACHE
 #endif
 
 #define USE_LYX_FONTCACHE
 #endif
 


@@ -35,7 +35,7 @@ public:
        QLFontInfo(LyXFont const & f);
 
        /// Return pixel width for the given unicode char
        QLFontInfo(LyXFont const & f);
 
        /// Return pixel width for the given unicode char

-       int width(Uchar val) const;
+       int width(Uchar val);

 
        /// The font instance
        QFont font;
 
        /// The font instance
        QFont font;