X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fddfd9e1f1d47935c56fa5bdd25203e910326e50..730d336601a3ece761b56e7c05d1099352670a25:/src/msw/combobox.cpp diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 9ccee8b4d0..c15da2ee31 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "combobox.h" #endif @@ -33,15 +33,18 @@ #ifndef WX_PRECOMP #include "wx/settings.h" #include "wx/log.h" + // for wxEVT_COMMAND_TEXT_ENTER + #include "wx/textctrl.h" #endif +#include "wx/app.h" #include "wx/combobox.h" #include "wx/brush.h" #include "wx/clipbrd.h" #include "wx/msw/private.h" #if wxUSE_TOOLTIPS - #ifndef __GNUWIN32_OLD__ + #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) #include #endif #include "wx/tooltip.h" @@ -51,8 +54,87 @@ // 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, wxControl,"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, wxControl) +#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 // ---------------------------------------------------------------------------- @@ -67,7 +149,7 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, // --------------------------------------------------------------------------- // the pointer to standard radio button wnd proc -static WXFARPROC gs_wndprocEdit = (WXFARPROC)NULL; +static WNDPROC gs_wndprocEdit = (WNDPROC)NULL; // ============================================================================ // implementation @@ -87,20 +169,36 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, switch ( message ) { - // forward some messages to the combobox + // 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); - wxCHECK_MSG( combo, 0, _T("should have combo as parent") ); - - if ( combo->MSWProcessEditMsg(message, wParam, lParam) ) + 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; + } } break; -#if 0 case WM_GETDLGCODE: { wxCHECK_MSG( win, 0, _T("should have a parent") ); @@ -112,16 +210,15 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, } } break; -#endif // 0 // deal with tooltips here -#if wxUSE_TOOLTIPS +#if wxUSE_TOOLTIPS && defined(TTN_NEEDTEXT) case WM_NOTIFY: { wxCHECK_MSG( win, 0, _T("should have a parent") ); NMHDR* hdr = (NMHDR *)lParam; - if ( (int)hdr->code == TTN_NEEDTEXT ) + if ( hdr->code == TTN_NEEDTEXT ) { wxToolTip *tooltip = win->GetToolTip(); if ( tooltip ) @@ -141,57 +238,91 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam); } -WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam) +// ---------------------------------------------------------------------------- +// wxComboBox callbacks +// ---------------------------------------------------------------------------- + +WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { -#if wxUSE_CTL3D - if ( m_useCtl3D ) - { - HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); - return (WXHBRUSH) hbrush; - } -#endif // wxUSE_CTL3D + // 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) - HDC hdc = (HDC)pDC; - if (GetParent()->GetTransparentBackground()) - SetBkMode(hdc, TRANSPARENT); - else - SetBkMode(hdc, OPAQUE); + switch ( nMsg ) + { + case CB_SETCURSEL: + // Selection was set with SetSelection. Update the value too. + if ((int)wParam > GetCount()) + m_value.clear(); + else + m_value = GetString(wParam); + m_selectionOld = -1; + break; - wxColour colBack = GetBackgroundColour(); + case WM_SIZE: + { + // 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); - if (!IsEnabled()) - colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); + long fromNew, toNew; + GetSelection(&fromNew, &toNew); - ::SetBkColor(hdc, wxColourToRGB(colBack)); - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); + if ( fromOld != fromNew || toOld != toNew ) + { + SetSelection(fromOld, toOld); + } - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); + return result; + } + } - return (WXHBRUSH)brush->GetResourceHandle(); + return wxChoice::MSWWindowProc(nMsg, wParam, lParam); } -// ---------------------------------------------------------------------------- -// wxComboBox -// ---------------------------------------------------------------------------- - bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) { switch ( msg ) { case WM_CHAR: - return HandleChar(wParam, lParam, TRUE /* isASCII */); + // for compatibility with wxTextCtrl, generate a special message + // when Enter is pressed + if ( wParam == VK_RETURN ) + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); + InitCommandEvent(event); + event.SetString(GetValue()); + event.SetInt(GetSelection()); + 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); + + case WM_SETFOCUS: + return HandleSetFocus((WXHWND)wParam); + + case WM_KILLFOCUS: + return HandleKillFocus((WXHWND)wParam); } - return FALSE; + return false; } bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) @@ -200,20 +331,34 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) int sel = -1; switch ( param ) { + case CBN_SELENDOK: case CBN_SELCHANGE: sel = GetSelection(); - if ( sel > -1 ) + + // we may sometimes get 2 CBN_SELCHANGE events or a CBN_SELENDOK + // before CBN_SELCHANGE with the same index when the user selects + // an item in the combobox -- ignore duplicates + if ( sel > -1 && sel != m_selectionOld ) { - value = GetString(sel); + 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(value); + event.SetString(m_value); ProcessCommand(event); } - else + else // no valid selection { + m_selectionOld = sel; + + // hence no EVT_TEXT neither break; } @@ -223,11 +368,29 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) case CBN_EDITCHANGE: { + 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) - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId()); - event.SetString(sel == -1 ? GetValue() : value); + if ( sel == -1 ) + { + m_value = wxGetWindowText(GetHwnd()); + m_selectionOld = -1; + } + 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); + } + } + + event.SetString(m_value); event.SetEventObject(this); ProcessCommand(event); } @@ -235,8 +398,8 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) } // there is no return value for the CBN_ notifications, so always return - // FALSE from here to pass the message to DefWindowProc() - return FALSE; + // false from here to pass the message to DefWindowProc() + return false; } WXHWND wxComboBox::GetEditHWND() const @@ -257,6 +420,10 @@ WXHWND wxComboBox::GetEditHWND() const return (WXHWND)hwndEdit; } +// ---------------------------------------------------------------------------- +// wxComboBox creation +// ---------------------------------------------------------------------------- + bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, @@ -266,114 +433,203 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - // first create wxWin object - if ( !CreateControl(parent, id, pos, size, style, validator, name) ) - return FALSE; + // 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); + + 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); +} + +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; - // get the right style - long msStyle = WS_TABSTOP | WS_VSCROLL | WS_HSCROLL | - CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT /* | WS_CLIPSIBLINGS */; 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; - if ( style & wxCB_SORT ) - msStyle |= CBS_SORT; + // there is no reason to not always use CBS_AUTOHSCROLL, so do use it + msStyle |= CBS_AUTOHSCROLL; + + // NB: we used to also add CBS_NOINTEGRALHEIGHT here but why? + + return msStyle; +} - // and now create the MSW control - if ( !MSWCreateControl(_T("COMBOBOX"), msStyle) ) - return FALSE; +// ---------------------------------------------------------------------------- +// wxComboBox text control-like methods +// ---------------------------------------------------------------------------- - SetSize(pos.x, pos.y, size.x, size.y); +void wxComboBox::SetValue(const wxString& value) +{ + if ( HasFlag(wxCB_READONLY) ) + SetStringSelection(value); + else + SetWindowText(GetHwnd(), value.c_str()); - // A choice/combobox normally has a white background (or other, depending - // on global settings) rather than inheriting the parent's background colour. - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); + m_value = value; + m_selectionOld = GetSelection(); +} - for ( int i = 0; i < n; i++ ) - { - Append(choices[i]); - } +// Clipboard operations +void wxComboBox::Copy() +{ + SendMessage(GetHwnd(), WM_COPY, 0, 0L); +} - if ( !value.IsEmpty() ) +void wxComboBox::Cut() +{ + SendMessage(GetHwnd(), WM_CUT, 0, 0L); +} + +void wxComboBox::Paste() +{ + SendMessage(GetHwnd(), WM_PASTE, 0, 0L); +} + +void wxComboBox::Undo() +{ + if (CanUndo()) { - SetValue(value); + HWND hEditWnd = (HWND) GetEditHWND() ; + if ( hEditWnd ) + ::SendMessage(hEditWnd, EM_UNDO, 0, 0); } +} - // 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) ) +void wxComboBox::Redo() +{ + if (CanUndo()) { - gs_wndprocEdit = (WXFARPROC)::SetWindowLong - ( - (HWND)GetEditHWND(), - GWL_WNDPROC, - (LPARAM)wxComboEditWndProc - ); + // Same as Undo, since Undo undoes the undo, i.e. a redo. + HWND hEditWnd = (HWND) GetEditHWND() ; + if ( hEditWnd ) + ::SendMessage(hEditWnd, EM_UNDO, 0, 0); } +} - return TRUE; +void wxComboBox::SelectAll() +{ + SetSelection(0, GetLastPosition()); } -// TODO: update and clear all this horrible mess (VZ) +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; +} -void wxComboBox::SetValue(const wxString& value) +bool wxComboBox::CanRedo() const { - // 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) - { - wxChar *tmp = new wxChar[len + singletons + 1]; - int j = 0; - for (i = 0; i < len; i ++) - { - if ((i > 0) && (value[i] == 10) && (value[i-1] != 13)) - { - tmp[j] = 13; - j ++; - } - tmp[j] = value[i]; - j ++; - } - tmp[j] = 0; - SetWindowText(GetHwnd(), tmp); - delete[] tmp; - } - else - SetWindowText(GetHwnd(), value); + if (!IsEditable()) + return false; + + HWND hEditWnd = (HWND) GetEditHWND() ; + if ( hEditWnd ) + return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; + else + return false; } -// Clipboard operations -void wxComboBox::Copy() +bool wxComboBox::HasSelection() const { - HWND hWnd = GetHwnd(); - SendMessage(hWnd, WM_COPY, 0, 0L); + long from, to; + GetSelection(&from, &to); + return from != to; } -void wxComboBox::Cut() +bool wxComboBox::CanCopy() const { - HWND hWnd = GetHwnd(); - SendMessage(hWnd, WM_CUT, 0, 0L); + // Can copy if there's a selection + return HasSelection(); } -void wxComboBox::Paste() +bool wxComboBox::CanCut() const +{ + return IsEditable() && CanCopy() ; +} + +bool wxComboBox::CanPaste() const { - HWND hWnd = GetHwnd(); - SendMessage(hWnd, WM_PASTE, 0, 0L); + 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 editable) +void wxComboBox::SetEditable(bool WXUNUSED(editable)) { // Can't implement in MSW? // HWND hWnd = GetHwnd(); @@ -394,7 +650,7 @@ void wxComboBox::SetInsertionPoint(long pos) // 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)_T("")); + SendMessage(hEditWnd, EM_REPLACESEL, 0, (LPARAM) wxEmptyString); } #endif // __WIN32__ } @@ -404,30 +660,29 @@ 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 last character after selection in + // its high-order word + DWORD pos= (DWORD)::SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L); + + return HIWORD(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) @@ -452,73 +707,117 @@ 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 wxWindows) 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 ( -#ifdef __WIN32__ - SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)) -#else // Win16 - SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar) -#endif - == CB_ERR ) + if ( SendMessage(GetHwnd(), CB_SETEDITSEL, + 0, (LPARAM)MAKELONG(from, to)) == CB_ERR ) { wxLogDebug(_T("CB_SETEDITSEL failed")); } } -void wxComboBox::DoMoveWindow(int x, int y, int width, int height) +void wxComboBox::GetSelection(long* from, long* to) const { - // here is why this is necessary: if the width is negative, the combobox - // window proc makes the window of the size width*height instead of - // interpreting height in the usual manner (meaning the height of the drop - // down list - usually the height specified in the call to MoveWindow() - // will not change the height of combo box per se) - // - // this behaviour is not documented anywhere, but this is just how it is - // here (NT 4.4) and, anyhow, the check shouldn't hurt - however without - // the check, constraints/sizers using combos may break the height - // constraint will have not at all the same value as expected - if ( width < 0 ) - return; + DWORD dwStart, dwEnd; + if ( ::SendMessage(GetHwnd(), CB_GETEDITSEL, + (WPARAM)&dwStart, (LPARAM)&dwEnd) == CB_ERR ) + { + *from = + *to = 0; + } + else + { + *from = dwStart; + *to = dwEnd; + } +} + +int wxComboBox::GetSelection() const +{ + return wxChoice::GetSelection(); +} - int cx, cy; - wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); +// ---------------------------------------------------------------------------- +// standard event handling +// ---------------------------------------------------------------------------- - // what should the height of the drop down list be? we choose 10 items by - // default and also 10 items max (if we always use n, the list will never - // have vertical scrollbar) - int n = GetCount(); - if ( !n || (n > 10) ) - n = 10; +void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event)) +{ + Cut(); +} - height = (n + 1)* EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); +void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event)) +{ + Copy(); +} - wxControl::DoMoveWindow(x, y, width, height); +void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event)) +{ + Paste(); } -wxSize wxComboBox::DoGetBestSize() const +void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event)) { - // the choice calculates the horz size correctly, but not the vertical - // component: correct it - wxSize size = wxChoice::DoGetBestSize(); + Undo(); +} - int cx, cy; - wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); - size.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); +void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event)) +{ + Redo(); +} - return size; +void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event)) +{ + long from, to; + GetSelection(& from, & to); + if (from != -1 && to != -1) + Remove(from, to); } -#endif - // wxUSE_COMBOBOX +void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event)) +{ + SetSelection(-1, -1); +} + +void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event) +{ + event.Enable( CanCut() ); +} + +void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event) +{ + event.Enable( CanCopy() ); +} + +void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event) +{ + event.Enable( CanPaste() ); +} + +void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event) +{ + event.Enable( CanUndo() ); +} + +void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event) +{ + event.Enable( CanRedo() ); +} + +void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event) +{ + event.Enable(HasSelection() && IsEditable()) ; +} + +void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) +{ + event.Enable(GetLastPosition() > 0); +} + +#endif // wxUSE_COMBOBOX