From d41adb6e05152784cb6b6e3009ef59cde2633c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 8 Mar 2002 23:59:15 +0000 Subject: [PATCH] corrections to the wxEditableListBox patch, removed conflict indicator checked in by mistake git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/gizmos/editlbox.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp index 0c40600798..c9ea5ae993 100644 --- a/contrib/src/gizmos/editlbox.cpp +++ b/contrib/src/gizmos/editlbox.cpp @@ -111,13 +111,9 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id, const wxString& name) : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name), m_edittingNew(FALSE) { -<<<<<<< editlbox.cpp m_style = style; m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL; -======= - m_style = style; ->>>>>>> 1.10 wxSizer *sizer = new wxBoxSizer(wxVERTICAL); wxPanel *subp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize,