X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4df123bce5ee66ac3aa2985a752b1ddd26725e84..a91a64da8ec5aa3916d06e77875d8ae5e13cfd9f:/src/msw/combobox.cpp diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 94ded90fd1..5faed26cb5 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,23 +26,22 @@ #if wxUSE_COMBOBOX +#include "wx/combobox.h" + #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #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" #if wxUSE_TOOLTIPS - #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) - #include - #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS @@ -92,7 +87,7 @@ wxBEGIN_FLAGS( wxComboBoxStyle ) wxEND_FLAGS( wxComboBoxStyle ) -IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl,"wx/combobox.h") +IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxChoice,"wx/combobox.h") wxBEGIN_PROPERTIES_TABLE(wxComboBox) wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent ) @@ -113,7 +108,7 @@ wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , #else -IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice) #endif @@ -174,6 +169,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,36 +198,13 @@ 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; } } 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; - } - } - break; -#endif // wxUSE_TOOLTIPS } return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam); @@ -241,18 +216,35 @@ 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 + if ( !GetEditHWNDIfAvailable() ) + break; + + 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); @@ -267,10 +259,16 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) // when Enter is pressed if ( wParam == VK_RETURN ) { + if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0)) + return false; + 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 +277,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); @@ -293,44 +295,59 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) case WM_KILLFOCUS: return HandleKillFocus((WXHWND)wParam); + + case WM_CUT: + case WM_COPY: + case WM_PASTE: + return HandleClipboardEvent(msg); } 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(); - - // 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 ) + case CBN_DROPDOWN: + // remember the last selection, just as wxChoice does + m_lastAcceptedSelection = GetCurrentSelection(); + if ( m_lastAcceptedSelection == -1 ) { - m_selectionOld = sel; + // but unlike with wxChoice we may have no selection but still + // have some text and we should avoid erasing it if the drop + // down is cancelled (see #8474) + m_lastAcceptedSelection = wxID_NONE; + } + break; - // 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); + 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 + + // set these variables so that they could be also fixed in + // CBN_EDITCHANGE below + sel = GetSelection(); + value = GetStringSelection(); + // this string is going to become the new combobox value soon but + // we need it to be done right now, otherwise the event handler + // could get a wrong value when it calls our GetValue() + ::SetWindowText(GetHwnd(), value.wx_str()); + + { 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 @@ -338,57 +355,78 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) // logical as the text does change) case CBN_EDITCHANGE: + if ( m_allowTextEvents ) { 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 and also interfere with our handling of CBN_DROPDOWN + return true; +} + +bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg) +{ + // prevent command accelerators from stealing editing + // hotkeys when we have the focus + if (wxIsCtrlDown()) + { + WPARAM vkey = pMsg->wParam; + + switch (vkey) + { + case 'C': + case 'V': + case 'X': + case VK_INSERT: + case VK_DELETE: + case VK_HOME: + case VK_END: + return false; + } + } + + return wxChoice::MSWShouldPreProcessMessage(pMsg); +} + +WXHWND wxComboBox::GetEditHWNDIfAvailable() const +{ + // notice that a slightly safer alternative could be to use FindWindowEx() + // but it's not available under WinCE so just take the first child for now + // to keep one version of the code for all platforms and fix it later if + // problems are discovered + + // we assume that the only child of the combobox is the edit window + return (WXHWND)::GetWindow(GetHwnd(), GW_CHILD); } WXHWND wxComboBox::GetEditHWND() const { // this function should not be called for wxCB_READONLY controls, it is - // the callers responsability to check this - wxASSERT_MSG( !(GetWindowStyle() & wxCB_READONLY), + // the callers responsibility to check this + wxASSERT_MSG( !HasFlag(wxCB_READONLY), _T("read-only combobox doesn't have any edit control") ); - POINT pt; - pt.x = pt.y = 4; - HWND hwndEdit = ::ChildWindowFromPoint(GetHwnd(), pt); - if ( !hwndEdit || hwndEdit == GetHwnd() ) - { - wxFAIL_MSG(_T("not read only combobox without edit control?")); - } + WXHWND hWndEdit = GetEditHWNDIfAvailable(); + wxASSERT_MSG( hWndEdit, _T("combobox without edit control?") ); - return (WXHWND)hwndEdit; + return hWndEdit; } // ---------------------------------------------------------------------------- @@ -424,8 +462,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, // edit control, we must subclass it as well if ( !(style & wxCB_READONLY) ) { - gs_wndprocEdit = wxSetWindowProc((HWND)GetEditHWND(), - wxComboEditWndProc); + gs_wndprocEdit = wxSetWindowProc((HWND)GetEditHWND(), wxComboEditWndProc); } // and finally, show the control @@ -456,6 +493,11 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) 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; @@ -480,224 +522,45 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const // wxComboBox text control-like methods // ---------------------------------------------------------------------------- +wxString wxComboBox::GetValue() const +{ + return HasFlag(wxCB_READONLY) ? GetStringSelection() + : wxTextEntry::GetValue(); +} + void wxComboBox::SetValue(const wxString& value) { if ( HasFlag(wxCB_READONLY) ) SetStringSelection(value); else - SetWindowText(GetHwnd(), value.c_str()); - - m_value = value; - m_selectionOld = GetSelection(); + wxTextEntry::SetValue(value); } -// Clipboard operations -void wxComboBox::Copy() +void wxComboBox::Clear() { - SendMessage(GetHwnd(), WM_COPY, 0, 0L); + wxChoice::Clear(); + if ( !HasFlag(wxCB_READONLY) ) + wxTextEntry::Clear(); } -void wxComboBox::Cut() +void wxComboBox::GetSelection(long *from, long *to) const { - SendMessage(GetHwnd(), WM_CUT, 0, 0L); -} - -void wxComboBox::Paste() -{ - SendMessage(GetHwnd(), WM_PASTE, 0, 0L); -} - -void wxComboBox::Undo() -{ - if (CanUndo()) + if ( !HasFlag(wxCB_READONLY) ) { - HWND hEditWnd = (HWND) GetEditHWND() ; - if ( hEditWnd ) - ::SendMessage(hEditWnd, EM_UNDO, 0, 0); + wxTextEntry::GetSelection(from, to); } -} - -void wxComboBox::Redo() -{ - if (CanUndo()) + else // text selection doesn't make sense for read only comboboxes { - // Same as Undo, since Undo undoes the undo, i.e. a redo. - HWND hEditWnd = (HWND) GetEditHWND() ; - if ( hEditWnd ) - ::SendMessage(hEditWnd, EM_UNDO, 0, 0); + if ( from ) + *from = -1; + if ( to ) + *to = -1; } } -void wxComboBox::SelectAll() -{ - SetSelection(0, GetLastPosition()); -} - -bool wxComboBox::CanUndo() const -{ - HWND hEditWnd = (HWND) GetEditHWND() ; - if ( hEditWnd ) - return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; - else - return false; -} - -bool wxComboBox::CanRedo() const -{ - HWND hEditWnd = (HWND) GetEditHWND() ; - if ( hEditWnd ) - return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; - else - return false; -} - -bool wxComboBox::HasSelection() const -{ - long from, to; - GetSelection(&from, &to); - return from != to; -} - -bool wxComboBox::CanCopy() const -{ - // Can copy if there's a selection - return HasSelection(); -} - -bool wxComboBox::CanCut() const -{ - return CanCopy() && IsEditable(); -} - -bool wxComboBox::CanPaste() const -{ - if ( !IsEditable() ) - return false; - - // Standard edit control: check for straight text on clipboard - if ( !::OpenClipboard(GetHwndOf(wxTheApp->GetTopWindow())) ) - return false; - - bool isTextAvailable = ::IsClipboardFormatAvailable(CF_TEXT) != 0; - ::CloseClipboard(); - - return isTextAvailable; -} - bool wxComboBox::IsEditable() const { - return !HasFlag(wxCB_READONLY); -} - -void wxComboBox::SetEditable(bool WXUNUSED(editable)) -{ - // Can't implement in MSW? -// HWND hWnd = GetHwnd(); -// SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L); -} - -void wxComboBox::SetInsertionPoint(long pos) -{ - if ( GetWindowStyle() & wxCB_READONLY ) - return; - -#ifdef __WIN32__ - 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) wxEmptyString); - } -#endif // __WIN32__ -} - -void wxComboBox::SetInsertionPointEnd() -{ - // setting insertion point doesn't make sense for read only comboboxes - if ( !(GetWindowStyle() & wxCB_READONLY) ) - { - long pos = GetLastPosition(); - SetInsertionPoint(pos); - } -} - -long wxComboBox::GetInsertionPoint() const -{ -#ifdef __WIN32__ - DWORD Pos=(DWORD)SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L); - return Pos&0xFFFF; -#else - return 0; -#endif -} - -long wxComboBox::GetLastPosition() const -{ - HWND hEditWnd = (HWND) GetEditHWND(); - - // 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(hEditWnd, EM_LINELENGTH, (WPARAM) 0, (LPARAM)0L); - - return (long)(lineLength); -} - -void wxComboBox::Replace(long from, long to, const wxString& value) -{ -#if wxUSE_CLIPBOARD - Remove(from, to); - - // Now replace with 'value', by pasting. - wxSetClipboardData(wxDF_TEXT, (wxObject *)(const wxChar *)value, 0, 0); - - // Paste into edit control - SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L); -#endif -} - -void wxComboBox::Remove(long from, long to) -{ - // Set selection and remove it - SetSelection(from, to); - SendMessage(GetHwnd(), WM_CUT, (WPARAM)0, (LPARAM)0); -} - -void wxComboBox::SetSelection(long from, long to) -{ - HWND hWnd = GetHwnd(); - long fromChar = from; - long toChar = to; - // if from and to are both -1, it means - // (in wxWidgets) that all text should be selected. - // This translates into Windows convention - if ((from == -1) && (to == -1)) - { - fromChar = 0; - toChar = -1; - } - - if ( SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)) == CB_ERR ) - { - wxLogDebug(_T("CB_SETEDITSEL failed")); - } -} - -void wxComboBox::GetSelection(long* from, long* to) const -{ - DWORD dwStart, dwEnd; - ::SendMessage(GetHwnd(), CB_GETEDITSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); - - *from = dwStart; - *to = dwEnd; -} - -int wxComboBox::GetSelection() const -{ - return wxChoice::GetSelection(); + return !HasFlag(wxCB_READONLY) && wxTextEntry::IsEditable(); } // ---------------------------------------------------------------------------- @@ -731,15 +594,12 @@ void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event)) void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event)) { - long from, to; - GetSelection(& from, & to); - if (from != -1 && to != -1) - Remove(from, to); + RemoveSelection(); } void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event)) { - SetSelection(-1, -1); + SelectAll(); } void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event) @@ -759,23 +619,34 @@ void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event) void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event) { - event.Enable( CanUndo() ); + event.Enable( IsEditable() && CanUndo() ); } void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event) { - event.Enable( CanRedo() ); + event.Enable( IsEditable() && CanRedo() ); } void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event) { - event.Enable(HasSelection() && IsEditable()) ; + event.Enable(IsEditable() && HasSelection()); } void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) { - event.Enable(GetLastPosition() > 0); + event.Enable(IsEditable() && !wxTextEntry::IsEmpty()); } -#endif // wxUSE_COMBOBOX +#if wxUSE_TOOLTIPS + +void wxComboBox::DoSetToolTip(wxToolTip *tip) +{ + wxChoice::DoSetToolTip(tip); + if ( tip && !HasFlag(wxCB_READONLY) ) + tip->Add(GetEditHWND()); +} + +#endif // wxUSE_TOOLTIPS + +#endif // wxUSE_COMBOBOX