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

Added an item to toback24.txt

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-02-11 15:50:59 +00:00
parent 6185050104
commit b6e2df0b36
1 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
docs/toback24.txt
View File

@@ -348,7 +348,6 @@ Checking in src/common/wxexpr.cpp;
new revision: 1.27; previous revision: 1.26
done
27. Fix assert (and crash in debug) in wxFileConfigGroup::DeleteSubgroupByName
Checking in src/common/fileconf.cpp;
@@ -363,3 +362,53 @@ Checking in src/msw/scrolbar.cpp;
new revision: 1.24; previous revision: 1.23
done
29. Patch 664399: wxButton default size should not be adjusted
(wxUniv), cures overlapping buttons on e.g. wxWizard sample.
Index: src/univ/button.cpp
===================================================================
RCS file: /pack/cvsroots/wxwindows/wxWindows/src/univ/button.cpp,v
retrieving revision 1.15
diff -r1.15 button.cpp
116,117c116,117
< s_sizeBtn.x = 8*dc.GetCharWidth();
< s_sizeBtn.y = (11*dc.GetCharHeight())/10 + 2;
---
> s_sizeBtn.x = dc.GetCharWidth()*10 + 2;
> s_sizeBtn.y = dc.GetCharHeight()*11/10 + 2;
139,149c139,140
< // for compatibility with other ports, the buttons default size is never
< // less than the standard one, but not when display not PDAs.
< if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA)
< {
< if ( !(GetWindowStyle() & wxBU_EXACTFIT) )
< {
< wxSize szDef = GetDefaultSize();
< if ( width < szDef.x )
< width = szDef.x;
< }
< }
---
> // The default size should not be adjusted, so the code is moved into the
> // renderer. This is conceptual wrong but currently the only solution
Index: src/univ/themes/win32.cpp
===================================================================
RCS file: /pack/cvsroots/wxwindows/wxWindows/src/univ/themes/win32.cpp,v
retrieving revision 1.55
diff -r1.55 win32.cpp
3989a3990,4001
> // for compatibility with other ports, the buttons default size is never
> // less than the standard one, but not when display not PDAs.
> if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA)
> {
> if ( !(window->GetWindowStyle() & wxBU_EXACTFIT) )
> {
> wxSize szDef = wxButton::GetDefaultSize();
> if ( size->x < szDef.x )
> size->x = szDef.x;
> }
> }
>