X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f03fc89fff2d6e823e7d4d14fbe14822ad6777b1..e65cc56a3b275ef24ab117dfcd84b75dd33ab66f:/src/common/layout.cpp

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 9a021d569b..e11c18f3f2 100644
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -16,6 +16,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
     #pragma implementation "layout.h"
 #endif
@@ -24,17 +25,21 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-    #pragma hdrstop
+  #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+  #include "wx/defs.h"
 #endif
 
-#include "wx/defs.h"
+#if wxUSE_CONSTRAINTS
 
 #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"
@@ -1342,13 +1347,13 @@ void wxSizer::DoSetSize(int x, int y, int w, int h, int WXUNUSED(flags))
     }
 }
 
-void wxSizer::GetSize(int *w, int *h) const
+void wxSizer::DoGetSize(int *w, int *h) const
 {
     *w = sizerWidth;
     *h = sizerHeight;
 }
 
-void wxSizer::GetPosition(int *x, int *y) const
+void wxSizer::DoGetPosition(int *x, int *y) const
 {
     *x = sizerX;
     *y = sizerY;
@@ -1762,3 +1767,4 @@ wxSpacingSizer::~wxSpacingSizer()
 {
 }
 
+#endif // wxUSE_CONSTRAINTS