Border corrections

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

diff --git a/src/generic/editlbox.cpp b/src/generic/editlbox.cpp
index b01dcf968d2a6d305d32a2fc0c5579c0e2f851df..26512e0735070fb78409a4d90e67e2d96359a030 100644 (file)
--- a/src/generic/editlbox.cpp
+++ b/src/generic/editlbox.cpp
@@ -14,6 +14,8 @@
     #pragma hdrstop
 #endif
 
     #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
 // 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,7 +26,13 @@
 #include "wx/sizer.h"
 #include "wx/listctrl.h"
 
 #include "wx/sizer.h"
 #include "wx/listctrl.h"
 

-static char * eledit_xpm[] = {
+// ============================================================================
+// implementation
+// ============================================================================
+
+const wxChar wxEditableListBoxNameStr[] = wxT("editableListBox");
+
+static const char * eledit_xpm[] = {

 "16 16 3 1",
 "   c None",
 ".  c #000000",
 "16 16 3 1",
 "   c None",
 ".  c #000000",


@@ -46,7 +54,7 @@ static char * eledit_xpm[] = {
 "                ",
 "                "};
 
 "                ",
 "                "};
 

-static char * elnew_xpm[] = {
+static const char * elnew_xpm[] = {

 "16 16 5 1",
 "   c None",
 ".  c #7F7F7F",
 "16 16 5 1",
 "   c None",
 ".  c #7F7F7F",


@@ -70,7 +78,7 @@ static char * elnew_xpm[] = {
 "                ",
 "                "};
 
 "                ",
 "                "};
 

-static char * eldel_xpm[] = {
+static const char * eldel_xpm[] = {

 "16 16 3 1",
 "   c None",
 ".  c #7F0000",
 "16 16 3 1",
 "   c None",
 ".  c #7F0000",


@@ -92,7 +100,7 @@ static char * eldel_xpm[] = {
 "   .         .  ",
 "                "};
 
 "   .         .  ",
 "                "};
 

-static char * eldown_xpm[] = {
+static const char * eldown_xpm[] = {

 "16 16 2 1",
 "   c None",
 ".  c #000000",
 "16 16 2 1",
 "   c None",
 ".  c #000000",


@@ -113,7 +121,7 @@ static char * eldown_xpm[] = {
 "                ",
 "                "};
 
 "                ",
 "                "};
 

-static char * elup_xpm[] = {
+static const char * elup_xpm[] = {

 "16 16 2 1",
 "   c None",
 ".  c #000000",
 "16 16 2 1",
 "   c None",
 ".  c #000000",


@@ -180,16 +188,21 @@ BEGIN_EVENT_TABLE(CleverListCtrl, wxListCtrl)
    EVT_SIZE(CleverListCtrl::OnSize)
 END_EVENT_TABLE()
 
    EVT_SIZE(CleverListCtrl::OnSize)
 END_EVENT_TABLE()
 

+
+// ----------------------------------------------------------------------------
+// wxEditableListBox
+// ----------------------------------------------------------------------------
+

 IMPLEMENT_CLASS(wxEditableListBox, wxPanel)
 
 // NB: generate the IDs at runtime to avoid conflict with XRCID values,
 //     they could cause XRCCTRL() failures in XRC-based dialogs
 IMPLEMENT_CLASS(wxEditableListBox, wxPanel)
 
 // NB: generate the IDs at runtime to avoid conflict with XRCID values,
 //     they could cause XRCCTRL() failures in XRC-based dialogs

-const int wxID_ELB_DELETE = wxNewId();
-const int wxID_ELB_EDIT = wxNewId();
-const int wxID_ELB_NEW = wxNewId();
-const int wxID_ELB_UP = wxNewId();
-const int wxID_ELB_DOWN = wxNewId();
-const int wxID_ELB_LISTCTRL = wxNewId();
+const int wxID_ELB_DELETE = wxWindow::NewControlId();
+const int wxID_ELB_EDIT = wxWindow::NewControlId();
+const int wxID_ELB_NEW = wxWindow::NewControlId();
+const int wxID_ELB_UP = wxWindow::NewControlId();
+const int wxID_ELB_DOWN = wxWindow::NewControlId();
+const int wxID_ELB_LISTCTRL = wxWindow::NewControlId();

 
 BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
     EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected)
 
 BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
     EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected)


@@ -201,15 +214,16 @@ BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
     EVT_BUTTON(wxID_ELB_DELETE, wxEditableListBox::OnDelItem)
 END_EVENT_TABLE()
 
     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)
                           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_style = style;

-    m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL;

 
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 
 
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 


@@ -279,6 +293,8 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
 
     SetSizer(sizer);
     Layout();
 
     SetSizer(sizer);
     Layout();

+
+    return true;

 }
 
 void wxEditableListBox::SetStrings(const wxArrayString& strings)
 }
 
 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);
 }
     m_listCtrl->SetItemState(m_selection + 1,
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }

+
+#endif // wxUSE_EDITABLELISTBOX