X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8898456df4728afe7d100011e0e23b0ffb9a6341..cc4d5638c66a409e421420ed7110917755a66788:/src/common/layout.cpp?ds=inline

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index d49aaea5b2..9d23b46116 100644
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,6 +25,8 @@
 
 #if wxUSE_CONSTRAINTS
 
+#include "wx/layout.h"
+
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/utils.h"
@@ -34,8 +35,6 @@
     #include "wx/intl.h"
 #endif
 
-#include "wx/layout.h"
-
 
 IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)
@@ -75,7 +74,7 @@ wxIndividualLayoutConstraint::wxIndividualLayoutConstraint()
     percent = 0;
     otherEdge = wxTop;
     done = false;
-    otherWin = (wxWindowBase *) NULL;
+    otherWin = NULL;
 }
 
 void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg)
@@ -158,7 +157,7 @@ bool wxIndividualLayoutConstraint::ResetIfWin(wxWindowBase *otherW)
         value = 0;
         percent = 0;
         otherEdge = wxTop;
-        otherWin = (wxWindowBase *) NULL;
+        otherWin = NULL;
         return true;
     }