From 7bebb27eab9bec0dac9e4bb44f207a950d1fb753 Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 5 Mar 2008 03:52:01 +0000 Subject: [PATCH] messages: - change messages name from LM_CUTTOCLIP to LM_CUT, LM_COPYTOCLIP to LM_COPY, LM_PASTEFROMCLIP to LM_PASTE, LM_CLEARSEL to LM_CLEAR since they are come from WM_CUT, WM_COPY, WM_CLEAR, WM_PASTE - assign windows message number to that messages (fixes issue #0010747) git-svn-id: trunk@14415 - --- lcl/grids.pas | 6 +++--- lcl/include/dbmemo.inc | 6 +++--- lcl/interfaces/carbon/carbonprivatecontrol.inc | 8 ++++---- lcl/interfaces/gtk/gtkcallback.inc | 6 +++--- lcl/interfaces/gtk/gtkwidgetset.inc | 6 +++--- lcl/interfaces/gtk/gtkwsstdctrls.pp | 12 ++++++------ lcl/interfaces/gtk2/gtk2wscustommemo.inc | 6 +++--- lcl/interfaces/win32/win32callback.inc | 10 +++++----- lcl/interfaces/wince/wincecallback.inc | 8 ++++---- lcl/lclmessageglue.pas | 12 ++++++------ lcl/lmessages.pp | 16 ++++++++-------- 11 files changed, 48 insertions(+), 48 deletions(-) diff --git a/lcl/grids.pas b/lcl/grids.pas index f9d94ce3c3..f0077be579 100644 --- a/lcl/grids.pas +++ b/lcl/grids.pas @@ -7049,9 +7049,9 @@ begin {$Endif} if FGrid<>nil then case TheMessage.Msg of - LM_CLEARSEL, - LM_CUTTOCLIP, - LM_PASTEFROMCLIP: + LM_CLEAR, + LM_CUT, + LM_PASTE: begin if FGrid.EditorIsReadOnly then exit; diff --git a/lcl/include/dbmemo.inc b/lcl/include/dbmemo.inc index 16e55eff77..3ca15971ec 100644 --- a/lcl/include/dbmemo.inc +++ b/lcl/include/dbmemo.inc @@ -206,9 +206,9 @@ end; procedure TDBMemo.WndProc(var AMessage: TLMessage); begin case AMessage.Msg of - LM_CLEARSEL, - LM_CUTTOCLIP, - LM_PASTEFROMCLIP: + LM_CLEAR, + LM_CUT, + LM_PASTE: FDatalink.Edit; end; inherited WndProc(AMessage); diff --git a/lcl/interfaces/carbon/carbonprivatecontrol.inc b/lcl/interfaces/carbon/carbonprivatecontrol.inc index 340e505bff..70919c8899 100644 --- a/lcl/interfaces/carbon/carbonprivatecontrol.inc +++ b/lcl/interfaces/carbon/carbonprivatecontrol.inc @@ -111,10 +111,10 @@ begin case Command.commandID of kHICommandUndo:; kHICommandRedo:; - kHICommandCut: SendSimpleMessage(AWidget.LCLObject, LM_CUTTOCLIP); - kHICommandCopy: SendSimpleMessage(AWidget.LCLObject, LM_COPYTOCLIP); - kHICommandPaste: SendSimpleMessage(AWidget.LCLObject, LM_PASTEFROMCLIP); - kHICommandClear: SendSimpleMessage(AWidget.LCLObject, LM_CLEARSEL); + kHICommandCut: SendSimpleMessage(AWidget.LCLObject, LM_CUT); + kHICommandCopy: SendSimpleMessage(AWidget.LCLObject, LM_COPY); + kHICommandPaste: SendSimpleMessage(AWidget.LCLObject, LM_PASTE); + kHICommandClear: SendSimpleMessage(AWidget.LCLObject, LM_CLEAR); kHICommandSelectAll:; end; end; diff --git a/lcl/interfaces/gtk/gtkcallback.inc b/lcl/interfaces/gtk/gtkcallback.inc index d2840a34ea..8363a9b375 100644 --- a/lcl/interfaces/gtk/gtkcallback.inc +++ b/lcl/interfaces/gtk/gtkcallback.inc @@ -2194,7 +2194,7 @@ var begin EventTrace('Cut to clip', data); if (Widget=nil) then ; - Mess.msg := LM_CUTTOCLIP; + Mess.msg := LM_CUT; Result:= DeliverMessage(Data, Mess) = 0; end; @@ -2204,7 +2204,7 @@ var begin EventTrace('Copy to Clip', data); if (Widget=nil) then ; - Mess.msg := LM_COPYTOCLIP; + Mess.msg := LM_COPY; Result:= DeliverMessage(Data, Mess) = 0; end; @@ -2214,7 +2214,7 @@ var begin EventTrace('Paste from clip', data); if (Widget=nil) then ; - Mess.msg := LM_PASTEFROMCLIP; + Mess.msg := LM_PASTE; Result:= DeliverMessage(Data, Mess) = 0; end; diff --git a/lcl/interfaces/gtk/gtkwidgetset.inc b/lcl/interfaces/gtk/gtkwidgetset.inc index f071fd9333..537701725a 100644 --- a/lcl/interfaces/gtk/gtkwidgetset.inc +++ b/lcl/interfaces/gtk/gtkwidgetset.inc @@ -3336,7 +3336,7 @@ begin ConnectSenderSignal(gObject, 'kill-line', @gtkkillline); end; - LM_CUTTOCLIP : + LM_CUT: begin if (ALCLObject is TCustomMemo) then ConnectSenderSignal(gCore, 'cut-clipboard', @gtkcuttoclip) @@ -3344,7 +3344,7 @@ begin ConnectSenderSignal(gObject, 'cut-clipboard', @gtkcuttoclip); end; - LM_COPYTOCLIP : + LM_COPY: begin if (ALCLObject is TCustomMemo) then ConnectSenderSignal(gCore, 'copy-clipboard', @gtkcopytoclip) @@ -3352,7 +3352,7 @@ begin ConnectSenderSignal(gObject, 'copy-clipboard', @gtkcopytoclip); end; - LM_PASTEFROMCLIP : + LM_PASTE: begin if (ALCLObject is TCustomMemo) then ConnectSenderSignal(gCore, 'paste-clipboard', @gtkpastefromclip) diff --git a/lcl/interfaces/gtk/gtkwsstdctrls.pp b/lcl/interfaces/gtk/gtkwsstdctrls.pp index 3a7aed05ef..867449cc2b 100644 --- a/lcl/interfaces/gtk/gtkwsstdctrls.pp +++ b/lcl/interfaces/gtk/gtkwsstdctrls.pp @@ -1036,9 +1036,9 @@ begin begin SetCallback(LM_CHANGED, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); SetCallback(LM_ACTIVATE, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); - SetCallback(LM_CUTTOCLIP, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); - SetCallback(LM_COPYTOCLIP, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); - SetCallback(LM_PASTEFROMCLIP, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); + SetCallback(LM_CUT, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); + SetCallback(LM_COPY, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); + SetCallback(LM_PASTE, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); {$ifdef gtk1} SetCallback(LM_INSERTTEXT, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); {$endif} @@ -1608,9 +1608,9 @@ begin begin SetCallback(LM_CHANGED, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); SetCallback(LM_ACTIVATE, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); - SetCallback(LM_CUTTOCLIP, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); - SetCallback(LM_COPYTOCLIP, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); - SetCallback(LM_PASTEFROMCLIP, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); + SetCallback(LM_CUT, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); + SetCallback(LM_COPY, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); + SetCallback(LM_PASTE, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); SetCallback(LM_INSERTTEXT, PGtkObject(AGtkWidget), AWidgetInfo^.LCLObject); end; end; diff --git a/lcl/interfaces/gtk2/gtk2wscustommemo.inc b/lcl/interfaces/gtk2/gtk2wscustommemo.inc index b508f6db1a..05f70bb6e0 100644 --- a/lcl/interfaces/gtk2/gtk2wscustommemo.inc +++ b/lcl/interfaces/gtk2/gtk2wscustommemo.inc @@ -17,7 +17,7 @@ var begin EventTrace('Gtk2WS_MemoCutToClip', WidgetInfo^.LCLObject); if (Widget=nil) then ; - Mess.msg := LM_CUTTOCLIP; + Mess.msg := LM_CUT; DeliverMessage(WidgetInfo^.LCLObject, Mess); end; @@ -27,7 +27,7 @@ var begin EventTrace('Gtk2WS_MemoCopyToClip', WidgetInfo^.LCLObject); if (Widget=nil) then ; - Mess.msg := LM_COPYTOCLIP; + Mess.msg := LM_COPY; DeliverMessage(WidgetInfo^.LCLObject, Mess); end; @@ -37,7 +37,7 @@ var begin EventTrace('Gtk2WS_MemoPasteFromClip', WidgetInfo^.LCLObject); if (Widget=nil) then ; - Mess.msg := LM_PASTEFROMCLIP; + Mess.msg := LM_PASTE; DeliverMessage(WidgetInfo^.LCLObject, Mess); end; diff --git a/lcl/interfaces/win32/win32callback.inc b/lcl/interfaces/win32/win32callback.inc index 1a9bfea7b8..aaae93e9c1 100644 --- a/lcl/interfaces/win32/win32callback.inc +++ b/lcl/interfaces/win32/win32callback.inc @@ -1411,15 +1411,15 @@ begin end; WM_CLEAR: begin - LMessage.Msg := LM_CLEARSEL; + LMessage.Msg := LM_CLEAR; end; WM_COPY: begin - LMessage.Msg := LM_COPYTOCLIP; + LMessage.Msg := LM_COPY; end; WM_CUT: begin - LMessage.Msg := LM_CUTTOCLIP; + LMessage.Msg := LM_CUT; end; WM_DESTROY: begin @@ -1961,7 +1961,7 @@ begin end; WM_PASTE: begin - LMessage.Msg := LM_PASTEFROMCLIP; + LMessage.Msg := LM_PASTE; end; WM_RBUTTONDBLCLK: begin @@ -2193,7 +2193,7 @@ begin WinProcess := False; end; - case Msg Of + case Msg of WM_MOVE: begin PLMsg:=@LMMove; diff --git a/lcl/interfaces/wince/wincecallback.inc b/lcl/interfaces/wince/wincecallback.inc index 0971a59dbf..3a69cc8ee8 100644 --- a/lcl/interfaces/wince/wincecallback.inc +++ b/lcl/interfaces/wince/wincecallback.inc @@ -1188,15 +1188,15 @@ begin end; WM_CLEAR: begin - LMessage.Msg := LM_CLEARSEL; + LMessage.Msg := LM_CLEAR; end; WM_COPY: begin - LMessage.Msg := LM_COPYTOCLIP; + LMessage.Msg := LM_COPY; end; WM_CUT: begin - LMessage.Msg := LM_CUTTOCLIP; + LMessage.Msg := LM_CUT; end; WM_DESTROY: begin @@ -1680,7 +1680,7 @@ begin end; WM_PASTE: begin - LMessage.Msg := LM_PASTEFROMCLIP; + LMessage.Msg := LM_PASTE; end; WM_RBUTTONDBLCLK: begin diff --git a/lcl/lclmessageglue.pas b/lcl/lclmessageglue.pas index a2b4e8e25e..59e622fbc7 100644 --- a/lcl/lclmessageglue.pas +++ b/lcl/lclmessageglue.pas @@ -784,12 +784,12 @@ end; * * * Params * * * - * Target : The Control that will recieve the message LM_CUTTOCLIP * + * Target : The Control that will recieve the message LM_CUT * * * ******************************************************************************} function LCLSendCutToClipboardMsg(const Target: TControl): PtrInt; begin - Result := SendSimpleMessage(Target, LM_CUTTOCLIP); + Result := SendSimpleMessage(Target, LM_CUT); end; {****************************************************************************** @@ -800,12 +800,12 @@ end; * * * Params * * * - * Target : The Control that will recieve the message LM_COPYTOCLIP * + * Target : The Control that will recieve the message LM_COPY * * * ******************************************************************************} function LCLSendCopyToClipboardMsg(const Target: TControl): PtrInt; begin - Result := SendSimpleMessage(Target, LM_COPYTOCLIP); + Result := SendSimpleMessage(Target, LM_COPY); end; {****************************************************************************** @@ -816,12 +816,12 @@ end; * * * Params * * * - * Target : The Control that will recieve the message LM_COPYTOCLIP * + * Target : The Control that will recieve the message LM_COPY * * * ******************************************************************************} function LCLSendPasteFromClipboardMsg(const Target: TControl): PtrInt; begin - Result := SendSimpleMessage(Target, LM_PASTEFROMCLIP); + Result := SendSimpleMessage(Target, LM_PASTE); end; {****************************************************************************** diff --git a/lcl/lmessages.pp b/lcl/lmessages.pp index c76c510d05..3987a77556 100644 --- a/lcl/lmessages.pp +++ b/lcl/lmessages.pp @@ -71,13 +71,9 @@ const LM_KILLCHAR = LM_LCL + 23; LM_KILLWORD = LM_LCL + 24; LM_KILLLINE = LM_LCL + 25; - LM_CUTTOCLIP = LM_LCL + 26; - LM_COPYTOCLIP = LM_LCL + 27; - LM_PASTEFROMCLIP = LM_LCL + 28; LM_CONFIGUREEVENT = LM_LCL + 31; // GTK internal. Should be removed later. LM_PAINT = LM_LCL + 32; LM_TIMER = LM_LCL + 40; - LM_CLEARSEL = LM_LCL + 50; // WM_CLEAR LM_EXIT = LM_LCL + 60; LM_CLOSEQUERY = LM_LCL + 62; LM_DRAGSTART = LM_LCL + 63; @@ -227,7 +223,10 @@ const LM_DROPFILES = $0233; LM_SELCHANGE = $0234; - + LM_CUT = $0300; + LM_COPY = $0301; + LM_PASTE = $0302; + LM_CLEAR = $0303; const // Moved from Controls to avoid circles @@ -874,9 +873,10 @@ begin LM_KILLCHAR :Result:='LM_KILLCHAR'; LM_KILLWORD :Result:='LM_KILLWORD'; LM_KILLLINE :Result:='LM_KILLLINE'; - LM_CUTTOCLIP :Result:='LM_CUTTOCLIP'; - LM_COPYTOCLIP :Result:='LM_COPYTOCLIP'; - LM_PASTEFROMCLIP :Result:='LM_PASTEFROMCLIP'; + LM_CUT :Result:='LM_CUT'; + LM_COPY :Result:='LM_COPY'; + LM_PASTE :Result:='LM_PASTE'; + LM_CLEAR :Result:='LM_CLEAR'; LM_CONFIGUREEVENT :Result:='LM_CONFIGUREEVENT'; LM_PAINT :Result:='LM_PAINT'; LM_KEYDOWN :Result:='LM_KEYDOWN';