no message

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

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index abb7f9bb7b891b2d9fa92060ddb362d5fc3e531c..7c8b0ab7cb825662522cfc84cae5c8dd1478be4f 100644 (file)
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -22,13 +22,14 @@
 
 #include "wx/defs.h"
 
-#if USE_CONSTRAINTS
+#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>
 #endif
 
 #include "wx/layout.h"
@@ -88,13 +89,13 @@ int wxSizerMarginY(wxWindow *win)
 }
 
 
-wxIndividualLayoutConstraint::wxIndividualLayoutConstraint(void)
+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(void)
+wxIndividualLayoutConstraint::~wxIndividualLayoutConstraint()
 {
 }
 
@@ -139,7 +140,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
@@ -722,7 +723,9 @@ bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constr
 
 // Get the value of this edge or dimension, or if this
 // is not determinable, -1.
-int wxIndividualLayoutConstraint::GetEdge(wxEdge which, wxWindow *thisWin, wxWindow *other)
+int wxIndividualLayoutConstraint::GetEdge(wxEdge which,
+                                          wxWindow *thisWin,
+                                          wxWindow *other) const
 {
   // If the edge or dimension belongs to the parent, then we
   // know the dimension is obtainable immediately.
@@ -942,7 +945,7 @@ int wxIndividualLayoutConstraint::GetEdge(wxEdge which, wxWindow *thisWin, wxWin
   return -1;
 }
 
-wxLayoutConstraints::wxLayoutConstraints(void)
+wxLayoutConstraints::wxLayoutConstraints()
 {
   left.SetEdge(wxLeft);
   top.SetEdge(wxTop);
@@ -954,7 +957,7 @@ wxLayoutConstraints::wxLayoutConstraints(void)
   height.SetEdge(wxHeight);
 }
 
-wxLayoutConstraints::~wxLayoutConstraints(void)
+wxLayoutConstraints::~wxLayoutConstraints()
 {
 }
 
@@ -1004,8 +1007,7 @@ bool wxLayoutConstraints::SatisfyConstraints(wxWindow *win, int *nChanges)
 
   *nChanges = noChanges;
 
-  return (left.GetDone() && top.GetDone() && right.GetDone() && bottom.GetDone() &&
-    centreX.GetDone() && centreY.GetDone());
+  return AreSatisfied();
 }
 
 /*
@@ -1085,7 +1087,7 @@ bool wxOldDoLayout(wxWindow *win)
       if (constr)
       {
         int tempNoChanges = 0;
-        (void) constr->SatisfyConstraints(child, &tempNoChanges);
+        (void)constr->SatisfyConstraints(child, &tempNoChanges);
         noChanges += tempNoChanges;
       }
       node = node->Next();
@@ -1097,7 +1099,7 @@ bool wxOldDoLayout(wxWindow *win)
   // failed, so we can print a specific diagnostic message.
   if (noFailures > 0)
   {
-    wxDebugMsg("wxWindow::Layout() failed.\n");
+    wxDebugMsg(_("wxWindow::Layout() failed.\n"));
   }
 */
   // Now set the sizes and positions of the children, and
@@ -1136,7 +1138,7 @@ bool wxOldDoLayout(wxWindow *win)
   return TRUE;
 }
 
-wxSizer::wxSizer(void)
+wxSizer::wxSizer()
 {
   sizerBehaviour = wxSizerNone;
   borderX = 2;
@@ -1197,7 +1199,7 @@ bool wxSizer::Create(wxWindow *parent, wxSizerBehaviour behav)
   return TRUE;
 }
 
-wxSizer::~wxSizer(void)
+wxSizer::~wxSizer()
 {
   // Remove all children without deleting them,
   // or ~wxbWindow will delete proper windows _twice_
@@ -1209,7 +1211,7 @@ wxSizer::~wxSizer(void)
     if (!win->IsKindOf(CLASSINFO(wxSizer)))
        {
        delete node;
-               win->SetSizerParent(NULL);
+               win->SetSizerParent((wxWindow *) NULL);
        }
     else
     {
@@ -1221,8 +1223,8 @@ wxSizer::~wxSizer(void)
 
   if (m_sizerParent) // && !m_sizerParent->IsKindOf(CLASSINFO(wxSizer)))
   {
-    m_sizerParent->SetSizer(NULL);
-       m_sizerParent = NULL;
+    m_sizerParent->SetSizer((wxSizer *) NULL);
+       m_sizerParent = (wxWindow *) NULL;
   }
 
 }
@@ -1273,7 +1275,7 @@ void wxSizer::RemoveSizerChild(wxWindow *child)
   GetChildren()->DeleteObject(child);
 }
 
-void wxSizer::SetSize(const int x, const int y, const int w, const int h, const int WXUNUSED(flags))
+void wxSizer::SetSize(int x, int y, int w, int h, int WXUNUSED(flags))
 {
   wxLayoutConstraints *constr = GetConstraints();
   if (x != -1)
@@ -1302,7 +1304,7 @@ void wxSizer::SetSize(const int x, const int y, const int w, const int h, const
   }
 }
 
-void wxSizer::Move(const int x, const int y)
+void wxSizer::Move(int x, int y)
 {
   wxLayoutConstraints *constr = GetConstraints();
   if (x != -1)
@@ -1340,7 +1342,7 @@ bool wxSizer::LayoutPhase1(int *noChanges)
     {
       if (!m_sizerParent)
       {
-        wxMessageBox("wxExpandSizer has no parent!", "Sizer error", wxOK);
+        wxMessageBox(_("wxExpandSizer has no parent!"), _("Sizer error"), wxOK);
         return TRUE;
       }
 
@@ -1488,7 +1490,7 @@ bool wxSizer::LayoutPhase2(int *noChanges)
  * wxRowColSizer
  */
  
-wxRowColSizer::wxRowColSizer(void)
+wxRowColSizer::wxRowColSizer()
 {
   rowOrCol = TRUE;
   rowOrColSize = 20;
@@ -1513,11 +1515,11 @@ bool wxRowColSizer::Create(wxWindow *parent, bool rc, int n, wxSizerBehaviour be
   return TRUE;
 }
 
-wxRowColSizer::~wxRowColSizer(void)
+wxRowColSizer::~wxRowColSizer()
 {
 }
 
-void wxRowColSizer::SetSize(const int x, const int y, const int w, const int h, const int flags)
+void wxRowColSizer::SetSize(int x, int y, int w, int h, int flags)
 {
   wxSizer::SetSize(x, y, w, h, flags);
 }
@@ -1677,7 +1679,7 @@ bool wxRowColSizer::LayoutPhase2(int *noChanges)
  * wxSpacingSizer
  */
  
-wxSpacingSizer::wxSpacingSizer(void)
+wxSpacingSizer::wxSpacingSizer()
 {
 }
 
@@ -1738,7 +1740,7 @@ bool wxSpacingSizer::Create(wxWindow *parent, wxRelationship rel, wxWindow *othe
   return TRUE;
 }
 
-wxSpacingSizer::~wxSpacingSizer(void)
+wxSpacingSizer::~wxSpacingSizer()
 {
 }