oops, wxUSE_UNICODE_MSLU and not wxUSE_MSLU

[wxWidgets.git] / src / gtk / combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index c1e77b07d7f95a43fac67a0607aa79fda040a6cf..9b11ce5315ad62c420f55ea2deaaecbf7ce03d15 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -349,9 +349,9 @@ int wxComboBox::DoAppend( const wxString &item )
     const int count = GetCount();
 
     if ( (int)m_clientDataList.GetCount() < count )
-    m_clientDataList.Append( (wxObject*) NULL );
+        m_clientDataList.Append( (wxObject*) NULL );
     if ( (int)m_clientObjectList.GetCount() < count )
-    m_clientObjectList.Append( (wxObject*) NULL );
+        m_clientObjectList.Append( (wxObject*) NULL );
 
     EnableEvents();
 
@@ -396,9 +396,9 @@ int wxComboBox::DoInsert( const wxString &item, int pos )
     count = GetCount();
 
     if ( (int)m_clientDataList.GetCount() < count )
-    m_clientDataList.Insert( pos, (wxObject*) NULL );
+        m_clientDataList.Insert( pos, (wxObject*) NULL );
     if ( (int)m_clientObjectList.GetCount() < count )
-    m_clientObjectList.Insert( pos, (wxObject*) NULL );
+        m_clientObjectList.Insert( pos, (wxObject*) NULL );
 
     EnableEvents();
 
@@ -532,7 +532,7 @@ void wxComboBox::SetString(int n, const wxString &text)
 
 int wxComboBox::FindString( const wxString &item ) const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") );
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
@@ -581,7 +581,7 @@ int wxComboBox::GetSelection() const
 
 wxString wxComboBox::GetString( int n ) const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
@@ -607,7 +607,7 @@ wxString wxComboBox::GetString( int n ) const
 
 wxString wxComboBox::GetStringSelection() const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
@@ -626,7 +626,7 @@ wxString wxComboBox::GetStringSelection() const
 
     wxFAIL_MSG( wxT("wxComboBox: no selection") );
 
-    return wxT("");
+    return wxEmptyString;
 }
 
 int wxComboBox::GetCount() const
@@ -677,7 +677,7 @@ void wxComboBox::SetValue( const wxString& value )
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp = wxT("");
+    wxString tmp;
     if (!value.IsNull()) tmp = value;
     gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );
 
@@ -1042,4 +1042,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
 }
 
 #endif
-