diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-03-06 19:42:30 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-03-06 19:42:30 +0000 |
| commit | cab1dedbd1f7f20d56a7c4bcb781569f03f52422 (patch) | |
| tree | a28ea6c7f125a935bd7aadc3ec5a2ecbc0677325 /src | |
| parent | e52b682a995fe2d7662b3f10730420996ccbb146 (diff) | |
Fix non-Xft build.
Add "--disable-xft" option to configure script.
Update dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1988 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/fl_font_x.cxx | 8 | ||||
| -rw-r--r-- | src/fl_set_fonts_x.cxx | 6 | ||||
| -rw-r--r-- | src/makedepend | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/src/fl_font_x.cxx b/src/fl_font_x.cxx index 50688a52a..139b82312 100644 --- a/src/fl_font_x.cxx +++ b/src/fl_font_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_font_x.cxx,v 1.10.2.1 2002/03/06 18:11:01 easysw Exp $" +// "$Id: fl_font_x.cxx,v 1.10.2.2 2002/03/06 19:42:30 easysw Exp $" // // Standard X11 font selection code for the Fast Light Tool Kit (FLTK). // @@ -101,13 +101,13 @@ char* fl_find_fontsize(char* name) { return r; } -const char* fl_encoding_ = "iso8859-1"; +const char* fl_encoding = "iso8859-1"; // return true if this matches fl_encoding: int fl_correct_encoding(const char* name) { if (*name != '-') return 0; const char* c = fl_font_word(name,13); - return (*c++ && !strcmp(c,fl_encoding_)); + return (*c++ && !strcmp(c,fl_encoding)); } // locate or create an Fl_FontSize for a given Fl_Fontdesc and size: @@ -250,5 +250,5 @@ void fl_draw(const char* str, int n, int x, int y) { } // -// End of "$Id: fl_font_x.cxx,v 1.10.2.1 2002/03/06 18:11:01 easysw Exp $". +// End of "$Id: fl_font_x.cxx,v 1.10.2.2 2002/03/06 19:42:30 easysw Exp $". // diff --git a/src/fl_set_fonts_x.cxx b/src/fl_set_fonts_x.cxx index f301ffcbe..48fa9bffa 100644 --- a/src/fl_set_fonts_x.cxx +++ b/src/fl_set_fonts_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_set_fonts_x.cxx,v 1.1.2.1 2002/03/06 18:11:01 easysw Exp $" +// "$Id: fl_set_fonts_x.cxx,v 1.1.2.2 2002/03/06 19:42:30 easysw Exp $" // // X11 font utilities for the Fast Light Tool Kit (FLTK). // @@ -321,8 +321,6 @@ int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { return numsizes; } -#endif - // -// End of "$Id: fl_set_fonts_x.cxx,v 1.1.2.1 2002/03/06 18:11:01 easysw Exp $". +// End of "$Id: fl_set_fonts_x.cxx,v 1.1.2.2 2002/03/06 19:42:30 easysw Exp $". // diff --git a/src/makedepend b/src/makedepend index 4506f2254..7518e9819 100644 --- a/src/makedepend +++ b/src/makedepend @@ -338,6 +338,7 @@ fl_file_dir.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Choice.H fl_file_dir.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H fl_font.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_font.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H Fl_Font.H +fl_font.o: fl_font_x.cxx fl_labeltype.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_labeltype.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/fl_draw.H fl_labeltype.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H @@ -348,8 +349,7 @@ fl_oval_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_oval_box.o: ../FL/fl_draw.H fl_overlay.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_overlay.o: ../FL/Fl_Window.H ../FL/fl_draw.H -fl_overlay_visual.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H -fl_overlay_visual.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H +fl_overlay_visual.o: ../config.h fl_plastic.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_plastic.o: ../FL/fl_draw.H fl_rect.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Enumerations.H @@ -360,8 +360,8 @@ fl_rounded_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_rounded_box.o: ../FL/fl_draw.H fl_set_font.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_set_font.o: ../FL/x.H ../FL/Fl_Window.H Fl_Font.H -fl_set_fonts.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H -fl_set_fonts.o: ../FL/Fl_Window.H Fl_Font.H +fl_set_fonts.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +fl_set_fonts.o: ../FL/x.H ../FL/Fl_Window.H Fl_Font.H fl_set_fonts_x.cxx fl_scroll_area.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_scroll_area.o: ../FL/Fl_Window.H fl_shadow_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H |