mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fl_draw() would segfault on WIN32 if no font was set; it now uses

Browse Source 
the default font (STR #828)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4329 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2005-05-12 13:37:49 +00:00
parent b289065e65
commit 2d35bc7a2a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -2,6 +2,8 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648, STR #692, STR #730, STR - Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745) #744, STR #745)
- fl_draw() would segfault on WIN32 if no font was set;
it now uses the default font (STR #828)
- Fl_Browser_ was calling the callback multiple times for - Fl_Browser_ was calling the callback multiple times for
a single selection change with FL_WHEN_CHANGED (STR a single selection change with FL_WHEN_CHANGED (STR
#834) #834)

2
src/fl_font_win32.cxx
View File

@ -155,7 +155,7 @@ double fl_width(uchar c) {
void fl_draw(const char* str, int n, int x, int y) { void fl_draw(const char* str, int n, int x, int y) {
COLORREF oldColor = SetTextColor(fl_gc, fl_RGB()); COLORREF oldColor = SetTextColor(fl_gc, fl_RGB());
SelectObject(fl_gc, fl_fontsize->fid); if (fl_fontsize) SelectObject(fl_gc, fl_fontsize->fid);
TextOut(fl_gc, x, y, str, n); TextOut(fl_gc, x, y, str, n);
SetTextColor(fl_gc, oldColor); SetTextColor(fl_gc, oldColor);
} }