X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/916eecaad6d0840cc8ec10f4fa2aa3d29322e3b3..69d31e313035d5e22d9400ec946f6007f710910c:/src/msw/combobox.cpp?ds=sidebyside diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 2f3f338f46..8fbcce2237 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -39,8 +39,13 @@ #endif #include "wx/clipbrd.h" +#include "wx/wupdlock.h" #include "wx/msw/private.h" +#if wxUSE_UXTHEME + #include "wx/msw/uxtheme.h" +#endif + #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS @@ -87,7 +92,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 ) @@ -108,7 +113,7 @@ wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , #else -IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice) #endif @@ -183,7 +188,7 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, // longer, check for it to avoid bogus assert failures if ( !win->IsBeingDeleted() ) { - wxFAIL_MSG( _T("should have combo as parent") ); + wxFAIL_MSG( wxT("should have combo as parent") ); } } else if ( combo->MSWProcessEditMsg(message, wParam, lParam) ) @@ -196,7 +201,7 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, case WM_GETDLGCODE: { - wxCHECK_MSG( win, 0, _T("should have a parent") ); + wxCHECK_MSG( win, 0, wxT("should have a parent") ); if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER ) { @@ -205,13 +210,6 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, } } break; - - case WM_CUT: - case WM_COPY: - case WM_PASTE: - if( win->HandleClipboardEvent( message ) ) - return 0; - break; } return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam); @@ -235,10 +233,28 @@ WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara { // 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); + + // if an editable combobox has a not empty text not from the + // list, it tries to autocomplete it from the list when it is + // resized, but we don't want this to happen as it doesn't seem + // to make any sense, so we forcefully restore the old text + wxString textOld; + if ( !HasFlag(wxCB_READONLY) && GetCurrentSelection() == -1 ) + textOld = GetValue(); + + // eliminate flickering during following hacks + wxWindowUpdateLocker lock(this); + WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam); + if ( !textOld.empty() && GetValue() != textOld ) + SetLabel(textOld); + long fromNew, toNew; GetSelection(&fromNew, &toNew); @@ -263,6 +279,9 @@ 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); const int sel = GetSelection(); @@ -296,6 +315,11 @@ 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; @@ -308,6 +332,29 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id) switch ( param ) { + case CBN_DROPDOWN: + // remember the last selection, just as wxChoice does + m_lastAcceptedSelection = GetCurrentSelection(); + if ( m_lastAcceptedSelection == -1 ) + { + // 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; + } + { + wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId()); + event.SetEventObject(this); + ProcessCommand(event); + } + break; + case CBN_CLOSEUP: + { + wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId()); + event.SetEventObject(this); + ProcessCommand(event); + } + break; case CBN_SELENDOK: #ifndef __SMARTPHONE__ // we need to reset this to prevent the selection from being undone @@ -323,7 +370,7 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id) // 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); + ::SetWindowText(GetHwnd(), value.wx_str()); { wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId()); @@ -339,6 +386,7 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id) // logical as the text does change) case CBN_EDITCHANGE: + if ( m_allowTextEvents ) { wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId()); @@ -360,26 +408,64 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id) } // skip wxChoice version as it would generate its own events for - // CBN_SELENDOK - return wxControl::MSWCommand(param, id); + // CBN_SELENDOK and also interfere with our handling of CBN_DROPDOWN + return true; } -WXHWND wxComboBox::GetEditHWND() const +bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg) { - // this function should not be called for wxCB_READONLY controls, it is - // the callers responsability to check this - wxASSERT_MSG( !(GetWindowStyle() & 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() ) + // prevent command accelerators from stealing editing + // hotkeys when we have the focus + if (wxIsCtrlDown()) { - wxFAIL_MSG(_T("not read only combobox without edit control?")); + 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 (WXHWND)hwndEdit; + 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 responsibility to check this + wxASSERT_MSG( !HasFlag(wxCB_READONLY), + wxT("read-only combobox doesn't have any edit control") ); + + WXHWND hWndEdit = GetEditHWNDIfAvailable(); + wxASSERT_MSG( hWndEdit, wxT("combobox without edit control?") ); + + return hWndEdit; +} + +wxWindow *wxComboBox::GetEditableWindow() +{ + wxASSERT_MSG( !HasFlag(wxCB_READONLY), + wxT("read-only combobox doesn't have any edit control") ); + + return this; } // ---------------------------------------------------------------------------- @@ -477,7 +563,8 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const wxString wxComboBox::GetValue() const { - return wxGetWindowText(m_hWnd); + return HasFlag(wxCB_READONLY) ? GetStringSelection() + : wxTextEntry::GetValue(); } void wxComboBox::SetValue(const wxString& value) @@ -485,222 +572,34 @@ void wxComboBox::SetValue(const wxString& value) if ( HasFlag(wxCB_READONLY) ) SetStringSelection(value); else - SetWindowText(GetHwnd(), value.c_str()); + 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 -{ - if (!IsEditable()) - return false; - - HWND hEditWnd = (HWND) GetEditHWND(); - if ( hEditWnd ) - return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; - else - return false; -} - -bool wxComboBox::CanRedo() const -{ - if (!IsEditable()) - return false; - - 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 IsEditable() && CanCopy(); -} - -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 editable) -{ - HWND hWnd = (HWND)GetEditHWND(); - if ( !::SendMessage(hWnd, EM_SETREADONLY, !editable, 0) ) - { - wxLogLastError(_T("SendMessage(EM_SETREADONLY)")); - } -} - -void wxComboBox::SetInsertionPoint(long pos) -{ - if ( GetWindowStyle() & wxCB_READONLY ) - return; - - 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); - } -} - -void wxComboBox::SetInsertionPointEnd() -{ - // setting insertion point doesn't make sense for read only comboboxes - if ( !(GetWindowStyle() & wxCB_READONLY) ) - { - wxTextPos pos = GetLastPosition(); - SetInsertionPoint(pos); - } -} - -long wxComboBox::GetInsertionPoint() const -{ - // 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 LOWORD(pos); -} - -wxTextPos 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. - wxTextPos lineLength = (wxTextPos)SendMessage(hEditWnd, EM_LINELENGTH, (WPARAM) 0, (LPARAM)0L); - - return 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); -#else - wxUnusedVar(from); - wxUnusedVar(to); - wxUnusedVar(value); -#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) -{ - // if from and to are both -1, it means (in wxWidgets) that all text should - // be selected, translate this into Windows convention - if ( (from == -1) && (to == -1) ) - { - from = 0; - } - - if ( SendMessage(GetHwnd(), CB_SETEDITSEL, - 0, (LPARAM)MAKELONG(from, to)) == CB_ERR ) - { - wxLogDebug(_T("CB_SETEDITSEL failed")); - } -} - -void wxComboBox::GetSelection(long* from, long* to) const -{ - DWORD dwStart, dwEnd; - if ( ::SendMessage(GetHwnd(), CB_GETEDITSEL, - (WPARAM)&dwStart, (LPARAM)&dwEnd) == CB_ERR ) - { - *from = - *to = 0; - } - else - { - *from = dwStart; - *to = dwEnd; - } + return !HasFlag(wxCB_READONLY) && wxTextEntry::IsEditable(); } // ---------------------------------------------------------------------------- @@ -734,15 +633,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) @@ -762,22 +658,52 @@ 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()); +} + +#if wxUSE_TOOLTIPS + +void wxComboBox::DoSetToolTip(wxToolTip *tip) +{ + wxChoice::DoSetToolTip(tip); + + if ( tip && !HasFlag(wxCB_READONLY) ) + tip->Add(GetEditHWND()); } +#endif // wxUSE_TOOLTIPS + +#if wxUSE_UXTHEME + +bool wxComboBox::SetHint(const wxString& hintOrig) +{ + wxString hint(hintOrig); + if ( wxUxThemeEngine::GetIfActive() ) + { + // under XP (but not Vista) there is a bug in cue banners + // implementation for combobox edit control: the first character is + // partially chopped off, so prepend a space to make it fully visible + hint.insert(0, " "); + } + + return wxTextEntry::SetHint(hint); +} + +#endif // wxUSE_UXTHEME + #endif // wxUSE_COMBOBOX