Merge in from trunk r64802 - r68625

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

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 710ff2223e12cf68f66c5822d8e99b764ac520ed..d479f3476e8bc85e1e79a5e57511080417f840eb 100644 (file)
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -75,7 +75,7 @@ wxIndividualLayoutConstraint::wxIndividualLayoutConstraint()
     percent = 0;
     otherEdge = wxTop;
     done = false;
     percent = 0;
     otherEdge = wxTop;
     done = false;

-    otherWin = (wxWindowBase *) NULL;
+    otherWin = NULL;

 }
 
 void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg)
 }
 
 void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg)


@@ -158,7 +158,7 @@ bool wxIndividualLayoutConstraint::ResetIfWin(wxWindowBase *otherW)
         value = 0;
         percent = 0;
         otherEdge = wxTop;
         value = 0;
         percent = 0;
         otherEdge = wxTop;

-        otherWin = (wxWindowBase *) NULL;
+        otherWin = NULL;

         return true;
     }
 
         return true;
     }