mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated patch version to 2 (1.0.2)

Browse Source 
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
This commit is contained in:
Michael R Sweet 1999-04-18 19:17:03 +00:00
parent 923aa16100
commit 816393d2d4
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FL/Enumerations.H
View File

@ -1,5 +1,5 @@
//
// "$Id: Enumerations.H,v 1.18.2.1 1999/03/25 13:35:37 mike Exp $"
// "$Id: Enumerations.H,v 1.18.2.2 1999/04/18 19:16:59 mike Exp $"
//
// Enumerations for the Fast Light Tool Kit (FLTK).
//
@ -56,7 +56,7 @@
#define FL_MAJOR_VERSION 1
#define FL_MINOR_VERSION 0
#define FL_PATCH_VERSION 1
#define FL_PATCH_VERSION 2
#define FL_VERSION ((double)FL_MAJOR_VERSION + \
(double)FL_MINOR_VERSION * 0.01)
@ -364,5 +364,5 @@ enum Fl_Damage {
#endif
//
// End of "$Id: Enumerations.H,v 1.18.2.1 1999/03/25 13:35:37 mike Exp $".
// End of "$Id: Enumerations.H,v 1.18.2.2 1999/04/18 19:16:59 mike Exp $".
//

11
fluid/Fl_Widget_Type.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Widget_Type.cxx,v 1.15.2.2 1999/04/18 14:10:53 gustavo Exp $"
// "$Id: Fl_Widget_Type.cxx,v 1.15.2.3 1999/04/18 19:17:00 mike Exp $"
//
// Widget type code for the Fast Light Tool Kit (FLTK).
//
@ -1323,7 +1323,12 @@ void Fl_Widget_Type::write_code1() {
if (varused) write_c("{ %s* o = ", t);
if (name()) write_c("%s = ", name());
if (is_window()) {
write_c("new %s(%d, %d", t, o->w(), o->h());
// Handle special case of Fl_Group class type within a window -
// output constructor using x, y, w, h...
if (strcmp(t, "Fl_Group") == 0)
write_c("new %s(0, 0, %d, %d", t, o->w(), o->h());
else
write_c("new %s(%d, %d", t, o->w(), o->h());
// prevent type() code from being emitted:
((Fl_Widget_Type*)factory)->o->type(o->type());
} else {
@ -1745,5 +1750,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) {
}
//
// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.2 1999/04/18 14:10:53 gustavo Exp $".
// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.3 1999/04/18 19:17:00 mike Exp $".
//

11
src/Fl_win32.cxx
View File

@ -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 $".
//