Fix code generating when wxWidgets 3.1 is set #1330
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Support was already in place for a wxWizard that had a bitmap, but not for creating one without.
The problem with using BitmapBundle() is it requires including bmpbndl.h just to get the BitmapBundle() declaration even though it might not be used anywhere else in the generated code. That requires conditionals around both the header file and the Create() function. Using wxNullBitmap works fine as an alternative to BitmapBundle() as far as wxWidgets 3.2 and beyond is concerned.
Weight() and using a float for a point size were not supported until 3.1.2.
This will likely get replaced in a future wxWidgets code update, but in the meantime it shuts off a non-stop assert while doing some testing on wxUE code generation.
This is primarily for the wxRibbon toolbar -- under 3.2, this generates a bundle and then extracts a bitmap that matches the DPI size. Under 3.1, there is no DPI scaling and no wxBitmapBundle, so only a simple bitmap is needed.
This fixes problems with code generation for bundles/bitmaps when a conditional for 3.1.6 is in place.
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes a number of problems when generating code with wxWidgets 3.1 selected, mostly related to how images are loaded (wxImage versus wxBitmapBundle).