X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33b64e6f8b7cf372a569e61d7eee879217945043..43f4e852a1b2ac37c3db6a2b87315192ac549191:/src/msw/combobox.cpp diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index aec17db23d..b823cc5899 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -1,63 +1,425 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.cpp +// Name: src/msw/combobox.cpp // Purpose: wxComboBox class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "combobox.h" -#endif +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/setup.h" + #pragma hdrstop #endif #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/clipbrd.h" +#include "wx/wupdlock.h" #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) +#if wxUSE_UXTHEME + #include "wx/msw/uxtheme.h" #endif -bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) -{ - if (param == CBN_SELCHANGE) - { - wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId); - event.SetInt(GetSelection()); - event.SetEventObject(this); - event.SetString(copystring(GetStringSelection())); - ProcessCommand(event); - delete[] event.GetString(); - return TRUE; - } - else if (param == CBN_EDITCHANGE) - { - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); - event.SetString(copystring(GetValue())); - event.SetEventObject(this); - ProcessCommand(event); - delete[] event.GetString(); - return TRUE; - } - else return FALSE; +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif // wxUSE_TOOLTIPS + +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxComboBox, wxControl) + EVT_MENU(wxID_CUT, wxComboBox::OnCut) + EVT_MENU(wxID_COPY, wxComboBox::OnCopy) + EVT_MENU(wxID_PASTE, wxComboBox::OnPaste) + EVT_MENU(wxID_UNDO, wxComboBox::OnUndo) + EVT_MENU(wxID_REDO, wxComboBox::OnRedo) + EVT_MENU(wxID_CLEAR, wxComboBox::OnDelete) + EVT_MENU(wxID_SELECTALL, wxComboBox::OnSelectAll) + + EVT_UPDATE_UI(wxID_CUT, wxComboBox::OnUpdateCut) + EVT_UPDATE_UI(wxID_COPY, wxComboBox::OnUpdateCopy) + EVT_UPDATE_UI(wxID_PASTE, wxComboBox::OnUpdatePaste) + EVT_UPDATE_UI(wxID_UNDO, wxComboBox::OnUpdateUndo) + EVT_UPDATE_UI(wxID_REDO, wxComboBox::OnUpdateRedo) + EVT_UPDATE_UI(wxID_CLEAR, wxComboBox::OnUpdateDelete) + EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll) +END_EVENT_TABLE() + +// ---------------------------------------------------------------------------- +// function prototypes +// ---------------------------------------------------------------------------- + +LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, + UINT message, + WPARAM wParam, + LPARAM lParam); + +// --------------------------------------------------------------------------- +// global vars +// --------------------------------------------------------------------------- + +// the pointer to standard radio button wnd proc +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 +// ---------------------------------------------------------------------------- + +LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + HWND hwndCombo = ::GetParent(hWnd); + wxWindow *win = wxFindWinFromHandle((WXHWND)hwndCombo); + + if ( ShouldForwardFromEditToCombo(message) ) + { + 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( wxT("should have combo as 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; + } + } + + return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam); +} + +// ---------------------------------------------------------------------------- +// wxComboBox callbacks +// ---------------------------------------------------------------------------- + +WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +{ + // 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 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); + + // 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); + + if ( fromOld != fromNew || toOld != toNew ) + { + SetSelection(fromOld, toOld); + } + + return result; + } + } + + return wxChoice::MSWWindowProc(nMsg, wParam, lParam); +} + +bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) +{ + switch ( msg ) + { + case WM_CHAR: + // for compatibility with wxTextCtrl, generate a special message + // 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(); + event.SetInt(sel); + event.SetString(GetValue()); + 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, WM_CHAR is one of the message we should forward. + + 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; +} + +bool wxComboBox::MSWCommand(WXUINT param, WXWORD id) +{ + int sel = -1; + wxString value; + + switch ( param ) + { + case CBN_DROPDOWN: + // remember the last selection, just as wxChoice does + m_lastAcceptedSelection = GetCurrentSelection(); + { + wxCommandEvent event(wxEVT_COMMAND_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 ) + { + SendSelectionChangedEvent(wxEVT_COMMAND_COMBOBOX_SELECTED); + m_pendingSelection = wxID_NONE; + } + { + 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 + // 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.t_str()); + + SendSelectionChangedEvent(wxEVT_COMMAND_COMBOBOX_SELECTED); + + // 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()); + + // if sel != -1, value was already initialized above + if ( sel == -1 ) + { + value = wxGetWindowText(GetHwnd()); + } + + event.SetString(value); + InitCommandEventWithItems(event, sel); + + ProcessCommand(event); + } + break; + + default: + return wxChoice::MSWCommand(param, id); + } + + // 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 +{ + // 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 + // 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; +} + +// ---------------------------------------------------------------------------- +// wxComboBox creation +// ---------------------------------------------------------------------------- + bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, @@ -67,261 +429,250 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - SetName(name); - SetValidator(validator); - if (parent) parent->AddChild(this); - SetBackgroundColour(parent->GetBackgroundColour()) ; - SetForegroundColour(parent->GetForegroundColour()) ; - m_noStrings = 0; - - m_windowStyle = style; - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - long msStyle = WS_CHILD | WS_HSCROLL | WS_VSCROLL | - WS_TABSTOP | WS_VISIBLE | CBS_NOINTEGRALHEIGHT; - - if (m_windowStyle & wxCB_READONLY) - msStyle |= CBS_DROPDOWNLIST; - else if (m_windowStyle & wxCB_SIMPLE) - msStyle |= CBS_SIMPLE; // A list (shown always) and edit control - else - msStyle |= CBS_DROPDOWN; - - if (m_windowStyle & wxCB_SORT) - msStyle |= CBS_SORT; - - bool want3D; - WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ; - - // Even with extended styles, need to combine with WS_BORDER - // for them to look right. - if ( want3D || wxStyleHasBorder(m_windowStyle) ) - msStyle |= WS_BORDER; - - m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "COMBOBOX", NULL, - msStyle, - 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, - wxGetInstance(), NULL); - - wxCHECK_MSG( m_hWnd, FALSE, "Failed to create combobox" ); - -/* -#if wxUSE_CTL3D - if (want3D) - { - Ctl3dSubclassCtl(wx_combo); - m_useCtl3D = TRUE; - } -#endif -*/ + // pretend that wxComboBox is hidden while it is positioned and resized and + // show it only right before leaving this method because otherwise there is + // some noticeable flicker while the control rearranges itself + m_isShown = false; + + if ( !CreateAndInit(parent, id, pos, size, n, choices, style, + validator, name) ) + return false; + + // we shouldn't call SetValue() for an empty string because this would + // (correctly) result in an assert with a read only combobox and is useless + // for the other ones anyhow + if ( !value.empty() ) + SetValue(value); + + // a (not read only) combobox is, in fact, 2 controls: the combobox itself + // and an edit control inside it and if we want to catch events from this + // edit control, we must subclass it as well + if ( !(style & wxCB_READONLY) ) + { + gs_wndprocEdit = wxSetWindowProc((HWND)GetEditHWND(), wxComboEditWndProc); + } + + // and finally, show the control + Show(true); - // Subclass again for purposes of dialog editing mode - SubclassWin(m_hWnd); + return true; +} + +bool wxComboBox::Create(wxWindow *parent, wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) +{ + wxCArrayString chs(choices); + return Create(parent, id, value, pos, size, chs.GetCount(), + chs.GetStrings(), style, validator, name); +} - SetFont(parent->GetFont()); - int i; - for (i = 0; i < n; i++) - { - Append(choices[i]); - } +WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + // we never have an external border + WXDWORD msStyle = wxChoice::MSWGetStyle + ( + (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; + + if ( style & wxCB_READONLY ) + msStyle |= CBS_DROPDOWNLIST; +#ifndef __WXWINCE__ + else if ( style & wxCB_SIMPLE ) + msStyle |= CBS_SIMPLE; // A list (shown always) and edit control +#endif + else + msStyle |= CBS_DROPDOWN; - SetSelection(i); + // there is no reason to not always use CBS_AUTOHSCROLL, so do use it + msStyle |= CBS_AUTOHSCROLL; - SetSize(x, y, width, height); - if ( !value.IsEmpty() ) - { - SetValue(value); - } + // NB: we used to also add CBS_NOINTEGRALHEIGHT here but why? - return TRUE; + return msStyle; } +// ---------------------------------------------------------------------------- +// wxComboBox text control-like methods +// ---------------------------------------------------------------------------- + wxString wxComboBox::GetValue() const { - return wxGetWindowText(GetHWND()); + return HasFlag(wxCB_READONLY) ? GetStringSelection() + : wxTextEntry::GetValue(); } void wxComboBox::SetValue(const wxString& value) { - // If newlines are denoted by just 10, must stick 13 in front. - int singletons = 0; - int len = value.Length(); - int i; - for (i = 0; i < len; i ++) - { - if ((i > 0) && (value[i] == 10) && (value[i-1] != 13)) - singletons ++; - } - if (singletons > 0) - { - char *tmp = new char[len + singletons + 1]; - int j = 0; - for (i = 0; i < len; i ++) + if ( HasFlag(wxCB_READONLY) ) + SetStringSelection(value); + else + wxTextEntry::SetValue(value); +} + +void wxComboBox::Clear() +{ + wxChoice::Clear(); + if ( !HasFlag(wxCB_READONLY) ) + wxTextEntry::Clear(); +} + +bool wxComboBox::ContainsHWND(WXHWND hWnd) const +{ + return hWnd == GetEditHWNDIfAvailable(); +} + +void wxComboBox::GetSelection(long *from, long *to) const +{ + if ( !HasFlag(wxCB_READONLY) ) + { + wxTextEntry::GetSelection(from, to); + } + else // text selection doesn't make sense for read only comboboxes { - if ((i > 0) && (value[i] == 10) && (value[i-1] != 13)) - { - tmp[j] = 13; - j ++; - } - tmp[j] = value[i]; - j ++; + if ( from ) + *from = -1; + if ( to ) + *to = -1; } - tmp[j] = 0; - SetWindowText((HWND) GetHWND(), tmp); - delete[] tmp; - } - else - SetWindowText((HWND) GetHWND(), (const char *)value); } -// Clipboard operations -void wxComboBox::Copy() +bool wxComboBox::IsEditable() const { - HWND hWnd = (HWND) GetHWND(); - SendMessage(hWnd, WM_COPY, 0, 0L); + return !HasFlag(wxCB_READONLY) && wxTextEntry::IsEditable(); } -void wxComboBox::Cut() +// ---------------------------------------------------------------------------- +// standard event handling +// ---------------------------------------------------------------------------- + +void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event)) { - HWND hWnd = (HWND) GetHWND(); - SendMessage(hWnd, WM_CUT, 0, 0L); + Cut(); } -void wxComboBox::Paste() +void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event)) { - HWND hWnd = (HWND) GetHWND(); - SendMessage(hWnd, WM_PASTE, 0, 0L); + Copy(); } -void wxComboBox::SetEditable(bool editable) +void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event)) { - // Can't implement in MSW? -// HWND hWnd = (HWND) GetHWND(); -// SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L); + Paste(); } -void wxComboBox::SetInsertionPoint(long pos) +void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event)) { -/* - HWND hWnd = (HWND) GetHWND(); -#ifdef __WIN32__ - SendMessage(hWnd, EM_SETSEL, pos, pos); - SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0); -#else - SendMessage(hWnd, EM_SETSEL, 0, MAKELPARAM(pos, pos)); -#endif - char *nothing = ""; - SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing); -*/ + Undo(); } -void wxComboBox::SetInsertionPointEnd() +void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event)) { -/* - long pos = GetLastPosition(); - SetInsertionPoint(pos); -*/ + Redo(); } -long wxComboBox::GetInsertionPoint() const +void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event)) { -/* - DWORD Pos=(DWORD)SendMessage((HWND) GetHWND(), EM_GETSEL, 0, 0L); - return Pos&0xFFFF; -*/ - return 0; + RemoveSelection(); } -long wxComboBox::GetLastPosition() const +void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event)) { -/* - HWND hWnd = (HWND) GetHWND(); + SelectAll(); +} - // Will always return a number > 0 (according to docs) - int noLines = (int)SendMessage(hWnd, EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0L); +void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event) +{ + event.Enable( CanCut() ); +} - // This gets the char index for the _beginning_ of the last line - int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)(noLines-1), (LPARAM)0L); - - // Get number of characters in the last line. We'll add this to the character - // index for the last line, 1st position. - int lineLength = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0L); +void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event) +{ + event.Enable( CanCopy() ); +} - return (long)(charIndex + lineLength); -*/ - return 0; +void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event) +{ + event.Enable( CanPaste() ); } -void wxComboBox::Replace(long from, long to, const wxString& value) +void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event) { -#if wxUSE_CLIPBOARD - HWND hWnd = (HWND) GetHWND(); - long fromChar = from; - long toChar = to; - - // Set selection and remove it -#ifdef __WIN32__ - SendMessage(hWnd, CB_SETEDITSEL, fromChar, toChar); -#else - SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)); -#endif - SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0); + event.Enable( IsEditable() && CanUndo() ); +} - // Now replace with 'value', by pasting. - wxSetClipboardData(wxDF_TEXT, (wxObject *)(const char *)value, 0, 0); +void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event) +{ + event.Enable( IsEditable() && CanRedo() ); +} - // Paste into edit control - SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L); -#endif +void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event) +{ + event.Enable(IsEditable() && HasSelection()); } -void wxComboBox::Remove(long from, long to) +void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) { - HWND hWnd = (HWND) GetHWND(); - long fromChar = from; - long toChar = to; - - // Cut all selected text -#ifdef __WIN32__ - SendMessage(hWnd, CB_SETEDITSEL, fromChar, toChar); -#else - SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)); -#endif - SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0); + event.Enable(IsEditable() && !wxTextEntry::IsEmpty()); } -void wxComboBox::SetSelection(long from, long to) +#if wxUSE_TOOLTIPS + +void wxComboBox::DoSetToolTip(wxToolTip *tip) { - HWND hWnd = (HWND) GetHWND(); - long fromChar = from; - long toChar = to; - // if from and to are both -1, it means - // (in wxWindows) that all text should be selected. - // This translates into Windows convention - if ((from == -1) && (to == -1)) + wxChoice::DoSetToolTip(tip); + + if ( tip && !HasFlag(wxCB_READONLY) ) + tip->AddOtherWindow(GetEditHWND()); +} + +#endif // wxUSE_TOOLTIPS + +#if wxUSE_UXTHEME + +bool wxComboBox::SetHint(const wxString& hintOrig) +{ + wxString hint(hintOrig); + if ( wxUxThemeEngine::GetIfActive() ) { - fromChar = 0; - toChar = -1; + // 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, " "); } - -#ifdef __WIN32__ - SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar); -// SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0); -#else - // WPARAM is 0: selection is scrolled into view - SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)); -#endif + + return wxTextEntry::SetHint(hint); } -#endif - // wxUSE_COMBOBOX +#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