Removed call to SetValidator since CreateBase was doing it already

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index f9a84f98d20be8f68dd943edd020baf32fa9cad1..620c2a74ab16a3f0409cb38d1b613f18eed54b6a 100644 (file)
--- 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;
 
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;
 

-    SetValidator(validator);
+    // Validator was set in CreateBase
+    //SetValidator(validator);

 
     parent->AddChild((wxButton *)this);
 
 
     parent->AddChild((wxButton *)this);
 


@@ -83,7 +84,7 @@ bool wxButton::Create(wxWindow *parent,
                       _T("BUTTON"),
                       label,
                       WS_VISIBLE | WS_TABSTOP | WS_CHILD,
                       _T("BUTTON"),
                       label,
                       WS_VISIBLE | WS_TABSTOP | WS_CHILD,

-                      0, 0, 0, 0, 
+                      0, 0, 0, 0,

                       GetWinHwnd(parent),
                       (HMENU)m_windowId,
                       wxGetInstance(),
                       GetWinHwnd(parent),
                       (HMENU)m_windowId,
                       wxGetInstance(),

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 5cc8e00a8221d666d210abe1bf55e142a0d1d816..6965ccf42a764fd431356f7475df026eced595f7 100644 (file)
--- 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;
 
     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);
 
     if ( parent )
         parent->AddChild(this);