diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_File_Chooser.H | 1 | ||||
| -rw-r--r-- | FL/fl_ask.H | 31 |
2 files changed, 22 insertions, 10 deletions
diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H index bc55fb561..6bc050b32 100644 --- a/FL/Fl_File_Chooser.H +++ b/FL/Fl_File_Chooser.H @@ -176,6 +176,7 @@ public: FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname,int relative=0); FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname,int relative=0); FL_EXPORT void fl_file_chooser_callback(void (*cb)(const char*)); +FL_EXPORT void fl_file_chooser_ok_label(const char*l); #endif // diff --git a/FL/fl_ask.H b/FL/fl_ask.H index 5ac067511..c0a134865 100644 --- a/FL/fl_ask.H +++ b/FL/fl_ask.H @@ -20,13 +20,15 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 // USA. // -// Please report all bugs and problems to "fltk-bugs@fltk.org". +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php // #ifndef fl_ask_H -#define fl_ask_H +# define fl_ask_H -#include "Enumerations.H" +# include "Enumerations.H" class Fl_Widget; @@ -39,13 +41,22 @@ enum { FL_BEEP_NOTIFICATION }; +# ifdef __GNUC__ +# define __fl_attr(x) __attribute__ (x) +# else +# define __fl_attr(x) +# endif // __GNUC__ + FL_EXPORT void fl_beep(int type = FL_BEEP_DEFAULT); -FL_EXPORT void fl_message(const char *,...); -FL_EXPORT void fl_alert(const char *,...); -FL_EXPORT int fl_ask(const char *,...); -FL_EXPORT int fl_choice(const char *q,const char *b0,const char *b1,const char *b2,...); -FL_EXPORT const char *fl_input(const char *label, const char *deflt = 0, ...); -FL_EXPORT const char *fl_password(const char *label, const char *deflt = 0, ...); +FL_EXPORT void fl_message(const char *,...) __fl_attr((__format__ (__printf__, 1, 2))); +FL_EXPORT void fl_alert(const char *,...) __fl_attr((__format__ (__printf__, 1, 2))); +// fl_ask() is deprecated since it uses "Yes" and "No" for the buttons, +// which does not conform to the current FLTK Human Interface Guidelines. +// Use fl_choice() instead with the appropriate verbs instead. +FL_EXPORT int fl_ask(const char *,...) __fl_attr((__format__ (__printf__, 1, 2), __deprecated__)); +FL_EXPORT int fl_choice(const char *q,const char *b0,const char *b1,const char *b2,...) __fl_attr((__format__ (__printf__, 1, 5))); +FL_EXPORT const char *fl_input(const char *label, const char *deflt = 0, ...) __fl_attr((__format__ (__printf__, 1, 3))); +FL_EXPORT const char *fl_password(const char *label, const char *deflt = 0, ...) __fl_attr((__format__ (__printf__, 1, 3))); FL_EXPORT Fl_Widget *fl_message_icon(); extern FL_EXPORT Fl_Font fl_message_font_; @@ -60,7 +71,7 @@ extern FL_EXPORT const char* fl_ok; extern FL_EXPORT const char* fl_cancel; extern FL_EXPORT const char* fl_close; -#endif +#endif // !fl_ask_H // // End of "$Id$". |