fix dereferencing end() iterator in ParseFormat() and constructing out of bound itera...

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

diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index b41574d65c3c190819bf3100443eb6581b254083..cbd48bdc80d83393993722c76f44604c4744503a 100644 (file)
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -18,12 +18,12 @@
 
 #if wxUSE_VALIDATORS
 
+#include "wx/validate.h"
+
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #endif
 
-#include "wx/validate.h"
-
 const wxValidator wxDefaultValidator;
 
 IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
@@ -34,7 +34,7 @@ bool wxValidator::ms_isSilent = false;
 
 wxValidator::wxValidator()
 {
-  m_validatorWindow = (wxWindow *) NULL;
+  m_validatorWindow = NULL;
 }
 
 wxValidator::~wxValidator()