diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_x.cxx | 6 | ||||
| -rw-r--r-- | src/fl_ask.cxx | 6 | ||||
| -rw-r--r-- | src/fl_file_chooser.cxx | 6 | ||||
| -rw-r--r-- | src/fl_set_fonts.cxx | 10 |
4 files changed, 16 insertions, 12 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 3828cde8f..bf71118af 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_x.cxx,v 1.24.2.18 2000/06/18 00:38:41 bill Exp $" +// "$Id: Fl_x.cxx,v 1.24.2.19 2000/08/20 04:35:16 spitzak Exp $" // // X specific code for the Fast Light Tool Kit (FLTK). // @@ -242,9 +242,11 @@ static Atom wm_delete_window; static Atom wm_protocols; static Atom _motif_wm_hints; +extern "C" { static void fd_callback(int,void *) {do_queued_events();} static int io_error_handler(Display*) {Fl::fatal("X I/O error"); return 0;} +} static int xerror_handler(Display* d, XErrorEvent* e) { char buf1[128], buf2[128]; @@ -896,5 +898,5 @@ void Fl_Window::make_current() { #endif // -// End of "$Id: Fl_x.cxx,v 1.24.2.18 2000/06/18 00:38:41 bill Exp $". +// End of "$Id: Fl_x.cxx,v 1.24.2.19 2000/08/20 04:35:16 spitzak Exp $". // diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx index e97d339d1..8db0f81af 100644 --- a/src/fl_ask.cxx +++ b/src/fl_ask.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_ask.cxx,v 1.8.2.6 2000/06/05 21:21:05 mike Exp $" +// "$Id: fl_ask.cxx,v 1.8.2.7 2000/08/20 04:35:16 spitzak Exp $" // // Standard dialog functions for the Fast Light Tool Kit (FLTK). // @@ -50,7 +50,7 @@ static Fl_Box *message; static Fl_Box *icon; static Fl_Button *button[3]; static Fl_Input *input; -static char *iconlabel = "?"; +static const char *iconlabel = "?"; uchar fl_message_font_ = 0; uchar fl_message_size_ = 14; @@ -230,5 +230,5 @@ const char *fl_password(const char *fmt, const char *defstr, ...) { } // -// End of "$Id: fl_ask.cxx,v 1.8.2.6 2000/06/05 21:21:05 mike Exp $". +// End of "$Id: fl_ask.cxx,v 1.8.2.7 2000/08/20 04:35:16 spitzak Exp $". // diff --git a/src/fl_file_chooser.cxx b/src/fl_file_chooser.cxx index 44c9afb1b..1dc390ce3 100644 --- a/src/fl_file_chooser.cxx +++ b/src/fl_file_chooser.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_file_chooser.cxx,v 1.10.2.5 2000/06/05 21:21:08 mike Exp $" +// "$Id: fl_file_chooser.cxx,v 1.10.2.6 2000/08/20 04:35:16 spitzak Exp $" // // File chooser widget for the Fast Light Tool Kit (FLTK). // @@ -438,7 +438,7 @@ static void input_cb(Fl_Widget*, void* v) { static void up_cb(Fl_Widget*, void* v) { // the .. button FCW* w = (FCW*)v; char* p; - char* newname; + const char* newname; char buf[FL_PATH_MAX]; p = w->browser.listed+w->browser.dirend-1; // point right before last '/' if (p < w->browser.listed) @@ -632,5 +632,5 @@ char* fl_file_chooser(const char* message, const char* pat, const char* fname) } // -// End of "$Id: fl_file_chooser.cxx,v 1.10.2.5 2000/06/05 21:21:08 mike Exp $". +// End of "$Id: fl_file_chooser.cxx,v 1.10.2.6 2000/08/20 04:35:16 spitzak Exp $". // diff --git a/src/fl_set_fonts.cxx b/src/fl_set_fonts.cxx index a5eafc387..9ab523808 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.3 2000/06/05 21:21:10 mike Exp $" +// "$Id: fl_set_fonts.cxx,v 1.6.2.4 2000/08/20 04:35:16 spitzak Exp $" // // More font utilities for the Fast Light Tool Kit (FLTK). // @@ -145,6 +145,7 @@ const char* Fl::get_font_name(Fl_Font fnum, int* ap) { return buffer; } +extern "C" { // sort raw (non-'*') X font names into perfect order: static int ultrasort(const void *aa, const void *bb) { @@ -214,13 +215,14 @@ static int ultrasort(const void *aa, const void *bb) { // something wrong, just do a string compare... return strcmp(*(char**)aa, *(char**)bb); } +} // converts a X font name to a standard starname, returns point size: static int to_canonical(char *to, const char *from) { char* c = fl_find_fontsize((char*)from); if (!c) return -1; // no point size found... - char* endptr; - int size = strtol(c,&endptr,10); + const char* endptr; + int size = strtol(c,(char**)&endptr,10); if (from[0] == '-') { // replace the "foundry" with -*-: *to++ = '-'; *to++ = '*'; @@ -327,5 +329,5 @@ int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { #endif // -// End of "$Id: fl_set_fonts.cxx,v 1.6.2.3 2000/06/05 21:21:10 mike Exp $". +// End of "$Id: fl_set_fonts.cxx,v 1.6.2.4 2000/08/20 04:35:16 spitzak Exp $". // |