reverted last changes which were false alarm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,6 +36,7 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr)
|
const wxString& name = wxChoiceNameStr)
|
||||||
{
|
{
|
||||||
|
Init();
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,6 +49,7 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr)
|
const wxString& name = wxChoiceNameStr)
|
||||||
{
|
{
|
||||||
|
Init();
|
||||||
Create(parent, id, pos, size, choices, style, validator, name);
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -136,8 +136,6 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
|
|||||||
const wxValidator& validator,
|
const wxValidator& validator,
|
||||||
const wxString& name)
|
const wxString& name)
|
||||||
{
|
{
|
||||||
Init();
|
|
||||||
|
|
||||||
// initialize wxControl
|
// initialize wxControl
|
||||||
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
|
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
|
||||||
return false;
|
return false;
|
||||||
|
Reference in New Issue
Block a user