diff options
| -rw-r--r-- | FL/Fl_Cairo.H | 5 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 4 | ||||
| -rw-r--r-- | src/Fl.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_Dial.cxx | 4 | ||||
| -rw-r--r-- | src/Fl_Text_Editor.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_get_system_colors.cxx | 6 | ||||
| -rw-r--r-- | src/fl_labeltype.cxx | 6 |
7 files changed, 18 insertions, 11 deletions
diff --git a/FL/Fl_Cairo.H b/FL/Fl_Cairo.H index 3793b669f..73ea07c34 100644 --- a/FL/Fl_Cairo.H +++ b/FL/Fl_Cairo.H @@ -68,8 +68,9 @@ public: // access attributes cairo_t* cc() const {return cc_;} ///< Gets the current cairo context - bool autolink() const {return autolink_;} ///< Sets the autolink option \see Fl::cairo_autolink_context(bool) - void cc(cairo_t* c, bool own=true) { ///< Sets the current cairo context, \a own indicates cc deletion is made by us + bool autolink() const {return autolink_;} ///< Sets the autolink option. See Fl::cairo_autolink_context(bool) + /** Sets the current cairo context, \a own indicates cc deletion is handle externally by user */ + void cc(cairo_t* c, bool own=true) { if (cc_ && own_cc_) cairo_destroy(cc_); cc_=c; if (!cc_) window_=0; diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index a0eba9e3a..9bd710c72 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -72,10 +72,6 @@ struct FL_EXPORT Fl_Label { unsigned color; /** draw the label aligned to the given box */ void draw(int,int,int,int, Fl_Align) const ; - /** measure the size of the label. - * \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 &w, int &h) const ; }; 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; |