summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2001-12-14 16:54:31 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2001-12-14 16:54:31 +0000
commit67bbab358f2c71ba7151b38146c71ec15d3931e4 (patch)
treec1e6b6a8a0c5e48bce208cd8574ff0fc9cca3504
parent5c3b2f74bc97b5ffdd2a7834c47b285b2f84aaee (diff)
Implement Fl::set_font(Fl_Font, Fl_Font)...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1845 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES1
-rw-r--r--src/fl_set_font.cxx8
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index c3b82c011..27ce91bab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ CHANGES IN FLTK 1.1.0b8
focus (the parent redraw clears the focus box.)
- Fixed the example program makefile - wasn't building
the mandelbrot and shiny demos right.
+ - Fl::set_font(Fl_Font, Fl_Font) was not implemented.
CHANGES IN FLTK 1.1.0b7
diff --git a/src/fl_set_font.cxx b/src/fl_set_font.cxx
index b41c8b6f6..e5bf2b710 100644
--- a/src/fl_set_font.cxx
+++ b/src/fl_set_font.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fl_set_font.cxx,v 1.5.2.3.2.2 2001/11/27 17:44:08 easysw Exp $"
+// "$Id: fl_set_font.cxx,v 1.5.2.3.2.3 2001/12/14 16:54:31 easysw Exp $"
//
// Font utilities for the Fast Light Tool Kit (FLTK).
//
@@ -68,8 +68,12 @@ void Fl::set_font(Fl_Font fnum, const char* name) {
s->first = 0;
}
+void Fl::set_font(Fl_Font fnum, Fl_Font from) {
+ Fl::set_font(fnum, get_font(from));
+}
+
const char* Fl::get_font(Fl_Font fnum) {return fl_fonts[fnum].name;}
//
-// End of "$Id: fl_set_font.cxx,v 1.5.2.3.2.2 2001/11/27 17:44:08 easysw Exp $".
+// End of "$Id: fl_set_font.cxx,v 1.5.2.3.2.3 2001/12/14 16:54:31 easysw Exp $".
//