From b89a0ffc982601a46c5050d0631f17792b4ba993 Mon Sep 17 00:00:00 2001
From: micha <micha@lazarus-ide.org>
Date: Thu, 3 Feb 2005 15:06:30 +0000
Subject: [PATCH] translate and route WM_SYSCHAR messages, fix WM_SYSKEYDOWN
 and WM_SYSKEYUP messages

git-svn-id: trunk@6724 -
---
 lcl/interfaces/win32/win32callback.inc | 37 +++++++++++++++++++++++---
 lcl/interfaces/win32/win32wsforms.pp   |  2 +-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/lcl/interfaces/win32/win32callback.inc b/lcl/interfaces/win32/win32callback.inc
index 2d69bf2e99..2de71a1759 100644
--- a/lcl/interfaces/win32/win32callback.inc
+++ b/lcl/interfaces/win32/win32callback.inc
@@ -1080,6 +1080,18 @@ Begin
             SW_SHOW)
       end;
     End;
+    WM_SYSCHAR:
+    Begin
+      PLMsg:=@LMChar;
+      With LMChar Do
+      Begin
+        Msg := CN_SYSCHAR;
+        KeyData := LParam;
+        CharCode := Word(WParam);
+        Assert(False,Format('WM_CHAR KeyData= %d CharCode= %d ',[KeyData,CharCode]));
+      End;
+      WinProcess := false;
+    End;
     WM_SYSKEYDOWN:
     Begin
       NotifyUserInput := True;
@@ -1253,14 +1265,14 @@ Begin
         WinProcess := true;
     end;
 
-    CN_CHAR:
+    CN_CHAR, CN_SYSCHAR:
     begin
       // if key not yet processed, let windows process it
       WinProcess := LMChar.CharCode <> VK_UNKNOWN;
       WParam := LMChar.CharCode;
     end;
    
-    CN_KEYDOWN, CN_KEYUP:
+    CN_KEYDOWN, CN_KEYUP, CN_SYSKEYDOWN, CN_SYSKEYUP:
     begin
       // if key not yet processed, let windows process it
       WinProcess := LMKey.CharCode <> VK_UNKNOWN;
@@ -1284,7 +1296,8 @@ Begin
     PLMsg^.Result := CallDefaultWindowProc(Window, Msg, WParam, LParam); 
 
     case Msg of
-      WM_CHAR, WM_KEYDOWN, WM_KEYUP:
+      WM_CHAR, WM_KEYDOWN, WM_KEYUP,
+      WM_SYSCHAR, WM_SYSKEYDOWN, WM_SYSKEYUP:
       begin
         case Msg of
           WM_CHAR: 
@@ -1292,6 +1305,11 @@ Begin
             LMChar.CharCode := Word(WParam);
             LMChar.Msg := LM_CHAR;
           end;
+          WM_SYSCHAR: 
+          begin
+            LMChar.CharCode := Word(WParam);
+            LMChar.Msg := LM_SYSCHAR;
+          end;
           WM_KEYDOWN:
           begin
             LMKey.CharCode := Word(WParam);
@@ -1302,6 +1320,16 @@ Begin
             LMKey.CharCode := Word(WParam);
             LMKey.Msg := LM_KEYUP;
           end;
+          WM_SYSKEYDOWN:
+          begin
+            LMKey.CharCode := Word(WParam);
+            LMKey.Msg := LM_SYSKEYDOWN;
+          end;
+          WM_SYSKEYUP: 
+          begin
+            LMKey.CharCode := Word(WParam);
+            LMKey.Msg := LM_SYSKEYUP;
+          end;
         end;
         case WParam of
           VK_RETURN:
@@ -1528,6 +1556,9 @@ end;
 
 {
   $Log$
+  Revision 1.187  2005/02/03 15:06:30  micha
+  translate and route WM_SYSCHAR messages, fix WM_SYSKEYDOWN and WM_SYSKEYUP messages
+
   Revision 1.186  2005/02/01 15:48:03  vincents
   fixed handling WM_MOUSEWHEEL in designer form (bug 647).
 
diff --git a/lcl/interfaces/win32/win32wsforms.pp b/lcl/interfaces/win32/win32wsforms.pp
index bd28c85ddd..31dcdf7f07 100644
--- a/lcl/interfaces/win32/win32wsforms.pp
+++ b/lcl/interfaces/win32/win32wsforms.pp
@@ -314,7 +314,7 @@ begin
 }
   else
     iconHandle := Windows.LoadIcon(MainInstance, 'MAINICON');
-  SendMessage(AForm.Handle, WM_SETICON, ICON_BIG, iconHandle);
+  SendMessage(winHandle, WM_SETICON, ICON_BIG, iconHandle);
 end;
 
 procedure TWin32WSCustomForm.ShowModal(const ACustomForm: TCustomForm);