You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

50 lines
1.7 KiB

  1. === modified file 'src/generic/scrlwing.cpp'
  2. --- src/generic/scrlwing.cpp 2013-12-16 05:42:30 -0800
  3. +++ src/generic/scrlwing.cpp 2014-10-21 01:19:02 -0700
  4. @@ -214,9 +214,6 @@
  5. return true;
  6. }
  7. - if ( processed && event.IsCommandEvent())
  8. - return true;
  9. -
  10. // For wxEVT_PAINT the user code can either handle this event as usual or
  11. // override virtual OnDraw(), so if the event hasn't been handled we need
  12. // to call this virtual function ourselves.
  13. @@ -235,6 +232,11 @@
  14. return true;
  15. }
  16. + // If the user code handled this event, it should prevent the default
  17. + // handling from taking place, so don't do anything else in this case.
  18. + if ( processed )
  19. + return true;
  20. +
  21. if ( evType == wxEVT_CHILD_FOCUS )
  22. {
  23. m_scrollHelper->HandleOnChildFocus((wxChildFocusEvent &)event);
  24. === modified file 'src/generic/vscroll.cpp'
  25. --- src/generic/vscroll.cpp 2013-12-16 05:42:30 -0800
  26. +++ src/generic/vscroll.cpp 2014-10-21 01:19:09 -0700
  27. @@ -89,9 +89,6 @@
  28. return true;
  29. }
  30. - if ( processed && event.IsCommandEvent())
  31. - return true;
  32. -
  33. // For wxEVT_PAINT the user code can either handle this event as usual or
  34. // override virtual OnDraw(), so if the event hasn't been handled we need
  35. // to call this virtual function ourselves.
  36. @@ -110,6 +107,11 @@
  37. return true;
  38. }
  39. + // If the user code handled this event, it should prevent the default
  40. + // handling from taking place, so don't do anything else in this case.
  41. + if ( processed )
  42. + return true;
  43. +
  44. // reset the skipped flag (which might have been set to true in
  45. // ProcessEvent() above) to be able to test it below
  46. bool wasSkipped = event.GetSkipped();