X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..4aa1406671c5d6abded83e3713b423ac4d40b7c9:/src/common/layout.cpp diff --git a/src/common/layout.cpp b/src/common/layout.cpp index 5fbe0e19f6..710ff2223e 100644 --- a/src/common/layout.cpp +++ b/src/common/layout.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: layout.cpp +// Name: src/common/layout.cpp // Purpose: Constraint layout system classes // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================= @@ -21,28 +21,24 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/defs.h" + #pragma hdrstop #endif #if wxUSE_CONSTRAINTS +#include "wx/layout.h" + #ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/msgdlg.h" - #include "wx/intl.h" + #include "wx/window.h" + #include "wx/utils.h" + #include "wx/dialog.h" + #include "wx/msgdlg.h" + #include "wx/intl.h" #endif -#include "wx/layout.h" - - IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject) - IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject) inline void wxGetAsIs(wxWindowBase* win, int* w, int* h) @@ -51,7 +47,7 @@ inline void wxGetAsIs(wxWindowBase* win, int* w, int* h) // The old way. Works for me. win->GetSize(w, h); #endif - + #if 0 // Vadim's change. Breaks wxPython's LayoutAnchors win->GetBestSize(w, h);