BIG glitch.

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

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index ab4aee570a2b835714daba6d94b6d4b55c99e9aa..e8f22391a6d5b5f4a64f3cf229ece5d7c19551cd 100644 (file)
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -22,8 +22,6 @@
 
 #include "wx/defs.h"
 
-#if USE_CONSTRAINTS
-
 #ifndef WX_PRECOMP
 #include "wx/window.h"
 #include "wx/utils.h"
@@ -92,7 +90,7 @@ int wxSizerMarginY(wxWindow *win)
 wxIndividualLayoutConstraint::wxIndividualLayoutConstraint()
 {
   myEdge = wxTop; relationship = wxUnconstrained; margin = 0; value = 0; percent = 0; otherEdge = wxTop;
-  done = FALSE; otherWin = NULL;
+  done = FALSE; otherWin = (wxWindow *) NULL;
 }
 
 wxIndividualLayoutConstraint::~wxIndividualLayoutConstraint()
@@ -140,7 +138,7 @@ bool wxIndividualLayoutConstraint::ResetIfWin(wxWindow *otherW)
   if (otherW == otherWin)
   {
     myEdge = wxTop; relationship = wxAsIs; margin = 0; value = 0; percent = 0; otherEdge = wxTop;
-    otherWin = NULL;
+    otherWin = (wxWindow *) NULL;
     return TRUE;
   }
   else
@@ -731,7 +729,7 @@ int wxIndividualLayoutConstraint::GetEdge(wxEdge which,
   // know the dimension is obtainable immediately.
   // E.g. a wxExpandSizer may contain a button (but the button's
   // true parent is a panel, not the sizer)
-  if (other->GetChildren()->Member(thisWin))
+  if (other->GetChildren().Member(thisWin))
   {
     switch (which)
     {
@@ -1054,7 +1052,7 @@ bool wxOldDoLayout(wxWindow *win)
 
   doneSoFar.Append(win);
 
-  wxNode *node = win->GetChildren()->First();
+  wxNode *node = win->GetChildren().First();
   while (node)
   {
     wxWindow *child = (wxWindow *)node->Data();
@@ -1079,7 +1077,7 @@ bool wxOldDoLayout(wxWindow *win)
   while ((noChanges > 0) && (noIterations < maxIterations))
   {
     noChanges = 0;
-    wxNode *node = win->GetChildren()->First();
+    wxNode *node = win->GetChildren().First();
     while (node)
     {
       wxWindow *child = (wxWindow *)node->Data();
@@ -1104,7 +1102,7 @@ bool wxOldDoLayout(wxWindow *win)
 */
   // Now set the sizes and positions of the children, and
   // recursively call Layout().
-  node = win->GetChildren()->First();
+  node = win->GetChildren().First();
   while (node)
   {
     wxWindow *child = (wxWindow *)node->Data();
@@ -1203,7 +1201,7 @@ wxSizer::~wxSizer()
 {
   // Remove all children without deleting them,
   // or ~wxbWindow will delete proper windows _twice_
-  wxNode *node = GetChildren()->First();
+  wxNode *node = GetChildren().First();
   while (node)
   {
     wxNode *next = node->Next();
@@ -1211,7 +1209,7 @@ wxSizer::~wxSizer()
     if (!win->IsKindOf(CLASSINFO(wxSizer)))
        {
        delete node;
-               win->SetSizerParent(NULL);
+               win->SetSizerParent((wxWindow *) NULL);
        }
     else
     {
@@ -1223,8 +1221,8 @@ wxSizer::~wxSizer()
 
   if (m_sizerParent) // && !m_sizerParent->IsKindOf(CLASSINFO(wxSizer)))
   {
-    m_sizerParent->SetSizer(NULL);
-       m_sizerParent = NULL;
+    m_sizerParent->SetSizer((wxSizer *) NULL);
+       m_sizerParent = (wxWindow *) NULL;
   }
 
 }
@@ -1249,7 +1247,7 @@ void wxSizer::SetBorder(int x, int y)
 void wxSizer::AddSizerChild(wxWindow *child)
 {
   child->SetSizerParent(this);
-  GetChildren()->Append(child);
+  GetChildren().Append(child);
 
   // Add some constraints for the purpose of storing
   // the relative position of the window/sizer
@@ -1272,10 +1270,10 @@ void wxSizer::AddSizerChild(wxWindow *child)
 
 void wxSizer::RemoveSizerChild(wxWindow *child)
 {
-  GetChildren()->DeleteObject(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)
@@ -1304,23 +1302,6 @@ void wxSizer::SetSize(int x, int y, int w, int h, int WXUNUSED(flags))
   }
 }
 
-void wxSizer::Move(int x, int y)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (x != -1)
-  {
-    sizerX = x;
-    if (constr)
-      constr->left.SetValue(x);
-  }
-  if (y != -1)
-  {
-    sizerY = y;
-    if (constr)
-      constr->top.SetValue(y);
-  }
-}
-
 void wxSizer::GetSize(int *w, int *h) const
 {
   *w = sizerWidth;
@@ -1382,7 +1363,7 @@ bool wxSizer::LayoutPhase1(int *noChanges)
       // Find the bounding box and set own size
       int maxX = 0;
       int maxY = 0;
-      wxNode *node = GetChildren()->First();
+      wxNode *node = GetChildren().First();
       while (node)
       {
         int x, y, width, height;
@@ -1519,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;
@@ -1580,7 +1556,7 @@ bool wxRowColSizer::LayoutPhase1(int *noChanges)
     int maxX = currentX;
     int maxY = currentY;
     
-    wxNode *node = GetChildren()->First();
+    wxNode *node = GetChildren().First();
     while (node)
     {
       wxWindow *win = (wxWindow *)node->Data();
@@ -1744,6 +1720,3 @@ wxSpacingSizer::~wxSpacingSizer()
 {
 }
 
-
-
-#endif