diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-11 11:52:43 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-11 11:52:43 +0000 |
| commit | 74824267355c4ac6f51bcec10bdf66b45b46ee0a (patch) | |
| tree | 3b8a2da7dbfe19c3c23c153cf9ab76e8e1a0f54e /src | |
| parent | ef36be385e5bedc22f5e1da11b5eca4a55d3c0b5 (diff) | |
Make Fl_Output a subclass of Fl_Input, and add input_type and readonly
methods/constants to support Fl_Output as a special case of Fl_Input
(you can do everything but change the text in Fl_Output...)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2073 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
44 files changed, 244 insertions, 250 deletions
diff --git a/src/Fl_Bitmap.cxx b/src/Fl_Bitmap.cxx index 625816d8c..d843d66cc 100644 --- a/src/Fl_Bitmap.cxx +++ b/src/Fl_Bitmap.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Bitmap.cxx,v 1.5.2.4.2.9 2002/01/01 15:11:29 easysw Exp $" +// "$Id: Fl_Bitmap.cxx,v 1.5.2.4.2.10 2002/04/11 11:52:41 easysw Exp $" // // Bitmap drawing routines for the Fast Light Tool Kit (FLTK). // @@ -29,7 +29,7 @@ #include <FL/Fl_Widget.H> #include <FL/Fl_Menu_Item.H> #include <FL/Fl_Bitmap.H> -#include <string.h> +#include "flstring.h" #ifdef __APPLE__ // MacOS bitmask functions Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *array) { @@ -340,5 +340,5 @@ Fl_Image *Fl_Bitmap::copy(int W, int H) { // -// End of "$Id: Fl_Bitmap.cxx,v 1.5.2.4.2.9 2002/01/01 15:11:29 easysw Exp $". +// End of "$Id: Fl_Bitmap.cxx,v 1.5.2.4.2.10 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Browser.cxx b/src/Fl_Browser.cxx index 8c8b6016d..06f2d7094 100644 --- a/src/Fl_Browser.cxx +++ b/src/Fl_Browser.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Browser.cxx,v 1.9.2.12.2.4 2002/03/05 10:42:13 easysw Exp $" +// "$Id: Fl_Browser.cxx,v 1.9.2.12.2.5 2002/04/11 11:52:41 easysw Exp $" // // Browser widget for the Fast Light Tool Kit (FLTK). // @@ -26,7 +26,7 @@ #include <FL/Fl.H> #include <FL/Fl_Browser.H> #include <FL/fl_draw.H> -#include <string.h> +#include "flstring.h" #include <stdlib.h> #include <math.h> @@ -495,5 +495,5 @@ int Fl_Browser::value() const { } // -// End of "$Id: Fl_Browser.cxx,v 1.9.2.12.2.4 2002/03/05 10:42:13 easysw Exp $". +// End of "$Id: Fl_Browser.cxx,v 1.9.2.12.2.5 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Chart.cxx b/src/Fl_Chart.cxx index 60e1d50dd..7fcb643d5 100644 --- a/src/Fl_Chart.cxx +++ b/src/Fl_Chart.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Chart.cxx,v 1.5.2.6.2.5 2002/01/01 15:11:30 easysw Exp $" +// "$Id: Fl_Chart.cxx,v 1.5.2.6.2.6 2002/04/11 11:52:41 easysw Exp $" // // Forms-compatible chart widget for the Fast Light Tool Kit (FLTK). // @@ -27,7 +27,7 @@ #include <FL/Fl.H> #include <FL/Fl_Chart.H> #include <FL/fl_draw.H> -#include <string.h> +#include "flstring.h" #include <stdlib.h> #define ARCINC (2.0*M_PI/360.0) @@ -378,5 +378,5 @@ void Fl_Chart::maxsize(int m) { } // -// End of "$Id: Fl_Chart.cxx,v 1.5.2.6.2.5 2002/01/01 15:11:30 easysw Exp $". +// End of "$Id: Fl_Chart.cxx,v 1.5.2.6.2.6 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Check_Browser.cxx b/src/Fl_Check_Browser.cxx index 7b574b4eb..4f1b08b7c 100644 --- a/src/Fl_Check_Browser.cxx +++ b/src/Fl_Check_Browser.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Check_Browser.cxx,v 1.1.2.3 2002/01/01 15:11:30 easysw Exp $" +// "$Id: Fl_Check_Browser.cxx,v 1.1.2.4 2002/04/11 11:52:41 easysw Exp $" // // Fl_Check_Browser header file for the Fast Light Tool Kit (FLTK). // @@ -25,7 +25,7 @@ #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #include <FL/fl_draw.H> #include <FL/Fl_Check_Browser.H> @@ -259,5 +259,5 @@ void Fl_Check_Browser::check_none() { // -// End of "$Id: Fl_Check_Browser.cxx,v 1.1.2.3 2002/01/01 15:11:30 easysw Exp $". +// End of "$Id: Fl_Check_Browser.cxx,v 1.1.2.4 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_File_Icon.cxx b/src/Fl_File_Icon.cxx index 28588fc59..4d0622a08 100644 --- a/src/Fl_File_Icon.cxx +++ b/src/Fl_File_Icon.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Icon.cxx,v 1.1.2.9 2002/03/29 14:16:03 easysw Exp $" +// "$Id: Fl_File_Icon.cxx,v 1.1.2.10 2002/04/11 11:52:41 easysw Exp $" // // Fl_File_Icon routines. // @@ -42,7 +42,7 @@ #include <config.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #ifdef HAVE_STRINGS_H # include <strings.h> #endif // HAVE_STRINGS_H @@ -471,5 +471,5 @@ Fl_File_Icon::labeltype(const Fl_Label *o, // I - Label data // -// End of "$Id: Fl_File_Icon.cxx,v 1.1.2.9 2002/03/29 14:16:03 easysw Exp $". +// End of "$Id: Fl_File_Icon.cxx,v 1.1.2.10 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_GIF_Image.cxx b/src/Fl_GIF_Image.cxx index 5bd20d37e..87c7ff188 100644 --- a/src/Fl_GIF_Image.cxx +++ b/src/Fl_GIF_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_GIF_Image.cxx,v 1.1.2.10 2002/01/07 20:40:02 easysw Exp $" +// "$Id: Fl_GIF_Image.cxx,v 1.1.2.11 2002/04/11 11:52:41 easysw Exp $" // // Fl_GIF_Image routines. // @@ -35,7 +35,7 @@ #include "config.h" #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" // Read a .gif file and convert it to a "xpm" format (actually my // modified one with compressed colormaps). @@ -374,5 +374,5 @@ Fl_GIF_Image::Fl_GIF_Image(const char *infname) : Fl_Pixmap((char *const*)0) { // -// End of "$Id: Fl_GIF_Image.cxx,v 1.1.2.10 2002/01/07 20:40:02 easysw Exp $". +// End of "$Id: Fl_GIF_Image.cxx,v 1.1.2.11 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index 69cca3aff..ca9b03414 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.9 2002/01/03 08:08:21 matthiaswm Exp $" +// "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.10 2002/04/11 11:52:41 easysw Exp $" // // OpenGL window code for the Fast Light Tool Kit (FLTK). // @@ -31,7 +31,7 @@ #include "Fl_Gl_Choice.H" #include <FL/Fl_Gl_Window.H> #include <stdlib.h> -#include <string.h> +#include "flstring.h" //////////////////////////////////////////////////////////////// @@ -368,5 +368,5 @@ void Fl_Gl_Window::draw_overlay() {} #endif // -// End of "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.9 2002/01/03 08:08:21 matthiaswm Exp $". +// End of "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.10 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index 199283f07..e1dfea76c 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Image.cxx,v 1.5.2.3.2.15 2002/01/07 20:40:02 easysw Exp $" +// "$Id: Fl_Image.cxx,v 1.5.2.3.2.16 2002/04/11 11:52:41 easysw Exp $" // // Image drawing code for the Fast Light Tool Kit (FLTK). // @@ -29,7 +29,7 @@ #include <FL/Fl_Widget.H> #include <FL/Fl_Menu_Item.H> #include <FL/Fl_Image.H> -#include <string.h> +#include "flstring.h" void fl_restore_clip(); // in fl_rect.cxx @@ -379,5 +379,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) { // -// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.15 2002/01/07 20:40:02 easysw Exp $". +// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.16 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx index c1655f68c..d59555787 100644 --- a/src/Fl_Input.cxx +++ b/src/Fl_Input.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input.cxx,v 1.10.2.15.2.7 2002/03/07 19:22:56 spitzak Exp $" +// "$Id: Fl_Input.cxx,v 1.10.2.15.2.8 2002/04/11 11:52:41 easysw Exp $" // // Input widget for the Fast Light Tool Kit (FLTK). // @@ -32,12 +32,14 @@ #include <FL/Fl.H> #include <FL/Fl_Input.H> #include <FL/fl_draw.H> -#include <string.h> +#include <FL/fl_ask.H> +#include "flstring.h" +#include <stdio.h> #define DND_OUT 1 void Fl_Input::draw() { - if (type() == FL_HIDDEN_INPUT) return; + if (input_type() == FL_HIDDEN_INPUT) return; Fl_Boxtype b = box(); if (damage() & FL_DAMAGE_ALL) draw_box(b, color()); Fl_Input_::drawtext(x()+Fl::box_dx(b)+3, y()+Fl::box_dy(b), @@ -70,22 +72,27 @@ int Fl_Input::handle_key() { if (Fl::compose(del)) { // Insert characters into numeric fields after checking for legality: - if (type() == FL_FLOAT_INPUT || type() == FL_INT_INPUT) { + if (input_type() == FL_FLOAT_INPUT || input_type() == FL_INT_INPUT) { Fl::compose_reset(); // ignore any foreign letters... + // This is complex to allow "0xff12" hex to be typed: if (!position() && (ascii == '+' || ascii == '-') || (ascii >= '0' && ascii <= '9') || (position()==1 && index(0)=='0' && (ascii=='x' || ascii == 'X')) || (position()>1 && index(0)=='0' && (index(1)=='x'||index(1)=='X') && (ascii>='A'&& ascii<='F' || ascii>='a'&& ascii<='f')) || - type()==FL_FLOAT_INPUT && ascii && strchr(".eE+-", ascii)) - replace(position(), mark(), &ascii, 1); + input_type()==FL_FLOAT_INPUT && ascii && strchr(".eE+-", ascii)) { + if (readonly()) fl_beep(); + else replace(position(), mark(), &ascii, 1); + } return 1; } - if (del || Fl::event_length()) - replace(position(), del ? position()-del : mark(), - Fl::event_text(), Fl::event_length()); + if (del || Fl::event_length()) { + if (readonly()) fl_beep(); + else replace(position(), del ? position()-del : mark(), + Fl::event_text(), Fl::event_length()); + } return 1; } @@ -134,12 +141,12 @@ int Fl_Input::handle_key() { position(size(), 0); maybe_do_callback(); return 1; - } else if (type() == FL_MULTILINE_INPUT) + } else if (input_type() == FL_MULTILINE_INPUT) return replace(position(), mark(), "\n", 1); else return 0; // reserved for shortcuts case FL_Tab: - if (Fl::event_state(FL_CTRL|FL_SHIFT) || type()!=FL_MULTILINE_INPUT) return 0; + if (Fl::event_state(FL_CTRL|FL_SHIFT) || input_type()!=FL_MULTILINE_INPUT || readonly()) return 0; return replace(position(), mark(), &ascii, 1); } @@ -153,6 +160,10 @@ int Fl_Input::handle_key() { return copy(1); case ctrl('D'): case ctrl('?'): + if (readonly()) { + fl_beep(); + return 1; + } if (mark() != position()) return cut(); else return cut(1); case ctrl('E'): @@ -160,10 +171,18 @@ int Fl_Input::handle_key() { case ctrl('F'): return shift_position(position()+1) + NORMAL_INPUT_MOVE; case ctrl('H'): + if (readonly()) { + fl_beep(); + return 1; + } if (mark() != position()) cut(); else cut(-1); return 1; case ctrl('K'): + if (readonly()) { + fl_beep(); + return 1; + } if (position()>=size()) return 0; i = line_end(position()); if (i == position() && i < size()) i++; @@ -188,24 +207,44 @@ int Fl_Input::handle_key() { shift_up_down_position(line_start(i)); return 1; case ctrl('U'): + if (readonly()) { + fl_beep(); + return 1; + } return cut(0, size()); case ctrl('V'): case ctrl('Y'): + if (readonly()) { + fl_beep(); + return 1; + } Fl::paste(*this, 1); return 1; case ctrl('X'): case ctrl('W'): + if (readonly()) { + fl_beep(); + return 1; + } copy(1); return cut(); case ctrl('Z'): case ctrl('_'): + if (readonly()) { + fl_beep(); + return 1; + } return undo(); case ctrl('I'): case ctrl('J'): case ctrl('L'): case ctrl('M'): + if (readonly()) { + fl_beep(); + return 1; + } // insert a few selected control characters literally: - if (type() != FL_FLOAT_INPUT && type() != FL_INT_INPUT) + if (input_type() != FL_FLOAT_INPUT && input_type() != FL_INT_INPUT) return replace(position(), mark(), &ascii, 1); } @@ -260,7 +299,7 @@ int Fl_Input::handle(int event) { w()-Fl::box_dw(b)-6, h()-Fl::box_dh(b), 0); newpos = position(); position( oldpos, oldmark ); - if (Fl::focus()==this && !Fl::event_state(FL_SHIFT) && type()!=FL_SECRET_INPUT && + if (Fl::focus()==this && !Fl::event_state(FL_SHIFT) && input_type()!=FL_SECRET_INPUT && (newpos >= mark() && newpos < position() || newpos >= position() && newpos < mark())) { // user clicked int the selection, may be trying to drag @@ -354,5 +393,5 @@ Fl_Input::Fl_Input(int x, int y, int w, int h, const char *l) } // -// End of "$Id: Fl_Input.cxx,v 1.10.2.15.2.7 2002/03/07 19:22:56 spitzak Exp $". +// End of "$Id: Fl_Input.cxx,v 1.10.2.15.2.8 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Input_.cxx b/src/Fl_Input_.cxx index b60fce213..645990c28 100644 --- a/src/Fl_Input_.cxx +++ b/src/Fl_Input_.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.9 2002/04/11 10:46:19 easysw Exp $" +// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.10 2002/04/11 11:52:41 easysw Exp $" // // Common input widget routines for the Fast Light Tool Kit (FLTK). // @@ -33,7 +33,7 @@ #include <FL/fl_draw.H> #include <FL/fl_ask.H> #include <math.h> -#include <string.h> +#include "flstring.h" #include <stdlib.h> #include <ctype.h> @@ -61,7 +61,7 @@ const char* Fl_Input_::expand(const char* p, char* buf) const { int width_to_lastspace = 0; int word_count = 0; #endif - if (type()==FL_SECRET_INPUT) { + if (input_type()==FL_SECRET_INPUT) { while (o<e && p < value_+size_) {*o++ = '*'; p++;} } else while (o<e) { #ifdef WORDWRAP @@ -80,8 +80,8 @@ const char* Fl_Input_::expand(const char* p, char* buf) const { if (p >= value_+size_) break; int c = *p++ & 255; if (c < ' ' || c == 127) { - if (c=='\n' && type()==FL_MULTILINE_INPUT) {p--; break;} - if (c == '\t' && type()==FL_MULTILINE_INPUT) { + if (c=='\n' && input_type()==FL_MULTILINE_INPUT) {p--; break;} + if (c == '\t' && input_type()==FL_MULTILINE_INPUT) { for (c = (o-buf)%8; c<8 && o<e; c++) *o++ = ' '; } else { *o++ = '^'; @@ -114,11 +114,11 @@ double Fl_Input_::expandpos( int* returnn // return offset into buf here ) const { int n = 0; - if (type()==FL_SECRET_INPUT) n = e-p; + if (input_type()==FL_SECRET_INPUT) n = e-p; else while (p<e) { int c = *p++ & 255; if (c < ' ' || c == 127) { - if (c == '\t' && type()==FL_MULTILINE_INPUT) n += 8-(n%8); + if (c == '\t' && input_type()==FL_MULTILINE_INPUT) n += 8-(n%8); else n += 2; } else if (c >= 128 && c < 0xA0) { n += 4; @@ -185,7 +185,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) { setfont(); #ifdef WORDWRAP - if (type()==FL_MULTILINE_INPUT) wordwrap = W; else wordwrap = 0; + if (input_type()==FL_MULTILINE_INPUT) wordwrap = W; else wordwrap = 0; #endif const char *p, *e; @@ -225,7 +225,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) { } // adjust the scrolling: - if (type()==FL_MULTILINE_INPUT) { + if (input_type()==FL_MULTILINE_INPUT) { int newy = yscroll_; if (cury < newy) newy = cury; if (cury > newy+H-height) newy = cury-H+height; @@ -304,7 +304,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) { } // for minimal update, erase all lines below last one if necessary: - if (type()==FL_MULTILINE_INPUT && do_mu && ypos<H + if (input_type()==FL_MULTILINE_INPUT && do_mu && ypos<H && (!erase_cursor_only || p <= value()+mu_p)) { if (ypos < 0) ypos = 0; fl_color(this->color()); @@ -319,14 +319,14 @@ static int isword(char c) { } int Fl_Input_::word_end(int i) const { - if (type() == FL_SECRET_INPUT) return size(); + if (input_type() == FL_SECRET_INPUT) return size(); //while (i < size() && !isword(index(i))) i++; while (i < size() && isword(index(i))) i++; return i; } int Fl_Input_::word_start(int i) const { - if (type() == FL_SECRET_INPUT) return 0; + if (input_type() == FL_SECRET_INPUT) return 0; // if (i >= size() || !isword(index(i))) // while (i > 0 && !isword(index(i-1))) i--; while (i > 0 && isword(index(i-1))) i--; @@ -334,7 +334,7 @@ int Fl_Input_::word_start(int i) const { } int Fl_Input_::line_end(int i) const { - if (type() != FL_MULTILINE_INPUT) return size(); + if (input_type() != FL_MULTILINE_INPUT) return size(); #ifdef WORDWRAP // go to the start of the paragraph: int j = i; @@ -355,7 +355,7 @@ int Fl_Input_::line_end(int i) const { } int Fl_Input_::line_start(int i) const { - if (type() != FL_MULTILINE_INPUT) return 0; + if (input_type() != FL_MULTILINE_INPUT) return 0; int j = i; while (j > 0 && index(j-1) != '\n') j--; #ifdef WORDWRAP @@ -387,12 +387,12 @@ void Fl_Input_::handle_mouse(int X, int Y, const char *p, *e; char buf[MAXBUF]; - int theline = (type()==FL_MULTILINE_INPUT) ? + int theline = (input_type()==FL_MULTILINE_INPUT) ? (Fl::event_y()-Y+yscroll_)/fl_height() : 0; int newpos = 0; #ifdef WORDWRAP - if (type()==FL_MULTILINE_INPUT) wordwrap = W; else wordwrap = 0; + if (input_type()==FL_MULTILINE_INPUT) wordwrap = W; else wordwrap = 0; #endif for (p=value();; ) { e = expand(p, buf); @@ -481,7 +481,7 @@ int Fl_Input_::up_down_position(int i, int keepmark) { setfont(); #ifdef WORDWRAP - if (type()==FL_MULTILINE_INPUT) + if (input_type()==FL_MULTILINE_INPUT) wordwrap = w()-Fl::box_dw(box())-6; else wordwrap = 0; #endif @@ -505,7 +505,7 @@ int Fl_Input_::copy(int clipboard) { int e = mark(); if (b != e) { if (b > e) {b = mark(); e = position();} - if (type() == FL_SECRET_INPUT) e = b; + if (input_type() == FL_SECRET_INPUT) e = b; Fl::copy(value()+b, e-b, clipboard); return 1; } @@ -575,7 +575,7 @@ int Fl_Input_::replace(int b, int e, const char* text, int ilen) { size_ -= e-b; undowidget = this; undoat = b; - if (type() == FL_SECRET_INPUT) yankcut = 0; else yankcut = undocut; + if (input_type() == FL_SECRET_INPUT) yankcut = 0; else yankcut = undocut; } if (ilen) { @@ -598,7 +598,7 @@ int Fl_Input_::replace(int b, int e, const char* text, int ilen) { // right after the whitespace before the current word. This will // result in sub-optimal update when such wrapping does not happen // but it is too hard to figure out for now... - if (type() == FL_MULTILINE_INPUT) + if (input_type() == FL_MULTILINE_INPUT) while (b > 0 && !isspace(index(b))) b--; #endif @@ -661,7 +661,7 @@ int Fl_Input_::yank() { int Fl_Input_::copy_cuts() { // put the yank buffer into the X clipboard - if (!yankcut || type()==FL_SECRET_INPUT) return 0; + if (!yankcut || input_type()==FL_SECRET_INPUT) return 0; Fl::copy(undobuffer, yankcut, 1); return 1; } @@ -722,8 +722,8 @@ int Fl_Input_::handletext(int event, int X, int Y, int W, int H) { // strip trailing control characters and spaces before pasting: const char* t = Fl::event_text(); const char* e = t+Fl::event_length(); - if (type() != FL_MULTILINE_INPUT) while (e > t && isspace(*(e-1))) e--; - if (type() == FL_INT_INPUT) { + if (input_type() != FL_MULTILINE_INPUT) while (e > t && isspace(*(e-1))) e--; + if (input_type() == FL_INT_INPUT) { while (isspace(*t) && t < e) t ++; const char *p = t; if (*p == '+' || *p == '-') p ++; @@ -737,7 +737,7 @@ int Fl_Input_::handletext(int event, int X, int Y, int W, int H) { fl_beep(FL_BEEP_ERROR); return 1; } else return replace(0, size(), t, e - t); - } else if (type() == FL_FLOAT_INPUT) { + } else if (input_type() == FL_FLOAT_INPUT) { while (isspace(*t) && t < e) t ++; const char *p = t; if (*p == '+' || *p == '-') p ++; @@ -864,5 +864,5 @@ Fl_Input_::~Fl_Input_() { } // -// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.9 2002/04/11 10:46:19 easysw Exp $". +// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.10 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Menu_.cxx b/src/Fl_Menu_.cxx index 1d1fc64fa..721caee35 100644 --- a/src/Fl_Menu_.cxx +++ b/src/Fl_Menu_.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_.cxx,v 1.7.2.8.2.2 2002/01/01 15:11:30 easysw Exp $" +// "$Id: Fl_Menu_.cxx,v 1.7.2.8.2.3 2002/04/11 11:52:41 easysw Exp $" // // Common menu code for the Fast Light Tool Kit (FLTK). // @@ -32,7 +32,7 @@ #include <FL/Fl.H> #include <FL/Fl_Menu_.H> -#include <string.h> +#include "flstring.h" #include <stdio.h> #include <stdlib.h> @@ -172,5 +172,5 @@ void Fl_Menu_::clear() { } // -// End of "$Id: Fl_Menu_.cxx,v 1.7.2.8.2.2 2002/01/01 15:11:30 easysw Exp $". +// End of "$Id: Fl_Menu_.cxx,v 1.7.2.8.2.3 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx index 006ffa4a4..4e4770463 100644 --- a/src/Fl_Menu_add.cxx +++ b/src/Fl_Menu_add.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.1 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.2 2002/04/11 11:52:41 easysw Exp $" // // Menu utilities for the Fast Light Tool Kit (FLTK). // @@ -34,7 +34,7 @@ // string with a % sign in it! #include <FL/Fl_Menu_.H> -#include <string.h> +#include "flstring.h" #include <stdio.h> #include <stdlib.h> @@ -261,5 +261,5 @@ void Fl_Menu_::remove(int i) { } // -// End of "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.1 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.2 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Output.cxx b/src/Fl_Output.cxx deleted file mode 100644 index c5379157f..000000000 --- a/src/Fl_Output.cxx +++ /dev/null @@ -1,53 +0,0 @@ -// -// "$Id: Fl_Output.cxx,v 1.6.2.3.2.2 2002/04/08 18:32:16 easysw Exp $" -// -// Output widget for the Fast Light Tool Kit (FLTK). -// -// Copyright 1998-2002 by Bill Spitzak and others. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems to "fltk-bugs@fltk.org". -// - -// This subclass of Fl_Input_ does not allow user to edit the output. -// Used to display output. - -#include <FL/Fl.H> -#include <FL/Fl_Output.H> -#include <FL/fl_draw.H> - -void Fl_Output::draw() { - Fl_Boxtype b = box() ? box() : FL_DOWN_BOX; - if (damage() & FL_DAMAGE_ALL) draw_box(b, color()); - Fl_Input_::drawtext(x()+Fl::box_dx(b)+3, y()+Fl::box_dy(b), - w()-Fl::box_dw(b)-6, h()-Fl::box_dh(b)); -} - -int Fl_Output::handle(int event) { - if (event == FL_KEYBOARD && Fl::event_text()[0] == 0x03) { - // Handle CTRL-C for copy... - return copy(1); - } - Fl_Boxtype b = box() ? box() : FL_DOWN_BOX; - return Fl_Input_::handletext(event, - x()+Fl::box_dx(b)+3, y()+Fl::box_dy(b), - w()-Fl::box_dw(b)-6, h()-Fl::box_dh(b)); -} - -// -// End of "$Id: Fl_Output.cxx,v 1.6.2.3.2.2 2002/04/08 18:32:16 easysw Exp $". -// diff --git a/src/Fl_PNM_Image.cxx b/src/Fl_PNM_Image.cxx index baadd90e4..2427122fe 100644 --- a/src/Fl_PNM_Image.cxx +++ b/src/Fl_PNM_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_PNM_Image.cxx,v 1.1.2.5 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_PNM_Image.cxx,v 1.1.2.6 2002/04/11 11:52:41 easysw Exp $" // // Fl_PNM_Image routines. // @@ -36,7 +36,7 @@ #include "config.h" #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #include <ctype.h> @@ -166,5 +166,5 @@ Fl_PNM_Image::Fl_PNM_Image(const char *name) // I - File to read // -// End of "$Id: Fl_PNM_Image.cxx,v 1.1.2.5 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_PNM_Image.cxx,v 1.1.2.6 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index ca52795b7..3fba05cc6 100644 --- a/src/Fl_Pixmap.cxx +++ b/src/Fl_Pixmap.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.14 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.15 2002/04/11 11:52:41 easysw Exp $" // // Pixmap drawing code for the Fast Light Tool Kit (FLTK). // @@ -38,7 +38,7 @@ #include <FL/Fl_Pixmap.H> #include <stdio.h> -#include <string.h> +#include "flstring.h" #include <ctype.h> extern uchar **fl_mask_bitmap; // used by fl_draw_pixmap.cxx to store mask @@ -467,5 +467,5 @@ void Fl_Pixmap::desaturate() { } // -// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.14 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.15 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Shared_Image.cxx b/src/Fl_Shared_Image.cxx index ff7f9b8f5..547296b52 100644 --- a/src/Fl_Shared_Image.cxx +++ b/src/Fl_Shared_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Shared_Image.cxx,v 1.23.2.8 2002/03/29 11:59:56 easysw Exp $" +// "$Id: Fl_Shared_Image.cxx,v 1.23.2.9 2002/04/11 11:52:41 easysw Exp $" // // Shared image code for the Fast Light Tool Kit (FLTK). // @@ -25,7 +25,7 @@ #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #include <FL/Fl.H> #include <FL/Fl_Shared_Image.H> @@ -455,5 +455,5 @@ Fl_Shared_Image::remove_handler(Fl_Shared_Handler *f) { // -// End of "$Id: Fl_Shared_Image.cxx,v 1.23.2.8 2002/03/29 11:59:56 easysw Exp $". +// End of "$Id: Fl_Shared_Image.cxx,v 1.23.2.9 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Sys_Menu_Bar.cxx b/src/Fl_Sys_Menu_Bar.cxx index b0bcdc6fb..f75981c53 100644 --- a/src/Fl_Sys_Menu_Bar.cxx +++ b/src/Fl_Sys_Menu_Bar.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.4 2002/04/11 11:52:41 easysw Exp $" // // MacOS system menu bar widget for the Fast Light Tool Kit (FLTK). // @@ -52,7 +52,7 @@ #include <FL/Fl.H> #include <FL/Fl_Sys_Menu_Bar.H> -#include <string.h> +#include "flstring.h" #include <stdio.h> #include <ctype.h> @@ -310,5 +310,5 @@ int Fl_Menu_Bar::handle(int event) { */ // -// End of "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.4 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx index 605ea0b31..3fba90de1 100644 --- a/src/Fl_Text_Buffer.cxx +++ b/src/Fl_Text_Buffer.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Buffer.cxx,v 1.9.2.3 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_Text_Buffer.cxx,v 1.9.2.4 2002/04/11 11:52:41 easysw Exp $" // // Copyright 2001-2002 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under @@ -25,7 +25,7 @@ #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #include <ctype.h> #include <FL/Fl_Text_Buffer.H> @@ -2285,5 +2285,5 @@ Fl_Text_Buffer::outputfile(const char *file, int start, int end, int buflen) { // -// End of "$Id: Fl_Text_Buffer.cxx,v 1.9.2.3 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_Text_Buffer.cxx,v 1.9.2.4 2002/04/11 11:52:41 easysw Exp $". // diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 1b34a27b6..4be0e9aed 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Display.cxx,v 1.12.2.12 2002/04/11 10:46:19 easysw Exp $" +// "$Id: Fl_Text_Display.cxx,v 1.12.2.13 2002/04/11 11:52:42 easysw Exp $" // // Copyright 2001-2002 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under @@ -28,7 +28,7 @@ #include <FL/Fl_Text_Display.H> #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #include <limits.h> #include <ctype.h> @@ -1958,5 +1958,5 @@ int Fl_Text_Display::handle(int event) { // -// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.12 2002/04/11 10:46:19 easysw Exp $". +// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.13 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/Fl_Text_Editor.cxx b/src/Fl_Text_Editor.cxx index 6e4e78fec..938f7735e 100644 --- a/src/Fl_Text_Editor.cxx +++ b/src/Fl_Text_Editor.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Editor.cxx,v 1.9.2.5 2002/03/07 19:22:56 spitzak Exp $" +// "$Id: Fl_Text_Editor.cxx,v 1.9.2.6 2002/04/11 11:52:42 easysw Exp $" // // Copyright 2001-2002 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under @@ -27,7 +27,7 @@ #include <FL/Fl.H> #include <FL/Fl_Text_Editor.H> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #include <ctype.h> @@ -439,5 +439,5 @@ int Fl_Text_Editor::handle(int event) { } // -// End of "$Id: Fl_Text_Editor.cxx,v 1.9.2.5 2002/03/07 19:22:56 spitzak Exp $". +// End of "$Id: Fl_Text_Editor.cxx,v 1.9.2.6 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/Fl_XBM_Image.cxx b/src/Fl_XBM_Image.cxx index 377e51e86..b030b85cd 100644 --- a/src/Fl_XBM_Image.cxx +++ b/src/Fl_XBM_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_XBM_Image.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_XBM_Image.cxx,v 1.1.2.4 2002/04/11 11:52:42 easysw Exp $" // // Fl_XBM_Image routines. // @@ -36,7 +36,7 @@ #include "config.h" #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" // // 'Fl_XBM_Image::Fl_XBM_Image()' - Load an XBM file. @@ -98,5 +98,5 @@ Fl_XBM_Image::Fl_XBM_Image(const char *name) : Fl_Bitmap((const char *)0,0,0) { // -// End of "$Id: Fl_XBM_Image.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_XBM_Image.cxx,v 1.1.2.4 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/Fl_XPM_Image.cxx b/src/Fl_XPM_Image.cxx index bc1ac6bb4..a28a34066 100644 --- a/src/Fl_XPM_Image.cxx +++ b/src/Fl_XPM_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_XPM_Image.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_XPM_Image.cxx,v 1.1.2.4 2002/04/11 11:52:42 easysw Exp $" // // Fl_XPM_Image routines. // @@ -35,7 +35,7 @@ #include "config.h" #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #include <ctype.h> @@ -125,5 +125,5 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { // -// End of "$Id: Fl_XPM_Image.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_XPM_Image.cxx,v 1.1.2.4 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/Fl_arg.cxx b/src/Fl_arg.cxx index 3587a4c70..97e9900a6 100644 --- a/src/Fl_arg.cxx +++ b/src/Fl_arg.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_arg.cxx,v 1.5.2.8.2.7 2002/03/25 21:08:41 easysw Exp $" +// "$Id: Fl_arg.cxx,v 1.5.2.8.2.8 2002/04/11 11:52:42 easysw Exp $" // // Optional argument initialization code for the Fast Light Tool Kit (FLTK). // @@ -32,7 +32,7 @@ #include <FL/filename.H> #include <FL/fl_draw.H> #include <ctype.h> -#include <string.h> +#include "flstring.h" #if defined(WIN32) || defined(__APPLE__) int XParseGeometry(const char*, int*, int*, unsigned int*, unsigned int*); @@ -364,5 +364,5 @@ int XParseGeometry(const char* string, int* x, int* y, #endif // ifdef WIN32 // -// End of "$Id: Fl_arg.cxx,v 1.5.2.8.2.7 2002/03/25 21:08:41 easysw Exp $". +// End of "$Id: Fl_arg.cxx,v 1.5.2.8.2.8 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/Fl_display.cxx b/src/Fl_display.cxx index c317981cf..f8b9b2aec 100644 --- a/src/Fl_display.cxx +++ b/src/Fl_display.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_display.cxx,v 1.4.2.3.2.3 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_display.cxx,v 1.4.2.3.2.4 2002/04/11 11:52:42 easysw Exp $" // // Display function for the Fast Light Tool Kit (FLTK). // @@ -28,7 +28,7 @@ #include <FL/Fl.H> #include <stdlib.h> -#include <string.h> +#include "flstring.h" void Fl::display(const char *d) { #if defined(__APPLE__) || defined(WIN32) @@ -49,5 +49,5 @@ void Fl::display(const char *d) { } // -// End of "$Id: Fl_display.cxx,v 1.4.2.3.2.3 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_display.cxx,v 1.4.2.3.2.4 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index ae5f2b9c3..c1c722933 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_mac.cxx,v 1.1.2.18 2002/04/07 18:31:55 easysw Exp $" +// "$Id: Fl_mac.cxx,v 1.1.2.19 2002/04/11 11:52:42 easysw Exp $" // // MacOS specific code for the Fast Light Tool Kit (FLTK). // @@ -50,7 +50,7 @@ #include <ctype.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #include <unistd.h> // external functions @@ -1359,6 +1359,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { // -// End of "$Id: Fl_mac.cxx,v 1.1.2.18 2002/04/07 18:31:55 easysw Exp $". +// End of "$Id: Fl_mac.cxx,v 1.1.2.19 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 810661546..79b4752f3 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_win32.cxx,v 1.33.2.37.2.25 2002/04/10 15:01:20 easysw Exp $" +// "$Id: Fl_win32.cxx,v 1.33.2.37.2.26 2002/04/11 11:52:42 easysw Exp $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // @@ -31,7 +31,7 @@ #include <FL/Fl.H> #include <FL/win32.H> #include <FL/Fl_Window.H> -#include <string.h> +#include "flstring.h" #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -1170,5 +1170,5 @@ void Fl_Window::make_current() { } // -// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.25 2002/04/10 15:01:20 easysw Exp $". +// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.26 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index fac25d63e..e389088f7 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_x.cxx,v 1.24.2.24.2.18 2002/04/10 01:32:03 easysw Exp $" +// "$Id: Fl_x.cxx,v 1.24.2.24.2.19 2002/04/11 11:52:42 easysw Exp $" // // X specific code for the Fast Light Tool Kit (FLTK). // @@ -40,7 +40,7 @@ # include <ctype.h> # include <stdio.h> # include <stdlib.h> -# include <string.h> +# include "flstring.h" # include <unistd.h> # include <sys/time.h> @@ -1229,5 +1229,5 @@ void Fl_Window::make_current() { #endif // -// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.18 2002/04/10 01:32:03 easysw Exp $". +// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.19 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/Makefile b/src/Makefile index 947a757c8..b8c4f0a6c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.18.2.14.2.38 2002/03/25 21:39:01 easysw Exp $" +# "$Id: Makefile,v 1.18.2.14.2.39 2002/04/11 11:52:42 easysw Exp $" # # Library makefile for the Fast Light Tool Kit (FLTK). # @@ -64,7 +64,6 @@ CPPFILES = \ Fl_Menu_add.cxx \ Fl_Menu_global.cxx \ Fl_Multi_Label.cxx \ - Fl_Output.cxx \ Fl_Overlay_Window.cxx \ Fl_Pack.cxx \ Fl_Pixmap.cxx \ @@ -428,5 +427,5 @@ uninstall: # -# End of "$Id: Makefile,v 1.18.2.14.2.38 2002/03/25 21:39:01 easysw Exp $". +# End of "$Id: Makefile,v 1.18.2.14.2.39 2002/04/11 11:52:42 easysw Exp $". # diff --git a/src/filename_expand.cxx b/src/filename_expand.cxx index ea0775d15..f50e06cf7 100644 --- a/src/filename_expand.cxx +++ b/src/filename_expand.cxx @@ -1,5 +1,5 @@ // -// "$Id: filename_expand.cxx,v 1.4.2.4.2.4 2002/03/25 21:08:42 easysw Exp $" +// "$Id: filename_expand.cxx,v 1.4.2.4.2.5 2002/04/11 11:52:42 easysw Exp $" // // Filename expansion routines for the Fast Light Tool Kit (FLTK). // @@ -30,7 +30,7 @@ #include <FL/filename.H> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #if defined(WIN32) && !defined(__CYGWIN__) #else # include <unistd.h> @@ -106,5 +106,5 @@ int fl_filename_expand(char *to,int tolen, const char *from) { // -// End of "$Id: filename_expand.cxx,v 1.4.2.4.2.4 2002/03/25 21:08:42 easysw Exp $". +// End of "$Id: filename_expand.cxx,v 1.4.2.4.2.5 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/filename_setext.cxx b/src/filename_setext.cxx index 6db8bd297..e2e9b8990 100644 --- a/src/filename_setext.cxx +++ b/src/filename_setext.cxx @@ -1,5 +1,5 @@ // -// "$Id: filename_setext.cxx,v 1.4.2.3.2.3 2002/03/25 21:08:42 easysw Exp $" +// "$Id: filename_setext.cxx,v 1.4.2.3.2.4 2002/04/11 11:52:42 easysw Exp $" // // Filename extension routines for the Fast Light Tool Kit (FLTK). // @@ -28,7 +28,7 @@ // If new extension is null, act like it is "" #include <FL/filename.H> -#include <string.h> +#include "flstring.h" char *fl_filename_setext(char *buf, int buflen, const char *ext) { char *q = (char *)fl_filename_ext(buf); @@ -41,5 +41,5 @@ char *fl_filename_setext(char *buf, int buflen, const char *ext) { // -// End of "$Id: filename_setext.cxx,v 1.4.2.3.2.3 2002/03/25 21:08:42 easysw Exp $". +// End of "$Id: filename_setext.cxx,v 1.4.2.3.2.4 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/fl_dnd_win32.cxx b/src/fl_dnd_win32.cxx index a1e74f777..7a5a53759 100644 --- a/src/fl_dnd_win32.cxx +++ b/src/fl_dnd_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_dnd_win32.cxx,v 1.5.2.6 2002/04/10 15:01:22 easysw Exp $" +// "$Id: fl_dnd_win32.cxx,v 1.5.2.7 2002/04/11 11:52:42 easysw Exp $" // // Drag & Drop code for the Fast Light Tool Kit (FLTK). // @@ -30,7 +30,7 @@ #include <FL/Fl.H> #include <FL/win32.H> #include <FL/Fl_Window.H> -#include <string.h> +#include "flstring.h" #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -349,5 +349,5 @@ int Fl::dnd() // -// End of "$Id: fl_dnd_win32.cxx,v 1.5.2.6 2002/04/10 15:01:22 easysw Exp $". +// End of "$Id: fl_dnd_win32.cxx,v 1.5.2.7 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx index 2209642fb..0e0463943 100644 --- a/src/fl_draw.cxx +++ b/src/fl_draw.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_draw.cxx,v 1.6.2.4.2.10 2002/01/23 16:58:01 easysw Exp $" +// "$Id: fl_draw.cxx,v 1.6.2.4.2.11 2002/04/11 11:52:42 easysw Exp $" // // Label drawing code for the Fast Light Tool Kit (FLTK). // @@ -34,7 +34,7 @@ #include <FL/fl_draw.H> #include <FL/Fl_Image.H> -#include <string.h> +#include "flstring.h" #include <ctype.h> #define MAXBUF 1024 @@ -327,5 +327,5 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) { } // -// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.10 2002/01/23 16:58:01 easysw Exp $". +// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.11 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/fl_draw_image.cxx b/src/fl_draw_image.cxx index 9e44c4391..68544af03 100644 --- a/src/fl_draw_image.cxx +++ b/src/fl_draw_image.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_draw_image.cxx,v 1.5.2.6.2.3 2002/01/01 15:11:32 easysw Exp $" +// "$Id: fl_draw_image.cxx,v 1.5.2.6.2.4 2002/04/11 11:52:42 easysw Exp $" // // Image drawing routines for the Fast Light Tool Kit (FLTK). // @@ -61,7 +61,7 @@ # include <FL/fl_draw.H> # include <FL/x.H> # include "Fl_XColor.H" -# include <string.h> +# include "flstring.h" static XImage i; // template used to pass info to X static int bytes_per_pixel; @@ -570,5 +570,5 @@ void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) { #endif // -// End of "$Id: fl_draw_image.cxx,v 1.5.2.6.2.3 2002/01/01 15:11:32 easysw Exp $". +// End of "$Id: fl_draw_image.cxx,v 1.5.2.6.2.4 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx index 6ef297d04..a63de8058 100644 --- a/src/fl_draw_pixmap.cxx +++ b/src/fl_draw_pixmap.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.7 2002/01/01 15:11:32 easysw Exp $" +// "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.8 2002/04/11 11:52:42 easysw Exp $" // // Pixmap drawing code for the Fast Light Tool Kit (FLTK). // @@ -39,7 +39,7 @@ #include <FL/x.H> #include <ctype.h> #include <stdio.h> -#include <string.h> +#include "flstring.h" static int ncolors, chars_per_pixel; @@ -262,5 +262,5 @@ int fl_draw_pixmap(const char*const* di, int x, int y, Fl_Color bg) { } // -// End of "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.7 2002/01/01 15:11:32 easysw Exp $". +// End of "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.8 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/fl_font.cxx b/src/fl_font.cxx index c8ceab378..e2ebaef31 100644 --- a/src/fl_font.cxx +++ b/src/fl_font.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_font.cxx,v 1.9.2.5.2.4 2002/03/06 18:11:01 easysw Exp $" +// "$Id: fl_font.cxx,v 1.9.2.5.2.5 2002/04/11 11:52:42 easysw Exp $" // // Font selection code for the Fast Light Tool Kit (FLTK). // @@ -33,7 +33,7 @@ #include <ctype.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include "flstring.h" #ifdef WIN32 # include "fl_font_win32.cxx" @@ -56,5 +56,5 @@ void fl_draw(const char* str, int x, int y) { } // -// End of "$Id: fl_font.cxx,v 1.9.2.5.2.4 2002/03/06 18:11:01 easysw Exp $". +// End of "$Id: fl_font.cxx,v 1.9.2.5.2.5 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/fl_line_style.cxx b/src/fl_line_style.cxx index f31948f06..314986db1 100644 --- a/src/fl_line_style.cxx +++ b/src/fl_line_style.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_line_style.cxx,v 1.3.2.3.2.9 2002/01/01 15:11:32 easysw Exp $" +// "$Id: fl_line_style.cxx,v 1.3.2.3.2.10 2002/04/11 11:52:42 easysw Exp $" // // Line style code for the Fast Light Tool Kit (FLTK). // @@ -25,7 +25,7 @@ #include <FL/fl_draw.H> #include <FL/x.H> -#include <string.h> +#include "flstring.h" #include <stdio.h> void fl_line_style(int style, int width, char* dashes) { @@ -104,5 +104,5 @@ void fl_line_style(int style, int width, char* dashes) { // -// End of "$Id: fl_line_style.cxx,v 1.3.2.3.2.9 2002/01/01 15:11:32 easysw Exp $". +// End of "$Id: fl_line_style.cxx,v 1.3.2.3.2.10 2002/04/11 11:52:42 easysw Exp $". // diff --git a/src/fl_plastic.cxx b/src/fl_plastic.cxx index c2311165b..738ffc516 100644 --- a/src/fl_plastic.cxx +++ b/src/fl_plastic.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_plastic.cxx,v 1.1.2.10 2002/03/25 21:08:42 easysw Exp $" +// "$Id: fl_plastic.cxx,v 1.1.2.11 2002/04/11 11:52:43 easysw Exp $" // // "Plastic" drawing routines for the Fast Light Tool Kit (FLTK). // @@ -32,7 +32,7 @@ #include <FL/Fl.H> #include <FL/fl_draw.H> -#include <string.h> +#include "flstring.h" extern uchar *fl_gray_ramp(); @@ -173,5 +173,5 @@ Fl_Boxtype fl_define_FL_PLASTIC_UP_BOX() { // -// End of "$Id: fl_plastic.cxx,v 1.1.2.10 2002/03/25 21:08:42 easysw Exp $". +// End of "$Id: fl_plastic.cxx,v 1.1.2.11 2002/04/11 11:52:43 easysw Exp $". // diff --git a/src/fl_set_font.cxx b/src/fl_set_font.cxx index c6dfec986..f0d017655 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.4 2002/01/01 15:11:32 easysw Exp $" +// "$Id: fl_set_font.cxx,v 1.5.2.3.2.5 2002/04/11 11:52:43 easysw Exp $" // // Font utilities for the Fast Light Tool Kit (FLTK). // @@ -31,7 +31,7 @@ #include <FL/x.H> #include "Fl_Font.H" #include <stdlib.h> -#include <string.h> +#include "flstring.h" static int table_size; @@ -75,5 +75,5 @@ void Fl::set_font(Fl_Font fnum, Fl_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.4 2002/01/01 15:11:32 easysw Exp $". +// End of "$Id: fl_set_font.cxx,v 1.5.2.3.2.5 2002/04/11 11:52:43 easysw Exp $". // diff --git a/src/fl_set_fonts.cxx b/src/fl_set_fonts.cxx index e84465fc3..fbd72bec8 100644 --- a/src/fl_set_fonts.cxx +++ b/src/fl_set_fonts.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.4 2002/03/06 18:11:01 easysw Exp $" +// "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.5 2002/04/11 11:52:43 easysw Exp $" // // More font utilities for the Fast Light Tool Kit (FLTK). // @@ -28,7 +28,7 @@ #include <FL/x.H> #include "Fl_Font.H" #include <ctype.h> -#include <string.h> +#include "flstring.h" #include <stdlib.h> #ifdef WIN32 @@ -42,5 +42,5 @@ #endif // WIN32 // -// End of "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.4 2002/03/06 18:11:01 easysw Exp $". +// End of "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.5 2002/04/11 11:52:43 easysw Exp $". // diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx index e547eccc8..bb2c1af08 100644 --- a/src/fl_shortcut.cxx +++ b/src/fl_shortcut.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_shortcut.cxx,v 1.4.2.9.2.4 2002/01/03 08:08:21 matthiaswm Exp $" +// "$Id: fl_shortcut.cxx,v 1.4.2.9.2.5 2002/04/11 11:52:43 easysw Exp $" // // Shortcut support routines for the Fast Light Tool Kit (FLTK). // @@ -44,7 +44,7 @@ #include <FL/Fl_Button.H> #include <FL/fl_draw.H> #include <ctype.h> -#include <string.h> +#include "flstring.h" #if !defined(WIN32) && !defined(__APPLE__) #include <FL/x.H> #endif @@ -200,5 +200,5 @@ int Fl_Widget::test_shortcut() { } // -// End of "$Id: fl_shortcut.cxx,v 1.4.2.9.2.4 2002/01/03 08:08:21 matthiaswm Exp $". +// End of "$Id: fl_shortcut.cxx,v 1.4.2.9.2.5 2002/04/11 11:52:43 easysw Exp $". // diff --git a/src/fl_symbols.cxx b/src/fl_symbols.cxx index 5e5d98bc6..382afca6e 100644 --- a/src/fl_symbols.cxx +++ b/src/fl_symbols.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_symbols.cxx,v 1.8.2.3.2.2 2002/01/01 15:11:32 easysw Exp $" +// "$Id: fl_symbols.cxx,v 1.8.2.3.2.3 2002/04/11 11:52:43 easysw Exp $" // // Symbol drawing code for the Fast Light Tool Kit (FLTK). // @@ -34,7 +34,7 @@ #include <FL/Fl.H> #include <FL/fl_draw.H> -#include <string.h> +#include "flstring.h" typedef struct { const char *name; @@ -361,5 +361,5 @@ static void fl_init_symbols(void) { } // -// End of "$Id: fl_symbols.cxx,v 1.8.2.3.2.2 2002/01/01 15:11:32 easysw Exp $". +// End of "$Id: fl_symbols.cxx,v 1.8.2.3.2.3 2002/04/11 11:52:43 easysw Exp $". // diff --git a/src/forms_fselect.cxx b/src/forms_fselect.cxx index 99c2ce397..7570b0479 100644 --- a/src/forms_fselect.cxx +++ b/src/forms_fselect.cxx @@ -1,5 +1,5 @@ // -// "$Id: forms_fselect.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $" +// "$Id: forms_fselect.cxx,v 1.4.2.3.2.3 2002/04/11 11:52:43 easysw Exp $" // // Forms file selection routines for the Fast Light Tool Kit (FLTK). // @@ -26,7 +26,7 @@ // Emulate the Forms file chooser using the fltk file chooser. #include <FL/forms.H> -#include <string.h> +#include "flstring.h" static char fl_directory[1024]; static const char *fl_pattern; // assummed passed value is static @@ -61,5 +61,5 @@ char* fl_get_pattern() {return (char *)fl_pattern;} char* fl_get_filename() {return fl_filename;} // -// End of "$Id: forms_fselect.cxx,v 1.4.2.3.2.2 2002/03/25 21:08:42 easysw Exp $". +// End of "$Id: forms_fselect.cxx,v 1.4.2.3.2.3 2002/04/11 11:52:43 easysw Exp $". // diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 27b756ac3..5f499c1a3 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -1,5 +1,5 @@ // -// "$Id: gl_draw.cxx,v 1.7.2.5.2.5 2002/01/03 08:08:21 matthiaswm Exp $" +// "$Id: gl_draw.cxx,v 1.7.2.5.2.6 2002/04/11 11:52:43 easysw Exp $" // // OpenGL drawing support routines for the Fast Light Tool Kit (FLTK). // @@ -35,7 +35,7 @@ #include <FL/fl_draw.H> #include "Fl_Gl_Choice.H" #include "Fl_Font.H" -#include <string.h> +#include "flstring.h" int gl_height() {return fl_height();} int gl_descent() {return fl_descent();} @@ -158,5 +158,5 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) { #endif // -// End of "$Id: gl_draw.cxx,v 1.7.2.5.2.5 2002/01/03 08:08:21 matthiaswm Exp $". +// End of "$Id: gl_draw.cxx,v 1.7.2.5.2.6 2002/04/11 11:52:43 easysw Exp $". // diff --git a/src/makedepend b/src/makedepend index 0290a370f..e2ee50cd1 100644 --- a/src/makedepend +++ b/src/makedepend @@ -11,14 +11,14 @@ Fl_Adjuster.o: ../FL/fl_draw.H fastarrow.h mediumarrow.h slowarrow.h Fl_Bitmap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H Fl_Bitmap.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_Widget.H Fl_Bitmap.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H -Fl_Bitmap.o: ../FL/Fl_Image.H ../FL/x.H +Fl_Bitmap.o: ../FL/Fl_Image.H ../FL/x.H flstring.h ../config.h Fl_BMP_Image.o: ../FL/Fl_BMP_Image.H ../FL/Fl_Image.H ../FL/x.H Fl_BMP_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H Fl_BMP_Image.o: ../config.h Fl_Browser.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Browser.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Group.H Fl_Browser.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -Fl_Browser.o: ../FL/Fl_Valuator.H ../FL/fl_draw.H +Fl_Browser.o: ../FL/Fl_Valuator.H ../FL/fl_draw.H flstring.h ../config.h Fl_Browser_.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Browser_.o: ../FL/Fl_Widget.H ../FL/Fl_Browser_.H ../FL/Fl_Group.H Fl_Browser_.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H @@ -33,8 +33,10 @@ Fl_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Button.o: ../FL/Fl_Button.H ../FL/Fl_Widget.H ../FL/Fl_Group.H Fl_Button.o: ../FL/Fl_Window.H ../FL/Fl_Group.H Fl_Chart.o: ../FL/math.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Chart.o: ../FL/Fl_Chart.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Check_Browser.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Chart.o: ../FL/Fl_Chart.H ../FL/Fl_Widget.H ../FL/fl_draw.H flstring.h +Fl_Chart.o: ../config.h +Fl_Check_Browser.o: flstring.h ../config.h ../FL/fl_draw.H +Fl_Check_Browser.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Check_Browser.o: ../FL/Fl_Check_Browser.H ../FL/Fl.H ../FL/Fl_Browser_.H Fl_Check_Browser.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H Fl_Check_Browser.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H @@ -89,7 +91,7 @@ Fl_File_Chooser2.o: ../FL/Fl_Button.H ../FL/fl_ask.H ../FL/Fl_Input.H Fl_File_Chooser2.o: ../FL/Fl_Input_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H Fl_File_Chooser2.o: ../FL/Fl_Menu_Item.H ../FL/filename.H ../FL/x.H Fl_File_Chooser2.o: ../FL/Fl_Window.H flstring.h ../config.h -Fl_File_Icon.o: ../config.h ../FL/Fl_File_Icon.H ../FL/Fl.H +Fl_File_Icon.o: ../config.h flstring.h ../FL/Fl_File_Icon.H ../FL/Fl.H Fl_File_Icon.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Widget.H Fl_File_Icon.o: ../FL/fl_draw.H ../FL/filename.H Fl_File_Icon2.o: flstring.h ../config.h ../FL/math.h ../FL/Fl_File_Icon.H @@ -99,7 +101,7 @@ Fl_File_Icon2.o: ../FL/Fl_Window.H ../FL/Fl_Widget.H ../FL/fl_draw.H Fl_File_Icon2.o: ../FL/filename.H Fl_GIF_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_GIF_Image.o: ../FL/Fl_GIF_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_Image.H -Fl_GIF_Image.o: ../FL/x.H ../FL/Fl_Window.H ../config.h +Fl_GIF_Image.o: ../FL/x.H ../FL/Fl_Window.H ../config.h flstring.h Fl_Group.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Group.o: ../FL/Fl_Group.H ../FL/Fl_Window.H ../FL/Fl_Group.H Fl_Group.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Fl_Tooltip.H @@ -120,11 +122,13 @@ Fl_Help_View.o: ../config.h Fl_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H Fl_Image.o: ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Widget.H Fl_Image.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H ../FL/x.H +Fl_Image.o: flstring.h ../config.h Fl_Input.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Input.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_draw.H +Fl_Input.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_draw.H ../FL/fl_ask.H +Fl_Input.o: flstring.h ../config.h Fl_Input_.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Input_.o: ../FL/Fl_Input_.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Input_.o: ../FL/fl_ask.H +Fl_Input_.o: ../FL/fl_ask.H flstring.h ../config.h Fl_JPEG_Image.o: ../FL/Fl_JPEG_Image.H ../FL/Fl_Image.H ../FL/x.H Fl_JPEG_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H Fl_JPEG_Image.o: ../config.h @@ -137,6 +141,7 @@ Fl_Menu.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H Fl_Menu.o: ../FL/fl_draw.H Fl_Menu_.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Menu_.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H +Fl_Menu_.o: flstring.h ../config.h Fl_Menu_Bar.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Menu_Bar.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H ../FL/Fl_Widget.H Fl_Menu_Bar.o: ../FL/Fl_Menu_Item.H @@ -148,14 +153,12 @@ Fl_Menu_Window.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H Fl_Menu_Window.o: ../FL/fl_draw.H ../FL/Fl_Menu_Window.H Fl_Menu_Window.o: ../FL/Fl_Single_Window.H Fl_Menu_add.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Enumerations.H -Fl_Menu_add.o: ../FL/Fl_Export.H ../FL/Fl_Menu_Item.H +Fl_Menu_add.o: ../FL/Fl_Export.H ../FL/Fl_Menu_Item.H flstring.h ../config.h Fl_Menu_global.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Menu_global.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H Fl_Multi_Label.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Multi_Label.o: ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H Fl_Multi_Label.o: ../FL/Fl_Multi_Label.H -Fl_Output.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Output.o: ../FL/Fl_Output.H ../FL/Fl_Input_.H ../FL/fl_draw.H Fl_Overlay_Window.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H Fl_Overlay_Window.o: ../FL/Fl_Export.H ../FL/Fl_Overlay_Window.H Fl_Overlay_Window.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H @@ -165,13 +168,13 @@ Fl_Pack.o: ../FL/Fl_Group.H ../FL/fl_draw.H Fl_Pixmap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Pixmap.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Widget.H Fl_Pixmap.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Pixmap.H -Fl_Pixmap.o: ../FL/Fl_Image.H ../FL/x.H +Fl_Pixmap.o: ../FL/Fl_Image.H ../FL/x.H flstring.h ../config.h Fl_PNG_Image.o: ../FL/Fl_PNG_Image.H ../FL/Fl_Image.H ../FL/x.H Fl_PNG_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H Fl_PNG_Image.o: ../config.h Fl_PNM_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_PNM_Image.o: ../FL/Fl_PNM_Image.H ../FL/Fl_Image.H ../FL/x.H -Fl_PNM_Image.o: ../FL/Fl_Window.H ../config.h +Fl_PNM_Image.o: ../FL/Fl_Window.H ../config.h flstring.h Fl_Positioner.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Positioner.o: ../FL/Fl_Positioner.H ../FL/Fl_Widget.H ../FL/fl_draw.H Fl_Progress.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H @@ -195,9 +198,9 @@ Fl_Scroll.o: ../FL/fl_draw.H Fl_Scrollbar.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Scrollbar.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H Fl_Scrollbar.o: ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Shared_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Shared_Image.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H -Fl_Shared_Image.o: ../FL/Fl_Window.H ../FL/Fl_BMP_Image.H +Fl_Shared_Image.o: flstring.h ../config.h ../FL/Fl.H ../FL/Enumerations.H +Fl_Shared_Image.o: ../FL/Fl_Export.H ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H +Fl_Shared_Image.o: ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_BMP_Image.H Fl_Shared_Image.o: ../FL/Fl_GIF_Image.H ../FL/Fl_Pixmap.H Fl_Shared_Image.o: ../FL/Fl_JPEG_Image.H ../FL/Fl_PNG_Image.H Fl_Shared_Image.o: ../FL/Fl_PNM_Image.H ../FL/Fl_XBM_Image.H @@ -208,17 +211,18 @@ Fl_Slider.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Widget.H Fl_Slider.o: ../FL/fl_draw.H Fl_Tabs.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Tabs.H Fl_Tabs.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Text_Buffer.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Export.H +Fl_Text_Buffer.o: flstring.h ../config.h ../FL/Fl_Text_Buffer.H +Fl_Text_Buffer.o: ../FL/Fl_Export.H Fl_Text_Display.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Text_Display.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H Fl_Text_Display.o: ../FL/fl_draw.H ../FL/Fl_Group.H ../FL/Fl_Widget.H Fl_Text_Display.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Text_Display.o: ../FL/Fl_Text_Buffer.H +Fl_Text_Display.o: ../FL/Fl_Text_Buffer.H flstring.h ../config.h Fl_Text_Editor.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Text_Editor.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H Fl_Text_Editor.o: ../FL/fl_draw.H ../FL/Fl_Group.H ../FL/Fl_Widget.H Fl_Text_Editor.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Text_Editor.o: ../FL/Fl_Text_Buffer.H +Fl_Text_Editor.o: ../FL/Fl_Text_Buffer.H flstring.h ../config.h Fl_Tile.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Tile.H Fl_Tile.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Window.H Fl_Tiled_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H @@ -255,18 +259,20 @@ Fl_Wizard.o: ../FL/Fl_Wizard.H ../FL/Fl_Group.H ../FL/fl_draw.H Fl_Wizard.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_XBM_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_XBM_Image.o: ../FL/Fl_XBM_Image.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H -Fl_XBM_Image.o: ../FL/x.H ../FL/Fl_Window.H ../config.h +Fl_XBM_Image.o: ../FL/x.H ../FL/Fl_Window.H ../config.h flstring.h Fl_XPM_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_XPM_Image.o: ../FL/Fl_XPM_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_Image.H -Fl_XPM_Image.o: ../FL/x.H ../FL/Fl_Window.H ../config.h +Fl_XPM_Image.o: ../FL/x.H ../FL/Fl_Window.H ../config.h flstring.h Fl_abort.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H flstring.h Fl_abort.o: ../config.h Fl_add_idle.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_arg.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H Fl_arg.o: ../FL/Fl_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_arg.o: ../FL/Fl_Widget.H ../FL/filename.H ../FL/fl_draw.H +Fl_arg.o: ../FL/Fl_Widget.H ../FL/filename.H ../FL/fl_draw.H flstring.h +Fl_arg.o: ../config.h Fl_compose.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_display.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_display.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H flstring.h +Fl_display.o: ../config.h Fl_get_key.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H Fl_get_key.o: ../FL/Fl_Window.H Fl_get_system_colors.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H @@ -283,15 +289,15 @@ Fl_visual.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_visual.o: ../FL/x.H ../FL/Fl_Window.H Fl_x.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_x.o: ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_x.o: ../FL/Fl_Widget.H +Fl_x.o: ../FL/Fl_Widget.H flstring.h filename_absolute.o: ../FL/filename.H ../FL/Fl_Export.H flstring.h filename_absolute.o: ../config.h -filename_expand.o: ../FL/filename.H ../FL/Fl_Export.H +filename_expand.o: ../FL/filename.H ../FL/Fl_Export.H flstring.h ../config.h filename_ext.o: ../FL/filename.H ../FL/Fl_Export.H filename_isdir.o: flstring.h ../config.h ../FL/filename.H ../FL/Fl_Export.H filename_list.o: ../config.h ../FL/filename.H ../FL/Fl_Export.H filename_match.o: ../FL/filename.H ../FL/Fl_Export.H -filename_setext.o: ../FL/filename.H ../FL/Fl_Export.H +filename_setext.o: ../FL/filename.H ../FL/Fl_Export.H flstring.h ../config.h fl_arc.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/math.h fl_arci.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H fl_arci.o: ../FL/Fl_Window.H @@ -316,13 +322,14 @@ fl_dnd.o: fl_dnd_x.cxx ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_dnd.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H fl_dnd.o: ../FL/Fl_Window.H fl_draw.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_draw.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H +fl_draw.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H flstring.h +fl_draw.o: ../config.h fl_draw_image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_draw_image.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H Fl_XColor.H -fl_draw_image.o: ../config.h ../FL/Enumerations.H +fl_draw_image.o: ../config.h ../FL/Enumerations.H flstring.h fl_draw_pixmap.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H fl_draw_pixmap.o: ../FL/Fl_Export.H ../FL/fl_draw.H ../FL/x.H -fl_draw_pixmap.o: ../FL/Fl_Window.H +fl_draw_pixmap.o: ../FL/Fl_Window.H flstring.h fl_engraved_label.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_engraved_label.o: ../FL/Fl_Widget.H ../FL/fl_draw.H fl_file_dir.o: ../config.h ../FL/filename.H ../FL/Fl_Export.H @@ -335,21 +342,21 @@ fl_file_dir.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/fl_ask.H 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/fl_draw.H ../FL/x.H ../FL/Fl_Window.H Fl_Font.H flstring.h fl_font.o: fl_font_xft.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 fl_labeltype.o: ../FL/Fl_Input_.H ../FL/Fl_Widget.H fl_line_style.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_line_style.o: ../FL/x.H ../FL/Fl_Window.H +fl_line_style.o: ../FL/x.H ../FL/Fl_Window.H flstring.h ../config.h 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_plastic.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_plastic.o: ../FL/fl_draw.H +fl_plastic.o: ../FL/fl_draw.H flstring.h ../config.h fl_rect.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Enumerations.H fl_rect.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H fl_round_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H @@ -357,21 +364,23 @@ fl_round_box.o: ../FL/fl_draw.H 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_font.o: ../FL/x.H ../FL/Fl_Window.H Fl_Font.H flstring.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_xft.cxx +fl_set_fonts.o: ../FL/x.H ../FL/Fl_Window.H Fl_Font.H flstring.h +fl_set_fonts.o: fl_set_fonts_xft.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 fl_shadow_box.o: ../FL/fl_draw.H fl_shortcut.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_shortcut.o: ../FL/Fl_Widget.H ../FL/Fl_Button.H ../FL/Fl_Widget.H -fl_shortcut.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H +fl_shortcut.o: ../FL/fl_draw.H flstring.h ../config.h ../FL/x.H +fl_shortcut.o: ../FL/Fl_Window.H fl_show_colormap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_show_colormap.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H fl_show_colormap.o: ../FL/fl_draw.H ../FL/fl_show_colormap.H ../config.h fl_symbols.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_symbols.o: ../FL/fl_draw.H +fl_symbols.o: ../FL/fl_draw.H flstring.h ../config.h fl_vertex.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H fl_vertex.o: ../FL/Fl_Window.H ../FL/math.h Fl_Gl_Choice.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H @@ -381,10 +390,10 @@ Fl_Gl_Overlay.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H Fl_Gl_Choice.H Fl_Gl_Overlay.o: ../FL/Fl_Gl_Window.H Fl_Gl_Window.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Gl_Window.o: ../FL/x.H ../FL/Fl_Window.H Fl_Gl_Choice.H -Fl_Gl_Window.o: ../FL/Fl_Gl_Window.H +Fl_Gl_Window.o: ../FL/Fl_Gl_Window.H flstring.h gl_draw.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H gl_draw.o: ../FL/gl.h ../FL/x.H ../FL/Fl_Window.H ../FL/fl_draw.H -gl_draw.o: Fl_Gl_Choice.H Fl_Font.H +gl_draw.o: Fl_Gl_Choice.H Fl_Font.H flstring.h gl_start.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H gl_start.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H gl_start.o: ../FL/Fl_Window.H ../FL/fl_draw.H Fl_Gl_Choice.H |