haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove no longer needed hack on msw with wx 3.2.5 

wxButton::GetDefaultSize was fixed and returns the correct size now
This commit is contained in:
Marek Roszko 2024-05-25 10:45:27 -04:00
parent ba65231f6b
commit 808517dd74
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/widgets/std_bitmap_button.cpp
View File

@ -41,19 +41,9 @@ STD_BITMAP_BUTTON::STD_BITMAP_BUTTON( wxWindow* aParent, wxWindowID aId,
{
if( aSize == wxDefaultSize )
{
#ifndef __WXMSW__
wxSize defaultSize = wxButton::GetDefaultSize( aParent );
#ifndef __WXMSW__
defaultSize.IncBy( 1 );
#else
// wxButton::GetDefaultSize does not work on Windows, it's based on some archiac
// ascii text size logic that does not hold true in modern Windows at hi dpi scaling
// instead spawn a button, grab it's size and then toss it :D
wxButton* dummyButton = new wxButton( this, wxID_ANY );
dummyButton->SetLabelText( "Z" );
wxSize defaultSize = dummyButton->GetSize();
dummyButton->Hide();
delete dummyButton;
#endif
SetMinSize( defaultSize );
}