#include "wx/spinctrl.h"
#include "wx/msw/private.h"
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
#include <commctrl.h>
#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
// ----------------------------------------------------------------------------
// implementation
// ============================================================================
+wxArraySpins wxSpinCtrl::ms_allSpins;
+
// ----------------------------------------------------------------------------
// wnd proc for the buddy text ctrl
// ----------------------------------------------------------------------------
{
wxSpinCtrl *spin = (wxSpinCtrl *)::GetWindowLong(hwnd, GWL_USERDATA);
- // forward some messages (the key ones only so far) to the spin ctrl
+ // 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
// ----------------------------------------------------------------------------
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 /* | WS_CLIPSIBLINGS */, // 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
}
// subclass the text ctrl to be able to intercept some events
- m_oldBuddyWndProc = (WXFARPROC)::GetWindowLong((HWND)m_hwndBuddy, GWL_WNDPROC);
- ::SetWindowLong((HWND)m_hwndBuddy, GWL_USERDATA, (LONG)this);
- ::SetWindowLong((HWND)m_hwndBuddy, GWL_WNDPROC, (LONG)wxBuddyTextWndProc);
+ 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());
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);
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((HWND)m_hwndBuddy);
+ ::DestroyWindow(GetBuddyHwnd());
}
// ----------------------------------------------------------------------------
void wxSpinCtrl::SetValue(const wxString& text)
{
- if ( !::SetWindowText((HWND)m_hwndBuddy, text.c_str()) )
+ if ( !::SetWindowText(GetBuddyHwnd(), text.c_str()) )
{
wxLogLastError(wxT("SetWindowText(buddy)"));
}
}
WXHANDLE hFont = GetFont().GetResourceHandle();
- (void)::SendMessage((HWND)m_hwndBuddy, WM_SETFONT, (WPARAM)hFont, TRUE);
+ (void)::SendMessage(GetBuddyHwnd(), WM_SETFONT, (WPARAM)hFont, TRUE);
return TRUE;
}
return FALSE;
}
- ::ShowWindow((HWND)m_hwndBuddy, show ? SW_SHOW : SW_HIDE);
+ ::ShowWindow(GetBuddyHwnd(), show ? SW_SHOW : SW_HIDE);
return TRUE;
}
return FALSE;
}
- ::EnableWindow((HWND)m_hwndBuddy, enable);
+ ::EnableWindow(GetBuddyHwnd(), enable);
return TRUE;
}
void wxSpinCtrl::SetFocus()
{
- ::SetFocus((HWND)m_hwndBuddy);
+ ::SetFocus(GetBuddyHwnd());
}
// ----------------------------------------------------------------------------
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(wxT("MoveWindow(buddy)"));
}
{
RECT spinrect, textrect, ctrlrect;
GetWindowRect(GetHwnd(), &spinrect);
- GetWindowRect((HWND)m_hwndBuddy, &textrect);
+ GetWindowRect(GetBuddyHwnd(), &textrect);
UnionRect(&ctrlrect,&textrect, &spinrect);
if ( x )
projects / wxWidgets.git / blobdiff