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 )

git-svn-id: trunk@14415 -
This commit is contained in:
paul 2008-03-05 03:52:01 +00:00
parent 8f523aab33
commit 7bebb27eab
11 changed files with 48 additions and 48 deletions

View File

@ -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;

View File

@ -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);

View File

@ -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;

View File

@ -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;

View File

@ -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)

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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;
{******************************************************************************

View File

@ -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';