use GetBestSize() and not GetSize() for AsIs() size constraints -- this makes much...

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 203e80717f6632ccf27c50c98db56b4310dacb14..787f7f6fe315760b52ad6d0346fa2b2f838b7540 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -211,6 +211,7 @@ All:
 All (GUI):
 
 - recursive wxSizer::GetItem returns item of given window, sizer or nth index
 All (GUI):
 
 - recursive wxSizer::GetItem returns item of given window, sizer or nth index

+- wxLayoutConstraints now use best size, not current size, for AsIs() condition

 
 Unix:
 
 
 Unix:
 

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 85dcafbb11fc0d6f0daf20380f478bfb805d0620..c542527219fe1a47c5d6cda59be06d2ed8f9af3b 100644 (file)
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -300,7 +300,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr
                 {
                     int x, y;
                     int w, h;
                 {
                     int x, y;
                     int w, h;

-                    win->GetSize(&w, &h);
+                    win->GetBestSize(&w, &h);

                     win->GetPosition(&x, &y);
                     value = x + w;
                     done = true;
                     win->GetPosition(&x, &y);
                     value = x + w;
                     done = true;


@@ -453,7 +453,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr
                 {
                     int x, y;
                     int w, h;
                 {
                     int x, y;
                     int w, h;

-                    win->GetSize(&w, &h);
+                    win->GetBestSize(&w, &h);

                     win->GetPosition(&x, &y);
                     value = h + y;
                     done = true;
                     win->GetPosition(&x, &y);
                     value = h + y;
                     done = true;


@@ -621,7 +621,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr
                     if (win)
                     {
                         int h;
                     if (win)
                     {
                         int h;

-                        win->GetSize(&value, &h);
+                        win->GetBestSize(&value, &h);

                         done = true;
                         return true;
                     }
                         done = true;
                         return true;
                     }


@@ -679,7 +679,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr
                     if (win)
                     {
                         int w;
                     if (win)
                     {
                         int w;

-                        win->GetSize(&w, &value);
+                        win->GetBestSize(&w, &value);

                         done = true;
                         return true;
                     }
                         done = true;
                         return true;
                     }