diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2006-09-05 11:16:15 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2006-09-05 11:16:15 +0000 |
| commit | caa6fd1ff2946592cc163618f2976a7192e68067 (patch) | |
| tree | a94d0defce6fdc7007c31800a43950a0b2f2d229 /src | |
| parent | 4b50eb22440384e0d12a923a4711c105caec97e4 (diff) | |
Fixed font caching issue from STR 1415
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5420 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/fl_font_win32.cxx | 4 | ||||
| -rw-r--r-- | src/fl_set_font.cxx | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/fl_font_win32.cxx b/src/fl_font_win32.cxx index 13b361e83..7f42f3eb9 100644 --- a/src/fl_font_win32.cxx +++ b/src/fl_font_win32.cxx @@ -126,6 +126,10 @@ int fl_size_ = 0; //static HDC font_gc; void fl_font(int fnum, int size) { + if (fnum==-1) { // just make sure that we will load a new font next time + fl_font_ = 0; fl_size_ = 0; + return; + } if (fnum == fl_font_ && size == fl_size_) return; fl_font_ = fnum; fl_size_ = size; fl_fontsize = find(fnum, size); diff --git a/src/fl_set_font.cxx b/src/fl_set_font.cxx index 4cabe5e4c..f069f909d 100644 --- a/src/fl_set_font.cxx +++ b/src/fl_set_font.cxx @@ -30,6 +30,7 @@ #include <FL/Fl.H> #include <FL/x.H> +#include <FL/fl_draw.H> #include "flstring.h" #include "Fl_Font.H" #include <stdlib.h> @@ -75,6 +76,7 @@ void Fl::set_font(Fl_Font fnum, const char* name) { s->xlist = 0; #endif s->first = 0; + fl_font(-1, 0); } void Fl::set_font(Fl_Font fnum, Fl_Font from) { |