X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/150e31d2088687cbfbab548f9e98918f8683d9b5..1ab440bc203fc700744039abdcff12bdd6ac6f0a:/src/msw/combobox.cpp diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index c07ac7bee0..41b73b4478 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,22 +26,24 @@ #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/combobox.h" -#include "wx/brush.h" #include "wx/clipbrd.h" #include "wx/msw/private.h" +// include "properly" +#include "wx/msw/wrapcctl.h" + #if wxUSE_TOOLTIPS - #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) - #include - #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS @@ -109,9 +107,13 @@ wxBEGIN_HANDLERS_TABLE(wxComboBox) wxEND_HANDLERS_TABLE() wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size ) + #else + IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) +#endif + BEGIN_EVENT_TABLE(wxComboBox, wxControl) EVT_MENU(wxID_CUT, wxComboBox::OnCut) EVT_MENU(wxID_COPY, wxComboBox::OnCopy) @@ -130,8 +132,6 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl) EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll) END_EVENT_TABLE() -#endif - // ---------------------------------------------------------------------------- // function prototypes // ---------------------------------------------------------------------------- @@ -171,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: { @@ -197,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; @@ -205,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); @@ -238,17 +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); - 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); @@ -264,17 +266,30 @@ 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()); - ProcessCommand(event); + InitCommandEventWithItems(event, sel); + + if ( ProcessCommand(event) ) + { + // don't let the event through to the native control + // because it doesn't need it and may generate an annoying + // beep if it gets it + 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); @@ -288,39 +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_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); - 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 @@ -331,35 +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()); - } - 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 @@ -445,6 +443,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; @@ -469,15 +472,17 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const // wxComboBox text control-like methods // ---------------------------------------------------------------------------- +wxString wxComboBox::GetValue() const +{ + return wxGetWindowText(m_hWnd); +} + 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 @@ -500,7 +505,7 @@ void wxComboBox::Undo() { if (CanUndo()) { - HWND hEditWnd = (HWND) GetEditHWND() ; + HWND hEditWnd = (HWND) GetEditHWND(); if ( hEditWnd ) ::SendMessage(hEditWnd, EM_UNDO, 0, 0); } @@ -511,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); } @@ -524,7 +529,10 @@ void wxComboBox::SelectAll() bool wxComboBox::CanUndo() const { - HWND hEditWnd = (HWND) GetEditHWND() ; + if (!IsEditable()) + return false; + + HWND hEditWnd = (HWND) GetEditHWND(); if ( hEditWnd ) return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; else @@ -533,7 +541,10 @@ bool wxComboBox::CanUndo() const bool wxComboBox::CanRedo() const { - HWND hEditWnd = (HWND) GetEditHWND() ; + if (!IsEditable()) + return false; + + HWND hEditWnd = (HWND) GetEditHWND(); if ( hEditWnd ) return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; else @@ -555,7 +566,7 @@ bool wxComboBox::CanCopy() const bool wxComboBox::CanCut() const { - return CanCopy() && IsEditable(); + return IsEditable() && CanCopy(); } bool wxComboBox::CanPaste() const @@ -593,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 @@ -609,30 +620,28 @@ void wxComboBox::SetInsertionPointEnd() // setting insertion point doesn't make sense for read only comboboxes if ( !(GetWindowStyle() & wxCB_READONLY) ) { - long pos = GetLastPosition(); + wxTextPos 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 + // 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); } -long wxComboBox::GetLastPosition() const +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. - int lineLength = (int)SendMessage(hEditWnd, EM_LINELENGTH, (WPARAM) 0, (LPARAM)0L); + wxTextPos lineLength = (wxTextPos)SendMessage(hEditWnd, EM_LINELENGTH, (WPARAM) 0, (LPARAM)0L); - return (long)(lineLength); + return lineLength; } void wxComboBox::Replace(long from, long to, const wxString& value) @@ -645,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 } @@ -657,19 +670,15 @@ void wxComboBox::Remove(long from, long to) 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)) + // 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) ) { - fromChar = 0; - toChar = -1; + from = 0; } - if ( SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)) == CB_ERR ) + if ( SendMessage(GetHwnd(), CB_SETEDITSEL, + 0, (LPARAM)MAKELONG(from, to)) == CB_ERR ) { wxLogDebug(_T("CB_SETEDITSEL failed")); } @@ -678,15 +687,17 @@ void wxComboBox::SetSelection(long from, long to) 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(); + if ( ::SendMessage(GetHwnd(), CB_GETEDITSEL, + (WPARAM)&dwStart, (LPARAM)&dwEnd) == CB_ERR ) + { + *from = + *to = 0; + } + else + { + *from = dwStart; + *to = dwEnd; + } } // ---------------------------------------------------------------------------- @@ -758,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) @@ -767,4 +778,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) } #endif // wxUSE_COMBOBOX -