#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_COMBOBOX
#ifndef WX_PRECOMP
-#include "wx/settings.h"
+ #include "wx/settings.h"
+ #include "wx/log.h"
#endif
#include "wx/combobox.h"
return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
}
-WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
- WXUINT message,
- WXWPARAM wParam,
- WXLPARAM lParam)
+WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
+ WXUINT WXUNUSED(message),
+ WXWPARAM WXUNUSED(wParam),
+ WXLPARAM WXUNUSED(lParam))
{
#if wxUSE_CTL3D
if ( m_useCtl3D )
{
case WM_CHAR:
return HandleChar(wParam, lParam, TRUE /* isASCII */);
-
+
case WM_KEYDOWN:
return HandleKeyDown(wParam, lParam);
bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
+ wxString value;
+ int sel = -1;
switch ( param )
{
case CBN_SELCHANGE:
- if (GetSelection() > -1)
+ sel = GetSelection();
+ if ( sel > -1 )
{
+ value = GetString(sel);
+
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
- event.SetInt(GetSelection());
+ event.SetInt(sel);
event.SetEventObject(this);
- event.SetString(GetStringSelection());
+ event.SetString(value);
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:
{
+ // 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());
- event.SetString(GetValue());
+ event.SetString(sel == -1 ? GetValue() : value);
event.SetEventObject(this);
ProcessCommand(event);
}
SendMessage(hWnd, WM_PASTE, 0, 0L);
}
-void wxComboBox::SetEditable(bool editable)
+void wxComboBox::SetEditable(bool WXUNUSED(editable))
{
// Can't implement in MSW?
// HWND hWnd = GetHwnd();
void wxComboBox::SetInsertionPoint(long pos)
{
-/*
- HWND hWnd = GetHwnd();
+ if ( GetWindowStyle() & wxCB_READONLY )
+ return;
+
#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));
-#endif
- char *nothing = "";
- SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
-*/
+ 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)
+ SendMessage(hEditWnd, EM_REPLACESEL, 0, (LPARAM)_T(""));
+ }
+#endif // __WIN32__
}
void wxComboBox::SetInsertionPointEnd()
{
-/*
- long pos = GetLastPosition();
- SetInsertionPoint(pos);
-*/
+ // setting insertion point doesn't make sense for read only comboboxes
+ if ( !(GetWindowStyle() & wxCB_READONLY) )
+ {
+ 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);
+ HWND hEditWnd = (HWND) GetEditHWND();
- // This gets the char index for the _beginning_ of the last line
- int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)(noLines-1), (LPARAM)0L);
-
- // 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)
{
#if wxUSE_CLIPBOARD
- HWND hWnd = GetHwnd();
- 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);
+ Remove(from, to);
// Now replace with 'value', by pasting.
wxSetClipboardData(wxDF_TEXT, (wxObject *)(const wxChar *)value, 0, 0);
// Paste into edit control
- SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L);
+ SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);
#endif
}
void wxComboBox::Remove(long from, long to)
{
- HWND hWnd = GetHwnd();
- long fromChar = from;
- long toChar = to;
-
- // 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);
+ // Set selection and remove it
+ SetSelection(from, to);
+ SendMessage(GetHwnd(), WM_CUT, (WPARAM)0, (LPARAM)0);
}
void wxComboBox::SetSelection(long from, long to)
toChar = -1;
}
+ if (
#ifdef __WIN32__
- SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar);
-// SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
-#else
- // WPARAM is 0: selection is scrolled into view
- SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar));
+ SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar))
+#else // Win16
+ SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar)
#endif
+ == CB_ERR )
+ {
+ wxLogDebug(_T("CB_SETEDITSEL failed"));
+ }
}
void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
projects / wxWidgets.git / blobdiff