X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68586e51b20dccee3fd5645aeaca7cc8ff298c2..9f4de6b2cf06f53a98b28f53640f3b9ec8cf4182:/src/msw/spinctrl.cpp?ds=sidebyside diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp index 5cbac4deda..dbf5cdceef 100644 --- a/src/msw/spinctrl.cpp +++ b/src/msw/spinctrl.cpp @@ -40,7 +40,7 @@ #include "wx/spinctrl.h" #include "wx/msw/private.h" -#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) +#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #include #endif @@ -50,9 +50,14 @@ // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl) + +BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton) + EVT_CHAR(wxSpinCtrl::OnChar) + EVT_SPIN(-1, wxSpinCtrl::OnSpinChange) +END_EVENT_TABLE() + +#define GetBuddyHwnd() (HWND)(m_hwndBuddy) // ---------------------------------------------------------------------------- // constants @@ -67,6 +72,131 @@ static const int MARGIN_BETWEEN = 1; // implementation // ============================================================================ +wxArraySpins wxSpinCtrl::ms_allSpins; + +// ---------------------------------------------------------------------------- +// wnd proc for the buddy text ctrl +// ---------------------------------------------------------------------------- + +LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + wxSpinCtrl *spin = (wxSpinCtrl *)::GetWindowLong(hwnd, GWL_USERDATA); + + // forward some messages (the key and focus ones only so far) to + // the spin ctrl + switch ( message ) + { + case WM_SETFOCUS: + case WM_KILLFOCUS: + case WM_CHAR: + case WM_DEADCHAR: + case WM_KEYUP: + case WM_KEYDOWN: + spin->MSWWindowProc(message, wParam, lParam); + + // The control may have been deleted at this point, so check. + if (!(::IsWindow(hwnd) && ((wxSpinCtrl *)::GetWindowLong(hwnd, GWL_USERDATA)) == spin)) + return 0; + break; + + case WM_GETDLGCODE: + // we want to get WXK_RETURN in order to generate the event for it + return DLGC_WANTCHARS; + } + + return ::CallWindowProc(CASTWNDPROC spin->GetBuddyWndProc(), + hwnd, message, wParam, lParam); +} + +/* static */ +wxSpinCtrl *wxSpinCtrl::GetSpinForTextCtrl(WXHWND hwndBuddy) +{ + wxSpinCtrl *spin = (wxSpinCtrl *)::GetWindowLong((HWND)hwndBuddy, + GWL_USERDATA); + + int i = ms_allSpins.Index(spin); + + if ( i == wxNOT_FOUND ) + return NULL; + + // sanity check + wxASSERT_MSG( spin->m_hwndBuddy == hwndBuddy, + _T("wxSpinCtrl has incorrect buddy HWND!") ); + + return spin; +} + +// process a WM_COMMAND generated by the buddy text control +bool wxSpinCtrl::ProcessTextCommand(WXWORD cmd, WXWORD WXUNUSED(id)) +{ + switch (cmd) + { + case EN_CHANGE: + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId()); + event.SetEventObject(this); + wxString val = wxGetWindowText(m_hwndBuddy); + event.SetString(val); + event.SetInt(GetValue()); + return GetEventHandler()->ProcessEvent(event); + } + case EN_SETFOCUS: + case EN_KILLFOCUS: + { + wxFocusEvent event(cmd == EN_KILLFOCUS ? wxEVT_KILL_FOCUS + : wxEVT_SET_FOCUS, + m_windowId); + event.SetEventObject( this ); + return GetEventHandler()->ProcessEvent(event); + } + default: + break; + } + + // not processed + return FALSE; +} + +void wxSpinCtrl::OnChar(wxKeyEvent& event) +{ + switch ( event.KeyCode() ) + { + case WXK_RETURN: + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); + InitCommandEvent(event); + wxString val = wxGetWindowText(m_hwndBuddy); + event.SetString(val); + event.SetInt(GetValue()); + if ( GetEventHandler()->ProcessEvent(event) ) + return; + break; + } + + case WXK_TAB: + // always produce navigation event - even if we process TAB + // ourselves the fact that we got here means that the user code + // decided to skip processing of this TAB - probably to let it + // do its default job. + { + wxNavigationKeyEvent eventNav; + eventNav.SetDirection(!event.ShiftDown()); + eventNav.SetWindowChange(event.ControlDown()); + eventNav.SetEventObject(this); + + if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) ) + return; + } + break; + } + + // no, we didn't process it + event.Skip(); +} + // ---------------------------------------------------------------------------- // construction // ---------------------------------------------------------------------------- @@ -83,7 +213,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, // before using DoGetBestSize(), have to set style to let the base class // know whether this is a horizontal or vertical control (we're always // vertical) - SetWindowStyle(style | wxSP_VERTICAL); + style |= wxSP_VERTICAL; + SetWindowStyle(style); // calculate the sizes: the size given is the toal size for both controls // and we need to fit them both in the given width (height is the same) @@ -113,13 +244,25 @@ bool wxSpinCtrl::Create(wxWindow *parent, SetRange(min, max); SetValue(initial); + bool want3D; + WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D); + int msStyle = WS_CHILD; + + // Even with extended styles, need to combine with WS_BORDER for them to + // look right. + if ( want3D || wxStyleHasBorder(style) ) + msStyle |= WS_BORDER; + + if ( style & wxCLIP_SIBLINGS ) + msStyle |= WS_CLIPSIBLINGS; + // create the text window m_hwndBuddy = (WXHWND)::CreateWindowEx ( - WS_EX_CLIENTEDGE, // sunken border + exStyle, // sunken border _T("EDIT"), // window class NULL, // no window title - WS_CHILD | WS_BORDER, // style (will be shown later) + msStyle /* | WS_CLIPSIBLINGS */, // style (will be shown later) pos.x, pos.y, // position 0, 0, // size (will be set later) GetHwndOf(parent), // parent @@ -130,11 +273,16 @@ bool wxSpinCtrl::Create(wxWindow *parent, if ( !m_hwndBuddy ) { - wxLogLastError("CreateWindow(buddy text window)"); + wxLogLastError(wxT("CreateWindow(buddy text window)")); return FALSE; } + // subclass the text ctrl to be able to intercept some events + m_wndProcBuddy = (WXFARPROC)::GetWindowLong(GetBuddyHwnd(), GWL_WNDPROC); + ::SetWindowLong(GetBuddyHwnd(), GWL_USERDATA, (LONG)this); + ::SetWindowLong(GetBuddyHwnd(), GWL_WNDPROC, (LONG)wxBuddyTextWndProc); + // should have the same font as the other controls SetFont(GetParent()->GetFont()); @@ -142,14 +290,16 @@ bool wxSpinCtrl::Create(wxWindow *parent, // couldn't call DoGetBestSize() before as font wasn't set if ( sizeText.y <= 0 ) { - // make it the same height as the button then - sizeText.y = DoGetBestSize().y; + int cx, cy; + wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); + + sizeText.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); } DoMoveWindow(pos.x, pos.y, sizeText.x + sizeBtn.x + MARGIN_BETWEEN, sizeText.y); - (void)::ShowWindow((HWND)m_hwndBuddy, SW_SHOW); + (void)::ShowWindow(GetBuddyHwnd(), SW_SHOW); // associate the text window with the spin button (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0); @@ -159,18 +309,35 @@ bool wxSpinCtrl::Create(wxWindow *parent, SetValue(value); } + // do it after finishing with m_hwndBuddy creation to avoid generating + // initial wxEVT_COMMAND_TEXT_UPDATED message + ms_allSpins.Add(this); + return TRUE; } +wxSpinCtrl::~wxSpinCtrl() +{ + ms_allSpins.Remove(this); + + // This removes spurious memory leak reporting + if (ms_allSpins.GetCount() == 0) + ms_allSpins.Clear(); + + // destroy the buddy window because this pointer which wxBuddyTextWndProc + // uses will not soon be valid any more + ::DestroyWindow(GetBuddyHwnd()); +} + // ---------------------------------------------------------------------------- // wxTextCtrl-like methods // ---------------------------------------------------------------------------- void wxSpinCtrl::SetValue(const wxString& text) { - if ( ::SetWindowText((HWND)m_hwndBuddy, text.c_str()) ) + if ( !::SetWindowText(GetBuddyHwnd(), text.c_str()) ) { - wxLogLastError("SetWindowText(buddy)"); + wxLogLastError(wxT("SetWindowText(buddy)")); } } @@ -186,7 +353,7 @@ int wxSpinCtrl::GetValue() const } // ---------------------------------------------------------------------------- -// when setting font, we need to do it for both controls +// forward some methods to subcontrols // ---------------------------------------------------------------------------- bool wxSpinCtrl::SetFont(const wxFont& font) @@ -198,11 +365,58 @@ bool wxSpinCtrl::SetFont(const wxFont& font) } WXHANDLE hFont = GetFont().GetResourceHandle(); - (void)::SendMessage((HWND)m_hwndBuddy, WM_SETFONT, (WPARAM)hFont, TRUE); + (void)::SendMessage(GetBuddyHwnd(), WM_SETFONT, (WPARAM)hFont, TRUE); + + return TRUE; +} + +bool wxSpinCtrl::Show(bool show) +{ + if ( !wxControl::Show(show) ) + { + return FALSE; + } + + ::ShowWindow(GetBuddyHwnd(), show ? SW_SHOW : SW_HIDE); return TRUE; } +bool wxSpinCtrl::Enable(bool enable) +{ + if ( !wxControl::Enable(enable) ) + { + return FALSE; + } + + ::EnableWindow(GetBuddyHwnd(), enable); + + return TRUE; +} + +void wxSpinCtrl::SetFocus() +{ + ::SetFocus(GetBuddyHwnd()); +} + +// ---------------------------------------------------------------------------- +// event processing +// ---------------------------------------------------------------------------- + +void wxSpinCtrl::OnSpinChange(wxSpinEvent& eventSpin) +{ + wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, GetId()); + event.SetEventObject(this); + event.SetInt(eventSpin.GetPosition()); + + (void)GetEventHandler()->ProcessEvent(event); + + if ( eventSpin.GetSkipped() ) + { + event.Skip(); + } +} + // ---------------------------------------------------------------------------- // size calculations // ---------------------------------------------------------------------------- @@ -234,18 +448,43 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height) wxLogDebug(_T("not enough space for wxSpinCtrl!")); } - if ( !::MoveWindow((HWND)m_hwndBuddy, x, y, widthText, height, TRUE) ) + if ( !::MoveWindow(GetBuddyHwnd(), x, y, widthText, height, TRUE) ) { - wxLogLastError("MoveWindow(buddy)"); + wxLogLastError(wxT("MoveWindow(buddy)")); } x += widthText + MARGIN_BETWEEN; if ( !::MoveWindow(GetHwnd(), x, y, widthBtn, height, TRUE) ) { - wxLogLastError("MoveWindow"); + wxLogLastError(wxT("MoveWindow")); } } +// get total size of the control +void wxSpinCtrl::DoGetSize(int *x, int *y) const +{ + RECT spinrect, textrect, ctrlrect; + GetWindowRect(GetHwnd(), &spinrect); + GetWindowRect(GetBuddyHwnd(), &textrect); + UnionRect(&ctrlrect,&textrect, &spinrect); + + if ( x ) + *x = ctrlrect.right - ctrlrect.left; + if ( y ) + *y = ctrlrect.bottom - ctrlrect.top; +} + +void wxSpinCtrl::DoGetPosition(int *x, int *y) const +{ + // hack: pretend that our HWND is the text control just for a moment + WXHWND hWnd = GetHWND(); + wxConstCast(this, wxSpinCtrl)->m_hWnd = m_hwndBuddy; + + wxSpinButton::DoGetPosition(x, y); + + wxConstCast(this, wxSpinCtrl)->m_hWnd = hWnd; +} + #endif // __WIN95__ #endif