summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fl_arc.cxx2
-rw-r--r--src/fl_arci.cxx18
-rw-r--r--src/fl_ask.cxx9
-rw-r--r--src/fl_color.cxx2
4 files changed, 16 insertions, 15 deletions
diff --git a/src/fl_arc.cxx b/src/fl_arc.cxx
index 7d3872901..8284613f2 100644
--- a/src/fl_arc.cxx
+++ b/src/fl_arc.cxx
@@ -49,7 +49,7 @@ static double _fl_hypot(double x, double y) {
\param[in] x,y,r center and radius of circular arc
\param[in] start,end angles of start and end of arc measured in degrees
counter-clockwise from 3 o'clock. If \a end is less than \a start
- then it draws the ark in a clockwise direction.
+ then it draws the arc in a clockwise direction.
*/
void fl_arc(double x, double y, double r, double start, double end) {
diff --git a/src/fl_arci.cxx b/src/fl_arci.cxx
index 6e9ba744d..339fc82ae 100644
--- a/src/fl_arci.cxx
+++ b/src/fl_arci.cxx
@@ -56,9 +56,9 @@
much nicer small circles, since the small sizes are often hard-coded bitmaps.
If a complete circle is drawn it will fit inside the passed bounding box.
- The two angles are measured in degrees counterclockwise from 3'oclock and
- are the starting and ending angle of the arc, a2 must be greater or equal
- to a1.
+ The two angles are measured in degrees counterclockwise from 3 o'clock and
+ are the starting and ending angle of the arc, \a a2 must be greater or equal
+ to \a a1.
fl_arc() draws a series of lines to approximate the arc. Notice that the
integer version of fl_arc() has a different number of arguments than the
@@ -66,8 +66,8 @@
\param[in] x,y,w,h bounding box of complete circle
\param[in] a1,a2 start and end angles of arc measured in degrees
- counter-clockwise from 3 o'clock. a2 must be greater
- than or equal to a1.
+ counter-clockwise from 3 o'clock. \a a2 must be greater
+ than or equal to \a a1.
*/
void fl_arc(int x,int y,int w,int h,double a1,double a2) {
if (w <= 0 || h <= 0) return;
@@ -105,14 +105,14 @@ void fl_arc(int x,int y,int w,int h,double a1,double a2) {
/**
Draw filled ellipse sections using integer coordinates.
- Like fl_arc, but fl_pie() draws a filled-in pie slice.
- This slice may extend outside the line drawn by fl_arc;
+ Like fl_arc(), but fl_pie() draws a filled-in pie slice.
+ This slice may extend outside the line drawn by fl_arc();
to avoid this use w - 1 and h - 1.
\param[in] x,y,w,h bounding box of complete circle
\param[in] a1,a2 start and end angles of arc measured in degrees
- counter-clockwise from 3 o'clock. a2 must be greater
- than or equal to a1.
+ counter-clockwise from 3 o'clock. \a a2 must be greater
+ than or equal to \a a1.
*/
void fl_pie(int x,int y,int w,int h,double a1,double a2) {
if (w <= 0 || h <= 0) return;
diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx
index f57462673..68f61f3a3 100644
--- a/src/fl_ask.cxx
+++ b/src/fl_ask.cxx
@@ -288,7 +288,7 @@ void fl_beep(int type) {
}
#endif // WIN32
}
-/** Shows an information message dialog box
+/** Shows an information message dialog box
\param[in] fmt can be used as an sprintf-like format and variables for the message text
*/
void fl_message(const char *fmt, ...) {
@@ -391,9 +391,10 @@ const char* fl_input(const char *fmt, const char *defstr, ...) {
return r;
}
-/** Shows an input dialog displaying the \a fmt message,
- like fl_input except the input text is not shown,
- '*' characters are displayed instead
+/** Shows an input dialog displaying the \a fmt message.
+
+ Like fl_input() except the input text is not shown,
+ '*' characters are displayed instead.
\param[in] fmt can be used as an sprintf-like format and variables for the message text
\param[in] defstr defines the default returned string if no text is entered
\return the user string input if OK was pushed, NULL if Cancel was pushed
diff --git a/src/fl_color.cxx b/src/fl_color.cxx
index 1c54a3a44..9025caba1 100644
--- a/src/fl_color.cxx
+++ b/src/fl_color.cxx
@@ -408,7 +408,7 @@ void Fl::get_color(Fl_Color i, uchar &red, uchar &green, uchar &blue) {
/**
Returns the weighted average color between the two given colors.
- The red, green abd blue values are averages using the following formula:
+ The red, green and blue values are averages using the following formula:
\code
color = color1 * weight + color2 * (1 - weight)
\endcode