Added insertion point code to wxComboBox

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 8626a568497c1597798ad18cdb189e63f06a08b0..cf839f4748e486aeb7e45c26f9710a6a8b9c6dd2 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -366,54 +366,46 @@ void wxComboBox::SetEditable(bool editable)
 
 void wxComboBox::SetInsertionPoint(long pos)
 {
-/*
-  HWND hWnd = GetHwnd();
 #ifdef __WIN32__
-  SendMessage(hWnd, EM_SETSEL, pos, pos);
-  SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
-#else
-  SendMessage(hWnd, EM_SETSEL, 0, MAKELPARAM(pos, pos));
+  HWND hWnd = GetHwnd();
+  SendMessage(hWnd, CB_SETEDITSEL, 0, MAKELPARAM(pos, pos));
+  HWND hEditWnd = (HWND) GetEditHWND() ;
+  if (hEditWnd)
+  {
+    // Scroll insertion point into view
+    SendMessage(hEditWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
+    // Why is this necessary? (Copied from wxTextCtrl::SetInsertionPoint)
+    static const wxChar *nothing = _T("");
+    SendMessage(hEditWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
+  }
 #endif
-  char *nothing = "";
-  SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
-*/
 }
 
 void wxComboBox::SetInsertionPointEnd()
 {
-/*
   long pos = GetLastPosition();
   SetInsertionPoint(pos);
-*/
 }
 
 long wxComboBox::GetInsertionPoint() const
 {
-/*
-  DWORD Pos=(DWORD)SendMessage(GetHwnd(), EM_GETSEL, 0, 0L);
-  return Pos&0xFFFF;
-*/
-  return 0;
+#ifdef __WIN32__
+    DWORD Pos=(DWORD)SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);
+    return Pos&0xFFFF;
+#else
+    return 0;
+#endif
 }
 
 long wxComboBox::GetLastPosition() const
 {
-/*
-    HWND hWnd = GetHwnd();
-
-    // Will always return a number > 0 (according to docs)
-    int noLines = (int)SendMessage(hWnd, EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0L);
-
-    // This gets the char index for the _beginning_ of the last line
-    int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)(noLines-1), (LPARAM)0L);
+    HWND hEditWnd = (HWND) GetEditHWND();
 
-    // Get number of characters in the last line. We'll add this to the character
+    // Get number of characters in the last (only) line. We'll add this to the character
     // index for the last line, 1st position.
-    int lineLength = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0L);
+    int lineLength = (int)SendMessage(hEditWnd, EM_LINELENGTH, (WPARAM) 0, (LPARAM)0L);
 
-    return (long)(charIndex + lineLength);
-*/
-  return 0;
+    return (long)(lineLength);
 }
 
 void wxComboBox::Replace(long from, long to, const wxString& value)