#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"
#include "wx/msw/private.h"
#if wxUSE_TOOLTIPS
- #ifndef __GNUWIN32_OLD__
+ #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
#include <commctrl.h>
#endif
#include "wx/tooltip.h"
#endif // 0
// deal with tooltips here
-#if wxUSE_TOOLTIPS
+#if wxUSE_TOOLTIPS && defined(TTN_NEEDTEXT)
case WM_NOTIFY:
{
wxCHECK_MSG( win, 0, _T("should have a parent") );
return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
}
-WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
+#if wxUSE_CTL3D
WXUINT message,
WXWPARAM wParam,
- WXLPARAM lParam)
+ WXLPARAM lParam
+#else
+ WXUINT WXUNUSED(message),
+ WXWPARAM WXUNUSED(wParam),
+ WXLPARAM WXUNUSED(lParam)
+#endif
+ )
{
#if wxUSE_CTL3D
if ( m_useCtl3D )
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:
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
- event.SetString(GetValue());
+
+ // 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)
+ if ( sel == -1 )
+ {
+ value = GetValue();
+ }
+ else // we're synthesizing text updated event from sel change
+ {
+ // we need to do this because the user code expects
+ // wxComboBox::GetValue() to return the new value from
+ // "text updated" handler but it hadn't been updated yet
+ SetValue(value);
+ }
+
+ event.SetString(value);
event.SetEventObject(this);
ProcessCommand(event);
}
if ( style & wxCB_SORT )
msStyle |= CBS_SORT;
+ if ( style & wxCLIP_SIBLINGS )
+ msStyle |= WS_CLIPSIBLINGS;
+
+
// and now create the MSW control
if ( !MSWCreateControl(_T("COMBOBOX"), msStyle) )
return FALSE;
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::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
-}
-
-void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
-{
- // here is why this is necessary: if the width is negative, the combobox
- // window proc makes the window of the size width*height instead of
- // interpreting height in the usual manner (meaning the height of the drop
- // down list - usually the height specified in the call to MoveWindow()
- // will not change the height of combo box per se)
- //
- // this behaviour is not documented anywhere, but this is just how it is
- // here (NT 4.4) and, anyhow, the check shouldn't hurt - however without
- // the check, constraints/sizers using combos may break the height
- // constraint will have not at all the same value as expected
- if ( width < 0 )
- return;
-
- int cx, cy;
- wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
-
- // what should the height of the drop down list be? we choose 10 items by
- // default and also 10 items max (if we always use n, the list will never
- // have vertical scrollbar)
- int n = GetCount();
- if ( !n || (n > 10) )
- n = 10;
-
- height = (n + 1)* EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
-
- wxControl::DoMoveWindow(x, y, width, height);
-}
-
-wxSize wxComboBox::DoGetBestSize() const
-{
- // the choice calculates the horz size correctly, but not the vertical
- // component: correct it
- wxSize size = wxChoice::DoGetBestSize();
-
- int cx, cy;
- wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
- size.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
-
- return size;
+ == CB_ERR )
+ {
+ wxLogDebug(_T("CB_SETEDITSEL failed"));
+ }
}
#endif
projects / wxWidgets.git / blobdiff