Fixed WIndows line endings
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4388 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
df32d2a9b8
commit
d00881fbc4
2
CHANGES
2
CHANGES
@ -2,6 +2,8 @@ CHANGES IN FLTK 1.1.7
|
||||
|
||||
- Documentation fixes (STR #648, STR #692, STR #730, STR
|
||||
#744, STR #745)
|
||||
- Fl::delete_widget would hang fl_wait after deleting the
|
||||
window (STR #679)
|
||||
- Fl::paste would sometimes not recoginze external
|
||||
changes of the clipboard (STR #722)
|
||||
- Clipping fixes for OSX
|
||||
|
@ -238,6 +238,7 @@ extern int fl_wait(double time); // in Fl_<platform>.cxx
|
||||
static char in_idle;
|
||||
|
||||
double Fl::wait(double time_to_wait) {
|
||||
// delete all widgets that were listed during callbacks
|
||||
do_widget_deletion();
|
||||
|
||||
if (first_timeout) {
|
||||
|
@ -273,7 +273,12 @@ int fl_wait(double time_to_wait) {
|
||||
KillTimer(NULL, timerid);
|
||||
}
|
||||
} else {
|
||||
have_message = GetMessage(&fl_msg, NULL, 0, 0);
|
||||
// make sure that we don't lock up if there are no more windows
|
||||
// that could receive messages, but still handle pending messages.
|
||||
if (!Fl_X::first)
|
||||
have_message = PeekMessage(&fl_msg, NULL, 0, 0, PM_REMOVE);
|
||||
else
|
||||
have_message = GetMessage(&fl_msg, NULL, 0, 0);
|
||||
}
|
||||
|
||||
fl_lock_function();
|
||||
|
Loading…
Reference in New Issue
Block a user