diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index f9a84f98d2..620c2a74ab 100644
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -70,7 +70,8 @@ bool wxButton::Create(wxWindow *parent,
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
-    SetValidator(validator);
+    // Validator was set in CreateBase
+    //SetValidator(validator);
 
     parent->AddChild((wxButton *)this);
 
@@ -83,7 +84,7 @@ bool wxButton::Create(wxWindow *parent,
                       _T("BUTTON"),
                       label,
                       WS_VISIBLE | WS_TABSTOP | WS_CHILD,
-                      0, 0, 0, 0, 
+                      0, 0, 0, 0,
                       GetWinHwnd(parent),
                       (HMENU)m_windowId,
                       wxGetInstance(),
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 5cc8e00a82..6965ccf42a 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -115,7 +115,8 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
-    SetValidator(validator);
+    // Validator was set in CreateBase
+    //SetValidator(validator);
     if ( parent )
         parent->AddChild(this);