Updates to or activation of wxChoice, wxStaticBitmap, wxBookCtrl on iOS (PR #25846)
RobertRoeb
Activate and use wxBitmapBundle in wxStaticBitmap
Activate wxChoice and implement EVT_CHOICE
Activate wxBookCtrl
Small correction about Resource directory on IOS
Implement label next to checkbox
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/25846
Commit Summary
- dd4ee47 Updates to or activation of wxChoice, wxStaticBitmap, wxBookCtrl
File Changes
(9 files)
- M Makefile.in (16)
- M build/bakefiles/files.bkl (1)
- M include/wx/bookctrl.h (2)
- M include/wx/osx/iphone/chkconf.h (24)
- M include/wx/simplebook.h (1)
- M interface/wx/stdpaths.h (1)
- M src/osx/iphone/checkbox.mm (31)
- M src/osx/iphone/choice.mm (10)
- M src/osx/iphone/statbmp.mm (8)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/25846.patch
- https://github.com/wxWidgets/wxWidgets/pull/25846.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
Could you please check/explain what happened to wx/choicebk.h inclusion?
Also, ideally this PR would have consisted of 3 or 4 commits, but maybe it can still be split when applying it...
> @@ -437,7 +437,7 @@ typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);
#define EVT_BOOKCTRL_PAGE_CHANGING(id, fn) EVT_NOTEBOOK_PAGE_CHANGING(id, fn)
#else
// dedicated to Smartphones
- #include "wx/choicebk.h"
+ // #include "wx/choicebk.h"
If we don't include it from here, we shouldn't define wxBookCtrl as wxChoicebook.
> @@ -11,6 +11,7 @@ #define _WX_SIMPLEBOOK_H_ #include "wx/compositebookctrl.h" +#include "wx/choicebk.h"
This really shouldn't be necessary here, something is wrong if it is.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
RobertRoeb
RobertRoeb left a comment (wxWidgets/wxWidgets#25846)ideally this PR would have consisted of 3 or 4 commits,
I didn't think of that. Let me know if I should re-do it
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
RobertRoeb
@RobertRoeb commented on this pull request.
> @@ -11,6 +11,7 @@ #define _WX_SIMPLEBOOK_H_ #include "wx/compositebookctrl.h" +#include "wx/choicebk.h"
src/xrc/xh_simplebook.cpp:21:
../wxWidgetsRR/include/wx/simplebook.h:167:36: error: use of undeclared identifier 'wxEVT_CHOICEBOOK_PAGE_CHANGING'
167 | return new wxBookCtrlEvent(wxEVT_BOOKCTRL_PAGE_CHANGING,
| ^
../wxWidgetsRR/include/wx/bookctrl.h:443:52: note: expanded from macro 'wxEVT_BOOKCTRL_PAGE_CHANGING'
443 | #define wxEVT_BOOKCTRL_PAGE_CHANGING wxEVT_CHOICEBOOK_PAGE_CHANGING
| ^
In file included from ../wxWidgetsRR/src/xrc/xh_simplebook.cpp:21:
../wxWidgetsRR/include/wx/simplebook.h:173:28: error: use of undeclared identifier 'wxEVT_CHOICEBOOK_PAGE_CHANGED'
173 | event.SetEventType(wxEVT_BOOKCTRL_PAGE_CHANGED);
| ^
../wxWidgetsRR/include/wx/bookctrl.h:442:52: note: expanded from macro 'wxEVT_BOOKCTRL_PAGE_CHANGED'
442 | #define wxEVT_BOOKCTRL_PAGE_CHANGED wxEVT_CHOICEBOOK_PAGE_CHANGED
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
RobertRoeb
@RobertRoeb commented on this pull request.
> @@ -437,7 +437,7 @@ typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);
#define EVT_BOOKCTRL_PAGE_CHANGING(id, fn) EVT_NOTEBOOK_PAGE_CHANGING(id, fn)
#else
// dedicated to Smartphones
- #include "wx/choicebk.h"
+ // #include "wx/choicebk.h"
src/common/bookctrl.cpp
In file included from ../wxWidgetsRR/src/common/bookctrl.cpp:24:
In file included from ../wxWidgetsRR/include/wx/compositebookctrl.h:13:
In file included from ../wxWidgetsRR/include/wx/bookctrl.h:440:
../wxWidgetsRR/include/wx/choicebk.h:38:46: error: expected class name
38 | class WXDLLIMPEXP_CORE wxChoicebook : public wxCompositeBookCtrlBase
| ^
../wxWidgetsRR/include/wx/choicebk.h:62:18: error: 'SetPageText' marked 'override' but does not override any member functions
62 | virtual bool SetPageText(size_t n, const wxString& strText) override;
| ^
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
RobertRoeb
@RobertRoeb commented on this pull request.
> @@ -437,7 +437,7 @@ typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);
#define EVT_BOOKCTRL_PAGE_CHANGING(id, fn) EVT_NOTEBOOK_PAGE_CHANGING(id, fn)
#else
// dedicated to Smartphones
- #include "wx/choicebk.h"
+ // #include "wx/choicebk.h"
It has taken me an hour to make this compile
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
> @@ -437,7 +437,7 @@ typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);
#define EVT_BOOKCTRL_PAGE_CHANGING(id, fn) EVT_NOTEBOOK_PAGE_CHANGING(id, fn)
#else
// dedicated to Smartphones
- #include "wx/choicebk.h"
+ // #include "wx/choicebk.h"
The first error seems to indicate that wxUSE_BOOKCTRL==0 in your build, which is problematic as it clearly includes wxBookCtrlBase-derived classes.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
> @@ -11,6 +11,7 @@ #define _WX_SIMPLEBOOK_H_ #include "wx/compositebookctrl.h" +#include "wx/choicebk.h"
I admit I have no idea why does wx/choicebk.h compile for you here but not above, but in any case it's obviously wrong to include the header declaring an unrelated class into this one, so I don't really understand how can you seriously propose doing it :-(
The real problem is that wxEVT_BOOKCTRL_PAGE_CHANGING is not defined by wx/bookctrl.h any more after the other change above, so that must be fixed and this one reverted.
—
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#25846)ideally this PR would have consisted of 3 or 4 commits,
I didn't think of that. Let me know if I should re-do it
I'd be glad if you did but I suspect it may take me less time to do it when merging, so I'm ready to do it myself. But please fix the other things if you can.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
RobertRoeb
RobertRoeb left a comment (wxWidgets/wxWidgets#25846)I removed activating wxChoiceBook as I don't know how to do it properly and I don't need it anymore as I just submitted wxNotebook
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
RobertRoeb
@RobertRoeb pushed 1 commit.
- 98990e3 Remove wxBookCtrl parts, proper calculation of wxCheckBox's label
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
RobertRoeb
@RobertRoeb pushed 1 commit.
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.