X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/150e31d2088687cbfbab548f9e98918f8683d9b5..976abb72fc2a94bf38c9231690ebeabc7631e491:/src/msw/combobox.cpp?ds=sidebyside diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index c07ac7bee0..50681b9440 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -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" @@ -37,6 +33,7 @@ #include "wx/textctrl.h" #endif +#include "wx/app.h" #include "wx/combobox.h" #include "wx/brush.h" #include "wx/clipbrd.h" @@ -109,9 +106,13 @@ 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) @@ -130,8 +131,6 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl) EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll) END_EVENT_TABLE() -#endif - // ---------------------------------------------------------------------------- // function prototypes // ---------------------------------------------------------------------------- @@ -171,6 +170,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: { @@ -238,17 +240,41 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, 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 ) { case CB_SETCURSEL: // Selection was set with SetSelection. Update the value too. if ((int)wParam > GetCount()) - m_value = wxEmptyString; + m_value.clear(); else m_value = GetString(wParam); + m_selectionOld = -1; break; + + 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 + long fromOld, toOld; + GetSelection(&fromOld, &toOld); + WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam); + + long fromNew, toNew; + GetSelection(&fromNew, &toNew); + + if ( fromOld != fromNew || toOld != toNew ) + { + SetSelection(fromOld, toOld); + } + + return result; + } } return wxChoice::MSWWindowProc(nMsg, wParam, lParam); @@ -267,14 +293,24 @@ 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; + } } + // 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,17 +324,19 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) return false; } -bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) +bool wxComboBox::MSWCommand(WXUINT param, WXWORD id) { wxString value; int sel = -1; switch ( param ) { + case CBN_SELENDOK: case CBN_SELCHANGE: sel = GetSelection(); - // somehow we get 2 CBN_SELCHANGE events with the same index when - // the user selects an item in the combobox -- ignore duplicates + // 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 ) { m_selectionOld = sel; @@ -337,6 +375,7 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) if ( sel == -1 ) { m_value = wxGetWindowText(GetHwnd()); + m_selectionOld = -1; } else // we're synthesizing text updated event from sel change { @@ -355,10 +394,14 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) 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() + // let the def window proc have it by returning false, but do not pass the + // message we've already handled here (notably CBN_SELCHANGE) to the base + // class as it would generate another event for them return false; } @@ -445,6 +488,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; @@ -524,6 +572,9 @@ void wxComboBox::SelectAll() bool wxComboBox::CanUndo() const { + if (!IsEditable()) + return false; + HWND hEditWnd = (HWND) GetEditHWND() ; if ( hEditWnd ) return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; @@ -533,6 +584,9 @@ bool wxComboBox::CanUndo() const bool wxComboBox::CanRedo() const { + if (!IsEditable()) + return false; + HWND hEditWnd = (HWND) GetEditHWND() ; if ( hEditWnd ) return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0; @@ -555,7 +609,7 @@ bool wxComboBox::CanCopy() const bool wxComboBox::CanCut() const { - return CanCopy() && IsEditable(); + return IsEditable() && CanCopy() ; } bool wxComboBox::CanPaste() const @@ -609,30 +663,28 @@ 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 first character of the selection in + // its low-order word + DWORD pos= (DWORD)::SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L); + return LOWORD(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) @@ -645,6 +697,10 @@ void wxComboBox::Replace(long from, long to, const wxString& value) // Paste into edit control SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L); +#else + wxUnusedVar(from); + wxUnusedVar(to); + wxUnusedVar(value); #endif } @@ -657,19 +713,15 @@ 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 wxWidgets) 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 ( SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)) == CB_ERR ) + if ( SendMessage(GetHwnd(), CB_SETEDITSEL, + 0, (LPARAM)MAKELONG(from, to)) == CB_ERR ) { wxLogDebug(_T("CB_SETEDITSEL failed")); } @@ -678,15 +730,22 @@ 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; + 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(); +{ + return wxChoice::GetSelection(); } // ----------------------------------------------------------------------------