Check the result of ToWChar() call in wxTextInputStream::NextChar() better.

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

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 80ff466793f9df42625764e4ab092e3df1b22f0b..2a23793d7ed04b163ab0c7e4d4237b5f25c9d1fe 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -185,7 +185,7 @@ void wxComboListBox::OnLeftUp(wxMouseEvent& event)
     wxCommandEvent evt(wxEVT_COMMAND_COMBOBOX_SELECTED,m_combo->GetId());
     evt.SetInt(wxListBox::GetSelection());
     evt.SetEventObject(m_combo);
     wxCommandEvent evt(wxEVT_COMMAND_COMBOBOX_SELECTED,m_combo->GetId());
     evt.SetInt(wxListBox::GetSelection());
     evt.SetEventObject(m_combo);

-    m_combo->ProcessEvent(evt);
+    m_combo->ProcessWindowEvent(evt);

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -273,7 +273,7 @@ wxComboBox::~wxComboBox()
 // wxComboBox methods forwarded to wxTextCtrl
 // ----------------------------------------------------------------------------
 
 // wxComboBox methods forwarded to wxTextCtrl
 // ----------------------------------------------------------------------------
 

-wxString wxComboBox::GetValue() const
+wxString wxComboBox::DoGetValue() const

 {
     return wxComboCtrl::GetValue();
 }
 {
     return wxComboCtrl::GetValue();
 }


@@ -364,7 +364,7 @@ void wxComboBox::DoClear()
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 {
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxComboBox::Delete") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxComboBox::Delete") );

 
     if (GetSelection() == (int)n)
         if ( GetTextCtrl() ) GetTextCtrl()->SetValue(wxEmptyString);
 
     if (GetSelection() == (int)n)
         if ( GetTextCtrl() ) GetTextCtrl()->SetValue(wxEmptyString);


@@ -379,14 +379,14 @@ unsigned int wxComboBox::GetCount() const
 
 wxString wxComboBox::GetString(unsigned int n) const
 {
 
 wxString wxComboBox::GetString(unsigned int n) const
 {

-    wxCHECK_MSG( IsValid(n), wxEmptyString, _T("invalid index in wxComboBox::GetString") );
+    wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxComboBox::GetString") );

 
     return GetLBox()->GetString(n);
 }
 
 void wxComboBox::SetString(unsigned int n, const wxString& s)
 {
 
     return GetLBox()->GetString(n);
 }
 
 void wxComboBox::SetString(unsigned int n, const wxString& s)
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxComboBox::SetString") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxComboBox::SetString") );

 
     GetLBox()->SetString(n, s);
 }
 
     GetLBox()->SetString(n, s);
 }


@@ -398,7 +398,7 @@ int wxComboBox::FindString(const wxString& s, bool bCase) const
 
 void wxComboBox::SetSelection(int n)
 {
 
 void wxComboBox::SetSelection(int n)
 {

-    wxCHECK_RET( (n == wxNOT_FOUND || IsValid(n)), _T("invalid index in wxComboBox::Select") );
+    wxCHECK_RET( (n == wxNOT_FOUND || IsValid(n)), wxT("invalid index in wxComboBox::Select") );

 
     GetLBox()->SetSelection(n);
 
 
     GetLBox()->SetSelection(n);