From 451f6363c9ce312d7fefc1fe6920b9c6b3f04229 Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Tue, 13 Sep 2005 12:54:59 +0000
Subject: [PATCH] fixed uninitialized variable (depending on wxChoice ctor used
 it resulted in an out of bounds wxChoice::GetSelection() return value)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/choice.h | 2 --
 src/msw/choice.cpp      | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 4661025fe9..d0cce839b2 100644
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -36,7 +36,6 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxChoiceNameStr)
     {
-        Init();
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
 
@@ -49,7 +48,6 @@ 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 31b0b5f46c..bd7944b8ea 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -136,6 +136,8 @@ 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;
-- 
2.45.2