aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-10-14 18:25:37 (GMT)
committerfluxgen <fluxgen>2002-10-14 18:25:37 (GMT)
commitf77b9dee32c62415f4c92791611e4db1b6d3431f (patch)
tree43e32858ce7ff535ae5e0d154a38b28022947b05
parent05437c8c5bc283b0e70397497aba9b329d678d70 (diff)
downloadfluxbox_pavel-f77b9dee32c62415f4c92791611e4db1b6d3431f.zip
fluxbox_pavel-f77b9dee32c62415f4c92791611e4db1b6d3431f.tar.bz2
XftFontImp fixes
-rw-r--r--src/Font.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/Font.cc b/src/Font.cc
index 627a825..ddc78e3 100644
--- a/src/Font.cc
+++ b/src/Font.cc
@@ -19,12 +19,16 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22//$Id: Font.cc,v 1.11 2002/10/13 22:27:21 fluxgen Exp $ 22//$Id: Font.cc,v 1.12 2002/10/14 18:25:37 fluxgen Exp $
23 23
24 24
25#include "Font.hh" 25#include "Font.hh"
26#include "FontImp.hh" 26#include "FontImp.hh"
27 27
28#ifdef HAVE_CONFIG_H
29#include "../config.h"
30#endif // HAVE_CONFIG_H
31
28// for antialias 32// for antialias
29#ifdef USE_XFT 33#ifdef USE_XFT
30#include "XftFontImp.hh" 34#include "XftFontImp.hh"
@@ -34,10 +38,6 @@
34#include "XFontImp.hh" 38#include "XFontImp.hh"
35#include "XmbFontImp.hh" 39#include "XmbFontImp.hh"
36 40
37#ifdef HAVE_CONFIG_H
38#include "../config.h"
39#endif // HAVE_CONFIG_H
40
41//use gnu extensions 41//use gnu extensions
42#ifndef _GNU_SOURCE 42#ifndef _GNU_SOURCE
43#define _GNU_SOURCE 43#define _GNU_SOURCE
@@ -82,8 +82,9 @@ Font::Font(const char *name, bool antialias) {
82 82
83 // create the right font implementation 83 // create the right font implementation
84#ifdef USE_XFT 84#ifdef USE_XFT
85 antialias = true;
85 if (antialias) { 86 if (antialias) {
86 m_fontimp = new XftFontImp(); 87 m_fontimp = std::auto_ptr<FontImp>(new XftFontImp());
87 } 88 }
88#endif //USE_XFT 89#endif //USE_XFT
89 // if we didn't create a Xft font then create basic font 90 // if we didn't create a Xft font then create basic font