/////////////////////////////////////////////////////////////////////////////
-// Name: msw/combobox.cpp
+// Name: src/msw/combobox.cpp
// Purpose: wxComboBox class
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "combobox.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
case WM_KEYUP:
case WM_KEYDOWN:
case WM_CHAR:
+ case WM_SYSCHAR:
+ case WM_SYSKEYDOWN:
+ case WM_SYSKEYUP:
case WM_SETFOCUS:
case WM_KILLFOCUS:
{
{
wxCHECK_MSG( win, 0, _T("should have a parent") );
- if ( win->GetWindowStyle() & wxPROCESS_ENTER )
+ if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
{
// need to return a custom dlg code or we'll never get it
return DLGC_WANTMESSAGE;
WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
- // handle WM_CTLCOLOR messages from our EDIT control to be able to set its
- // colour correctly (to be the same as our own one)
+ // TODO: handle WM_CTLCOLOR messages from our EDIT control to be able to
+ // set its colour correctly (to be the same as our own one)
+
switch ( nMsg )
{
- case CB_SETCURSEL:
- // Selection was set with SetSelection. Update the value too.
- if ((int)wParam > GetCount())
- m_value = wxEmptyString;
- else
- m_value = GetString(wParam);
- m_selectionOld = -1;
- break;
+ case WM_SIZE:
+ // wxStaticBox can generate this message, when modifying the control's style.
+ // This causes the content of the combobox to be selected, for some reason.
+ case WM_STYLECHANGED:
+ {
+ // combobox selection sometimes spontaneously changes when its
+ // size changes, restore it to the old value if necessary
+ long fromOld, toOld;
+ GetSelection(&fromOld, &toOld);
+ WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam);
+
+ long fromNew, toNew;
+ GetSelection(&fromNew, &toNew);
+
+ if ( fromOld != fromNew || toOld != toNew )
+ {
+ SetSelection(fromOld, toOld);
+ }
+
+ return result;
+ }
}
return wxChoice::MSWWindowProc(nMsg, wParam, lParam);
return true;
}
}
+ // fall through
+ case WM_SYSCHAR:
return HandleChar(wParam, lParam, true /* isASCII */);
+ case WM_SYSKEYDOWN:
case WM_KEYDOWN:
return HandleKeyDown(wParam, lParam);
+ case WM_SYSKEYUP:
case WM_KEYUP:
return HandleKeyUp(wParam, lParam);
return false;
}
-bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
+bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
{
- wxString value;
int sel = -1;
+ wxString value;
+
switch ( param )
{
- case CBN_SELCHANGE:
- sel = GetSelection();
+ case CBN_SELENDOK:
+#ifndef __SMARTPHONE__
+ // we need to reset this to prevent the selection from being undone
+ // by wxChoice, see wxChoice::MSWCommand() and comments there
+ m_lastAcceptedSelection = wxID_NONE;
+#endif
- // somehow we get 2 CBN_SELCHANGE events with the same index when
- // the user selects an item in the combobox -- ignore duplicates
- if ( sel > -1 && sel != m_selectionOld )
+ // set these variables so that they could be also fixed in
+ // CBN_EDITCHANGE below
+ sel = GetSelection();
+ value = GetStringSelection();
{
- m_selectionOld = sel;
-
- // GetValue() would still return the old value from here but
- // according to the docs we should return the new value if the
- // user calls it in his event handler, so update internal
- // m_value
- m_value = GetString(sel);
-
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
- event.SetInt(sel);
event.SetEventObject(this);
- event.SetString(m_value);
+ event.SetInt(sel);
+ event.SetString(value);
ProcessCommand(event);
}
- else // no valid selection
- {
- m_selectionOld = sel;
-
- // hence no EVT_TEXT neither
- break;
- }
// fall through: for compability with wxGTK, also send the text
// update event when the selection changes (this also seems more
case CBN_EDITCHANGE:
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+ event.SetEventObject(this);
- // 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 was already initialized above
if ( sel == -1 )
{
- m_value = wxGetWindowText(GetHwnd());
- m_selectionOld = -1;
- }
- else // we're synthesizing text updated event from sel change
- {
- // We need to retrieve the current selection because the
- // user may have changed it in the previous handler (for
- // CBN_SELCHANGE above).
- sel = GetSelection();
- if ( sel > -1 )
- {
- m_value = GetString(sel);
- }
+ value = wxGetWindowText(GetHwnd());
}
- event.SetString(m_value);
- event.SetEventObject(this);
+ event.SetString(value);
ProcessCommand(event);
}
break;
+
+ default:
+ return wxChoice::MSWCommand(param, id);
}
- // there is no return value for the CBN_ notifications, so always return
- // false from here to pass the message to DefWindowProc()
- return false;
+ // skip wxChoice version as it would generate its own events for
+ // CBN_SELENDOK
+ return wxControl::MSWCommand(param, id);
}
WXHWND wxComboBox::GetEditHWND() const
(style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
);
+ // usually WS_TABSTOP is added by wxControl::MSWGetStyle() but as we're
+ // created hidden (see Create() above), it is not done for us but we still
+ // want to have this style
+ msStyle |= WS_TABSTOP;
+
// remove the style always added by wxChoice
msStyle &= ~CBS_DROPDOWNLIST;
}
// ----------------------------------------------------------------------------
-// wxComboBox geometry
+// wxComboBox text control-like methods
// ----------------------------------------------------------------------------
-void
-wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+wxString wxComboBox::GetValue() const
{
- // work around a Windows bug (search for "Bug in Windows Combobox" in
- // Google Groups): resizing the combobox changes the selection in it
- long fromOld, toOld;
- GetSelection(&fromOld, &toOld);
-
- wxChoice::DoSetSize(x, y, width, height, sizeFlags);
-
- long fromNew, toNew;
- GetSelection(&fromNew, &toNew);
-
- if ( fromOld != fromNew || toOld != toNew )
- {
- SetSelection(fromOld, toOld);
- }
+ return wxGetWindowText(m_hWnd);
}
-// ----------------------------------------------------------------------------
-// wxComboBox text control-like methods
-// ----------------------------------------------------------------------------
-
void wxComboBox::SetValue(const wxString& value)
{
if ( HasFlag(wxCB_READONLY) )
SetStringSelection(value);
else
SetWindowText(GetHwnd(), value.c_str());
-
- m_value = value;
- m_selectionOld = GetSelection();
}
// Clipboard operations
{
if (CanUndo())
{
- HWND hEditWnd = (HWND) GetEditHWND() ;
+ HWND hEditWnd = (HWND) GetEditHWND();
if ( hEditWnd )
::SendMessage(hEditWnd, EM_UNDO, 0, 0);
}
if (CanUndo())
{
// Same as Undo, since Undo undoes the undo, i.e. a redo.
- HWND hEditWnd = (HWND) GetEditHWND() ;
+ HWND hEditWnd = (HWND) GetEditHWND();
if ( hEditWnd )
::SendMessage(hEditWnd, EM_UNDO, 0, 0);
}
{
if (!IsEditable())
return false;
-
- HWND hEditWnd = (HWND) GetEditHWND() ;
+
+ HWND hEditWnd = (HWND) GetEditHWND();
if ( hEditWnd )
return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
else
{
if (!IsEditable())
return false;
-
- HWND hEditWnd = (HWND) GetEditHWND() ;
+
+ HWND hEditWnd = (HWND) GetEditHWND();
if ( hEditWnd )
return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
else
bool wxComboBox::CanCut() const
{
- return IsEditable() && CanCopy() ;
+ return IsEditable() && CanCopy();
}
bool wxComboBox::CanPaste() const
#ifdef __WIN32__
HWND hWnd = GetHwnd();
::SendMessage(hWnd, CB_SETEDITSEL, 0, MAKELPARAM(pos, pos));
- HWND hEditWnd = (HWND) GetEditHWND() ;
+ HWND hEditWnd = (HWND) GetEditHWND();
if ( hEditWnd )
{
// Scroll insertion point into view
long wxComboBox::GetInsertionPoint() const
{
- // CB_GETEDITSEL returns the index of the last character after selection in
- // its high-order word
+ // CB_GETEDITSEL returns the index of the first character of the selection in
+ // its low-order word
DWORD pos= (DWORD)::SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);
-
- return HIWORD(pos);
+ return LOWORD(pos);
}
wxTextPos wxComboBox::GetLastPosition() const
// Paste into edit control
SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);
+#else
+ wxUnusedVar(from);
+ wxUnusedVar(to);
+ wxUnusedVar(value);
#endif
}
}
}
-int wxComboBox::GetSelection() const
-{
- return wxChoice::GetSelection();
-}
-
// ----------------------------------------------------------------------------
// standard event handling
// ----------------------------------------------------------------------------
void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
{
- event.Enable(HasSelection() && IsEditable()) ;
+ event.Enable(HasSelection() && IsEditable());
}
void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
}
#endif // wxUSE_COMBOBOX
-
projects / wxWidgets.git / blobdiff