X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8898456df4728afe7d100011e0e23b0ffb9a6341..d6a658ff0cd928953efdaf1ea56ff04b9cf281c1:/src/common/layout.cpp diff --git a/src/common/layout.cpp b/src/common/layout.cpp index d49aaea5b2..d479f3476e 100644 --- a/src/common/layout.cpp +++ b/src/common/layout.cpp @@ -26,6 +26,8 @@ #if wxUSE_CONSTRAINTS +#include "wx/layout.h" + #ifndef WX_PRECOMP #include "wx/window.h" #include "wx/utils.h" @@ -34,8 +36,6 @@ #include "wx/intl.h" #endif -#include "wx/layout.h" - IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject) @@ -75,7 +75,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 +158,7 @@ bool wxIndividualLayoutConstraint::ResetIfWin(wxWindowBase *otherW) value = 0; percent = 0; otherEdge = wxTop; - otherWin = (wxWindowBase *) NULL; + otherWin = NULL; return true; }