Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
3764021e
Commit
3764021e
authored
Nov 07, 2014
by
Garth Corral
Committed by
Wayne Stambaugh
Nov 07, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add patch for wxWidgets 3 to fix scrolling on OSX.
parent
5c3cc11e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
50 additions
and
0 deletions
+50
-0
wxwidgets-3.0.0_macosx_scrolledwindow.patch
patches/wxwidgets-3.0.0_macosx_scrolledwindow.patch
+50
-0
No files found.
patches/wxwidgets-3.0.0_macosx_scrolledwindow.patch
0 → 100644
View file @
3764021e
=== modified file 'src/generic/scrlwing.cpp'
--- src/generic/scrlwing.cpp 2013-12-16 05:42:30 -0800
+++ src/generic/scrlwing.cpp 2014-10-21 01:19:02 -0700
@@ -214,9 +214,6 @@
return true;
}
- if ( processed && event.IsCommandEvent())
- return true;
-
// For wxEVT_PAINT the user code can either handle this event as usual or
// override virtual OnDraw(), so if the event hasn't been handled we need
// to call this virtual function ourselves.
@@ -235,6 +232,11 @@
return true;
}
+ // If the user code handled this event, it should prevent the default
+ // handling from taking place, so don't do anything else in this case.
+ if ( processed )
+ return true;
+
if ( evType == wxEVT_CHILD_FOCUS )
{
m_scrollHelper->HandleOnChildFocus((wxChildFocusEvent &)event);
=== modified file 'src/generic/vscroll.cpp'
--- src/generic/vscroll.cpp 2013-12-16 05:42:30 -0800
+++ src/generic/vscroll.cpp 2014-10-21 01:19:09 -0700
@@ -89,9 +89,6 @@
return true;
}
- if ( processed && event.IsCommandEvent())
- return true;
-
// For wxEVT_PAINT the user code can either handle this event as usual or
// override virtual OnDraw(), so if the event hasn't been handled we need
// to call this virtual function ourselves.
@@ -110,6 +107,11 @@
return true;
}
+ // If the user code handled this event, it should prevent the default
+ // handling from taking place, so don't do anything else in this case.
+ if ( processed )
+ return true;
+
// reset the skipped flag (which might have been set to true in
// ProcessEvent() above) to be able to test it below
bool wasSkipped = event.GetSkipped();
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment