mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed fluid bug that caused styles patch to crash when you delete menu item. 

Changed a comment in Fl.cxx
Changed valuators demo to remove code to set value() on some widgets and
put the value into the gui box instead.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@421 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Bill Spitzak 1999-03-13 20:07:21 +00:00
parent fcaa42485f
commit 2316172e5f
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fluid/Fl_Type.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Type.cxx,v 1.6 1999/02/17 16:31:47 mike Exp $"
// "$Id: Fl_Type.cxx,v 1.6.2.1 1999/03/13 20:07:19 bill Exp $"
//
// Widget type code for the Fast Light Tool Kit (FLTK).
//
@ -465,13 +465,13 @@ void Fl_Type::open() {
void Fl_Type::setlabel(const char *) {}
Fl_Type::~Fl_Type() {
if (parent) parent->remove_child(this);
// warning: destructor only works for widgets that have been add()ed.
if (widget_browser) widget_browser->deleting(this);
if (prev) prev->next = next; else first = next;
if (next) next->prev = prev; else last = prev;
if (current == this) current = 0;
modflag = 1;
if (parent) parent->remove_child(this);
}
int Fl_Type::is_parent() const {return 0;}
@ -648,5 +648,5 @@ void Fl_Type::read_property(const char *c) {
int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
//
// End of "$Id: Fl_Type.cxx,v 1.6 1999/02/17 16:31:47 mike Exp $".
// End of "$Id: Fl_Type.cxx,v 1.6.2.1 1999/03/13 20:07:19 bill Exp $".
//

6
src/Fl.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl.cxx,v 1.24.2.1 1999/03/12 19:17:53 carl Exp $"
// "$Id: Fl.cxx,v 1.24.2.2 1999/03/13 20:07:20 bill Exp $"
//
// Main event handling code for the Fast Light Tool Kit (FLTK).
//
@ -225,7 +225,7 @@ int Fl::check() {
if (numtimeouts) {fl_elapsed(); call_timeouts();}
fl_wait(1, 0.0);
flush();
return Fl_X::first ? 1 : 0; // return 0 if no windows
return Fl_X::first != 0; // return true if there is a window
}
int Fl::ready() {
@ -682,5 +682,5 @@ int fl_old_shortcut(const char* s) {
}
//
// End of "$Id: Fl.cxx,v 1.24.2.1 1999/03/12 19:17:53 carl Exp $".
// End of "$Id: Fl.cxx,v 1.24.2.2 1999/03/13 20:07:20 bill Exp $".
//

14
test/valuators.fl
View File

@ -9,7 +9,7 @@ Function {} {open
} {
Fl_Window {} {
label {Valuator classes, showing values for type()} open
xywh {414 83 567 506} color 43 selection_color 43
xywh {370 393 567 506} color 43 selection_color 43
code0 {\#include <stdio.h>} visible
} {
Fl_Box {} {
@ -131,24 +131,22 @@ fflush(stdout);}
Fl_Dial {} {
label 0
callback {printf("%g \\r",o->value());
fflush(stdout);} selected
xywh {315 280 65 65} color 10 selection_color 1 labelsize 8
fflush(stdout);}
xywh {315 280 65 65} color 10 selection_color 1 labelsize 8 value 0.5
code0 {o->angles(0,315);}
}
Fl_Dial {} {
label FL_LINE_DIAL
callback {printf("%g \\r",o->value());
fflush(stdout);}
xywh {395 280 65 65} type Line color 10 selection_color 1 labelsize 8
code1 {o->value(0.5);}
xywh {395 280 65 65} type Line color 10 selection_color 1 labelsize 8 value 0.5
}
Fl_Dial {} {
label FL_FILL_DIAL
callback {printf("%g \\r",o->value());
fflush(stdout);}
xywh {475 280 65 65} type Fill color 10 selection_color 1 labelsize 8
fflush(stdout);} selected
xywh {475 280 65 65} type Fill color 10 selection_color 1 labelsize 8 value 1
code0 {o->angles(0,360);}
code1 {o->value(1.0);}
}
Fl_Box {} {
label Fl_Roller