diff options
| author | Fabien Costantini <fabien@onepost.net> | 2012-04-05 05:12:30 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2012-04-05 05:12:30 +0000 |
| commit | 8809c5d65dd20895dcae90e9d2af05fd271f2e9e (patch) | |
| tree | d53cbf6d921ae68bda31b6c5d522dc8c87ee9bd1 /FL | |
| parent | 37ea8ba9e635e9655417714bd49ab7bb2b36beb5 (diff) | |
Fixed build error in msvs because Fl ref to FULLSCREEN enum was not accessible in Fl_Widget. new inline is_fullscreen() getter has been implemented to avoid a build error with (at least) msvc compilers. Fixed a ton of warnings / problems when bilding on windows 64 bits target with ms toolchain. cleaned up about 200 warnings raised when building win74 targets.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl.H | 12 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 10 | ||||
| -rw-r--r-- | FL/forms.H | 4 |
3 files changed, 21 insertions, 5 deletions
@@ -43,6 +43,16 @@ class Fl_Window; class Fl_Image; struct Fl_Label; +// Keep avoiding having the socket deps at that level but mke sure it will work in both 32 & 64 bit builds +#if defined(WIN32) && !defined(__CYGWIN__) +# if defined(_WIN64) +# define FL_SOCKET unsigned __int64 +# else +# define FL_SOCKET int +# endif +#else +# define FL_SOCKET int +#endif /** \defgroup callback_functions Callback function typedefs \brief Typedefs defined in <FL/Fl.H> for callback or handler functions passed as function parameters. @@ -81,7 +91,7 @@ typedef void (*Fl_Idle_Handler)(void *data); typedef void (*Fl_Old_Idle_Handler)(); /** Signature of add_fd functions passed as parameters */ -typedef void (*Fl_FD_Handler)(int fd, void *data); +typedef void (*Fl_FD_Handler)(FL_SOCKET fd, void *data); /** Signature of add_handler functions passed as parameters */ typedef int (*Fl_Event_Handler)(int event); diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index 27e6801c2..4fb48109d 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -152,7 +152,7 @@ protected: See activate(), output(), visible(), changed(), set_visible_focus() */ enum { - INACTIVE = 1<<0, ///< the widget can't receive focus, and is disabled but potentially visible + INACTIVE = 1<<0, ///< the widget can't receive focus, and is disabled but potentially visible INVISIBLE = 1<<1, ///< the widget is not drawn, but can receive a few special events OUTPUT = 1<<2, ///< for output only NOBORDER = 1<<3, ///< don't draw a decoration (Fl_Window) @@ -687,12 +687,18 @@ public: */ void clear_visible() {flags_ |= INVISIBLE;} + /** Returns whether the widget is in full screen mode + \retval non 0 if in full screen mode + */ + unsigned int is_fullscreen() const {return (flags_ & FULLSCREEN);} + /** Returns whether the widget is active. - \retval 0 if the widget is inactive + \retval 0 if the widget is inacti \see active_r(), activate(), deactivate() */ unsigned int active() const {return !(flags_&INACTIVE);} + /** Returns whether the widget and all of its parents are active. \retval 0 if this or any of the parent widgets are inactive \see active(), activate(), deactivate() diff --git a/FL/forms.H b/FL/forms.H index adb2b95e8..a54864e1e 100644 --- a/FL/forms.H +++ b/FL/forms.H @@ -159,9 +159,9 @@ typedef int FL_COLOR; extern FL_EXPORT void fl_initialize(int*, char*[], const char*, FL_CMD_OPT*, int); inline void fl_finish() {} -typedef void (*FL_IO_CALLBACK) (int, void*); +typedef void (*FL_IO_CALLBACK) (FL_SOCKET, void*); inline void fl_add_io_callback(int fd, short w, FL_IO_CALLBACK cb, void* v) { - Fl::add_fd(fd,w,cb,v);} + Fl::add_fd(fd, w, cb, v);} inline void fl_remove_io_callback(int fd, short, FL_IO_CALLBACK) { Fl::remove_fd(fd);} // removes all the callbacks! |