cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrap wxStaticText contents under Mac too

Browse Source 
Instead of just clipping the label, wrap it. This is more consistent
with wxMSW and wxGTK and also generally more useful.

See #23341, #23345.

(cherry picked from commit 9c8dfe5b2a8a6d80c25bee37e6a2d9d03656c3e7)
This commit is contained in:
Stefan Csomor 2023-03-13 17:31:15 +01:00 committed by Vadim Zeitlin
parent b2d8c472db
commit bf83403ea7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -399,6 +399,7 @@ wxOSX:
- Fix wxLocale::GetCurrent() when the current locale is "C".
- Fix wxLocale::Init(wxLANGUAGE_DEFAULT) with "mixed" locales (#23114).
- Fix setting Chinese locales (#23209).
- Wrap wxStaticText contents (#23341).
wxQt:

2
src/osx/cocoa/stattext.mm
View File

@ -157,7 +157,7 @@ wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
[v setBezeled:NO];
[v setBordered:NO];
NSLineBreakMode linebreak = NSLineBreakByClipping;
NSLineBreakMode linebreak = NSLineBreakByWordWrapping;
if ( style & wxST_ELLIPSIZE_MASK )
{
if ( style & wxST_ELLIPSIZE_MIDDLE )