Skip to content

Incl cleanup#7

Merged
lanurmi merged 35 commits intomasterfrom
incl-cleanup
Mar 11, 2025
Merged

Incl cleanup#7
lanurmi merged 35 commits intomasterfrom
incl-cleanup

Conversation

@lanurmi
Copy link
Owner

@lanurmi lanurmi commented Feb 24, 2025

No description provided.

vadz and others added 28 commits February 22, 2025 15:15
No real changes, just a small clean up.
Since the changes of 6f463d1 (Make sizes in wxAuiDockArt metrics DPI
independent, 2024-09-28) all metrics used by wxAuiDockArt were scaled by
the DPI factor, but this could be undesirable for the metrics using
small values, such as the border size, which is just 1px by default, but
became 2px when using 200% DPI scaling, or even sash size, which also
became visually too thick at 8px instead of the default 4px.

Revert to the old behaviour for just these metrics by adding a new
virtual GetMetricForWindow() function to wxAuiDockArt which decides
whether the given metric should or not be scaled by the DPI and don't do
it by default for these two metrics.

Document that this -- admittedly, rather arbitrary -- logic can be
changed by overriding GetMetricForWindow() in the derived classes.

See wxWidgets#24844.

Closes wxWidgets#25006.
The existing code added new tabs before setting their label, which
resulted in them being shown initially truncated.

Fix this by adding new tabs with their correct label (and image), as
this seems to make more sense and also fixes the problem.

Also don't override SetMaximum() in wxCocoaTabView, this doesn't make
sense as wxNotebook doesn't have a "maximum" property unlike wxSpinCtrl
or wxGauge, for which this function (and the associated SetMinimum())
exists, and just do what this function did in SetupTabs() itself, which
is the function explicitly intended to be overridden in wxNotebook.

See wxWidgets#25196.

Closes wxWidgets#25194.
Avoid scaling small AUI dock art metrics by DPI.

See wxWidgets#25191.
This test was added back in 232fdc6 (Merge the new GUI tests from
SOC2010_GUI_TEST branch., 2010-08-22) but didn't use actual line break
to an apparent confusion between slash and backslash.
No real changes, just use a more clearly named function and remove the
unnecessary inclusion of wx/utils.h (where wxStripMenuCodes() is
declared).
It may be different from the GtkLabel text if we had stripped any
mnemonics from it.
Avoid duplicating the same code, extract it into a helper function.

No real changes.
This function doesn't work for all windows, notably it doesn't do
anything and triggers an assert for wxTextCtrl since the changes of
79f0697 (Make wxTextCtrl::SetLabel() consistently do nothing
everywhere, 2024-11-28), so don't use it to store the notebook page
title and store it separately, just as we already do for the page
images and as was done for wxGTK in the recent 3835619 (Store the
original page text in wxGTK wxNotebook, 2025-02-24).

Incidentally, this also makes GetPageText() return the same string that
was passed to SetPageText() instead of returning the string with the
mnemonics stripped, as it did before.

Closes wxWidgets#25195.
Due to a missing comma in wxAuiToolBarArtSetting, this enum element
didn't appear in the generated documentation.

This should have been part of 7a8e314 (Fix clicking on drop down
button in wxAuiToolBar on wxMSW, 2018-09-20), see wxWidgets#939.
Don't override virtual functions only to forward to the base class
versions.

No real changes.
Store them in DIPs internally and apply the window-dependent scale
factor when actually using them to ensure that they can have different
values for windows on the monitors using different DPI.

This mirrors what was done to wxAuiDockArt previously.

See wxWidgets#25191.
Do it for consistency with the other wxBookCtrl-derived classes.

Document this behaviour.
This passes now, after the recent changes.

Also update the sample to use a mnemonic for one of the pages to be able
to check that it appears correctly visually too.
We can get events with unknown (and, arguably, invalid) values, at least
when using Samba, so don't assert if this happens but just ignore them.

This extends the changes of 83c75a4 (Ignore invalid file notification
events, 2020-10-30) to cover all unknown events and not just those with
"Action" field set to 0.

Closes wxWidgets#18953.
Get rid of an unnecessary temporary variable, make another local
variable const.

No real changes.
The return value of Native2WatcherFlags() never includes
wxFSW_EVENT_WARNING or wxFSW_EVENT_ERROR, so don't test for them.

Also don't compare flags with 0 needlessly as the other half of
comparison catches this case too.

No changes in behaviour.
No real changes, just another bit of minor cleanup in MSW
wxFileSystemWatcher code.
Panes may be hidden by user, so it makes sense to store their visibility
as part of the serialized representation to be able to restore the same
visual layout later.

See wxWidgets#25186.
Fix confusion between wxNotebook pages text and label.

See wxWidgets#25197.
Improve AUI bar art sizes scaling when using per-monitor DPI.

See wxWidgets#25198.
Ignore all unknown events in wxMSW wxFileSystemWatcher.

See wxWidgets#25201.
Don't include standard C headers that aren't used for anything by the
wx headers.
@lanurmi lanurmi merged commit 44c5b7f into master Mar 11, 2025
33 of 37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants