X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1dfd425a8cda56960488f1ba5b39ad6e223a1e05..c0badb709a86b91a203416784b649e3d00c699c7:/src/msw/combobox.cpp diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 38ec288a72..2648bd8024 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/combobox.cpp +// Name: src/msw/combobox.cpp // Purpose: wxComboBox class // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // 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" @@ -30,16 +26,17 @@ #if wxUSE_COMBOBOX +#include "wx/combobox.h" + #ifndef WX_PRECOMP #include "wx/settings.h" #include "wx/log.h" // for wxEVT_COMMAND_TEXT_ENTER #include "wx/textctrl.h" + #include "wx/app.h" + #include "wx/brush.h" #endif -#include "wx/app.h" -#include "wx/combobox.h" -#include "wx/brush.h" #include "wx/clipbrd.h" #include "wx/msw/private.h" @@ -174,6 +171,9 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, case WM_KEYUP: case WM_KEYDOWN: case WM_CHAR: + case WM_SYSCHAR: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: case WM_SETFOCUS: case WM_KILLFOCUS: { @@ -200,7 +200,7 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, { 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; @@ -208,28 +208,12 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, } break; - // deal with tooltips here -#if wxUSE_TOOLTIPS && defined(TTN_NEEDTEXT) - case WM_NOTIFY: - { - wxCHECK_MSG( win, 0, _T("should have a parent") ); - - NMHDR* hdr = (NMHDR *)lParam; - if ( hdr->code == TTN_NEEDTEXT ) - { - wxToolTip *tooltip = win->GetToolTip(); - if ( tooltip ) - { - TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam; - ttt->lpszText = (wxChar *)tooltip->GetTip().c_str(); - } - - // processed - return 0; - } - } + case WM_CUT: + case WM_COPY: + case WM_PASTE: + if( win->HandleClipboardEvent( message ) ) + return 0; break; -#endif // wxUSE_TOOLTIPS } return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam); @@ -241,18 +225,32 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, 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); @@ -268,9 +266,12 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) if ( wParam == VK_RETURN ) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); - InitCommandEvent(event); + + const int sel = GetSelection(); + event.SetInt(sel); event.SetString(GetValue()); - event.SetInt(GetSelection()); + InitCommandEventWithItems(event, sel); + if ( ProcessCommand(event) ) { // don't let the event through to the native control @@ -279,12 +280,16 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM 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); @@ -298,41 +303,31 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM 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_SELENDOK: - case CBN_SELCHANGE: - sel = GetSelection(); +#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 - // we may sometimes get 2 CBN_SELCHANGE events or a CBN_SELENDOK - // before CBN_SELCHANGE 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); - ProcessCommand(event); - } - else // no valid selection - { - m_selectionOld = sel; + event.SetString(value); + InitCommandEventWithItems(event, sel); - // hence no EVT_TEXT neither - break; + ProcessCommand(event); } // fall through: for compability with wxGTK, also send the text @@ -343,36 +338,26 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId()); - // 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); + InitCommandEventWithItems(event, sel); + 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 @@ -484,41 +469,20 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const } // ---------------------------------------------------------------------------- -// 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 @@ -541,7 +505,7 @@ void wxComboBox::Undo() { if (CanUndo()) { - HWND hEditWnd = (HWND) GetEditHWND() ; + HWND hEditWnd = (HWND) GetEditHWND(); if ( hEditWnd ) ::SendMessage(hEditWnd, EM_UNDO, 0, 0); } @@ -552,7 +516,7 @@ void wxComboBox::Redo() 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); } @@ -567,8 +531,8 @@ bool wxComboBox::CanUndo() const { if (!IsEditable()) return false; - - HWND hEditWnd = (HWND) GetEditHWND() ; + + HWND hEditWnd = (HWND) GetEditHWND(); if ( hEditWnd ) return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; else @@ -579,8 +543,8 @@ bool wxComboBox::CanRedo() const { if (!IsEditable()) return false; - - HWND hEditWnd = (HWND) GetEditHWND() ; + + HWND hEditWnd = (HWND) GetEditHWND(); if ( hEditWnd ) return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; else @@ -602,7 +566,7 @@ bool wxComboBox::CanCopy() const bool wxComboBox::CanCut() const { - return IsEditable() && CanCopy() ; + return IsEditable() && CanCopy(); } bool wxComboBox::CanPaste() const @@ -640,7 +604,7 @@ void wxComboBox::SetInsertionPoint(long pos) #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 @@ -663,11 +627,10 @@ void wxComboBox::SetInsertionPointEnd() 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 @@ -691,6 +654,10 @@ void wxComboBox::Replace(long from, long to, const wxString& value) // Paste into edit control SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L); +#else + wxUnusedVar(from); + wxUnusedVar(to); + wxUnusedVar(value); #endif } @@ -733,11 +700,6 @@ void wxComboBox::GetSelection(long* from, long* to) const } } -int wxComboBox::GetSelection() const -{ - return wxChoice::GetSelection(); -} - // ---------------------------------------------------------------------------- // standard event handling // ---------------------------------------------------------------------------- @@ -807,7 +769,7 @@ void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event) void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event) { - event.Enable(HasSelection() && IsEditable()) ; + event.Enable(HasSelection() && IsEditable()); } void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) @@ -816,4 +778,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) } #endif // wxUSE_COMBOBOX -