--- ./src/Fl_Help_Dialog.cxx Tue Jan 28 15:51:17 2003 +++ ../fltk-1.1.3/./src/Fl_Help_Dialog.cxx Tue Feb 25 11:41:29 2003 @@ -114,7 +114,7 @@ { Fl_Help_View* o = view_ = new Fl_Help_View(10, 10, 510, 330); o->box(FL_DOWN_BOX); o->color(49); - o->selection_color(49); + o->selection_color(4); o->labeltype(FL_NORMAL_LABEL); o->labelfont(0); o->labelsize(14); --- ./src/Makefile Thu Jan 30 16:43:17 2003 +++ ../fltk-1.1.3/./src/Makefile Tue Feb 25 11:41:29 2003 @@ -264,7 +264,7 @@ libfltk_gl.so.1.1: $(GLOBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(GLOBJECTS) + $(DSOCOMMAND) $@ $(GLOBJECTS) -lGLU -lGL -$(RM) libfltk_gl.so $(LN) libfltk_gl.so.1.1 libfltk_gl.so --- ./src/Fl_Help_Dialog.fl Tue Jan 28 15:51:17 2003 +++ ../fltk-1.1.3/./src/Fl_Help_Dialog.fl Tue Feb 25 11:41:29 2003 @@ -48,7 +48,7 @@ strlcpy(file_[index_], view_->filename(), sizeof(file_[0])); line_[index_] = view_->topline(); }} open - private xywh {10 10 510 330} box DOWN_BOX resizable + private xywh {10 10 510 330} box DOWN_BOX selection_color 4 resizable code0 {\#include } class Fl_Help_View } {} --- ./test/help.cxx Thu Jan 30 16:45:41 2003 +++ ../fltk-1.1.3/./test/help.cxx Tue Feb 25 11:41:29 2003 @@ -48,7 +48,7 @@ help = new Fl_Help_Dialog; if (argc < 2) - help->load("../documentation/index.html"); + help->load("/usr/freeware/share/doc/fltk/index.html"); else help->load(argv[1]); --- ./test/scroll.cxx Thu Jan 30 16:46:01 2003 +++ ../fltk-1.1.3/./test/scroll.cxx Tue Feb 25 13:31:09 2003 @@ -69,7 +69,7 @@ } void type_cb(Fl_Widget*, void* v) { - thescroll->type(int(v)); + thescroll->type(long(v)); thescroll->redraw(); } @@ -85,7 +85,7 @@ }; void align_cb(Fl_Widget*, void* v) { - thescroll->scrollbar.align(int(v)); + thescroll->scrollbar.align(long(v)); thescroll->redraw(); } --- ./test/input.cxx Thu Jan 30 16:45:45 2003 +++ ../fltk-1.1.3/./test/input.cxx Tue Feb 25 13:31:20 2003 @@ -59,7 +59,7 @@ void color_cb(Fl_Widget* button, void* v) { Fl_Color c; - switch ((int)v) { + switch ((long)v) { case 0: c = FL_WHITE; break; case 1: c = FL_SELECTION_COLOR; break; default: c = FL_BLACK; break; --- ./test/threads.cxx Thu Jan 30 16:46:04 2003 +++ ../fltk-1.1.3/./test/threads.cxx Tue Feb 25 12:48:48 2003 @@ -61,7 +61,7 @@ // very simple prime number calculator ! for (; ; n+= step) { int p; - int hn = (int)sqrt(n); + int hn = (int)sqrt((float)n); for (p=3; p<=hn; p+=2) if ( n%p == 0 ) break; if (p >= hn) { char s[128]; --- ./test/Makefile Thu Jan 30 16:44:46 2003 +++ ../fltk-1.1.3/./test/Makefile Tue Feb 25 11:41:29 2003 @@ -25,6 +25,12 @@ include ../makeinclude +# Override the libraries list to link with the shared versions +LINKFLTK = -L../src -lfltk +LINKFLTKGL = -L../src -lfltk_gl +LINKFLTKFORMS = -L../src -lfltk_forms -lfltk +LINKFLTKIMG = -L../src -lfltk_images -lfltk $(IMAGELIBS) + CPPFILES =\ adjuster.cxx \ arc.cxx \ --- ./test/keyboard.cxx Thu Jan 30 16:45:46 2003 +++ ../fltk-1.1.3/./test/keyboard.cxx Tue Feb 25 13:31:51 2003 @@ -103,11 +103,11 @@ for (int i = 0; i < window->children(); i++) { Fl_Widget* b = window->child(i); if (b->callback() == (Fl_Callback*)key_cb) { - int i = int(b->user_data()); + int i = long(b->user_data()); if (!i) i = b->label()[0]; ((Fl_Button*)b)->value(Fl::event_key(i)); } else if (b->callback() == (Fl_Callback*)shift_cb) { - int i = int(b->user_data()); + int i = long(b->user_data()); ((Fl_Button*)b)->value(Fl::event_state(i)); } } --- ./test/line_style.cxx Thu Jan 30 16:45:49 2003 +++ ../fltk-1.1.3/./test/line_style.cxx Tue Feb 25 13:32:18 2003 @@ -52,9 +52,9 @@ buf[3] = char(sliders[7]->value()); buf[4] = 0; fl_line_style( - (int)(choice[0]->mvalue()->user_data()) + - (int)(choice[1]->mvalue()->user_data()) + - (int)(choice[2]->mvalue()->user_data()), + (long)(choice[0]->mvalue()->user_data()) + + (long)(choice[1]->mvalue()->user_data()) + + (long)(choice[2]->mvalue()->user_data()), (int)(sliders[3]->value()), buf); fl_rect(10,10,w()-20,h()-20); --- ./test/cursor.cxx Thu Jan 30 16:45:19 2003 +++ ../fltk-1.1.3/./test/cursor.cxx Tue Feb 25 13:30:39 2003 @@ -37,7 +37,7 @@ Fl_Hor_Value_Slider *cursor_slider; void choice_cb(Fl_Widget *, void *v) { - cursor = (Fl_Cursor)(int)v; + cursor = (Fl_Cursor)(long)v; cursor_slider->value(cursor); fl_cursor(cursor,fg,bg); } --- ./fltk-config.in Thu Jan 30 16:38:21 2003 +++ ../fltk-1.1.3/./fltk-config.in Tue Feb 25 11:41:29 2003 @@ -56,7 +56,6 @@ LDLIBS="@LDFLAGS@ @LIBS@" # libraries to link with: -LIBNAME="@LIBNAME@" DSONAME="@DSONAME@" DSOLINK="@DSOLINK@" IMAGELIBS="@IMAGELIBS@" --- ./makeinclude.in Thu Jan 30 16:38:24 2003 +++ ../fltk-1.1.3/./makeinclude.in Tue Feb 25 13:33:19 2003 @@ -53,8 +53,8 @@ # flags for C++ compiler: OPTIM = @OPTIM@ -CFLAGS = $(OPTIM) @CFLAGS@ -CXXFLAGS = $(OPTIM) @CXXFLAGS@ +CFLAGS = $(OPTIM) @CFLAGS@ $(CFLAGS_MIPSPRO) +CXXFLAGS = $(OPTIM) @CXXFLAGS@ $(CFLAGS_MIPSPRO) # program to make the archive: LIBNAME = @LIBNAME@ @@ -70,8 +70,8 @@ DSOCOMMAND = @DSOCOMMAND@ # libraries to link with: -LDLIBS = @LDFLAGS@ @LIBS@ -GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ +LDLIBS = @LDFLAGS@ @LIBS@ $(LDFLAGS_MIPSPRO) +GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ $(LDFLAGS_MIPSPRO) LINKFLTK = -L../lib @LINKFLTK@ LINKFLTKGL = -L../lib @LINKFLTKGL@ LINKFLTKFORMS = -L../lib -lfltk_forms @LINKFLTK@ @@ -124,10 +124,10 @@ .man.z: echo Formatting $<... - rm -f $@ t.z - $(NROFF) -man $< >t - pack -f t - mv t.z $@ + rm -f $@ t.$<.z + $(NROFF) -man $< >t.$< + pack -f t.$< + mv t.$<.z $@ # # End of "$Id: makeinclude.in,v 1.7.2.11.2.25 2003/01/30 21:38:24 easysw Exp $".