X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..52069700e7f9c4cc1fc4379306e9f763c5b83073:/src/msw/combobox.cpp diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index cc082448e1..94ded90fd1 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -37,6 +37,7 @@ #include "wx/textctrl.h" #endif +#include "wx/app.h" #include "wx/combobox.h" #include "wx/brush.h" #include "wx/clipbrd.h" @@ -65,7 +66,7 @@ wxBEGIN_FLAGS( wxComboBoxStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -94,14 +95,14 @@ 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( 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( 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( 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() @@ -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) + #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 // ---------------------------------------------------------------------------- @@ -213,27 +235,6 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, 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 // ---------------------------------------------------------------------------- @@ -244,16 +245,14 @@ WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara // 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 CB_SETCURSEL: + // Selection was set with SetSelection. Update the value too. + if ((int)wParam > GetCount()) + m_value = wxEmptyString; + else + m_value = GetString(wParam); + m_selectionOld = -1; + break; } return wxChoice::MSWWindowProc(nMsg, wParam, lParam); @@ -272,10 +271,16 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) InitCommandEvent(event); event.SetString(GetValue()); event.SetInt(GetSelection()); - ProcessCommand(event); + 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; + } } - return HandleChar(wParam, lParam, TRUE /* isASCII */); + return HandleChar(wParam, lParam, true /* isASCII */); case WM_KEYDOWN: return HandleKeyDown(wParam, lParam); @@ -290,7 +295,7 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) return HandleKillFocus((WXHWND)wParam); } - return FALSE; + return false; } bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) @@ -301,18 +306,30 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { case CBN_SELCHANGE: sel = GetSelection(); - if ( sel > -1 ) + + // 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 ) { - 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; } @@ -329,25 +346,22 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) // want the new one) if ( sel == -1 ) { - value = GetValue(); + 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). + // 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); + m_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); } - event.SetString(value); + event.SetString(m_value); event.SetEventObject(this); ProcessCommand(event); } @@ -355,8 +369,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 @@ -393,11 +407,11 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, // 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; + m_isShown = false; if ( !CreateAndInit(parent, id, pos, size, n, choices, style, validator, name) ) - return FALSE; + 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 @@ -415,9 +429,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, } // and finally, show the control - Show(TRUE); + Show(true); - return TRUE; + return true; } bool wxComboBox::Create(wxWindow *parent, wxWindowID id, @@ -472,22 +486,107 @@ void wxComboBox::SetValue(const wxString& value) SetStringSelection(value); else SetWindowText(GetHwnd(), value.c_str()); + + m_value = value; + m_selectionOld = GetSelection(); } // Clipboard operations void wxComboBox::Copy() { - SendMessage(GetHwnd(), WM_COPY, 0, 0L); + SendMessage(GetHwnd(), WM_COPY, 0, 0L); } void wxComboBox::Cut() { - SendMessage(GetHwnd(), WM_CUT, 0, 0L); + SendMessage(GetHwnd(), WM_CUT, 0, 0L); } void wxComboBox::Paste() { - SendMessage(GetHwnd(), WM_PASTE, 0, 0L); + SendMessage(GetHwnd(), WM_PASTE, 0, 0L); +} + +void wxComboBox::Undo() +{ + if (CanUndo()) + { + HWND hEditWnd = (HWND) GetEditHWND() ; + if ( hEditWnd ) + ::SendMessage(hEditWnd, EM_UNDO, 0, 0); + } +} + +void wxComboBox::Redo() +{ + if (CanUndo()) + { + // Same as Undo, since Undo undoes the undo, i.e. a redo. + HWND hEditWnd = (HWND) GetEditHWND() ; + if ( hEditWnd ) + ::SendMessage(hEditWnd, EM_UNDO, 0, 0); + } +} + +void wxComboBox::SelectAll() +{ + SetSelection(0, GetLastPosition()); +} + +bool wxComboBox::CanUndo() const +{ + HWND hEditWnd = (HWND) GetEditHWND() ; + if ( hEditWnd ) + return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; + else + return false; +} + +bool wxComboBox::CanRedo() const +{ + HWND hEditWnd = (HWND) GetEditHWND() ; + if ( hEditWnd ) + return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; + else + return false; +} + +bool wxComboBox::HasSelection() const +{ + long from, to; + GetSelection(&from, &to); + return from != to; +} + +bool wxComboBox::CanCopy() const +{ + // Can copy if there's a selection + return HasSelection(); +} + +bool wxComboBox::CanCut() const +{ + return CanCopy() && IsEditable(); +} + +bool wxComboBox::CanPaste() const +{ + 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 WXUNUSED(editable)) @@ -587,5 +686,96 @@ 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(); +} + +// ---------------------------------------------------------------------------- +// standard event handling +// ---------------------------------------------------------------------------- + +void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event)) +{ + Cut(); +} + +void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event)) +{ + Copy(); +} + +void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event)) +{ + Paste(); +} + +void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event)) +{ + Undo(); +} + +void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event)) +{ + Redo(); +} + +void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event)) +{ + long from, to; + GetSelection(& from, & to); + if (from != -1 && to != -1) + Remove(from, to); +} + +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