Pass toolbar button ID in wxContextHelpEvent - LF/CR fixed in files (PR #25818)
StevenPHirshman
I've updated the changes to the files needed to handle the toolbar button ID in the context help event. The files should be exactly the same as the originals except for the addition of the virtual function SetHelpIdAtPoint.
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/25818
Commit Summary
- 5d89d67 Update cshelp.cpp
- dc9078f Merge branch 'master' of https://github.com/StevenPHirshman/wxWidgets
- 45aefbf added virtual SetHelpEventPos
- d01f5a4 Replace SetHelpEventPos with SetHelpIdAtPoint
- a7aefb7 added comments to window.h and event.h
- 2a6b28a updated information text in event.h
- 3da5a60 updated line endings
- 3742804 Change CR/LF to LF and add terminating LF
- 044b3b0 Delete include/wx/window.h
- 722cdc2 Delete src/common/cshelp.cpp
- 4fbc8f0 Delete src/common/tbarbase.cpp
- 8152db1 Delete src/common/wincmn.cpp
- e59b8b2 Delete include/wx/tbarbase.h
- a76cb50 Merge branch 'StevenPHirshman'
- 2d1858d CR/LF Mods for SetHelpIdAtPoint
- b84acb2 LR?CR fix 2
File Changes
(9 files)
- A include/wx/msvc/wx/setup.h (279)
- M include/wx/msw/setup.h (4)
- M include/wx/msw/wx.rc (2)
- M include/wx/tbarbase.h (2)
- M include/wx/window.h (2)
- M interface/wx/event.h (3)
- D src/common/cshelp.cpp (462)
- M src/common/tbarbase.cpp (14)
- M src/common/wincmn.cpp (2)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/25818.patch
- https://github.com/wxWidgets/wxWidgets/pull/25818.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
MaartenBent left a comment (wxWidgets/wxWidgets#25818)You can see all the changes of your PR: below the title, click Files changed.
You can also see these changes before you submit a Pull Request. So you can make sure all the changes are correct before creating the Pull Request.
It shows that you:
- deleted
src/common/cshelp.cpp - added a new file
include/wx/msvc/wx/setup.hthat shouldn't be there - committed unrelated changes to
include/wx/msw/setup.handinclude/wx/msw/wx.rc - You added documentation to
interface/wx/event.hbut the function is added towindow.h. So you should add a new function tointerface/wx/window.hdescribing this function. Similar to all the other functions in this file.
The deleted file should also cause a build error when you build at your PC locally. So you should at least test that your local build is successful before committing to a (or creating a new) Pull Request.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
StevenPHirshman left a comment (wxWidgets/wxWidgets#25818)You can see all the changes of your PR: below the title, click
Files changed.You can also see these changes before you submit a Pull Request. So you can make sure all the changes are correct before creating the Pull Request.
It shows that you:
- deleted
src/common/cshelp.cpp- added a new file
include/wx/msvc/wx/setup.hthat shouldn't be there- committed unrelated changes to
include/wx/msw/setup.handinclude/wx/msw/wx.rc- You added documentation to
interface/wx/event.hbut the function is added towindow.h. So you should add a new function tointerface/wx/window.hdescribing this function. Similar to all the other functions in this file.The deleted file should also cause a build error when you build at your PC locally. So you should at least test that your local build is successful before committing to a (or creating a new) Pull Request.
Thank you. I don't know how that happened. Will make the fixes you said. I neglected to check the build locally, or I would have caught the absence of the cshelp.cpp file. Thanks again.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
@StevenPHirshman pushed 1 commit.
- 9ac4156 Add files via upload
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
@StevenPHirshman pushed 1 commit.
- d6e4f17 Delete include/wx/msvc directory
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
@StevenPHirshman pushed 1 commit.
- 37cfc62 Delete src/common/window.h
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
@StevenPHirshman pushed 1 commit.
- 29ee2fb Delete src/common/tbarbase.h
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
StevenPHirshman left a comment (wxWidgets/wxWidgets#25818)You can see all the changes of your PR: below the title, click
Files changed.You can also see these changes before you submit a Pull Request. So you can make sure all the changes are correct before creating the Pull Request.
It shows that you:
- deleted
src/common/cshelp.cpp- added a new file
include/wx/msvc/wx/setup.hthat shouldn't be there- committed unrelated changes to
include/wx/msw/setup.handinclude/wx/msw/wx.rc- You added documentation to
interface/wx/event.hbut the function is added towindow.h. So you should add a new function tointerface/wx/window.hdescribing this function. Similar to all the other functions in this file.The deleted file should also cause a build error when you build at your PC locally. So you should at least test that your local build is successful before committing to a (or creating a new) Pull Request.
I successfully rebuilt the libs on my local PC. Now some of the github builds are failing with errors like this (see below). I didn't touch anything with OpenGL. What could cause this?
D:\a\wxWidgets\wxWidgets\samples\opengl\cube\cube.cpp(28,1): error C1189: #error: "OpenGL required: set wxUSE_GLCANVAS to 1 and rebuild the library" [D:\a\wxWidgets\wxWidgets\samples\opengl\cube\cube.vcxproj]
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
StevenPHirshman left a comment (wxWidgets/wxWidgets#25818)You can see all the changes of your PR: below the title, click
Files changed.You can also see these changes before you submit a Pull Request. So you can make sure all the changes are correct before creating the Pull Request.
It shows that you:
- deleted
src/common/cshelp.cpp- added a new file
include/wx/msvc/wx/setup.hthat shouldn't be there- committed unrelated changes to
include/wx/msw/setup.handinclude/wx/msw/wx.rc- You added documentation to
interface/wx/event.hbut the function is added towindow.h. So you should add a new function tointerface/wx/window.hdescribing this function. Similar to all the other functions in this file.The deleted file should also cause a build error when you build at your PC locally. So you should at least test that your local build is successful before committing to a (or creating a new) Pull Request.
On the failed MAC OS14 wxIOS failed build, there was an error message involving the new function I added. It does not produce an error on my local (Windows 10) build. I'll try to track it down, but I wonder if it is a MAC - specific thing.
/Users/runner/work/wxWidgets/wxWidgets/include/wx/tbarbase.h:289:18: error: 'SetHelpIdAtPoint' marked 'override' but does not override any member functions
virtual void SetHelpIdAtPoint(wxHelpEvent& event) override;
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
@StevenPHirshman pushed 1 commit.
- 168d748 Update control.h
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
@StevenPHirshman pushed 1 commit.
- 98ae974 Update control.h
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
@StevenPHirshman pushed 1 commit.
- b201283 Update window.h
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#25818)Sorry but you need to really stop and think about what you're doing. There are things here that make absolutely no sense, like changes in include/wx/msw/setup.h or src/common/event.h you've added for no discernible reason.
Please check your changes in "Files changed" tab before clicking "Submit"!
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
@StevenPHirshman pushed 1 commit.
- 80f0a0b Delete src/common/event.h
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
@StevenPHirshman pushed 1 commit.
- 9ab0ebb Delete include/wx/msw/setup.h
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
@StevenPHirshman pushed 1 commit.
- a52c4c1 Add files via upload
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
StevenPHirshman
StevenPHirshman left a comment (wxWidgets/wxWidgets#25818)Sorry but you need to really stop and think about what you're doing. There are things here that make absolutely no sense, like changes in
include/wx/msw/setup.horsrc/common/event.hyou've added for no discernible reason.Please check your changes in "Files changed" tab before clicking "Submit"!
I don't know how the event.h file got there - I deleted it. There are NO CHANGES made to the setup.h file. I just downloaded it from your repository and uploaded it again to mine - the file is identical to what is in your repository. No changes.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#25818)You undid changes to setup.h but there are still changes in include/wx/msw/wx.rc. Which means that you probably still didn't look at the changes, as advised to do multiple times before.
Sorry, I don't know how to say it more clearly, but you MUST review your changes before submitting them.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
Closed #25818.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#25818)To avoid wasting more time on this, I've created my own version of your PR in #25820. Please test it there and if it works for you, I'll merge it soon.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.