X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c42404a58eac2c9eb0557565a471a794c387a715..a46a73a6776392ad1ac75ea58e53b1c3a72d9484:/src/msw/spinctrl.cpp

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index e8f8323ff3..d6e9aebcad 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -56,6 +56,8 @@ BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
 END_EVENT_TABLE()
 
+#define GetBuddyHwnd()      (HWND)(m_hwndBuddy)
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -69,6 +71,69 @@ 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 ones only so far) to the spin ctrl
+    switch ( message )
+    {
+        case WM_CHAR:
+        case WM_DEADCHAR:
+        case WM_KEYUP:
+        case WM_KEYDOWN:
+            spin->MSWWindowProc(message, wParam, lParam);
+            break;
+    }
+
+    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))
+{
+    if ( cmd == EN_CHANGE )
+    {
+        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+        event.SetEventObject(this);
+        event.SetInt(GetValue());
+        GetEventHandler()->ProcessEvent(event);
+
+        return TRUE;
+    }
+
+    // not processed
+    return FALSE;
+}
+
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
@@ -122,7 +187,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
                      WS_EX_CLIENTEDGE,       // sunken border
                      _T("EDIT"),             // window class
                      NULL,                   // no window title
-                     WS_CHILD | WS_BORDER,   // style (will be shown later)
+                     WS_CHILD | WS_BORDER /* | WS_CLIPSIBLINGS */,   // style (will be shown later)
                      pos.x, pos.y,           // position
                      0, 0,                   // size (will be set later)
                      GetHwndOf(parent),      // parent
@@ -133,11 +198,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());
 
@@ -154,7 +224,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     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);
@@ -164,18 +234,31 @@ 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);
+
+    // 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)"));
     }
 }
 
@@ -203,7 +286,7 @@ 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;
 }
@@ -215,7 +298,7 @@ bool wxSpinCtrl::Show(bool show)
         return FALSE;
     }
 
-    ::ShowWindow((HWND)m_hwndBuddy, show ? SW_SHOW : SW_HIDE);
+    ::ShowWindow(GetBuddyHwnd(), show ? SW_SHOW : SW_HIDE);
 
     return TRUE;
 }
@@ -227,14 +310,14 @@ bool wxSpinCtrl::Enable(bool enable)
         return FALSE;
     }
 
-    ::EnableWindow((HWND)m_hwndBuddy, enable);
+    ::EnableWindow(GetBuddyHwnd(), enable);
 
     return TRUE;
 }
 
 void wxSpinCtrl::SetFocus()
 {
-    ::SetFocus((HWND)m_hwndBuddy);
+    ::SetFocus(GetBuddyHwnd());
 }
 
 // ----------------------------------------------------------------------------
@@ -286,18 +369,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