X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff0846a09f348f6b99a8a82c6fe43700cbdf3315..9b49405777342458dc1666001865eef7309b6c30:/src/generic/editlbox.cpp?ds=sidebyside diff --git a/src/generic/editlbox.cpp b/src/generic/editlbox.cpp index 6e0dea8563..204e28908a 100644 --- a/src/generic/editlbox.cpp +++ b/src/generic/editlbox.cpp @@ -30,9 +30,9 @@ // implementation // ============================================================================ -const wxChar wxEditableListBoxNameStr[] = wxT("editableListBox"); +const char wxEditableListBoxNameStr[] = "editableListBox"; -static char * eledit_xpm[] = { +static const char * 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 * 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 * 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 * 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 * elup_xpm[] = { "16 16 2 1", " c None", ". c #000000", @@ -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)