wxgtk-webkit-infinite-loop.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From 572fe37898f8d4f8664849ec76483dd63ea13a13 Mon Sep 17 00:00:00 2001
  2. From: Paul Cornett <paulcor@users.noreply.github.com>
  3. Date: Sat, 6 Jan 2018 11:07:11 -0800
  4. Subject: [PATCH] Avoid calling default "key-press-event" handler
  5. We have already done everything it does, and doing it again seems to
  6. cause an infinite loop with WebKitGTK. See #17932
  7. ---
  8. src/gtk/toplevel.cpp | 10 +++++-----
  9. 1 file changed, 5 insertions(+), 5 deletions(-)
  10. diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
  11. index f63fdd3e463..ae825d40396 100644
  12. --- a/src/gtk/toplevel.cpp
  13. +++ b/src/gtk/toplevel.cpp
  14. @@ -227,15 +227,15 @@ wxgtk_tlw_key_press_event(GtkWidget *widget, GdkEventKey *event)
  15. // GTK+ gtk_window_key_press_event() handler.
  16. if ( gtk_window_propagate_key_event(window, event) )
  17. - return TRUE;
  18. + return true;
  19. if ( gtk_window_activate_key(window, event) )
  20. - return TRUE;
  21. + return true;
  22. - if (GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event))
  23. - return TRUE;
  24. + GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event);
  25. - return FALSE;
  26. + // Avoid calling the default handler, we have already done everything it does
  27. + return true;
  28. }
  29. }