summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--src/fl_font_xft.cxx3
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index a1931457d..a069295d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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"
diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx
index f02d65af7..487cd00a3 100644
--- a/src/fl_font_xft.cxx
+++ b/src/fl_font_xft.cxx
@@ -499,6 +499,9 @@ void fl_destroy_xft_draw(Window id) {
}
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) {