X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ff9d30c0aab3b281ef9b380eac17435556c5088..e5dcae09e6c207688b41c8b744764d32b7b39a46:/src/gtk/choice.cpp diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 8ccb592059..759985b65b 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -42,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) void wxChoice::Init() { - m_strings = (wxSortedArrayString *)NULL; + m_strings = NULL; m_stringCellIndex = 0; } @@ -129,7 +129,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") ); wxASSERT_MSG( !IsSorted() || (pos == GetCount()), - _T("In a sorted choice data could only be appended")); + wxT("In a sorted choice data could only be appended")); const int count = items.GetCount(); @@ -187,7 +187,7 @@ void wxChoice::DoClear() void wxChoice::DoDeleteOneItem(unsigned int n) { wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") ); + wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") ); GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); GtkTreeModel* model = gtk_combo_box_get_model( combobox );