X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/395367bcd303ad3b8fbf7d4f523f62d72ec7fa55..677dc0ed1a3ff68af15f6246d6d0708d5264b07a:/src/generic/editlbox.cpp diff --git a/src/generic/editlbox.cpp b/src/generic/editlbox.cpp index 7817992687..26512e0735 100644 --- a/src/generic/editlbox.cpp +++ b/src/generic/editlbox.cpp @@ -32,7 +32,7 @@ const wxChar wxEditableListBoxNameStr[] = wxT("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", @@ -197,12 +197,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 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) @@ -293,6 +293,8 @@ bool wxEditableListBox::Create(wxWindow *parent, wxWindowID id, SetSizer(sizer); Layout(); + + return true; } void wxEditableListBox::SetStrings(const wxArrayString& strings)