diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h index 7804a96625..544d10dd0c 100644 --- a/include/wx/gtk/listbox.h +++ b/include/wx/gtk/listbox.h @@ -18,7 +18,10 @@ class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase { public: // ctors and such - wxListBox(); + wxListBox() + { + Init(); + } wxListBox( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -27,9 +30,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr ) { -#if wxUSE_CHECKLISTBOX - m_hasCheckBoxes = FALSE; -#endif // wxUSE_CHECKLISTBOX + Init(); Create(parent, id, pos, size, n, choices, style, validator, name); } wxListBox( wxWindow *parent, wxWindowID id, @@ -40,13 +41,13 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr ) { -#if wxUSE_CHECKLISTBOX - m_hasCheckBoxes = FALSE; -#endif // wxUSE_CHECKLISTBOX + Init(); Create(parent, id, pos, size, choices, style, validator, name); } virtual ~wxListBox(); + void Init(); //common construction + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index d908514a19..2028db5fea 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -419,7 +419,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) // construction // ---------------------------------------------------------------------------- -wxListBox::wxListBox() +void wxListBox::Init() { m_treeview = (GtkTreeView*) NULL; #if wxUSE_CHECKLISTBOX