# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1387534076 -3600
# Node ID 4befeedc4d5d38ae051b9c6b08f8e7d104b5d406
# Parent  53a2b3f77dd3aa1609650f5da63cf1c903713743
Initial work on xft - added XftFontDescription

diff -r 53a2b3f77dd3 -r 4befeedc4d5d Make.proto
--- a/Make.proto	Fri Dec 20 11:03:12 2013 +0100
+++ b/Make.proto	Fri Dec 20 11:07:56 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview/Make.proto,v 1.162 2013-11-25 10:51:46 cg Exp $
+# $Header: /cvs/stx/stx/libview/Make.proto,v 1.163 2013-12-20 10:07:56 vrany Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libview at 2012-03-09 09:29:06.849.
@@ -50,7 +50,7 @@
 # ********** OPTIONAL: MODIFY the next line ***
 # additional C-libraries that should be pre-linked with the class-objects
 LD_OBJ_LIBS=
-LOCAL_SHARED_LIBS=
+LOCAL_SHARED_LIBS=$(LIB_XFT)
 
 
 # ********** OPTIONAL: MODIFY the next line ***
diff -r 53a2b3f77dd3 -r 4befeedc4d5d Make.spec
--- a/Make.spec	Fri Dec 20 11:03:12 2013 +0100
+++ b/Make.spec	Fri Dec 20 11:07:56 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview/Make.spec,v 1.54 2013-01-11 14:32:51 cg Exp $
+# $Header: /cvs/stx/stx/libview/Make.spec,v 1.55 2013-12-20 10:07:56 vrany Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libview at 2012-03-09 09:29:06.457.
@@ -51,6 +51,7 @@
 
 UNIX_CLASSES= \
 	XEmbedContainerView \
+	XftFontDescription	\
 
 COMMON_CLASSES= \
 	FontDescription \
@@ -123,6 +124,7 @@
 
 UNIX_OBJS= \
     $(OUTDIR_SLASH)XEmbedContainerView.$(O) \
+    $(OUTDIR_SLASH)XftFontDescription.$(O) \
 
 COMMON_OBJS= \
     $(OUTDIR_SLASH)FontDescription.$(O) \
diff -r 53a2b3f77dd3 -r 4befeedc4d5d libInit.cc
--- a/libInit.cc	Fri Dec 20 11:03:12 2013 +0100
+++ b/libInit.cc	Fri Dec 20 11:07:56 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvs/stx/stx/libview/libInit.cc,v 1.63 2012-03-09 08:29:42 stefan Exp $
+ * $Header: /cvs/stx/stx/libview/libInit.cc,v 1.64 2013-12-20 10:07:56 vrany Exp $
  *
  * DO NOT EDIT
  * automagically generated from the projectDefinition: stx_libview.
@@ -90,6 +90,7 @@
 _ModalBox_Init(pass,__pRT__,snd);
 #ifdef UNIX
 _XEmbedContainerView_Init(pass,__pRT__,snd);
+_XftFontDescription_Init(pass,__pRT__,snd);
 #endif /* UNIX */
 #ifdef WIN32
 _WinWorkstation_Init(pass,__pRT__,snd);
diff -r 53a2b3f77dd3 -r 4befeedc4d5d stx_libview.st
--- a/stx_libview.st	Fri Dec 20 11:03:12 2013 +0100
+++ b/stx_libview.st	Fri Dec 20 11:07:56 2013 +0100
@@ -386,6 +386,7 @@
         (XEmbedContainerView unix)
         XWorkstation
         GLXWorkstation
+	(XftFontDescription unix)
     )
 !
 
@@ -437,10 +438,10 @@
 !stx_libview class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/stx_libview.st,v 1.63 2013-03-13 16:04:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/stx_libview.st,v 1.64 2013-12-20 10:07:56 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/stx_libview.st,v 1.63 2013-03-13 16:04:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/stx_libview.st,v 1.64 2013-12-20 10:07:56 vrany Exp $'
 ! !