diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-09-16 14:52:26 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-09-16 14:54:18 +0200 |
| commit | c550e6fd86057073d664f521ae473f081fb75b93 (patch) | |
| tree | 061b0e00fbf46cfcdc83c5c77bf224c9ebedf898 /contrib | |
| parent | bf65abb8556b09ca486ea319e74981800fb9a734 (diff) | |
| download | tigervnc-c550e6fd86057073d664f521ae473f081fb75b93.tar.gz tigervnc-c550e6fd86057073d664f521ae473f081fb75b93.zip | |
Fix broken FLTK patch
Remove some lines that weren't consistent with the earlier
suggested patches.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/fltk/12-fltk-1.3.2-xhandlers.patch | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/contrib/fltk/12-fltk-1.3.2-xhandlers.patch b/contrib/fltk/12-fltk-1.3.2-xhandlers.patch index 0ac3fe4b..2d25d343 100644 --- a/contrib/fltk/12-fltk-1.3.2-xhandlers.patch +++ b/contrib/fltk/12-fltk-1.3.2-xhandlers.patch @@ -142,16 +142,13 @@ diff -up fltk-1.3.2/src/Fl_win32.cxx.xhandlers fltk-1.3.2/src/Fl_win32.cxx IActiveIMMApp *fl_aimm = NULL; MSG fl_msg; -@@ -401,26 +403,25 @@ int fl_wait(double time_to_wait) { +@@ -401,23 +403,21 @@ int fl_wait(double time_to_wait) { // Execute the message we got, and all other pending messages: // have_message = PeekMessage(&fl_msg, NULL, 0, 0, PM_REMOVE); - have_message = PeekMessageW(&fl_msg, NULL, 0, 0, PM_REMOVE); - if (have_message > 0) { - while (have_message != 0 && have_message != -1) { -- // Let applications treat WM_QUIT identical to SIGTERM on *nix -- if (fl_msg.message == WM_QUIT) -- raise(SIGTERM); - if (fl_msg.message == fl_wake_msg) { - // Used for awaking wait() from another thread - thread_message_ = (void*)fl_msg.wParam; @@ -169,10 +166,6 @@ diff -up fltk-1.3.2/src/Fl_win32.cxx.xhandlers fltk-1.3.2/src/Fl_win32.cxx + if (fl_send_system_handlers(&fl_msg)) + continue; + -+ // Let applications treat WM_QUIT identical to SIGTERM on *nix -+ if (fl_msg.message == WM_QUIT) -+ raise(SIGTERM); -+ + if (fl_msg.message == fl_wake_msg) { + // Used for awaking wait() from another thread + thread_message_ = (void*)fl_msg.wParam; |