1 files changed, 9 insertions, 9 deletions

diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc
index 80eb2c4..fe5b8e6 100644
--- a/src/FbTk/XftFontImp.cc
+++ b/src/FbTk/XftFontImp.cc
@@ -102,8 +102,8 @@ void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString
 
     XftDraw *draw = XftDrawCreate(w.display(),
                                   w.drawable(),
-                                  DefaultVisual(w.display(), screen),
-                                  DefaultColormap(w.display(), screen));
+                                  App::instance()->defaultVisual(screen),
+                                  App::instance()->defaultColormap(screen));
 
     XGCValues gc_val;
 
@@ -114,7 +114,7 @@ void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString
     // get red, green, blue values
     XColor xcol;
     xcol.pixel = gc_val.foreground;
-    XQueryColor(w.display(), DefaultColormap(w.display(), screen), &xcol);
+    XQueryColor(w.display(), App::instance()->defaultColormap(screen), &xcol);
 
     // convert xcolor to XftColor
     XRenderColor rendcol;
@@ -124,8 +124,8 @@ void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString
     rendcol.alpha = 0xFFFF;
     XftColor xftcolor;
     XftColorAllocValue(w.display(), 
-                       DefaultVisual(w.display(), screen), 
-                       DefaultColormap(w.display(), screen),
+                       App::instance()->defaultVisual(screen), 
+                       App::instance()->defaultColormap(screen),
                        &rendcol, &xftcolor);
 
     // draw string
@@ -145,8 +145,8 @@ void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString
                               x, y,
                               (XftChar8 *)(text.data()), len);
             XftColorFree(w.display(), 
-                         DefaultVisual(w.display(), screen),
-                         DefaultColormap(w.display(), screen), &xftcolor);
+                         App::instance()->defaultVisual(screen),
+                         App::instance()->defaultColormap(screen), &xftcolor);
             XftDrawDestroy(draw);
             return;
         }
@@ -161,8 +161,8 @@ void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const FbString
 
 
     XftColorFree(w.display(), 
-                 DefaultVisual(w.display(), screen),
-                 DefaultColormap(w.display(), screen), &xftcolor);
+                 App::instance()->defaultVisual(screen),
+                 App::instance()->defaultColormap(screen), &xftcolor);
     XftDrawDestroy(draw);
 }