From 13005b2a3f0f16579522523460a82dca48e855a4 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Sun, 4 May 2003 21:45:46 +0000
Subject: Fl_File_Browser incorrectly included "." on WIN32 (STR #9)

Include shellapi.h instead of ShellAPI.h in the WIN32
drag-n-drop code in order to work with the MingW cross compiler
(STR #6)

The cursor was not properly restored when doing drag-n-drop on
X11 (STR #4)

Fl::remove_fd() didn't recalculate the highest file descriptor
properly (STR #20)

Fl_Preferences::deleteGroup() didn't work properly (STR #13)

Fixed the fl_show_file_selector() function - it was copying
using the wrong string size (STR #14)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2975 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_x.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/Fl_x.cxx')

diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 83b23e707..6379a054f 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_x.cxx,v 1.24.2.24.2.28 2003/04/03 04:28:15 matthiaswm Exp $"
+// "$Id: Fl_x.cxx,v 1.24.2.24.2.29 2003/05/04 21:45:46 easysw Exp $"
 //
 // X specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -123,6 +123,7 @@ void Fl::add_fd(int n, void (*cb)(int, void*), void* v) {
 
 void Fl::remove_fd(int n, int events) {
   int i,j;
+  maxfd = -1; // recalculate maxfd on the fly
   for (i=j=0; i<nfds; i++) {
 #  if USE_POLL
     if (pollfds[i].fd == n) {
@@ -137,6 +138,7 @@ void Fl::remove_fd(int n, int events) {
       fd[i].events = e;
     }
 #  endif
+    if (fd[i].fd > maxfd) maxfd = fd[i].fd;
     // move it down in the array if necessary:
     if (j<i) {
       fd[j] = fd[i];
@@ -151,7 +153,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--;
 #  endif
 }
 
@@ -1266,5 +1267,5 @@ void Fl_Window::make_current() {
 #endif
 
 //
-// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.28 2003/04/03 04:28:15 matthiaswm Exp $".
+// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.29 2003/05/04 21:45:46 easysw Exp $".
 //
-- 
cgit v1.2.3