From 3a582e90c030cdc9639803ba303dab17beae52d2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 7 Nov 2002 21:19:26 +0000
Subject: [PATCH] cleaned up (well, removed) the mess in wxComboBox::SetValue()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/combobox.cpp | 47 ++++++--------------------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 02fe9f09fa..4acd9c73bd 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -384,63 +384,28 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     return TRUE;
 }
 
-// TODO: update and clear all this horrible mess (VZ)
-
 void wxComboBox::SetValue(const wxString& value)
 {
-  // If newlines are denoted by just 10, must stick 13 in front.
-  size_t singletons = 0;
-  size_t len = value.Length();
-  size_t i;
-  for (i = 0; i < len; i ++)
-  {
-    if ((i > 0) && (value[i] == 10) && (value[i-1] != 13))
-      singletons ++;
-  }
-  if (singletons > 0)
-  {
-    wxString tmp;
-    tmp.Alloc(len + singletons);
-    size_t j = 0;
-    for (i = 0; i < len; i ++)
-    {
-      if ((i > 0) && (value[i] == 10) && (value[i-1] != 13))
-      {
-        tmp[j] = 13;
-        j ++;
-      }
-      tmp[j] = value[i];
-      j ++;
-    }
-    if (GetWindowStyle() & wxCB_READONLY)
-        SetStringSelection(tmp);
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection(value);
     else
-        SetWindowText(GetHwnd(), tmp.c_str());
-  }
-  else
-    if (GetWindowStyle() & wxCB_READONLY)
-      SetStringSelection(value);
-    else
-      SetWindowText(GetHwnd(), value.c_str());
+        SetWindowText(GetHwnd(), value.c_str());
 }
 
 // Clipboard operations
 void wxComboBox::Copy()
 {
-  HWND hWnd = GetHwnd();
-  SendMessage(hWnd, WM_COPY, 0, 0L);
+  SendMessage(GetHwnd(), WM_COPY, 0, 0L);
 }
 
 void wxComboBox::Cut()
 {
-  HWND hWnd = GetHwnd();
-  SendMessage(hWnd, WM_CUT, 0, 0L);
+  SendMessage(GetHwnd(), WM_CUT, 0, 0L);
 }
 
 void wxComboBox::Paste()
 {
-  HWND hWnd = GetHwnd();
-  SendMessage(hWnd, WM_PASTE, 0, 0L);
+  SendMessage(GetHwnd(), WM_PASTE, 0, 0L);
 }
 
 void wxComboBox::SetEditable(bool WXUNUSED(editable))