From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Wed, 14 Sep 2005 12:08:24 +0000 (+0000)
Subject: reverted last changes which were false alarm
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/94500b32849a55cb4e07f3f4d6b095090522adac?ds=inline

reverted last changes which were false alarm


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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index d0cce839b2..4661025fe9 100644
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -36,6 +36,7 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxChoiceNameStr)
     {
+        Init();
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
 
@@ -48,6 +49,7 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxChoiceNameStr)
     {
+        Init();
         Create(parent, id, pos, size, choices, style, validator, name);
     }
 
diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index bd7944b8ea..31b0b5f46c 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -136,8 +136,6 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
                              const wxValidator& validator,
                              const wxString& name)
 {
-    Init();
-
     // initialize wxControl
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;