all repos — fluxbox @ f77b9dee32c62415f4c92791611e4db1b6d3431f

custom fork of the fluxbox windowmanager

XftFontImp fixes
fluxgen fluxgen
commit

f77b9dee32c62415f4c92791611e4db1b6d3431f

parent

05437c8c5bc283b0e70397497aba9b329d678d70

1 files changed, 7 insertions(+), 6 deletions(-)

jump to
M src/Font.ccsrc/Font.cc

@@ -19,11 +19,15 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -//$Id: Font.cc,v 1.11 2002/10/13 22:27:21 fluxgen Exp $ +//$Id: Font.cc,v 1.12 2002/10/14 18:25:37 fluxgen Exp $ #include "Font.hh" #include "FontImp.hh" + +#ifdef HAVE_CONFIG_H +#include "../config.h" +#endif // HAVE_CONFIG_H // for antialias #ifdef USE_XFT

@@ -33,10 +37,6 @@

// standard font system #include "XFontImp.hh" #include "XmbFontImp.hh" - -#ifdef HAVE_CONFIG_H -#include "../config.h" -#endif // HAVE_CONFIG_H //use gnu extensions #ifndef _GNU_SOURCE

@@ -82,8 +82,9 @@ }

// create the right font implementation #ifdef USE_XFT + antialias = true; if (antialias) { - m_fontimp = new XftFontImp(); + m_fontimp = std::auto_ptr<FontImp>(new XftFontImp()); } #endif //USE_XFT // if we didn't create a Xft font then create basic font