X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8933fbc62e616831f1708b063f6a369221b1934c..777469ca936965a1ed15f70f3fe81f665833bf6a:/src/msw/combobox.cpp diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index bc36474d1a..cb0885892e 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -32,7 +31,7 @@ #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/settings.h" #include "wx/log.h" - // for wxEVT_COMMAND_TEXT_ENTER + // for wxEVT_TEXT_ENTER #include "wx/textctrl.h" #include "wx/app.h" #include "wx/brush.h" @@ -54,69 +53,6 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxComboBoxStyle ) - -wxBEGIN_FLAGS( wxComboBoxStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxCB_SIMPLE) - wxFLAGS_MEMBER(wxCB_SORT) - wxFLAGS_MEMBER(wxCB_READONLY) - wxFLAGS_MEMBER(wxCB_DROPDOWN) - -wxEND_FLAGS( wxComboBoxStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxChoice,"wx/combobox.h") - -wxBEGIN_PROPERTIES_TABLE(wxComboBox) - wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent ) - wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent ) - - // TODO DELEGATES - wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( Value ,wxString, SetValue, GetValue, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY_FLAGS( WindowStyle , wxComboBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -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, wxChoice) - -#endif - BEGIN_EVENT_TABLE(wxComboBox, wxControl) EVT_MENU(wxID_CUT, wxComboBox::OnCut) EVT_MENU(wxID_COPY, wxComboBox::OnCopy) @@ -155,6 +91,36 @@ static WNDPROC gs_wndprocEdit = (WNDPROC)NULL; // implementation // ============================================================================ +namespace +{ + +// Check if the given message should be forwarded from the edit control which +// is part of the combobox to wxComboBox itself. All messages generating the +// events that the code using wxComboBox could be interested in must be +// forwarded. +bool ShouldForwardFromEditToCombo(UINT message) +{ + switch ( message ) + { + case WM_KEYUP: + case WM_KEYDOWN: + case WM_CHAR: + case WM_SYSCHAR: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + case WM_SETFOCUS: + case WM_KILLFOCUS: + case WM_CUT: + case WM_COPY: + case WM_PASTE: + return true; + } + + return false; +} + +} // anonymous namespace + // ---------------------------------------------------------------------------- // wnd proc for subclassed edit control // ---------------------------------------------------------------------------- @@ -167,49 +133,34 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, HWND hwndCombo = ::GetParent(hWnd); wxWindow *win = wxFindWinFromHandle((WXHWND)hwndCombo); - switch ( message ) + if ( ShouldForwardFromEditToCombo(message) ) { - // forward some messages to the combobox to generate the appropriate - // wxEvents from them - case WM_KEYUP: - case WM_KEYDOWN: - case WM_CHAR: - case WM_SYSCHAR: - case WM_SYSKEYDOWN: - case WM_SYSKEYUP: - case WM_SETFOCUS: - case WM_KILLFOCUS: + wxComboBox *combo = wxDynamicCast(win, wxComboBox); + if ( !combo ) + { + // we can get WM_KILLFOCUS while our parent is already half + // destroyed and hence doesn't look like a combobx any + // longer, check for it to avoid bogus assert failures + if ( !win->IsBeingDeleted() ) { - wxComboBox *combo = wxDynamicCast(win, wxComboBox); - if ( !combo ) - { - // we can get WM_KILLFOCUS while our parent is already half - // destroyed and hence doesn't look like a combobx any - // longer, check for it to avoid bogus assert failures - if ( !win->IsBeingDeleted() ) - { - wxFAIL_MSG( _T("should have combo as parent") ); - } - } - else if ( combo->MSWProcessEditMsg(message, wParam, lParam) ) - { - // handled by parent - return 0; - } + wxFAIL_MSG( wxT("should have combo as parent") ); } - break; - - case WM_GETDLGCODE: - { - wxCHECK_MSG( win, 0, _T("should have a parent") ); + } + else if ( combo->MSWProcessEditMsg(message, wParam, lParam) ) + { + // handled by parent + return 0; + } + } + else if ( message == WM_GETDLGCODE ) + { + wxCHECK_MSG( win, 0, wxT("should have a parent") ); - if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER ) - { - // need to return a custom dlg code or we'll never get it - return DLGC_WANTMESSAGE; - } - } - break; + if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER ) + { + // need to return a custom dlg code or we'll never get it + return DLGC_WANTMESSAGE; + } } return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam); @@ -282,7 +233,7 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0)) return false; - wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); + wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId); const int sel = GetSelection(); event.SetInt(sel); @@ -297,29 +248,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); - - case WM_SETFOCUS: - return HandleSetFocus((WXHWND)wParam); + // fall through, WM_CHAR is one of the message we should forward. - case WM_KILLFOCUS: - return HandleKillFocus((WXHWND)wParam); - - case WM_CUT: - case WM_COPY: - case WM_PASTE: - return HandleClipboardEvent(msg); + default: + if ( ShouldForwardFromEditToCombo(msg) ) + { + // For all the messages forward from the edit control the + // result is not used. + WXLRESULT result; + return MSWHandleMessage(&result, msg, wParam, lParam); + } } return false; @@ -335,26 +273,27 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id) 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()); + wxCommandEvent event(wxEVT_COMBOBOX_DROPDOWN, GetId()); event.SetEventObject(this); ProcessCommand(event); } break; + case CBN_CLOSEUP: + // Do the same thing as in wxChoice but using different event type. + if ( m_pendingSelection != wxID_NONE ) { - wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId()); + SendSelectionChangedEvent(wxEVT_COMBOBOX); + m_pendingSelection = wxID_NONE; + } + { + wxCommandEvent event(wxEVT_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 @@ -370,25 +309,18 @@ 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.wx_str()); - - { - wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId()); - event.SetInt(sel); - event.SetString(value); - InitCommandEventWithItems(event, sel); + ::SetWindowText(GetHwnd(), value.t_str()); - ProcessCommand(event); - } + SendSelectionChangedEvent(wxEVT_COMBOBOX); - // fall through: for compability with wxGTK, also send the text + // fall through: for compatibility with wxGTK, also send the text // update event when the selection changes (this also seems more // logical as the text does change) case CBN_EDITCHANGE: if ( m_allowTextEvents ) { - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId()); + wxCommandEvent event(wxEVT_TEXT, GetId()); // if sel != -1, value was already initialized above if ( sel == -1 ) @@ -438,6 +370,21 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg) WXHWND wxComboBox::GetEditHWNDIfAvailable() const { + // FIXME-VC6: Only VC6 needs this guard, see WINVER definition in + // include/wx/msw/wrapwin.h +#if defined(WINVER) && WINVER >= 0x0500 + WinStruct info; + if ( MSWGetComboBoxInfo(&info) ) + return info.hwndItem; +#endif // WINVER >= 0x0500 + + if (HasFlag(wxCB_SIMPLE)) + { + POINT pt; + pt.x = pt.y = 4; + return (WXHWND) ::ChildWindowFromPoint(GetHwnd(), pt); + } + // 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 @@ -452,10 +399,10 @@ 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), - _T("read-only combobox doesn't have any edit control") ); + wxT("read-only combobox doesn't have any edit control") ); WXHWND hWndEdit = GetEditHWNDIfAvailable(); - wxASSERT_MSG( hWndEdit, _T("combobox without edit control?") ); + wxASSERT_MSG( hWndEdit, wxT("combobox without edit control?") ); return hWndEdit; } @@ -463,7 +410,7 @@ WXHWND wxComboBox::GetEditHWND() const wxWindow *wxComboBox::GetEditableWindow() { wxASSERT_MSG( !HasFlag(wxCB_READONLY), - _T("read-only combobox doesn't have any edit control") ); + wxT("read-only combobox doesn't have any edit control") ); return this; } @@ -582,6 +529,11 @@ void wxComboBox::Clear() wxTextEntry::Clear(); } +bool wxComboBox::ContainsHWND(WXHWND hWnd) const +{ + return hWnd == GetEditHWNDIfAvailable(); +} + void wxComboBox::GetSelection(long *from, long *to) const { if ( !HasFlag(wxCB_READONLY) ) @@ -683,7 +635,7 @@ void wxComboBox::DoSetToolTip(wxToolTip *tip) wxChoice::DoSetToolTip(tip); if ( tip && !HasFlag(wxCB_READONLY) ) - tip->Add(GetEditHWND()); + tip->AddOtherWindow(GetEditHWND()); } #endif // wxUSE_TOOLTIPS @@ -706,4 +658,20 @@ bool wxComboBox::SetHint(const wxString& hintOrig) #endif // wxUSE_UXTHEME +wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const +{ + wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) ); + + if ( !HasFlag(wxCB_READONLY) ) + { + // Add the margins we have previously set + wxPoint marg( GetMargins() ); + marg.x = wxMax(0, marg.x); + marg.y = wxMax(0, marg.y); + tsize.IncBy( marg ); + } + + return tsize; +} + #endif // wxUSE_COMBOBOX