Author: ianmacarthur
Date: 2010-04-02 01:53:16 -0700 (Fri, 02 Apr 2010)
New Revision: 7400
Log:
More win32 porting tweaks - still not building though...
Modified:
branches/branch-3.0/fltk3/Fl_Adjuster.H
branches/branch-3.0/fltk3/Fl_Counter.H
branches/branch-3.0/fltk3/Fl_Dial.H
branches/branch-3.0/fltk3/Fl_Roller.H
branches/branch-3.0/fltk3/Fl_Value_Output.H
branches/branch-3.0/fltk3/Valuator.h
Modified: branches/branch-3.0/fltk3/Fl_Adjuster.H
===================================================================
--- branches/branch-3.0/fltk3/Fl_Adjuster.H 2010-04-02 08:48:46 UTC (rev
7399)
+++ branches/branch-3.0/fltk3/Fl_Adjuster.H 2010-04-02 08:53:16 UTC (rev
7400)
@@ -3,7 +3,7 @@
//
// Adjuster widget header file for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2009 by Bill Spitzak and others.
+// Copyright 1998-2010 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
@@ -33,14 +33,14 @@
#ifndef Fl_Adjuster_H
#define Fl_Adjuster_H
-#ifndef fltk3::Valuator_H
+#ifndef Fltk3_Valuator_H
#include "Valuator.h"
#endif
/**
The Fl_Adjuster widget was stolen from Prisms, and has proven
to be very useful for values that need a large dynamic range.
- \image html adjuster1.gif
+ \image html adjuster1.gif
\image latex adjuster1.eps "Fl_Adjuster" width=4cm
<P>When you press a button and drag to the right the value increases.
When you drag to the left it decreases. The largest button adjusts by
Modified: branches/branch-3.0/fltk3/Fl_Counter.H
===================================================================
--- branches/branch-3.0/fltk3/Fl_Counter.H 2010-04-02 08:48:46 UTC (rev
7399)
+++ branches/branch-3.0/fltk3/Fl_Counter.H 2010-04-02 08:53:16 UTC (rev
7400)
@@ -3,7 +3,7 @@
//
// Counter header file for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2009 by Bill Spitzak and others.
+// Copyright 1998-2010 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
@@ -33,7 +33,7 @@
#ifndef Fl_Counter_H
#define Fl_Counter_H
-#ifndef fltk3::Valuator_H
+#ifndef Fltk3_Valuator_H
#include "Valuator.h"
#endif
Modified: branches/branch-3.0/fltk3/Fl_Dial.H
===================================================================
--- branches/branch-3.0/fltk3/Fl_Dial.H 2010-04-02 08:48:46 UTC (rev 7399)
+++ branches/branch-3.0/fltk3/Fl_Dial.H 2010-04-02 08:53:16 UTC (rev 7400)
@@ -3,7 +3,7 @@
//
// Dial header file for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2009 by Bill Spitzak and others.
+// Copyright 1998-2010 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
@@ -31,7 +31,7 @@
#ifndef Fl_Dial_H
#define Fl_Dial_H
-#ifndef fltk3::Valuator_H
+#ifndef Fltk3_Valuator_H
#include "Valuator.h"
#endif
@@ -43,7 +43,7 @@
/**
The Fl_Dial widget provides a circular dial to control a
single floating point value.
- <P ALIGN=CENTER>\image html dial.gif
+ <P ALIGN=CENTER>\image html dial.gif
\image latex dial.eps "Fl_Dial" width=4cm
Use type() to set the type of the dial to:
<UL>
@@ -72,7 +72,7 @@
and label string. The default type is FL_NORMAL_DIAL.
*/
Fl_Dial(int x,int y,int w,int h, const char *l = 0);
- /**
+ /**
Sets Or gets the angles used for the minimum and maximum values. The
default
values are 45 and 315 (0 degrees is straight down and the angles
progress clockwise). Normally angle1 is less than angle2, but if you
Modified: branches/branch-3.0/fltk3/Fl_Roller.H
===================================================================
--- branches/branch-3.0/fltk3/Fl_Roller.H 2010-04-02 08:48:46 UTC (rev
7399)
+++ branches/branch-3.0/fltk3/Fl_Roller.H 2010-04-02 08:53:16 UTC (rev
7400)
@@ -3,7 +3,7 @@
//
// Roller header file for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2009 by Bill Spitzak and others.
+// Copyright 1998-2010 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
@@ -31,14 +31,14 @@
#ifndef Fl_Roller_H
#define Fl_Roller_H
-#ifndef fltk3::Valuator_H
+#ifndef Fltk3_Valuator_H
#include "Valuator.h"
#endif
/**
The Fl_Roller widget is a "dolly" control commonly used to
move 3D objects.
- <P ALIGN=CENTER>\image html Fl_Roller.gif
+ <P ALIGN=CENTER>\image html Fl_Roller.gif
\image latex Fl_Roller.eps "Fl_Roller" width=4cm
*/
class FL_EXPORT Fl_Roller : public fltk3::Valuator {
Modified: branches/branch-3.0/fltk3/Fl_Value_Output.H
===================================================================
--- branches/branch-3.0/fltk3/Fl_Value_Output.H 2010-04-02 08:48:46 UTC (rev
7399)
+++ branches/branch-3.0/fltk3/Fl_Value_Output.H 2010-04-02 08:53:16 UTC (rev
7400)
@@ -3,7 +3,7 @@
//
// Value output header file for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2009 by Bill Spitzak and others.
+// Copyright 1998-2010 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
@@ -31,7 +31,7 @@
#ifndef Fl_Value_Output_H
#define Fl_Value_Output_H
-#ifndef fltk3::Valuator_H
+#ifndef Fltk3_Valuator_H
#include "Valuator.h"
#endif
@@ -39,12 +39,12 @@
The Fl_Value_Output widget displays a floating point value.
If step() is not zero, the user can adjust the value by
dragging the mouse left and right. The left button moves one step()
- per pixel, the middle by 10 * step(), and the right button by
+ per pixel, the middle by 10 * step(), and the right button by
100 * step().
- <P>This is much lighter-weight than
+ <P>This is much lighter-weight than
Fl_Value_Input because it contains no text editing code or
character buffer. </P>
- <P ALIGN=CENTER>\image html Fl_Value_Output.gif
+ <P ALIGN=CENTER>\image html Fl_Value_Output.gif
\image latex Fl_Value_Output.eps "Fl_Value_Output" width=8cm
*/
class FL_EXPORT Fl_Value_Output : public fltk3::Valuator {
Modified: branches/branch-3.0/fltk3/Valuator.h
===================================================================
--- branches/branch-3.0/fltk3/Valuator.h 2010-04-02 08:48:46 UTC (rev
7399)
+++ branches/branch-3.0/fltk3/Valuator.h 2010-04-02 08:53:16 UTC (rev
7400)
@@ -3,7 +3,7 @@
//
// Valuator header file for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2009 by Bill Spitzak and others.
+// Copyright 1998-2010 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
@@ -44,12 +44,12 @@
and provides a consistent interface to set the value, range, and step,
and insures that callbacks are done the same for every object.
<P>There are probably more of these classes in FLTK than any others:
- <P ALIGN=CENTER>\image html valuators.gif</P>
+ <P ALIGN=CENTER>\image html valuators.gif</P>
\image latex valuators.eps "Valuators derived from Valuators" width=10cm
<P>In the above diagram each box surrounds an actual subclass. These
are further differentiated by setting the type() of the widget t
- o the symbolic value labeling the widget.
- The ones labelled "0" are the default versions with a type(0).
+ o the symbolic value labeling the widget.
+ The ones labelled "0" are the default versions with a type(0).
For consistency the symbol FL_VERTICAL is defined as zero.
*/
class FL_EXPORT Valuator : public fltk3::Widget {
@@ -93,17 +93,17 @@
range. This clamping is done <I>after</I> rounding to the step
value (this makes a difference if the range is not a multiple of
the step).
-
+
<P>The minimum may be greater than the maximum. This has the
effect of "reversing" the object so the larger values
are in the opposite direction. This also switches which end of
the filled sliders is filled.</P>
-
+
<P>Some widgets consider this a "soft" range. This
means they will stop at the range, but if the user releases and
grabs the control again and tries to move it further, it is
allowed.</P>
-
+
<P>The range may affect the display. You must redraw()
the widget after changing the range.
*/
@@ -118,7 +118,7 @@
value is rounded to the nearest multiple of the step value. This
is done <I>before</I> clamping it to the range. For most widgets
the default step is zero.
-
+
<P>For precision the step is stored as the ratio of two
integers, A/B. You can set these integers directly. Currently
setting a floating point value sets the nearest A/1 or 1/B value
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
