diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-12-02 15:51:38 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-12-02 15:51:38 +0000 |
| commit | beb210d4d4ea2550fcc9de5a610b8fe6d9afc631 (patch) | |
| tree | f792a964cfdc82e9de4fd838be0c58282eefbbd5 /src/fl_set_fonts_win32.cxx | |
| parent | c061230dc7ba0d14dcfa96dedb59f34f6a16d378 (diff) | |
Font changes from Bill.
git-svn-id: file:///fltk/svn/fltk/trunk@109 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_set_fonts_win32.cxx')
| -rwxr-xr-x | src/fl_set_fonts_win32.cxx | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/fl_set_fonts_win32.cxx b/src/fl_set_fonts_win32.cxx index 80aeb2342..71fa41630 100755 --- a/src/fl_set_fonts_win32.cxx +++ b/src/fl_set_fonts_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_set_fonts_win32.cxx,v 1.3 1998/10/21 14:20:59 mike Exp $" +// "$Id: fl_set_fonts_win32.cxx,v 1.4 1998/12/02 15:51:37 mike Exp $" // // WIN32 font utilities for the Fast Light Tool Kit (FLTK). // @@ -39,13 +39,19 @@ const char* Fl::get_font_name(Fl_Font fnum, int* ap) { const char* p = fl_fonts[fnum].name; if (!p || !*p) {if (ap) *ap = 0; return "";} - if (ap) switch (*p) { - case 'B': *ap = FL_BOLD; break; - case 'I': *ap = FL_ITALIC; break; - case 'P': *ap = FL_BOLD | FL_ITALIC; break; - default: *ap = 0; break; + int type; + switch (*p) { + case 'B': type = FL_BOLD; break; + case 'I': type = FL_ITALIC; break; + case 'P': type = FL_BOLD | FL_ITALIC; break; + default: type = 0; break; } - return p+1; + if (!type) return p+1; + static char *buffer; if (!buffer) buffer = new char[128]; + strcpy(buffer, p+1); + if (type & FL_BOLD) strcat(buffer, " bold"); + if (type & FL_ITALIC) strcat(buffer, " italic"); + return buffer; } static int fl_free_font = FL_FREE_FONT; @@ -81,5 +87,5 @@ int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { } // -// End of "$Id: fl_set_fonts_win32.cxx,v 1.3 1998/10/21 14:20:59 mike Exp $". +// End of "$Id: fl_set_fonts_win32.cxx,v 1.4 1998/12/02 15:51:37 mike Exp $". // |