summaryrefslogtreecommitdiff
path: root/src/fl_font.cxx
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>1999-07-22 07:27:12 +0000
committerBill Spitzak <spitzak@gmail.com>1999-07-22 07:27:12 +0000
commit0bb590c832fb50a6bcf40aecbae2cad918ebee94 (patch)
treebd7153ec8d97c9f0fd51207da8e5aed9623e52ba /src/fl_font.cxx
parentae621ef7787392b1214a4a662a9f70e7c3a74794 (diff)
Pragma added around xlib.h to shut up the IRIX compiler warnings
Fluid writes "class foo;" to the header and c file without prepending "extern" or "static". This patch also does this to "class foo bar;" which is wrong... Tabs draw very short labels. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@629 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_font.cxx')
-rw-r--r--src/fl_font.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fl_font.cxx b/src/fl_font.cxx
index 670acc352..e5e50b045 100644
--- a/src/fl_font.cxx
+++ b/src/fl_font.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fl_font.cxx,v 1.9.2.1 1999/07/21 01:21:49 carl Exp $"
+// "$Id: fl_font.cxx,v 1.9.2.2 1999/07/22 07:27:12 bill Exp $"
//
// Font selection code for the Fast Light Tool Kit (FLTK).
//
@@ -278,8 +278,8 @@ double fl_width(uchar c) {
}
void fl_draw(const char* str, int n, int x, int y) {
- if (!fl_xfont) fl_font(0, 14); // Perhaps this should be configured somewhere?
if (font_gc != fl_gc) {
+ if (!fl_xfont) fl_font(FL_HELVETICA, 14);
font_gc = fl_gc;
XSetFont(fl_display, fl_gc, fl_xfont->fid);
}
@@ -293,5 +293,5 @@ void fl_draw(const char* str, int x, int y) {
#endif
//
-// End of "$Id: fl_font.cxx,v 1.9.2.1 1999/07/21 01:21:49 carl Exp $".
+// End of "$Id: fl_font.cxx,v 1.9.2.2 1999/07/22 07:27:12 bill Exp $".
//