X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c64755ed1ad825e3a5b6ddc71bc77e8f25fc5999..79b7b95aed76eb742deef93d046886c20452fb36:/src/msw/combobox.cpp?ds=inline diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 2648bd8024..bb65134622 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -29,6 +29,7 @@ #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 @@ -41,9 +42,6 @@ #include "wx/msw/private.h" #if wxUSE_TOOLTIPS - #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) - #include - #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS @@ -89,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 ) @@ -110,7 +108,7 @@ wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , #else -IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice) #endif @@ -237,6 +235,9 @@ 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); WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam); @@ -265,6 +266,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(); @@ -321,6 +325,12 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id) // 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); @@ -357,25 +367,51 @@ 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); + 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 +{ + // we assume that the only child of the combobox is the edit window so it's + // unnecessary to pass "EDIT" as class name parameter + return (WXHWND)::FindWindowEx(GetHwnd(), NULL, NULL, NULL); } 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; } // ---------------------------------------------------------------------------- @@ -411,8 +447,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 @@ -474,7 +509,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) @@ -482,222 +518,34 @@ void wxComboBox::SetValue(const wxString& value) if ( HasFlag(wxCB_READONLY) ) SetStringSelection(value); else - SetWindowText(GetHwnd(), value.c_str()); -} - -// Clipboard operations -void wxComboBox::Copy() -{ - SendMessage(GetHwnd(), WM_COPY, 0, 0L); -} - -void wxComboBox::Cut() -{ - SendMessage(GetHwnd(), WM_CUT, 0, 0L); + wxTextEntry::SetValue(value); } -void wxComboBox::Paste() +void wxComboBox::Clear() { - SendMessage(GetHwnd(), WM_PASTE, 0, 0L); + wxChoice::Clear(); + if ( !HasFlag(wxCB_READONLY) ) + wxTextEntry::Clear(); } -void wxComboBox::Undo() +void wxComboBox::GetSelection(long *from, long *to) const { - 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 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) ) - { - 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(); } // ---------------------------------------------------------------------------- @@ -759,22 +607,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() && GetLastPosition() > 0); +} + +#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