Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blind fix for setting selection in combobox text ctrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-01-15 22:03:44 +00:00
parent e1e9ea4097
commit fddfd9e1f1
1 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/msw/combobox.cpp
View File

@@ -25,13 +25,14 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_COMBOBOX #if wxUSE_COMBOBOX
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/log.h"
#endif #endif
#include "wx/combobox.h" #include "wx/combobox.h"
@@ -195,23 +196,38 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{ {
wxString value;
int sel = -1;
switch ( param ) switch ( param )
{ {
case CBN_SELCHANGE: case CBN_SELCHANGE:
if (GetSelection() > -1) sel = GetSelection();
if ( sel > -1 )
{ {
value = GetString(sel);
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId()); wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
event.SetInt(GetSelection()); event.SetInt(sel);
event.SetEventObject(this); event.SetEventObject(this);
event.SetString(GetStringSelection()); event.SetString(value);
ProcessCommand(event); ProcessCommand(event);
} }
break; else
{
break;
}
// fall through: for compability with wxGTK, also send the text
// update event when the selection changes (this also seems more
// logical as the text does change)
case CBN_EDITCHANGE: case CBN_EDITCHANGE:
{ {
// if sel != -1, value was initialized above (and we can't use
// GetValue() here as it would return the old selection and we
// want the new one)
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId()); wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
event.SetString(GetValue()); event.SetString(sel == -1 ? GetValue() : value);
event.SetEventObject(this); event.SetEventObject(this);
ProcessCommand(event); ProcessCommand(event);
} }
@@ -417,39 +433,21 @@ long wxComboBox::GetLastPosition() const
void wxComboBox::Replace(long from, long to, const wxString& value) void wxComboBox::Replace(long from, long to, const wxString& value)
{ {
#if wxUSE_CLIPBOARD #if wxUSE_CLIPBOARD
HWND hWnd = GetHwnd(); Remove(from, to);
long fromChar = from;
long toChar = to;
// Set selection and remove it
#ifdef __WIN32__
SendMessage(hWnd, CB_SETEDITSEL, fromChar, toChar);
#else
SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar));
#endif
SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
// Now replace with 'value', by pasting. // Now replace with 'value', by pasting.
wxSetClipboardData(wxDF_TEXT, (wxObject *)(const wxChar *)value, 0, 0); wxSetClipboardData(wxDF_TEXT, (wxObject *)(const wxChar *)value, 0, 0);
// Paste into edit control // Paste into edit control
SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L); SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);
#endif #endif
} }
void wxComboBox::Remove(long from, long to) void wxComboBox::Remove(long from, long to)
{ {
HWND hWnd = GetHwnd(); // Set selection and remove it
long fromChar = from; SetSelection(from, to);
long toChar = to; SendMessage(GetHwnd(), WM_CUT, (WPARAM)0, (LPARAM)0);
// Cut all selected text
#ifdef __WIN32__
SendMessage(hWnd, CB_SETEDITSEL, fromChar, toChar);
#else
SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar));
#endif
SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
} }
void wxComboBox::SetSelection(long from, long to) void wxComboBox::SetSelection(long from, long to)
@@ -466,13 +464,16 @@ void wxComboBox::SetSelection(long from, long to)
toChar = -1; toChar = -1;
} }
if (
#ifdef __WIN32__ #ifdef __WIN32__
SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar); SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar))
// SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0); #else // Win16
#else SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar)
// WPARAM is 0: selection is scrolled into view
SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar));
#endif #endif
== CB_ERR )
{
wxLogDebug(_T("CB_SETEDITSEL failed"));
}
} }
void wxComboBox::DoMoveWindow(int x, int y, int width, int height) void wxComboBox::DoMoveWindow(int x, int y, int width, int height)