diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-04-18 19:17:03 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-04-18 19:17:03 +0000 |
| commit | 816393d2d4aef5293e6acb8bc2c1344a53206a75 (patch) | |
| tree | 816991e7afc7c70b2de28281193b8109bb1d4166 /src | |
| parent | 923aa16100771ca4cbcdb2e575f3fe17753d5d1f (diff) | |
Updated patch version to 2 (1.0.2)
Fixed missing fdsets variable in Fl_win32.cxx
Removed unused maxfd variable in Fl_win32.cxx
FLUID now outputs the window constructor with x,y arguments if
the class name is Fl_Group (this allows you to setup classes
using FLUID) Add extra code after all the widgets to move them
to the desired offset within the window.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@548 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_win32.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index a687cd448..4caad8d1c 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_win32.cxx,v 1.33.2.6 1999/04/17 01:02:29 bill Exp $" +// "$Id: Fl_win32.cxx,v 1.33.2.7 1999/04/18 19:17:03 mike Exp $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // @@ -51,8 +51,11 @@ // fd's are only implemented for sockets. Microsoft Windows does not // have a unified IO system, so it doesn't support select() on files, -// devices, or pipes... +// devices, or pipes... Also, unlike UNIX the Windows select() call +// doesn't use the nfds parameter, so we don't need to keep track of +// the maximum FD number... +static fd_set fdsets[3]; #define POLLIN 1 #define POLLOUT 4 #define POLLERR 8 @@ -80,7 +83,6 @@ void Fl::add_fd(int n, int events, void (*cb)(int, void*), void *v) { if (events & POLLIN) FD_SET(n, &fdsets[0]); if (events & POLLOUT) FD_SET(n, &fdsets[1]); if (events & POLLERR) FD_SET(n, &fdsets[2]); - if (n > maxfd) maxfd = n; } void Fl::add_fd(int fd, void (*cb)(int, void*), void* v) { @@ -105,7 +107,6 @@ void Fl::remove_fd(int n, int events) { if (events & POLLIN) FD_CLR(n, &fdsets[0]); if (events & POLLOUT) FD_CLR(n, &fdsets[1]); if (events & POLLERR) FD_CLR(n, &fdsets[2]); - if (n == maxfd) maxfd--; } void Fl::remove_fd(int n) { @@ -921,5 +922,5 @@ void Fl_Window::make_current() { } // -// End of "$Id: Fl_win32.cxx,v 1.33.2.6 1999/04/17 01:02:29 bill Exp $". +// End of "$Id: Fl_win32.cxx,v 1.33.2.7 1999/04/18 19:17:03 mike Exp $". // |