[Git][wxwidgets/wxwidgets][master] 6 commits: Move fallback definitions used only in wxWebViewIE to its header

2 views
Skip to first unread message

Vadim Zeitlin (@_VZ_)

unread,
Apr 24, 2026, 1:47:51 PMApr 24
to wx-commi...@googlegroups.com

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets

Commits:

  • f8d47598
    by Vadim Zeitlin at 2026-04-20T23:09:16+02:00 
    Move fallback definitions used only in wxWebViewIE to its header

Don't define INET_E_XXX symbols use only by wxWebViewIE in
wx/msw/missing.h included by all files, this is unnecessary and also can
result in problems if the application predefines WIN32_LEAN_AND_MEAN, as
these symbols are not defined after including just windows.h in this
case but are defined if urlmon.h is included later, e.g. by one of COM
headers, as their definitions in urlmon.h would results in redefinition
warnings.

Instead, define them only in webview_missing.h and include it after all
Windows headers to ensure that these symbols are defined if they are
present there (which is probably always the case by now).
  • 96eaa04e
    by Vadim Zeitlin at 2026-04-24T16:45:45+02:00 
    Stop scaling icons loaded from resources in wxMSW

This is not backwards compatible but looks like the right thing to do
because old behaviour was inconsistent: using LoadIcon() meant that we
always loaded icons of the given (system default size) which meant that
some icons were upscaled while the others were not, e.g. in a system
using 200% scaling 16x16 icons were loaded as 32x32 ones, but so were
32x32 icons too.

Use LoadImage() to load the image in its actual size, where "actual"
means the size of the first icon for icons with multiple bitmaps. This
might not be the best thing to do and maybe we should load the default
icon size if the icon provides it, which could be done in a way similar
to what we do in MSW-specific wxIconBundle::AddIcon().

Not scaling the icons means that they always use scale of 1, which makes
things behave correctly for DPI-unaware applications that were broken
before, which seems better even if it breaks DPI-aware applications: but
those should be using wxBitmapBundle, which still works correctly.

See #26370.

Closes #26369.
  • 81423de6
    by Vadim Zeitlin at 2026-04-24T16:46:31+02:00 
    Set wxSlider thumb size to match its initial size in wxMSW

The changes of 8f3b87dce7 (Fix wxSlider::SetThumbLength() on wxMSW,
2019-01-31) broke the behaviour of wxSlider controls created with a
fixed height as their thumb didn't fit it any longer and left no space
for ticks at all.

Work around this by setting the initial thumb size ourselves if a fixed
control size is given. Also use the fixed default thumb size when
calculating the best size as the value of GetThumbLength() could vary
depending on how the control was created.

It might be better to revert the use of TBS_FIXEDLENGTH and just leave
with the default thumb size in any DPI.

See #1208.

See #26372.
  • bad7d09d
    by Vadim Zeitlin at 2026-04-24T16:56:12+02:00 
    Fix positioning images in generic wx{List,Tree}Ctrl in high DPI

The implementation of GetImageLogicalSize() overload taking the image
index returned correct answer for this individual image, but was wrong
when used in the control with multiple images with different logical
sizes. This resulted in the actual bitmap being drawn, as returned by
GetImageBitmapFor(), being of different size than the size returned by
this function, as GetImageBitmapFor() uses the best ("consensus") size
for all images, which is also returned by GetImageLogicalSize() overload
not taking the image.

Solve this by simply getting rid of the overload taking the image and
replacing all existing calls to it with the calls to the other overload.
This is backwards-incompatible, but this function was only added in 3.3
and removing it is a lesser evil than either leaving a function which
can only be misused, or keeping the unused image index parameter which
would be confusing.

See #26397.

Closes #26391.
  • 1bc4900e
    by stevecor at 2026-04-24T19:10:09+02:00 
    Remove wxUSE_GEOMETRY

Disabling it doesn't save much on code size and the build without it is
currently broken anyhow, so just remove the possibility to turn it off.

Closes #26388.

Closes #26402.
  • 1a8ef74f
    by mcorino at 2026-04-24T19:13:37+02:00 
    Fix wxRibbonPanel::GetMinimisedIcon() docs after recent changes

This was forgotten in 722f58e238 (Refactor wxRibbon to use
wxBitmapBundle for icons and images, 2026-01-25), see #26117.

Closes #26406.

Co-authored-by: Vadim Zeitlin <va...@wxwidgets.org>

31 changed files:

The diff was not included because it is too large.
Reply all
Reply to author
Forward
0 new messages