X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f644b28c1154d638270d0d1abbc41f760be6abbd..4e1ba52e0a6749942692db66e852994113eac1af:/src/common/layout.cpp diff --git a/src/common/layout.cpp b/src/common/layout.cpp index adadfe0be5..c542527219 100644 --- a/src/common/layout.cpp +++ b/src/common/layout.cpp @@ -60,10 +60,6 @@ wxIndividualLayoutConstraint::wxIndividualLayoutConstraint() otherWin = (wxWindowBase *) NULL; } -wxIndividualLayoutConstraint::~wxIndividualLayoutConstraint() -{ -} - void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg) { if (rel == wxSameAs) @@ -304,7 +300,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr { int x, y; int w, h; - win->GetSize(&w, &h); + win->GetBestSize(&w, &h); win->GetPosition(&x, &y); value = x + w; done = true; @@ -457,7 +453,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr { int x, y; int w, h; - win->GetSize(&w, &h); + win->GetBestSize(&w, &h); win->GetPosition(&x, &y); value = h + y; done = true; @@ -625,7 +621,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr if (win) { int h; - win->GetSize(&value, &h); + win->GetBestSize(&value, &h); done = true; return true; } @@ -683,7 +679,7 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr if (win) { int w; - win->GetSize(&w, &value); + win->GetBestSize(&w, &value); done = true; return true; } @@ -960,10 +956,6 @@ wxLayoutConstraints::wxLayoutConstraints() height.SetEdge(wxHeight); } -wxLayoutConstraints::~wxLayoutConstraints() -{ -} - bool wxLayoutConstraints::SatisfyConstraints(wxWindowBase *win, int *nChanges) { int noChanges = 0;