Warning fixes.

[wxWidgets.git] / src / common / layout.cpp

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index adadfe0be554a8cf6c167419d7fe3c4a73f3659b..c542527219fe1a47c5d6cda59be06d2ed8f9af3b 100644 (file)
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -60,10 +60,6 @@ wxIndividualLayoutConstraint::wxIndividualLayoutConstraint()
     otherWin = (wxWindowBase *) NULL;
 }
 
     otherWin = (wxWindowBase *) NULL;
 }
 

-wxIndividualLayoutConstraint::~wxIndividualLayoutConstraint()
-{
-}
-

 void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg)
 {
     if (rel == wxSameAs)
 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;
                 {
                     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;


@@ -457,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;


@@ -625,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;
                     }


@@ -683,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;
                     }


@@ -960,10 +956,6 @@ wxLayoutConstraints::wxLayoutConstraints()
     height.SetEdge(wxHeight);
 }
 
     height.SetEdge(wxHeight);
 }
 

-wxLayoutConstraints::~wxLayoutConstraints()
-{
-}
-

 bool wxLayoutConstraints::SatisfyConstraints(wxWindowBase *win, int *nChanges)
 {
     int noChanges = 0;
 bool wxLayoutConstraints::SatisfyConstraints(wxWindowBase *win, int *nChanges)
 {
     int noChanges = 0;