Author: matt
Date: 2009-09-13 03:15:42 -0700 (Sun, 13 Sep 2009)
New Revision: 6862
Log:
Setting a default font for Xft
Modified:
branches/branch-1.3/CHANGES
branches/branch-1.3/src/fl_font_xft.cxx
Modified: branches/branch-1.3/CHANGES
===================================================================
--- branches/branch-1.3/CHANGES 2009-09-13 10:04:51 UTC (rev 6861)
+++ branches/branch-1.3/CHANGES 2009-09-13 10:15:42 UTC (rev 6862)
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.3.0
+ - Setting a default font for Xft (STR #2216)
+ - Avoiding lockup if two popups collide (STR #1986)
- Temporarily limited builds to 32-bit on OX S to stay
compatible to Snow Leopard
- Fixed Windows compile bug with "#define USE_COLORMAP 0"
Modified: branches/branch-1.3/src/fl_font_xft.cxx
===================================================================
--- branches/branch-1.3/src/fl_font_xft.cxx 2009-09-13 10:04:51 UTC (rev
6861)
+++ branches/branch-1.3/src/fl_font_xft.cxx 2009-09-13 10:15:42 UTC (rev
6862)
@@ -499,6 +499,9 @@
}
void fl_draw(const char *str, int n, int x, int y) {
+ if ( !current_font ) {
+ fl_font(FL_HELVETICA, 14);
+ }
#if USE_OVERLAY
XftDraw*& draw = fl_overlay ? draw_overlay : ::draw;
if (fl_overlay) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
