X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3622daa901777a33969d8bc04e2d62dee14d164..3f659fd6b10a8a5c899eaa99adc76a55322b33fd:/src/common/layout.cpp

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 3ac377c21b..81effab44a 100644
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -29,6 +29,7 @@
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
+#include <wx/intl.h>
 #endif
 
 #include "wx/layout.h"
@@ -91,7 +92,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()
@@ -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
@@ -1098,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
@@ -1210,7 +1211,7 @@ wxSizer::~wxSizer()
     if (!win->IsKindOf(CLASSINFO(wxSizer)))
 	{
       	delete node;
-  		win->SetSizerParent(NULL);
+  		win->SetSizerParent((wxWindow *) NULL);
 	}
     else
     {
@@ -1222,8 +1223,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;
   }
 
 }
@@ -1341,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;
       }