Commit 3cca078e authored by Aaron M. Ucko's avatar Aaron M. Ucko

[svn-upgrade] Integrating new upstream version, fltk1.1 (1.1.8~r5891)

parent 9b5d5801
...@@ -3,6 +3,8 @@ CHANGES IN FLTK 1.1.8 ...@@ -3,6 +3,8 @@ CHANGES IN FLTK 1.1.8
- Documentation fixes (STR #1454, STR #1455, STR #1456, - Documentation fixes (STR #1454, STR #1455, STR #1456,
STR #1457, STR #1458, STR #1460, STR #1481, STR #1578, STR #1457, STR #1458, STR #1460, STR #1481, STR #1578,
STR #1639, STR #1645, STR #1644) STR #1639, STR #1645, STR #1644)
- Fixed rendering of grayscale images with alpha
channel (STR #1703)
- Fixed occasional incomplete refresh (STR #1681) - Fixed occasional incomplete refresh (STR #1681)
- Improved fl_down, fl_frame, added fl_box (STR #1678) - Improved fl_down, fl_frame, added fl_box (STR #1678)
- Fixed selection of submenu items in - Fixed selection of submenu items in
......
// //
// "$Id: Fl.H 5749 2007-03-20 10:41:14Z matt $" // "$Id: Fl.H 5848 2007-05-20 16:18:31Z mike $"
// //
// Main header file for the Fast Light Tool Kit (FLTK). // Main header file for the Fast Light Tool Kit (FLTK).
// //
...@@ -212,11 +212,11 @@ public: ...@@ -212,11 +212,11 @@ public:
// multi-head support: // multi-head support:
static int screen_count(); static int screen_count();
static void screen_xywh(int &x, int &y, int &w, int &h) { static void screen_xywh(int &X, int &Y, int &W, int &H) {
screen_xywh(x, y, w, h, e_x_root, e_y_root); screen_xywh(X, Y, W, H, e_x_root, e_y_root);
} }
static void screen_xywh(int &x, int &y, int &w, int &h, int mx, int my); static void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my);
static void screen_xywh(int &x, int &y, int &w, int &h, int n); static void screen_xywh(int &X, int &Y, int &W, int &H, int n);
// color map: // color map:
static void set_color(Fl_Color, uchar, uchar, uchar); static void set_color(Fl_Color, uchar, uchar, uchar);
...@@ -289,5 +289,5 @@ public: ...@@ -289,5 +289,5 @@ public:
#endif // !Fl_H #endif // !Fl_H
// //
// End of "$Id: Fl.H 5749 2007-03-20 10:41:14Z matt $". // End of "$Id: Fl.H 5848 2007-05-20 16:18:31Z mike $".
// //
...@@ -62,12 +62,19 @@ class Fl_Input_Choice : public Fl_Group { ...@@ -62,12 +62,19 @@ class Fl_Input_Choice : public Fl_Group {
const Fl_Menu_Item *item = o->menubutton()->mvalue(); const Fl_Menu_Item *item = o->menubutton()->mvalue();
if ( item && item->flags & (FL_SUBMENU|FL_SUBMENU_POINTER) ) return; // ignore submenus if ( item && item->flags & (FL_SUBMENU|FL_SUBMENU_POINTER) ) return; // ignore submenus
o->inp_->value(o->menu_->text()); o->inp_->value(o->menu_->text());
o->inp_->set_changed();
o->do_callback(); o->do_callback();
} }
static void inp_cb(Fl_Widget*, void *data) { static void inp_cb(Fl_Widget*, void *data) {
Fl_Input_Choice *o=(Fl_Input_Choice *)data; Fl_Input_Choice *o=(Fl_Input_Choice *)data;
if (o->inp_->changed())
o->Fl_Widget::set_changed();
else
o->Fl_Widget::clear_changed();
o->do_callback(); o->do_callback();
if (o->callback() != default_callback)
o->Fl_Widget::clear_changed();
} }
// Custom resize behavior -- input stretches, menu button doesn't // Custom resize behavior -- input stretches, menu button doesn't
...@@ -99,7 +106,15 @@ public: ...@@ -99,7 +106,15 @@ public:
menu_->add(s); menu_->add(s);
} }
int changed() const { int changed() const {
return inp_->changed(); return inp_->changed() | Fl_Widget::changed();
}
void clear_changed() {
inp_->clear_changed();
Fl_Widget::clear_changed();
}
void set_changed() {
inp_->set_changed();
// no need to call Fl_Widget::set_changed()
} }
void clear() { void clear() {
menu_->clear(); menu_->clear();
......
// //
// "$Id: glut.H 5715 2007-02-25 00:05:06Z matt $" // "$Id: glut.H 5889 2007-06-07 17:28:43Z matt $"
// //
// GLUT emulation header file for the Fast Light Tool Kit (FLTK). // GLUT emulation header file for the Fast Light Tool Kit (FLTK).
// //
...@@ -35,12 +35,6 @@ ...@@ -35,12 +35,6 @@
// Although I have copied the GLUT API, none of my code is based on // Although I have copied the GLUT API, none of my code is based on
// any GLUT implementation details and is therefore covered by the LGPL. // any GLUT implementation details and is therefore covered by the LGPL.
// FLTK does not include the GLUT drawing functions (such as
// glutWireTeapot()) or the stroke fonts but the declarations for the
// drawing functions are included here because otherwise there is no
// way to get them along with this. To use them you will have to
// link in the original GLUT library, put -lglut *after* -lfltk.
// Commented out lines indicate parts of GLUT that are not emulated. // Commented out lines indicate parts of GLUT that are not emulated.
#ifndef Fl_glut_H #ifndef Fl_glut_H
...@@ -489,5 +483,5 @@ FL_EXPORT void glutSolidIcosahedron(); ...@@ -489,5 +483,5 @@ FL_EXPORT void glutSolidIcosahedron();
#endif // !Fl_glut_H #endif // !Fl_glut_H
// //
// End of "$Id: glut.H 5715 2007-02-25 00:05:06Z matt $". // End of "$Id: glut.H 5889 2007-06-07 17:28:43Z matt $".
// //
...@@ -11615,6 +11615,12 @@ if test -n "$GCC"; then ...@@ -11615,6 +11615,12 @@ if test -n "$GCC"; then
# The following additional warnings are useful for tracking down problems... # The following additional warnings are useful for tracking down problems...
#OPTIM="-Wshadow -Wconversion $OPTIM" #OPTIM="-Wshadow -Wconversion $OPTIM"
# We know that Carbon is deprecated on OS X 10.4. To avoid hundreds of warnings
# we will temporarily disable 'deprecated' warnings on OS X.
if test "$uname" = "Darwin" -a $uversion -ge 800; then
OPTIM="-Wno-deprecated-declarations $OPTIM"
fi
# Set the default compiler optimizations... # Set the default compiler optimizations...
if test -z "$DEBUGFLAG"; then if test -z "$DEBUGFLAG"; then
# #
......
dnl -*- sh -*- dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf" dnl the "configure" script is made from this by running GNU "autoconf"
dnl dnl
dnl "$Id: configure.in 5830 2007-05-14 19:35:32Z mike $" dnl "$Id: configure.in 5849 2007-05-20 16:32:37Z matt $"
dnl dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl dnl
...@@ -889,6 +889,12 @@ if test -n "$GCC"; then ...@@ -889,6 +889,12 @@ if test -n "$GCC"; then
# The following additional warnings are useful for tracking down problems... # The following additional warnings are useful for tracking down problems...
#OPTIM="-Wshadow -Wconversion $OPTIM" #OPTIM="-Wshadow -Wconversion $OPTIM"
# We know that Carbon is deprecated on OS X 10.4. To avoid hundreds of warnings
# we will temporarily disable 'deprecated' warnings on OS X.
if test "$uname" = "Darwin" -a $uversion -ge 800; then
OPTIM="-Wno-deprecated-declarations $OPTIM"
fi
# Set the default compiler optimizations... # Set the default compiler optimizations...
if test -z "$DEBUGFLAG"; then if test -z "$DEBUGFLAG"; then
# #
...@@ -1071,5 +1077,5 @@ dnl Make sure the fltk-config script is executable... ...@@ -1071,5 +1077,5 @@ dnl Make sure the fltk-config script is executable...
chmod +x fltk-config chmod +x fltk-config
dnl dnl
dnl End of "$Id: configure.in 5830 2007-05-14 19:35:32Z mike $". dnl End of "$Id: configure.in 5849 2007-05-20 16:32:37Z matt $".
dnl dnl
...@@ -201,7 +201,7 @@ const char *filter()</A></H4> ...@@ -201,7 +201,7 @@ const char *filter()</A></H4>
<P>Sets or gets the current filename filter patterns. The filter <P>Sets or gets the current filename filter patterns. The filter
patterns use <A patterns use <A
href="#fl_filename_match"><tt>fl_filename_match()</tt></A>. href="functions.html#fl_filename_match"><tt>fl_filename_match()</tt></A>.
Multiple patterns can be used by separating them with tabs, like Multiple patterns can be used by separating them with tabs, like
"*.jpg\t*.png\t*.gif\t*". In addition, you can provide "*.jpg\t*.png\t*.gif\t*". In addition, you can provide
human-readable labels with the patterns inside parenthesis, like human-readable labels with the patterns inside parenthesis, like
......
...@@ -86,7 +86,7 @@ The filename can also contain a target name ("filename.html#target"). ...@@ -86,7 +86,7 @@ The filename can also contain a target name ("filename.html#target").
<P>Shows the <code>Fl_Help_Dialog</code> window. <P>Shows the <code>Fl_Help_Dialog</code> window.
<H4><A NAME="Fl_Help_Dialog.topline">void textsize(uchar s)<BR> <H4><A NAME="Fl_Help_Dialog.textsize">void textsize(uchar s)<BR>
uchar textsize()</A></H4> uchar textsize()</A></H4>
<P>Sets or gets the default text size for the help view. <P>Sets or gets the default text size for the help view.
......
...@@ -455,7 +455,7 @@ the list with <tt>fl_vertex</tt>. ...@@ -455,7 +455,7 @@ the list with <tt>fl_vertex</tt>.
<P>Start and end drawing a closed sequence of lines. <P>Start and end drawing a closed sequence of lines.
<H4><A NAME= fl_begin_polygon>void fl_begin_polygon() <H4><A NAME=fl_begin_polygon>void fl_begin_polygon()
<BR>void fl_end_polygon()</A></H4> <BR>void fl_end_polygon()</A></H4>
<P>Start and end drawing a convex filled polygon. <P>Start and end drawing a convex filled polygon.
......
...@@ -279,11 +279,11 @@ A</A>. ...@@ -279,11 +279,11 @@ A</A>.
<LI><A HREF="drawing.html#fl_delete_offscreen"><TT>fl_delete_offscreen</TT></A></LI> <LI><A HREF="drawing.html#fl_delete_offscreen"><TT>fl_delete_offscreen</TT></A></LI>
<LI><A HREF="drawing.html#fl_end_offscreen"><TT>fl_end_offscreen</TT></A></LI> <LI><A HREF="drawing.html#fl_end_offscreen"><TT>fl_end_offscreen</TT></A></LI>
</UL> </UL>
</ul> </UL>
</LI> </LI>
</UL> </UL>
<UL> <UL>
<LI>Dialog Functions <LI>Dialog Functions
<UL> <UL>
...@@ -352,7 +352,7 @@ A</A>. ...@@ -352,7 +352,7 @@ A</A>.
<LI><A HREF="osissues.html#fl_xid"><TT>fl_xid</TT></A></LI> <LI><A HREF="osissues.html#fl_xid"><TT>fl_xid</TT></A></LI>
<LI><A HREF="osissues.html#fl_xpixel"><TT>fl_xpixel</TT></A></LI> <LI><A HREF="osissues.html#fl_xpixel"><TT>fl_xpixel</TT></A></LI>
</UL> </UL>
</UL>
</td> </td>
</table> </table>
...@@ -637,7 +637,7 @@ which color provides the best contrast. ...@@ -637,7 +637,7 @@ which color provides the best contrast.
<H3>Prototype</H3> <H3>Prototype</H3>
<UL><PRE> <UL><PRE>
Fl_Color fl_cursor(Fl_Cursor cursor, Fl_Color fg, Fl_Color bg); void fl_cursor(Fl_Cursor cursor, Fl_Color fg, Fl_Color bg);
</PRE></UL> </PRE></UL>
<H3>Description</H3> <H3>Description</H3>
......
...@@ -619,6 +619,12 @@ version of FLTK: ...@@ -619,6 +619,12 @@ version of FLTK:
doesn't work, and the main window title bar turns gray doesn't work, and the main window title bar turns gray
while menus are popped up.</LI> while menus are popped up.</LI>
<LI>Compilation with <TT>gcc 3.4.4</TT> and <TT>-Os</TT> exposes an
optimisation bug in gcc. The symptom is that when drawing
filled circles only the perimeter is drawn. This can for instance
be seen in the symbols demo. Other optimisation options such
as -O2 and -O3 seem to work OK. More details can be found
in STR#1656 </LI>
</UL> </UL>
<H2>The MacOS Interface</h2> <H2>The MacOS Interface</h2>
......
...@@ -47,6 +47,8 @@ HREF="license.html">Appendix A</A>.</B> ...@@ -47,6 +47,8 @@ HREF="license.html">Appendix A</A>.</B>
<LI><A HREF="fluid.html#FLUID">Chapter 9 - Programming With FLUID</A></LI> <LI><A HREF="fluid.html#FLUID">Chapter 9 - Programming With FLUID</A></LI>
<LI><A HREF="advanced.html#advanced">Chapter 10 - Advanced FLTK</A></LI>
<LI><A HREF="widgets.html#widgets">Appendix A - Class Reference</A></LI> <LI><A HREF="widgets.html#widgets">Appendix A - Class Reference</A></LI>
<LI><A HREF="functions.html#functions">Appendix B - Function Reference</A></LI> <LI><A HREF="functions.html#functions">Appendix B - Function Reference</A></LI>
...@@ -95,7 +97,7 @@ HREF="license.html">Appendix A</A>.</B> ...@@ -95,7 +97,7 @@ HREF="license.html">Appendix A</A>.</B>
<DD>The Microsoft Windows 32-bit Application Programmer's Interface.</DD> <DD>The Microsoft Windows 32-bit Application Programmer's Interface.</DD>
<DT>MacOS</DT> <DT>MacOS</DT>
<DD>The Apple Macintosh OS 8.6 and later, including OS X.<DD> <DD>The Apple Macintosh OS 8.6 and later, including OS X.</DD>
</DL> </DL>
......
// //
// "$Id: Fl_Group_Type.cxx 5609 2007-01-18 11:28:47Z matt $" // "$Id: Fl_Group_Type.cxx 5845 2007-05-20 00:01:06Z mike $"
// //
// Fl_Group object code for the Fast Light Tool Kit (FLTK). // Fl_Group object code for the Fast Light Tool Kit (FLTK).
// //
...@@ -230,7 +230,7 @@ void Fl_Group_Type::move_child(Fl_Type* cc, Fl_Type* before) { ...@@ -230,7 +230,7 @@ void Fl_Group_Type::move_child(Fl_Type* cc, Fl_Type* before) {
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
// live mode support // live mode support
Fl_Widget *Fl_Group_Type::enter_live_mode(int top) { Fl_Widget *Fl_Group_Type::enter_live_mode(int) {
Fl_Group *grp = new Fl_Group(o->x(), o->y(), o->w(), o->h()); Fl_Group *grp = new Fl_Group(o->x(), o->y(), o->w(), o->h());
live_widget = grp; live_widget = grp;
if (live_widget) { if (live_widget) {
...@@ -245,7 +245,7 @@ Fl_Widget *Fl_Group_Type::enter_live_mode(int top) { ...@@ -245,7 +245,7 @@ Fl_Widget *Fl_Group_Type::enter_live_mode(int top) {
return live_widget; return live_widget;
} }
Fl_Widget *Fl_Tabs_Type::enter_live_mode(int top) { Fl_Widget *Fl_Tabs_Type::enter_live_mode(int) {
Fl_Tabs *grp = new Fl_Tabs(o->x(), o->y(), o->w(), o->h()); Fl_Tabs *grp = new Fl_Tabs(o->x(), o->y(), o->w(), o->h());
live_widget = grp; live_widget = grp;
if (live_widget) { if (live_widget) {
...@@ -278,7 +278,7 @@ void Fl_Group_Type::copy_properties() { ...@@ -278,7 +278,7 @@ void Fl_Group_Type::copy_properties() {
const char scroll_type_name[] = "Fl_Scroll"; const char scroll_type_name[] = "Fl_Scroll";
Fl_Widget *Fl_Scroll_Type::enter_live_mode(int top) { Fl_Widget *Fl_Scroll_Type::enter_live_mode(int) {
Fl_Group *grp = new Fl_Scroll(o->x(), o->y(), o->w(), o->h()); Fl_Group *grp = new Fl_Scroll(o->x(), o->y(), o->w(), o->h());
grp->show(); grp->show();
live_widget = grp; live_widget = grp;
...@@ -326,5 +326,5 @@ void Fl_Tile_Type::copy_properties() { ...@@ -326,5 +326,5 @@ void Fl_Tile_Type::copy_properties() {
} }
// //
// End of "$Id: Fl_Group_Type.cxx 5609 2007-01-18 11:28:47Z matt $". // End of "$Id: Fl_Group_Type.cxx 5845 2007-05-20 00:01:06Z mike $".
// //
// //
// "$Id: Fl_Type.cxx 5808 2007-05-10 12:06:31Z matt $" // "$Id: Fl_Type.cxx 5845 2007-05-20 00:01:06Z mike $"
// //
// Widget type code for the Fast Light Tool Kit (FLTK). // Widget type code for the Fast Light Tool Kit (FLTK).
// //
...@@ -848,7 +848,7 @@ int Fl_Type::read_fdesign(const char*, const char*) {return 0;} ...@@ -848,7 +848,7 @@ int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
* \return a widget pointer that the live mode initiator can 'show()' * \return a widget pointer that the live mode initiator can 'show()'
* \see leave_live_mode() * \see leave_live_mode()
*/ */
Fl_Widget *Fl_Type::enter_live_mode(int top) { Fl_Widget *Fl_Type::enter_live_mode(int) {
return 0L; return 0L;
} }
...@@ -866,5 +866,5 @@ void Fl_Type::copy_properties() { ...@@ -866,5 +866,5 @@ void Fl_Type::copy_properties() {
} }
// //
// End of "$Id: Fl_Type.cxx 5808 2007-05-10 12:06:31Z matt $". // End of "$Id: Fl_Type.cxx 5845 2007-05-20 00:01:06Z mike $".
// //
// //
// "$Id: Fl_Widget_Type.cxx 5808 2007-05-10 12:06:31Z matt $" // "$Id: Fl_Widget_Type.cxx 5845 2007-05-20 00:01:06Z mike $"
// //
// Widget type code for the Fast Light Tool Kit (FLTK). // Widget type code for the Fast Light Tool Kit (FLTK).
// //
...@@ -1689,7 +1689,7 @@ void overlay_cb(Fl_Button*o,void *v) { ...@@ -1689,7 +1689,7 @@ void overlay_cb(Fl_Button*o,void *v) {
void leave_live_mode_cb(Fl_Widget*, void*); void leave_live_mode_cb(Fl_Widget*, void*);
void live_mode_cb(Fl_Button*o,void *v) { void live_mode_cb(Fl_Button*o,void *) {
/// \todo live mode should end gracefully when the application quits /// \todo live mode should end gracefully when the application quits
/// or when the user closes the live widget /// or when the user closes the live widget
static Fl_Type *live_type = 0L; static Fl_Type *live_type = 0L;
...@@ -2620,7 +2620,7 @@ void leave_live_mode_cb(Fl_Widget*, void*) { ...@@ -2620,7 +2620,7 @@ void leave_live_mode_cb(Fl_Widget*, void*) {
live_mode_cb(0, 0); live_mode_cb(0, 0);
} }
Fl_Widget *Fl_Widget_Type::enter_live_mode(int top) { Fl_Widget *Fl_Widget_Type::enter_live_mode(int) {
live_widget = widget(o->x(), o->y(), o->w(), o->h()); live_widget = widget(o->x(), o->y(), o->w(), o->h());
if (live_widget) if (live_widget)
copy_properties(); copy_properties();
...@@ -2705,5 +2705,5 @@ void Fl_Pack_Type::copy_properties() ...@@ -2705,5 +2705,5 @@ void Fl_Pack_Type::copy_properties()
} }
// //
// End of "$Id: Fl_Widget_Type.cxx 5808 2007-05-10 12:06:31Z matt $". // End of "$Id: Fl_Widget_Type.cxx 5845 2007-05-20 00:01:06Z mike $".
// //
// //
// "$Id: Fl_Window_Type.cxx 5808 2007-05-10 12:06:31Z matt $" // "$Id: Fl_Window_Type.cxx 5845 2007-05-20 00:01:06Z mike $"
// //
// Window type code for the Fast Light Tool Kit (FLTK). // Window type code for the Fast Light Tool Kit (FLTK).
// //
...@@ -1482,7 +1482,7 @@ void Fl_Widget_Class_Type::write_code2() { ...@@ -1482,7 +1482,7 @@ void Fl_Widget_Class_Type::write_code2() {
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
// live mode support // live mode support
Fl_Widget *Fl_Window_Type::enter_live_mode(int top) { Fl_Widget *Fl_Window_Type::enter_live_mode(int) {
Fl_Window *win = new Fl_Window(o->x(), o->y(), o->w(), o->h()); Fl_Window *win = new Fl_Window(o->x(), o->y(), o->w(), o->h());
live_widget = win; live_widget = win;
if (live_widget) { if (live_widget) {
...@@ -1510,5 +1510,5 @@ void Fl_Window_Type::copy_properties() { ...@@ -1510,5 +1510,5 @@ void Fl_Window_Type::copy_properties() {
// //
// End of "$Id: Fl_Window_Type.cxx 5808 2007-05-10 12:06:31Z matt $". // End of "$Id: Fl_Window_Type.cxx 5845 2007-05-20 00:01:06Z mike $".
// //
// //
// "$Id: align_widget.cxx 4561 2005-09-09 11:36:36Z matt $" // "$Id: align_widget.cxx 5845 2007-05-20 00:01:06Z mike $"
// //
// Alignment code for the Fast Light Tool Kit (FLTK). // Alignment code for the Fast Light Tool Kit (FLTK).
// //
...@@ -521,7 +521,7 @@ void widget_size_cb(Fl_Widget *, long size) { ...@@ -521,7 +521,7 @@ void widget_size_cb(Fl_Widget *, long size) {
} }
Fl_Widget *w = ((Fl_Widget_Type *)o)->o; Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
w->labelsize(size); w->labelsize((uchar)size);
Fl_Font f; Fl_Font f;
int s = (int)size; int s = (int)size;
Fl_Color c; Fl_Color c;
...@@ -536,6 +536,6 @@ void widget_size_cb(Fl_Widget *, long size) { ...@@ -536,6 +536,6 @@ void widget_size_cb(Fl_Widget *, long size) {
// //
// End of "$Id: align_widget.cxx 4561 2005-09-09 11:36:36Z matt $". // End of "$Id: align_widget.cxx 5845 2007-05-20 00:01:06Z mike $".
// //
// //
// "$Id: function_panel.cxx 5440 2006-09-17 18:31:35Z matt $" // "$Id: function_panel.cxx 5845 2007-05-20 00:01:06Z mike $"
// //
// Code dialogs for the Fast Light Tool Kit (FLTK). // Code dialogs for the Fast Light Tool Kit (FLTK).
// //
...@@ -483,7 +483,7 @@ Fl_Double_Window* make_comment_panel() { ...@@ -483,7 +483,7 @@ Fl_Double_Window* make_comment_panel() {
return comment_panel; return comment_panel;
} }
void type_make_cb(Fl_Widget*w,void*d) { void type_make_cb(Fl_Widget*,void*d) {
undo_checkpoint(); undo_checkpoint();
Fl_Type *t = Fl_Type_make((char*)d); Fl_Type *t = Fl_Type_make((char*)d);
if (t) { if (t) {
...@@ -499,7 +499,7 @@ void type_make_cb(Fl_Widget*w,void*d) { ...@@ -499,7 +499,7 @@ void type_make_cb(Fl_Widget*w,void*d) {
Fl_Window *widgetbin_panel=(Fl_Window *)0; Fl_Window *widgetbin_panel=(Fl_Window *)0;
Fl_Window* make_widgetbin() { Fl_Window* make_widgetbin() {
{ widgetbin_panel = new Fl_Window(551, 85, "Widget Bin"); { widgetbin_panel = new Fl_Window(550, 85, "Widget Bin");
widgetbin_panel->align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE); widgetbin_panel->align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE);
{ Fl_Group* o = new Fl_Group(3, 3, 79, 79); { Fl_Group* o = new Fl_Group(3, 3, 79, 79);
{ Fl_Button* o = new Fl_Button(5, 5, 24, 24); { Fl_Button* o = new Fl_Button(5, 5, 24, 24);
...@@ -914,5 +914,5 @@ Fl_Double_Window* make_sourceview() { ...@@ -914,5 +914,5 @@ Fl_Double_Window* make_sourceview() {
} }
// //
// End of "$Id: function_panel.cxx 5440 2006-09-17 18:31:35Z matt $". // End of "$Id: function_panel.cxx 5845 2007-05-20 00:01:06Z mike $".
// //
...@@ -3,7 +3,7 @@ version 1.0108 ...@@ -3,7 +3,7 @@ version 1.0108
header_name {.h} header_name {.h}
code_name {.cxx} code_name {.cxx}
comment {// comment {//
// "$Id: function_panel.fl 5440 2006-09-17 18:31:35Z matt $" // "$Id: function_panel.fl 5845 2007-05-20 00:01:06Z mike $"
// //
// Code dialogs for the Fast Light Tool Kit (FLTK). // Code dialogs for the Fast Light Tool Kit (FLTK).
// //
...@@ -125,7 +125,7 @@ Function {make_code_panel()} {open ...@@ -125,7 +125,7 @@ Function {make_code_panel()} {open
Function {make_codeblock_panel()} {open Function {make_codeblock_panel()} {open
} { } {
Fl_Window codeblock_panel { Fl_Window codeblock_panel {
label {Code Block Properties} label {Code Block Properties} selected
xywh {468 221 300 115} type Double labelsize 11 hide resizable xywh {468 221 300 115} type Double labelsize 11 hide resizable
code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal
} { } {
...@@ -339,7 +339,7 @@ Function {make_comment_panel()} {open ...@@ -339,7 +339,7 @@ Function {make_comment_panel()} {open
} }
} }
Function {type_make_cb(Fl_Widget*w,void*d)} {open return_type void Function {type_make_cb(Fl_Widget*,void*d)} {open return_type void
} { } {
code {undo_checkpoint(); code {undo_checkpoint();
Fl_Type *t = Fl_Type_make((char*)d); Fl_Type *t = Fl_Type_make((char*)d);
...@@ -356,8 +356,8 @@ Function {type_make_cb(Fl_Widget*w,void*d)} {open return_type void ...@@ -356,8 +356,8 @@ Function {type_make_cb(Fl_Widget*w,void*d)} {open return_type void
Function {make_widgetbin()} {open Function {make_widgetbin()} {open
} { } {
Fl_Window widgetbin_panel { Fl_Window widgetbin_panel {
label {Widget Bin} selected label {Widget Bin}
xywh {411 171 551 85} type Single align 80 non_modal visible xywh {411 171 550 85} type Single align 80 non_modal visible
} { } {
Fl_Group {} { Fl_Group {} {
xywh {3 3 79 79} xywh {3 3 79 79}
...@@ -751,6 +751,6 @@ Function {make_sourceview()} {open ...@@ -751,6 +751,6 @@ Function {make_sourceview()} {open
comment { comment {
// //
// End of "$Id: function_panel.fl 5440 2006-09-17 18:31:35Z matt $". // End of "$Id: function_panel.fl 5845 2007-05-20 00:01:06Z mike $".
//} {in_source in_header //} {in_source in_header
} }
// //
// "$Id: function_panel.h 5440 2006-09-17 18:31:35Z matt $" // "$Id: function_panel.h 5845 2007-05-20 00:01:06Z mike $"
// //
// Code dialogs for the Fast Light Tool Kit (FLTK). // Code dialogs for the Fast Light Tool Kit (FLTK).
// //
...@@ -88,7 +88,7 @@ extern Fl_Light_Button *comment_in_header; ...@@ -88,7 +88,7 @@ extern Fl_Light_Button *comment_in_header;
extern Fl_Menu_Button *comment_predefined; extern Fl_Menu_Button *comment_predefined;
extern Fl_Button *comment_load; extern Fl_Button *comment_load;
Fl_Double_Window* make_comment_panel(); Fl_Double_Window* make_comment_panel();
void type_make_cb(Fl_Widget*w,void*d); void type_make_cb(Fl_Widget*,void*d);
#include <FL/Fl_Window.H> #include <FL/Fl_Window.H>
extern Fl_Window *widgetbin_panel; extern Fl_Window *widgetbin_panel;
extern void type_make_cb(Fl_Button*, void*); extern void type_make_cb(Fl_Button*, void*);
...@@ -108,5 +108,5 @@ Fl_Double_Window* make_sourceview(); ...@@ -108,5 +108,5 @@ Fl_Double_Window* make_sourceview();
#endif #endif
// //
// End of "$Id: function_panel.h 5440 2006-09-17 18:31:35Z matt $". // End of "$Id: function_panel.h 5845 2007-05-20 00:01:06Z mike $".
// //
# #
# "$Id: Makefile.mingw 4052 2005-02-24 21:55:12Z mike $" # "$Id: Makefile.mingw 5844 2007-05-18 19:04:14Z matt $"
# #
# Top-level makefile for the Fast Light Tool Kit (FLTK). # Top-level makefile for the Fast Light Tool Kit (FLTK).
# #
# Copyright 1998-2001 by Bill Spitzak and others. # Copyright 1998-2006 by Bill Spitzak and others.
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public # modify it under the terms of the GNU Library General Public
...@@ -20,95 +20,99 @@ ...@@ -20,95 +20,99 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA. # USA.
# #
# Please report all bugs and problems to "fltk-bugs@fltk.org". # Please report all bugs and problems on the following page:
# #
# http://www.fltk.org/str.php
# By default use a Un*x-style shell
#
# uncomment next line to use NT command shell
# SHELL=cmd.exe
#
# or uncomment next line to explicitly use a unix-compatible shell
# SHELL=sh.exe
#
# If we are using a Un*x-based make, make sure the environmental var is set
# set MAKE_MODE=unix
#
# By default, a Un*x style make is assumed, so towards the bottom of this
# file filenames are copied with 'cp' and use forward slashes throughout
# in filepaths.
# #
# Changing to a Windows-based command line would require 'cp' replaced with
# a local equivalent ('copy' is OK) and potentially for forward-slashes in include makeinclude
# filepaths to be replaced by back-slashes.
DIRS = $(IMAGEDIRS) src fluid test documentation
all: makeinclude config.h all: makeinclude
echo "=== making zlib ===" for dir in $(DIRS); do\
touch zlib/makedepend echo "=== making $$dir ===";\
cd zlib ; $(MAKE) (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\