diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl.H | 19 | ||||
| -rw-r--r-- | FL/Fl_Button.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Color_Chooser.H | 4 | ||||
| -rw-r--r-- | FL/fl_ask.H | 3 |
4 files changed, 19 insertions, 9 deletions
@@ -254,10 +254,9 @@ public: static int damage() {return damage_;} static void redraw(); static void flush(); - /** \defgroup fl_windows Windows handling functions - Windows and standard dialogs handling + /** \addtogroup group_comdlg @{ */ - /** \fn void (*warning)(const char*, ...) + /** FLTK calls this to print a warning message. You can override the behavior by setting the function pointer to your own routine. @@ -272,7 +271,7 @@ public: own routine. <P>Fl::error means there is a recoverable error such as the inability to read an image file. The default implementation - prints the error message to stderr and returns. + shows an error dialog to stderr and returns. */ static void (*error)(const char*, ...); /** @@ -282,13 +281,19 @@ public: <P>Fl::fatal must not return, as FLTK is in an unusable state, however your version may be able to use longjmp or an exception to continue, as long as it does not call FLTK - again. The default implementation prints the error message to - stderr and exits with status 1. + again. The default implementation shows a fatal dialog box + and exits with status 1. */ static void (*fatal)(const char*, ...); + /** @} */ + + /** \defgroup fl_windows Windows handling functions + Windows and standard dialogs handling + @{ */ static Fl_Window* first_window(); static void first_window(Fl_Window*); static Fl_Window* next_window(const Fl_Window*); + /** Returns the top-most modal() window currently shown. This is the most recently @@ -805,7 +810,7 @@ public: /** @} */ #ifdef HAVE_CAIRO - /** \defgroup group_cairo Cairo functions support + /** \defgroup group_cairo Cairo support functions and classes @{ */ public: diff --git a/FL/Fl_Button.H b/FL/Fl_Button.H index 05b1b7585..9aabe5a95 100644 --- a/FL/Fl_Button.H +++ b/FL/Fl_Button.H @@ -43,7 +43,9 @@ are set to zero.*/ #define FL_HIDDEN_BUTTON 3 ///< for Forms compatibility +#ifndef FL_DOXYGEN extern FL_EXPORT int fl_old_shortcut(const char*); +#endif /** \class Fl_Button diff --git a/FL/Fl_Color_Chooser.H b/FL/Fl_Color_Chooser.H index 8a9372f9d..c6fabbc3c 100644 --- a/FL/Fl_Color_Chooser.H +++ b/FL/Fl_Color_Chooser.H @@ -76,6 +76,9 @@ public: #endif // !FL_DOXYGEN +/** \addtogroup group_comdlg + @{ */ + /** \class Fl_Color_Chooser \brief The Fl_Color_Chooser widget provides a standard RGB color chooser. @@ -108,6 +111,7 @@ public: user picks! You can however use fl_rectf() to fill a region with a simulated color using dithering. */ +/** @} */ class FL_EXPORT Fl_Color_Chooser : public Fl_Group { Flcc_HueBox huebox; Flcc_ValueBox valuebox; diff --git a/FL/fl_ask.H b/FL/fl_ask.H index d2c8d540b..dd4f83e1c 100644 --- a/FL/fl_ask.H +++ b/FL/fl_ask.H @@ -31,7 +31,7 @@ # include "Enumerations.H" class Fl_Widget; - +/** Different system beeps available. \relatesalso fl_beep(int) */ enum { FL_BEEP_DEFAULT = 0, FL_BEEP_MESSAGE, @@ -73,7 +73,6 @@ extern FL_EXPORT const char* fl_yes; extern FL_EXPORT const char* fl_ok; extern FL_EXPORT const char* fl_cancel; extern FL_EXPORT const char* fl_close; - #endif // !fl_ask_H // |