cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrections to the wxEditableListBox patch, removed conflict indicator checked in by mistake

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2002-03-08 23:59:15 +00:00
parent dd1d4b137b
commit d41adb6e05
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/gizmos/editlbox.cpp
View File

@ -111,13 +111,9 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
const wxString& name) const wxString& name)
: wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name), m_edittingNew(FALSE) : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name), m_edittingNew(FALSE)
{ {
<<<<<<< editlbox.cpp
m_style = style; m_style = style;
m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL; m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL;
=======
m_style = style;
>>>>>>> 1.10
wxSizer *sizer = new wxBoxSizer(wxVERTICAL); wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
wxPanel *subp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxPanel *subp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize,