Skip to content

Commit

Permalink
Wrong attribute fixed in Doxygen.
Browse files Browse the repository at this point in the history
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6158 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
Matthias Melcher committed Aug 12, 2008
1 parent 478d976 commit 797f635
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Expand Up @@ -1022,7 +1022,7 @@ INCLUDE_FILE_PATTERNS =
# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.

PREDEFINED = FL_EXPORT:=
PREDEFINED = FL_DOXYGEN FL_EXPORT:=

# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
Expand Down
13 changes: 7 additions & 6 deletions FL/Fl_Widget.H
Expand Up @@ -44,6 +44,7 @@ typedef Fl_Callback* Fl_Callback_p; // needed for BORLAND
typedef void (Fl_Callback0)(Fl_Widget*);
typedef void (Fl_Callback1)(Fl_Widget*, long);


/** This struct stores all information for a text or mixed graphics label.
*
* \todo For FLTK1.3, the Fl_Label type will become a widget by itself. That way
Expand All @@ -69,10 +70,10 @@ struct FL_EXPORT Fl_Label {
/** draw the leabel aligned to the given box */
void draw(int,int,int,int, Fl_Align) const ;
/** measure the size of the label.
* \param[inout] w, h on input, this is the requested size for the label text plus image;
* \param w, h on input, this is the requested size for the label text plus image;
* on return, this will contain the size needed to fit the label
*/
void measure(int&, int&) const ;
void measure(int &w, int &h) const ;
};


Expand Down Expand Up @@ -256,7 +257,7 @@ public:
/** Change the size of the widget.
* size(w,h) is a shortcut for resize(x(),y(),w,h).
*
* \param[in] w, h new size
* \param[in] W, H new size
* \see position(int, int), resize(int, int, int, int)
*/
void size(int W,int H) {resize(x_,y_,W,H);}
Expand Down Expand Up @@ -343,7 +344,7 @@ public:
* The label is shown somewhere on or next to the widget. The passed pointer
* is stored unchanged in the widget (the string is \em not copied), so if
* you need to set the label to a formatted value, make sure the buffer is
* \code static, global, or allocated. The copy_label() method can be used
* <tt>static</tt>, global, or allocated. The copy_label() method can be used
* to make a copy of the label string automatically.
* \param[in] text pointer to new label text
* \see copy_label()
Expand Down Expand Up @@ -713,7 +714,7 @@ public:
*/
int visible_focus() { return flags_ & VISIBLE_FOCUS; }

/** Sets the default callback for all widgets..
/** Sets the default callback for all widgets.
* Sets the default callback, which puts a pointer to the widget on the queue
* returned by Fl::readqueue(). You may want to call this from your own callback.
* \param cb the new callback
Expand Down Expand Up @@ -757,7 +758,7 @@ public:
/** Checks if w is a child of this widget.
* \param[in] w potential child widget
* \return Returns 1 if \em w is a child of this widget, or is
* equal to this widget. Returns 0 if \en w is NULL.
* equal to this widget. Returns 0 if \em w is NULL.
*/
int contains(const Fl_Widget *w) const ;

Expand Down

0 comments on commit 797f635

Please sign in to comment.