diff --git a/lcl/interfaces/win32/win32callback.inc b/lcl/interfaces/win32/win32callback.inc
index 2c19e67047..aa34971b6a 100644
--- a/lcl/interfaces/win32/win32callback.inc
+++ b/lcl/interfaces/win32/win32callback.inc
@@ -29,11 +29,6 @@
 const
   WM_THEMECHANGED = $31A;
 
-{ forward declarations }
-
-function ComboBoxEditWindowProc(Window: HWnd; Msg: UInt; WParam: Windows.WParam;
-    LParam: Windows.LParam): LResult; stdcall; forward;
-
 {-----------------------------------------------------------------------------
   Function: DisableWindowsProc
   Params: Window - handle of toplevel windows to be disabled
@@ -217,6 +212,7 @@ Var
       exit;              
     
     // create a paint message
+    WinProcess := false;
     AWinControl := TWinControl(OwnerObject);
     if AWinControl.DoubleBuffered then
     begin
@@ -423,7 +419,7 @@ Begin
           BN_CLICKED:   LMessage.Msg := LM_CLICKED;
           BN_KILLFOCUS: LMessage.Msg := LM_EXIT;
         end
-      else if OwnerObject is TEdit then
+      else if (OwnerObject is TEdit) or (OwnerObject is TCustomSpinEdit) then
         case Hi(WParam) of
           EN_CHANGE:    LMessage.Msg := CM_TEXTCHANGED;
         end
@@ -713,7 +709,7 @@ Begin
 
         // check if the window is an edit control of a combobox, if so,
         // redirect it to the combobox, not the edit control
-        if Windows.GetWindowLong(TargetWindow, GWL_WNDPROC) = longint(@ComboBoxEditWindowProc) then
+        if Windows.GetProp(TargetWindow, 'ComboEdit') <> 0 then
           TargetWindow := Windows.GetParent(TargetWindow);
         if TargetWindow <> Window then
         begin
@@ -773,7 +769,7 @@ Begin
     WM_PAINT:
     Begin
       SendPaintMessage;
-      WinProcess := False; 
+      // SendPaintMessage sets winprocess to false
     End;
     WM_PASTE:
     Begin
@@ -1126,17 +1122,17 @@ begin
 end;
     
 {------------------------------------------------------------------------------
- Function: ComboBoxEditWindowProc
+ Function: ChildEditWindowProc
  Params: Window - The window that receives a message
          Msg    - The message received
          WParam - Word parameter
          LParam - Long-integer parameter
   Returns: 0 if Msg is handled; non-zero long-integer result otherwise
 
-  Handles the messages sent to the edit child of a combobox control by Windows 
-  or other applications
+  Handles the messages sent to the edit child of a (combobox, spinedit) control 
+  by Windows or other applications
  ------------------------------------------------------------------------------}
-function ComboBoxEditWindowProc(Window: HWnd; Msg: UInt; WParam: Windows.WParam;
+function ChildEditWindowProc(Window: HWnd; Msg: UInt; WParam: Windows.WParam;
     LParam: Windows.LParam): LResult; stdcall;
 var
   LMessage: TLMessage;
@@ -1260,6 +1256,9 @@ end;
 
 {
   $Log$
+  Revision 1.118  2004/06/19 15:10:04  micha
+  fix spinedit not firing onchange event
+
   Revision 1.117  2004/06/18 20:47:33  vincents
   fixed pasting from clipboard
 
diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc
index e33094d0e8..2cbec19098 100644
--- a/lcl/interfaces/win32/win32object.inc
+++ b/lcl/interfaces/win32/win32object.inc
@@ -2582,8 +2582,8 @@ Begin
       csCombobox:
       begin
         Buddy := Windows.GetTopWindow(Window);
-        if Buddy <> HWND(nil) then
-          Windows.SetProp(Buddy, 'DefWndProc', Windows.SetWindowLong(Buddy, GWL_WNDPROC, LongInt(@ComboBoxEditWindowProc)));
+        Windows.SetProp(Buddy, 'ComboEdit', 1);
+        SubClassWndProc := @ChildEditWindowProc;
       end;
 
       csGroupBox:
@@ -2595,11 +2595,20 @@ Begin
         end;
       end;
 
+      csSpinEdit:
+      begin
+        SubClassWndProc := @ChildEditWindowProc;
+      end;
+
       end;
       Windows.SendMessage(Window, WM_SETFONT, WParam(FMessageFont), 0);
     end;
     If Buddy <> HWND(Nil) Then
+    begin
+      Windows.SetProp(Buddy, 'DefWndProc', Windows.SetWindowLong(Buddy, GWL_WNDPROC, LongInt(SubClassWndProc)));
+      Windows.SetProp(Buddy, 'Wincontrol', dword(Sender));
       Windows.SendMessage(Buddy, WM_SETFONT, WParam(FMessageFont), 0);
+    end;
   End
   Else If (Sender Is TMenuItem) Then
     TMenuItem(Sender).Handle := Window
@@ -3270,6 +3279,9 @@ End;
 
 {
   $Log$
+  Revision 1.210  2004/06/19 15:10:04  micha
+  fix spinedit not firing onchange event
+
   Revision 1.209  2004/06/18 20:47:34  vincents
   fixed pasting from clipboard