diff --git a/lcl/interfaces/win32/win32callback.inc b/lcl/interfaces/win32/win32callback.inc
index decc4f2e15..613ab4ac6e 100644
--- a/lcl/interfaces/win32/win32callback.inc
+++ b/lcl/interfaces/win32/win32callback.inc
@@ -197,8 +197,8 @@ Var
     if Result=nil then //if Result is still nil, process main menu
     begin
       MainMenuHandle := GetMenu(Window);
-      GetMenuItemInfo(MainMenuHandle, Lo(WParam), false, @MenuInfo);
-      Result := TObject(MenuInfo.dwItemData);
+      if GetMenuItemInfo(MainMenuHandle, Lo(WParam), false, @MenuInfo) then
+        Result := TObject(MenuInfo.dwItemData);
     end;
   end;
 
@@ -368,8 +368,8 @@ Begin
     End;
     WM_COMMAND:
     Begin
-      OwnerObject := TObject(GetProp(LParam, 'Wincontrol'));
-      if LParam=0 then OwnerObject := GetMenuItemObject; {menuitem or shortcut}
+      if LParam=0 then OwnerObject := GetMenuItemObject {menuitem or shortcut}
+      else OwnerObject := TObject(GetProp(LParam, 'Wincontrol'));      
 
 // is this for speedbuttons?
 //      If ((OwnerObject Is TControl) And (Not (OwnerObject Is TButton))) Then
@@ -490,6 +490,11 @@ Begin
     WM_GETDLGCODE:
     Begin
       LMessage.Msg := LM_GETDLGCODE;
+      if OwnerObject is TEdit then
+      begin
+        WinProcess := false;
+	LMessage.Result := DLGC_WANTALLKEYS;
+      end;
     End;
     WM_KEYDOWN:
     Begin
@@ -1001,6 +1006,10 @@ end;
 
 {
   $Log$
+  Revision 1.93  2004/02/21 10:11:36  micha
+    1. pressing the Return key in ObjectInspector when editing a value throws an exception
+    2. placing TPairSplitter component on the form produces "Division by zero"
+
   Revision 1.92  2004/02/12 18:03:15  mattias
   fixed combobox enabled  from Vincent
 
diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc
index b7fa5ddd5e..76b251c522 100644
--- a/lcl/interfaces/win32/win32object.inc
+++ b/lcl/interfaces/win32/win32object.inc
@@ -2151,6 +2151,11 @@ Begin
       WindowTitle := StrCaption;
       Flags := Flags Or SS_LEFT;
     End;
+    csPairSplitter, csPairSplitterSide:
+    begin
+      pClassName := 'STATIC';
+      WindowTitle := StrCaption;
+    end;
     csListView:
     Begin
       pClassName := WC_LISTVIEW;
@@ -3001,6 +3006,10 @@ End;
 
 {
   $Log$
+  Revision 1.171  2004/02/21 10:11:36  micha
+    1. pressing the Return key in ObjectInspector when editing a value throws an exception
+    2. placing TPairSplitter component on the form produces "Division by zero"
+
   Revision 1.170  2004/02/20 19:52:18  micha
   fixed: tarrow crash in win32
   added: interface function DrawArrow to draw themed arrow