respect the encoding of the text style and not only the global control font encoding...

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

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index bda0e3e9fb4b1a0f4e78c93b5ccc4ff32557f285..4c011c1a7e1d34af4d75b6cfaa4e097b89d93274 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -90,7 +90,7 @@ BEGIN_EVENT_TABLE(wxComboListBox, wxListBox)
     EVT_LEFT_UP(wxComboListBox::OnLeftUp)
 END_EVENT_TABLE()
 
     EVT_LEFT_UP(wxComboListBox::OnLeftUp)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS2(wxComboBox, wxControl, wxComboControl)
+IMPLEMENT_DYNAMIC_CLASS2(wxComboBox, wxControl, wxComboCtrl)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -131,7 +131,10 @@ wxString wxComboListBox::GetStringValue() const
 void wxComboListBox::SetStringValue(const wxString& value)
 {
     if ( !value.empty() )
 void wxComboListBox::SetStringValue(const wxString& value)
 {
     if ( !value.empty() )

-        wxListBox::SetStringSelection(value);
+    {
+               if (FindString(value) != wxNOT_FOUND)
+               wxListBox::SetStringSelection(value);
+       }

     else
         wxListBox::SetSelection(-1);
 }
     else
         wxListBox::SetSelection(-1);
 }


@@ -149,7 +152,7 @@ bool wxComboListBox::PerformAction(const wxControlAction& action,
     {
         // we don't let the listbox handle this as instead of just using the
         // single key presses, as usual, we use the text ctrl value as prefix
     {
         // we don't let the listbox handle this as instead of just using the
         // single key presses, as usual, we use the text ctrl value as prefix

-        // and this is done by wxComboControl itself
+        // and this is done by wxComboCtrl itself

         return true;
     }
 
         return true;
     }
 


@@ -232,7 +235,7 @@ bool wxComboBox::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString& name)
 {
                         const wxValidator& validator,
                         const wxString& name)
 {

-    if ( !wxComboControl::Create(parent, id, value, pos, size, style,
+    if ( !wxComboCtrl::Create(parent, id, value, pos, size, style,

                                  validator, name) )
     {
         return false;
                                  validator, name) )
     {
         return false;


@@ -257,12 +260,12 @@ wxComboBox::~wxComboBox()
 
 wxString wxComboBox::GetValue() const
 {
 
 wxString wxComboBox::GetValue() const
 {

-    return wxComboControl::GetValue();
+    return wxComboCtrl::GetValue();

 }
 
 void wxComboBox::SetValue(const wxString& value)
 {
 }
 
 void wxComboBox::SetValue(const wxString& value)
 {

-    wxComboControl::SetValue(value);
+    wxComboCtrl::SetValue(value);

 }
 
 void wxComboBox::Copy()
 }
 
 void wxComboBox::Copy()