X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02b7b6b072762ff1e02950109a751815ac7429fd..aff6c20af53b7e6b09cdfcac7f029614fb3bdabf:/src/msw/combobox.cpp diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 5ac0ec4d72..84b1bca018 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,27 @@ #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/combobox.h" -#include "wx/brush.h" #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 - #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) - #include - #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS @@ -91,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 ) @@ -109,10 +110,31 @@ 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) + +IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice) + #endif +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 // ---------------------------------------------------------------------------- @@ -152,6 +174,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: { @@ -163,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) ) @@ -176,84 +201,70 @@ 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() & wxPROCESS_ENTER ) + if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER ) { // need to return a custom dlg code or we'll never get it return DLGC_WANTMESSAGE; } } 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; - } - } - break; -#endif // wxUSE_TOOLTIPS } return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam); } -WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, - WXHWND WXUNUSED(pWnd), - WXUINT WXUNUSED(nCtlColor), - WXUINT WXUNUSED(message), - WXWPARAM WXUNUSED(wParam), - WXLPARAM WXUNUSED(lParam)) -{ - HDC hdc = (HDC)pDC; - wxColour colBack = GetBackgroundColour(); - - if (!IsEnabled()) - colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - - ::SetBkColor(hdc, wxColourToRGB(colBack)); - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); - - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); - - return (WXHBRUSH)brush->GetResourceHandle(); -} - // ---------------------------------------------------------------------------- // wxComboBox callbacks // ---------------------------------------------------------------------------- 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 ) { - // we have to handle both: one for the normal case and the other for - // wxCB_READONLY - case WM_CTLCOLOREDIT: - case WM_CTLCOLORSTATIC: - WXWORD nCtlColor; - WXHDC hdc; - WXHWND hwnd; - UnpackCtlColor(wParam, lParam, &nCtlColor, &hdc, &hwnd); - - return (WXLRESULT)OnCtlColor(hdc, hwnd, nCtlColor, nMsg, wParam, lParam); + 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); @@ -268,18 +279,34 @@ 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); - 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,93 +315,183 @@ 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; } -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(); - if ( sel > -1 ) + case CBN_DROPDOWN: + // remember the last selection, just as wxChoice does + m_lastAcceptedSelection = GetCurrentSelection(); + if ( m_lastAcceptedSelection == -1 ) { - value = GetString(sel); + // 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 + // 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.wx_str()); + { wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId()); event.SetInt(sel); - event.SetEventObject(this); event.SetString(value); + InitCommandEventWithItems(event, sel); + ProcessCommand(event); } - else - { - break; - } // fall through: for compability 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 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 ) { - value = GetValue(); - } - 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 ) - { - value = GetString(sel); - } - // we need to do this because the user code expects - // wxComboBox::GetValue() to return the new value from - // "text updated" handler but it hadn't been updated yet - SetValue(value); + value = wxGetWindowText(GetHwnd()); } event.SetString(value); - event.SetEventObject(this); + 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 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()) + { + 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 +{ +#if defined(WINVER) && WINVER >= 0x0500 + typedef BOOL (WINAPI *GetComboBoxInfo_t)(HWND, COMBOBOXINFO*); + static GetComboBoxInfo_t s_pfnGetComboBoxInfo = NULL; + static bool s_triedToLoad = false; + if ( !s_triedToLoad ) + { + s_triedToLoad = true; + wxLoadedDLL dllUser32("user32.dll"); + wxDL_INIT_FUNC(s_pfn, GetComboBoxInfo, dllUser32); + } + + if ( s_pfnGetComboBoxInfo ) + { + WinStruct info; + (*s_pfnGetComboBoxInfo)(GetHwnd(), &info); + return info.hwndItem; + } +#endif + + if (HasFlag(wxCB_SIMPLE)) { - wxFAIL_MSG(_T("not read only combobox without edit control?")); + POINT pt; + pt.x = pt.y = 4; + return (WXHWND) ::ChildWindowFromPoint(GetHwnd(), pt); } - return (WXHWND)hwndEdit; + // 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; } // ---------------------------------------------------------------------------- @@ -410,8 +527,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 @@ -442,6 +558,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; @@ -466,126 +587,149 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const // wxComboBox text control-like methods // ---------------------------------------------------------------------------- +wxString wxComboBox::GetValue() const +{ + return HasFlag(wxCB_READONLY) ? GetStringSelection() + : wxTextEntry::GetValue(); +} + 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); + if ( !HasFlag(wxCB_READONLY) ) + { + wxTextEntry::GetSelection(from, to); + } + else // text selection doesn't make sense for read only comboboxes + { + if ( from ) + *from = -1; + if ( to ) + *to = -1; + } } -void wxComboBox::Paste() +bool wxComboBox::IsEditable() const { - SendMessage(GetHwnd(), WM_PASTE, 0, 0L); + return !HasFlag(wxCB_READONLY) && wxTextEntry::IsEditable(); } -void wxComboBox::SetEditable(bool WXUNUSED(editable)) +// ---------------------------------------------------------------------------- +// standard event handling +// ---------------------------------------------------------------------------- + +void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event)) { - // Can't implement in MSW? -// HWND hWnd = GetHwnd(); -// SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L); + Cut(); } -void wxComboBox::SetInsertionPoint(long pos) +void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event)) { - if ( GetWindowStyle() & wxCB_READONLY ) - return; + Copy(); +} -#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::OnPaste(wxCommandEvent& WXUNUSED(event)) +{ + Paste(); } -void wxComboBox::SetInsertionPointEnd() +void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event)) { - // setting insertion point doesn't make sense for read only comboboxes - if ( !(GetWindowStyle() & wxCB_READONLY) ) - { - long pos = GetLastPosition(); - SetInsertionPoint(pos); - } + Undo(); } -long wxComboBox::GetInsertionPoint() const +void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event)) { -#ifdef __WIN32__ - DWORD Pos=(DWORD)SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L); - return Pos&0xFFFF; -#else - return 0; -#endif + Redo(); } -long wxComboBox::GetLastPosition() const +void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event)) { - HWND hEditWnd = (HWND) GetEditHWND(); + RemoveSelection(); +} - // 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); +void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event)) +{ + SelectAll(); +} - return (long)(lineLength); +void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event) +{ + event.Enable( CanCut() ); } -void wxComboBox::Replace(long from, long to, const wxString& value) +void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event) { -#if wxUSE_CLIPBOARD - Remove(from, to); + event.Enable( CanCopy() ); +} - // Now replace with 'value', by pasting. - wxSetClipboardData(wxDF_TEXT, (wxObject *)(const wxChar *)value, 0, 0); +void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event) +{ + event.Enable( CanPaste() ); +} - // Paste into edit control - SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L); -#endif +void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event) +{ + event.Enable( IsEditable() && CanUndo() ); } -void wxComboBox::Remove(long from, long to) +void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event) { - // Set selection and remove it - SetSelection(from, to); - SendMessage(GetHwnd(), WM_CUT, (WPARAM)0, (LPARAM)0); + event.Enable( IsEditable() && CanRedo() ); } -void wxComboBox::SetSelection(long from, long to) +void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event) { - 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)) - { - fromChar = 0; - toChar = -1; - } + event.Enable(IsEditable() && HasSelection()); +} + +void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) +{ + event.Enable(IsEditable() && !wxTextEntry::IsEmpty()); +} + +#if wxUSE_TOOLTIPS + +void wxComboBox::DoSetToolTip(wxToolTip *tip) +{ + wxChoice::DoSetToolTip(tip); - if ( SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)) == CB_ERR ) + 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() ) { - wxLogDebug(_T("CB_SETEDITSEL failed")); + // 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_COMBOBOX +#endif // wxUSE_UXTHEME +#endif // wxUSE_COMBOBOX