FreeBSD compilation fixes

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

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 517d626892d7e9d9f0e6e7678ce1ce651a61df8d..e8f22391a6d5b5f4a64f3cf229ece5d7c19551cd 100644 (file)
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -22,8 +22,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_CONSTRAINTS
-
 #ifndef WX_PRECOMP
 #include "wx/window.h"
 #include "wx/utils.h"
@@ -1275,7 +1273,7 @@ void wxSizer::RemoveSizerChild(wxWindow *child)
   GetChildren().DeleteObject(child);
 }
 
-void wxSizer::SetSize(int x, int y, int w, int h, int WXUNUSED(flags))
+void wxSizer::DoSetSize(int x, int y, int w, int h, int WXUNUSED(flags))
 {
   wxLayoutConstraints *constr = GetConstraints();
   if (x != -1)
@@ -1502,11 +1500,6 @@ wxRowColSizer::~wxRowColSizer()
 {
 }
 
-void wxRowColSizer::SetSize(int x, int y, int w, int h, int flags)
-{
-  wxSizer::SetSize(x, y, w, h, flags);
-}
-
 bool wxRowColSizer::LayoutPhase1(int *noChanges)
 {
   *noChanges = 0;
@@ -1727,6 +1720,3 @@ wxSpacingSizer::~wxSpacingSizer()
 {
 }
 
-
-
-#endif