summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>1999-05-11 09:39:31 +0000
committerBill Spitzak <spitzak@gmail.com>1999-05-11 09:39:31 +0000
commit4e66f937698fd0792c17db2085d99ee5985c81ff (patch)
treee74c8ad3ae56b08a3c2e6d7d5eca596ddba38562 /src
parentd4bcbf5be337164e631c75d50b397992d794166f (diff)
Missing header files and FL_EXTERNs that prevented DLL's from compiling
under BCC. Fluid will output A::B::C names for nested classes. Fl_Browser::lineposition(n, BOTTOM) will align the bottom of the line rather than the top with the bottom of the browser. The connect program does wait() so that it does not leave a zombie for every one of your ppp connections. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@584 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Browser.cxx9
-rw-r--r--src/Fl_win32.cxx21
-rw-r--r--src/fl_shortcut.cxx5
3 files changed, 20 insertions, 15 deletions
diff --git a/src/Fl_Browser.cxx b/src/Fl_Browser.cxx
index f6b383629..4f734275f 100644
--- a/src/Fl_Browser.cxx
+++ b/src/Fl_Browser.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Browser.cxx,v 1.9.2.5 1999/05/01 15:08:21 mike Exp $"
+// "$Id: Fl_Browser.cxx,v 1.9.2.6 1999/05/11 09:39:29 bill Exp $"
//
// Browser widget for the Fast Light Tool Kit (FLTK).
//
@@ -394,9 +394,12 @@ void Fl_Browser::lineposition(int line, Fl_Line_Position pos) {
if (line<1) line = 1;
if (line>lines) line = lines;
int p = 0;
- for (FL_BLINE* l=first; l&& line>1; l = l->next) {
+
+ FL_BLINE* l;
+ for (l=first; l && line>1; l = l->next) {
line--; p += item_height(l);
}
+ if (l && (pos == BOTTOM)) p += item_height (l);
int final = p, X, Y, W, H;
bbox(X, Y, W, H);
@@ -485,5 +488,5 @@ int Fl_Browser::value() const {
}
//
-// End of "$Id: Fl_Browser.cxx,v 1.9.2.5 1999/05/01 15:08:21 mike Exp $".
+// End of "$Id: Fl_Browser.cxx,v 1.9.2.6 1999/05/11 09:39:29 bill Exp $".
//
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 5ead99f60..1f098bdeb 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_win32.cxx,v 1.33.2.9 1999/05/09 14:49:14 mike Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.10 1999/05/11 09:39:30 bill Exp $"
//
// WIN32-specific code for the Fast Light Tool Kit (FLTK).
//
@@ -132,7 +132,6 @@ double fl_wait(int timeout_flag, double time) {
int have_message = 0;
int timerid;
-
if (nfds) {
// For WIN32 we need to poll for socket input FIRST, since
// the event queue is not something we can select() on...
@@ -148,8 +147,8 @@ double fl_wait(int timeout_flag, double time) {
if (::select(0,&fdt[0],&fdt[1],&fdt[2],&t)) {
// We got something - do the callback!
for (int i = 0; i < nfds; i ++) {
- int f = fd[i].fd;
- short revents = 0;
+ int f = fd[i].fd;
+ short revents = 0;
if (FD_ISSET(f,&fdt[0])) revents |= POLLIN;
if (FD_ISSET(f,&fdt[1])) revents |= POLLOUT;
if (FD_ISSET(f,&fdt[2])) revents |= POLLERR;
@@ -166,15 +165,15 @@ double fl_wait(int timeout_flag, double time) {
// First see if there is a message waiting...
have_message = PeekMessage(&fl_msg, NULL, 0, 0, PM_REMOVE);
if (!have_message) {
- // If not then set a 1ms timer...
+ // If not then set a 1ms timer...
timerid = SetTimer(NULL, 0, 1, NULL);
- GetMessage(&fl_msg, NULL, 0, 0);
- KillTimer(NULL, timerid);
+ GetMessage(&fl_msg, NULL, 0, 0);
+ KillTimer(NULL, timerid);
}
- } else
+ } else {
// Wait for a message...
GetMessage(&fl_msg, NULL, 0, 0);
-
+ }
have_message = 1;
} else {
// Perform the requested timeout...
@@ -854,6 +853,8 @@ void Fl_X::set_minmax(LPMINMAXINFO minmax)
////////////////////////////////////////////////////////////////
+#include <FL/filename.H> // need so FL_EXPORT filename_name works
+
// returns pointer to the filename, or null if name ends with '/'
const char *filename_name(const char *name) {
const char *p,*q;
@@ -939,5 +940,5 @@ void Fl_Window::make_current() {
}
//
-// End of "$Id: Fl_win32.cxx,v 1.33.2.9 1999/05/09 14:49:14 mike Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.10 1999/05/11 09:39:30 bill Exp $".
//
diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx
index 7cea32430..88f3ed660 100644
--- a/src/fl_shortcut.cxx
+++ b/src/fl_shortcut.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fl_shortcut.cxx,v 1.4 1999/01/07 19:17:43 mike Exp $"
+// "$Id: fl_shortcut.cxx,v 1.4.2.1 1999/05/11 09:39:31 bill Exp $"
//
// Shortcut support routines for the Fast Light Tool Kit (FLTK).
//
@@ -41,6 +41,7 @@
#include <FL/Fl.H>
#include <FL/Fl_Widget.H>
+#include <FL/fl_draw.H>
#include <ctype.h>
#include <string.h>
#ifndef WIN32
@@ -123,5 +124,5 @@ int Fl_Widget::test_shortcut() {
}
//
-// End of "$Id: fl_shortcut.cxx,v 1.4 1999/01/07 19:17:43 mike Exp $".
+// End of "$Id: fl_shortcut.cxx,v 1.4.2.1 1999/05/11 09:39:31 bill Exp $".
//