Ensure there is valid context for DrawRectangle

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

diff --git a/src/generic/editlbox.cpp b/src/generic/editlbox.cpp
index 7817992687b43c711f027ab47fa768523ed866d5..7818c33a5a531993c0960ccd2bca24bb60167a12 100644 (file)
--- a/src/generic/editlbox.cpp
+++ b/src/generic/editlbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        editlbox.cpp
+// Name:        src/generic/editlbox.cpp
 // Purpose:     ListBox with editable items
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -30,9 +30,9 @@
 // implementation
 // ============================================================================
 
-const wxChar wxEditableListBoxNameStr[] = wxT("editableListBox");
+const char wxEditableListBoxNameStr[] = "editableListBox";
 
-static char * eledit_xpm[] = {
+static const char* const eledit_xpm[] = {
 "16 16 3 1",
 "   c None",
 ".  c #000000",
@@ -54,7 +54,7 @@ static char * eledit_xpm[] = {
 "                ",
 "                "};
 
-static char * elnew_xpm[] = {
+static const char* const elnew_xpm[] = {
 "16 16 5 1",
 "   c None",
 ".  c #7F7F7F",
@@ -78,7 +78,7 @@ static char * elnew_xpm[] = {
 "                ",
 "                "};
 
-static char * eldel_xpm[] = {
+static const char* const eldel_xpm[] = {
 "16 16 3 1",
 "   c None",
 ".  c #7F0000",
@@ -100,7 +100,7 @@ static char * eldel_xpm[] = {
 "   .         .  ",
 "                "};
 
-static char * eldown_xpm[] = {
+static const char* const eldown_xpm[] = {
 "16 16 2 1",
 "   c None",
 ".  c #000000",
@@ -121,7 +121,7 @@ static char * eldown_xpm[] = {
 "                ",
 "                "};
 
-static char * elup_xpm[] = {
+static const char* const elup_xpm[] = {
 "16 16 2 1",
 "   c None",
 ".  c #000000",
@@ -160,7 +160,7 @@ public:
 
     void CreateColumns()
     {
-        InsertColumn(0, _T("item"));
+        InsertColumn(0, wxT("item"));
         SizeColumns();
     }
 
@@ -172,6 +172,7 @@ public:
 #else
          w -= 2*wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
 #endif
+         if (w < 0) w = 0;
          SetColumnWidth(0, w);
     }
 
@@ -197,12 +198,12 @@ 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 wxWindowIDRef wxID_ELB_DELETE = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_EDIT = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_NEW = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_UP = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_DOWN = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_LISTCTRL = wxWindow::NewControlId();
 
 BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
     EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected)
@@ -293,6 +294,8 @@ bool wxEditableListBox::Create(wxWindow *parent, wxWindowID id,
 
     SetSizer(sizer);
     Layout();
+
+    return true;
 }
 
 void wxEditableListBox::SetStrings(const wxArrayString& strings)
@@ -367,26 +370,32 @@ void wxEditableListBox::OnEditItem(wxCommandEvent& WXUNUSED(event))
     m_listCtrl->EditLabel(m_selection);
 }
 
-void wxEditableListBox::OnUpItem(wxCommandEvent& WXUNUSED(event))
+void wxEditableListBox::SwapItems(long i1, long i2)
 {
-    wxString t1, t2;
+    // swap the text
+    wxString t1 = m_listCtrl->GetItemText(i1);
+    wxString t2 = m_listCtrl->GetItemText(i2);
+    m_listCtrl->SetItemText(i1, t2);
+    m_listCtrl->SetItemText(i2, t1);
+
+    // swap the item data
+    long d1 = m_listCtrl->GetItemData(i1);
+    long d2 = m_listCtrl->GetItemData(i2);
+    m_listCtrl->SetItemData(i1, d2);
+    m_listCtrl->SetItemData(i2, d1);
+}
+
 
-    t1 = m_listCtrl->GetItemText(m_selection - 1);
-    t2 = m_listCtrl->GetItemText(m_selection);
-    m_listCtrl->SetItemText(m_selection - 1, t2);
-    m_listCtrl->SetItemText(m_selection, t1);
+void wxEditableListBox::OnUpItem(wxCommandEvent& WXUNUSED(event))
+{
+    SwapItems(m_selection - 1, m_selection);
     m_listCtrl->SetItemState(m_selection - 1,
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 
 void wxEditableListBox::OnDownItem(wxCommandEvent& WXUNUSED(event))
 {
-    wxString t1, t2;
-
-    t1 = m_listCtrl->GetItemText(m_selection + 1);
-    t2 = m_listCtrl->GetItemText(m_selection);
-    m_listCtrl->SetItemText(m_selection + 1, t2);
-    m_listCtrl->SetItemText(m_selection, t1);
+    SwapItems(m_selection + 1, m_selection);
     m_listCtrl->SetItemState(m_selection + 1,
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }