From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 11 Feb 2003 15:50:59 +0000 (+0000)
Subject: Added an item to toback24.txt
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b6e2df0b36cb67b5f69736ff03613cbc831e41cd

Added an item to toback24.txt


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/toback24.txt b/docs/toback24.txt
index 0ce9690c8f..e212ada2e1 100644
--- a/docs/toback24.txt
+++ b/docs/toback24.txt
@@ -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;
+>             }
+>         }
+> 
+
+