Remove wxMBConv_mac and wxMBConv_macUTF8D converters and use wxMBConv_cf(wxFONTENCODI...

[wxWidgets.git] / src / generic / editlbox.cpp

diff --git a/src/generic/editlbox.cpp b/src/generic/editlbox.cpp
index b01dcf968d2a6d305d32a2fc0c5579c0e2f851df..6e0dea8563ab8dc22929be21424ebcaf4486dad9 100644 (file)
--- a/src/generic/editlbox.cpp
+++ b/src/generic/editlbox.cpp
@@ -14,6 +14,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_EDITABLELISTBOX
+
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
@@ -24,6 +26,12 @@
 #include "wx/sizer.h"
 #include "wx/listctrl.h"
 
+// ============================================================================
+// implementation
+// ============================================================================
+
+const wxChar wxEditableListBoxNameStr[] = wxT("editableListBox");
+
 static char * eledit_xpm[] = {
 "16 16 3 1",
 "   c None",
@@ -180,6 +188,11 @@ BEGIN_EVENT_TABLE(CleverListCtrl, wxListCtrl)
    EVT_SIZE(CleverListCtrl::OnSize)
 END_EVENT_TABLE()
 
+
+// ----------------------------------------------------------------------------
+// wxEditableListBox
+// ----------------------------------------------------------------------------
+
 IMPLEMENT_CLASS(wxEditableListBox, wxPanel)
 
 // NB: generate the IDs at runtime to avoid conflict with XRCID values,
@@ -201,15 +214,16 @@ BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
     EVT_BUTTON(wxID_ELB_DELETE, wxEditableListBox::OnDelItem)
 END_EVENT_TABLE()
 
-wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
+bool wxEditableListBox::Create(wxWindow *parent, wxWindowID id,
                           const wxString& label,
                           const wxPoint& pos, const wxSize& size,
                           long style,
                           const wxString& name)
-   : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name)
 {
+    if (!wxPanel::Create(parent, id, pos, size, wxTAB_TRAVERSAL, name))
+        return false;
+
     m_style = style;
-    m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL;
 
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 
@@ -279,6 +293,8 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
 
     SetSizer(sizer);
     Layout();
+
+    return true;
 }
 
 void wxEditableListBox::SetStrings(const wxArrayString& strings)
@@ -376,3 +392,5 @@ void wxEditableListBox::OnDownItem(wxCommandEvent& WXUNUSED(event))
     m_listCtrl->SetItemState(m_selection + 1,
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
+
+#endif // wxUSE_EDITABLELISTBOX