summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFabien Costantini <fabien@onepost.net>2008-10-03 07:48:38 +0000
committerFabien Costantini <fabien@onepost.net>2008-10-03 07:48:38 +0000
commitbd882119e79d08ef2477b1db76f8a0a5735a6f93 (patch)
tree55f5f158e184b706285cdc3898f13f0b453402b4 /src
parenta95a1f01a9fccfe126f4a135596e151ea4e6cd1d (diff)
Doxygen documentation : minor comment fixes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6365 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl.cxx2
-rw-r--r--src/Fl_Dial.cxx4
-rw-r--r--src/Fl_Text_Editor.cxx2
-rw-r--r--src/Fl_get_system_colors.cxx6
-rw-r--r--src/fl_labeltype.cxx6
5 files changed, 15 insertions, 5 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx
index 12fece49d..5006ea143 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -548,7 +548,9 @@ int Fl::ready() {
////////////////////////////////////////////////////////////////
// Window list management:
+#ifndef FL_DOXYGEN
Fl_X* Fl_X::first;
+#endif
Fl_Window* fl_find(Window xid) {
Fl_X *window;
diff --git a/src/Fl_Dial.cxx b/src/Fl_Dial.cxx
index 25f471698..1b97d313f 100644
--- a/src/Fl_Dial.cxx
+++ b/src/Fl_Dial.cxx
@@ -104,8 +104,8 @@ void Fl_Dial::draw() {
}
/**
- Allow subclasses to handle event based on given position and size.
- \param[in] X, Y, W, H position and size
+ Allows subclasses to handle event based on given position and size.
+ \param[in] event, X, Y, W, H event to handle, related position and size.
*/
int Fl_Dial::handle(int event, int X, int Y, int W, int H) {
switch (event) {
diff --git a/src/Fl_Text_Editor.cxx b/src/Fl_Text_Editor.cxx
index c3fbf2fe0..2dc1359e7 100644
--- a/src/Fl_Text_Editor.cxx
+++ b/src/Fl_Text_Editor.cxx
@@ -69,7 +69,9 @@ Fl_Text_Editor::Fl_Text_Editor(int X, int Y, int W, int H, const char* l)
default_key_function(kf_default);
}
+#ifndef FL_DOXYGEN
Fl_Text_Editor::Key_Binding* Fl_Text_Editor::global_key_bindings = 0;
+#endif
// These are the default key bindings every widget should start with
static struct {
diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx
index 87af217b9..8baef3365 100644
--- a/src/Fl_get_system_colors.cxx
+++ b/src/Fl_get_system_colors.cxx
@@ -263,8 +263,10 @@ extern void fl_down_frame(int, int, int, int, Fl_Color);
extern void fl_thin_up_frame(int, int, int, int, Fl_Color);
extern void fl_thin_down_frame(int, int, int, int, Fl_Color);
-const char *Fl::scheme_ = (const char *)0; ///< current scheme
-Fl_Image *Fl::scheme_bg_ = (Fl_Image *)0; ///< current background image for the scheme
+#ifndef FL_DOXYGEN
+const char *Fl::scheme_ = (const char *)0; // current scheme
+Fl_Image *Fl::scheme_bg_ = (Fl_Image *)0; // current background image for the scheme
+#endif
static Fl_Pixmap tile(tile_xpm);
diff --git a/src/fl_labeltype.cxx b/src/fl_labeltype.cxx
index 92a0d00e9..6f7f00545 100644
--- a/src/fl_labeltype.cxx
+++ b/src/fl_labeltype.cxx
@@ -87,7 +87,11 @@ void Fl_Label::draw(int X, int Y, int W, int H, Fl_Align align) const {
if (!value && !image) return;
table[type](this, X, Y, W, H, align);
}
-/** Gets the size of the label W and H contains the calculated size at return. */
+/**
+ Measures the size of the label.
+ \param W, H in out : this is the requested size for the label text plus image;
+ on return, this will contain the size needed to fit the label
+*/
void Fl_Label::measure(int& W, int& H) const {
if (!value && !image) {
W = H = 0;