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

Applied Patch 664399: wxButton default size should not be adjusted

Browse Source 
(wxUniv)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-02-02 14:39:55 +00:00
parent f68c6b523c
commit 61a83c1c50
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/univ/button.cpp
View File

@@ -113,8 +113,11 @@ wxSize wxButtonBase::GetDefaultSize()
// this corresponds more or less to wxMSW standard in Win32 theme (see // this corresponds more or less to wxMSW standard in Win32 theme (see
// wxWin32Renderer::AdjustSize()) // wxWin32Renderer::AdjustSize())
s_sizeBtn.x = 8*dc.GetCharWidth(); // s_sizeBtn.x = 8*dc.GetCharWidth();
s_sizeBtn.y = (11*dc.GetCharHeight())/10 + 2; // s_sizeBtn.y = (11*dc.GetCharHeight())/10 + 2;
// Otto Wyss, Patch 664399
s_sizeBtn.x = dc.GetCharWidth()*10 + 2;
s_sizeBtn.y = dc.GetCharHeight()*11/10 + 2;
} }
return s_sizeBtn; return s_sizeBtn;
@@ -136,6 +139,11 @@ wxSize wxButton::DoGetBestClientSize() const
width += m_bitmap.GetWidth() + 2*m_marginBmpX; width += m_bitmap.GetWidth() + 2*m_marginBmpX;
} }
// The default size should not be adjusted, so the code is moved into the
// renderer. This is conceptual wrong but currently the only solution.
// (Otto Wyss, Patch 664399)
/*
// for compatibility with other ports, the buttons default size is never // for compatibility with other ports, the buttons default size is never
// less than the standard one, but not when display not PDAs. // less than the standard one, but not when display not PDAs.
if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA) if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA)
@@ -147,7 +155,7 @@ wxSize wxButton::DoGetBestClientSize() const
width = szDef.x; width = szDef.x;
} }
} }
*/
return wxSize(width, height); return wxSize(width, height);
} }