X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4e1487169a6403cb8bb86576c1612f46c19e34f..ed8efd46d9c8fa3bf5d10b2a6efd295a6dd71bdb:/src/gtk/choice.cpp?ds=sidebyside

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 97129ba2f1..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;
 }
 
@@ -79,6 +79,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
     }
 
     m_widget = gtk_combo_box_new_text();
+    g_object_ref(m_widget);
 
     Append(n, choices);
 
@@ -128,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();
 
@@ -186,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 );