paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 22:59:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed WindowProc

Browse Source 
git-svn-id: trunk@4426 -
This commit is contained in:
mattias 2003-07-26 13:26:56 +00:00
parent 2491d3f480
commit 017985b0ec
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/transfermacros.pp
View File

@ -446,9 +446,7 @@ begin
inc(ChompLen); inc(ChompLen);
if ChompLen>0 then if ChompLen>0 then
Result:=LeftStr(Result,length(Filename)-ChompLen); Result:=LeftStr(Result,length(Filename)-ChompLen);
writeln('TTransferMacroList.MF_MakeFile A "',Result,'"');
Result:=TrimFilename(Result); Result:=TrimFilename(Result);
writeln('TTransferMacroList.MF_MakeFile B "',Result,'"');
end; end;
function TTransferMacroList.MF_Trim(const Filename: string; var Abort: boolean function TTransferMacroList.MF_Trim(const Filename: string; var Abort: boolean

5
lcl/include/customcombobox.inc
View File

@ -554,7 +554,7 @@ begin
inherited Create(AOwner); inherited Create(AOwner);
fCompStyle := csComboBox; fCompStyle := csComboBox;
SetBounds(1,1,100,25); SetInitialBounds(1,1,100,25);
FItems := TStringlist.Create; FItems := TStringlist.Create;
FItemIndex:=-1; FItemIndex:=-1;
FDropDownCount:=8; FDropDownCount:=8;
@ -788,6 +788,9 @@ end;
{ {
$Log$ $Log$
Revision 1.29 2003/07/26 13:26:56 mattias
fixed WindowProc
Revision 1.28 2003/06/12 16:18:23 mattias Revision 1.28 2003/06/12 16:18:23 mattias
applied TComboBox fix for grabbing keys from Yoyong applied TComboBox fix for grabbing keys from Yoyong

21
lcl/interfaces/win32/win32callback.inc
View File

@ -51,14 +51,18 @@ End;
Handles the messages sent to the current window by Windows or other Handles the messages sent to the current window by Windows or other
applications applications
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
Function WindowProc(Window: HWnd; Msg: UInt; WParam: WParam; LParam: LParam): LResult; stdcall; Function WindowProc(Window: HWnd; Msg: UInt;
WParam: WParam; LParam: LParam): LResult; stdcall;
Var Var
LMessage: TLMessage; LMessage: TLMessage;
PLMsg: PLMessage;
R: TRect; R: TRect;
OwnerObject: TObject; OwnerObject: TObject;
WinProcess: Boolean; WinProcess: Boolean;
PrevWndProc: Pointer; PrevWndProc: Pointer;
LMInsertText: TLMInsertText; // used by CB_INSERTSTRING, LB_INSERTSTRING
procedure ShowHideTabPage(NotebookHandle: HWnd; Showing: boolean); procedure ShowHideTabPage(NotebookHandle: HWnd; Showing: boolean);
var var
NoteBook: TCustomNotebook; NoteBook: TCustomNotebook;
@ -103,6 +107,7 @@ Begin
Result := 0; Result := 0;
LMessage.Msg := -1; LMessage.Msg := -1;
PLMsg := @LMessage;
WinProcess := True; WinProcess := True;
Assert(False, 'Trace:WindowProc - Getting Object With Callback Procedure'); Assert(False, 'Trace:WindowProc - Getting Object With Callback Procedure');
@ -141,7 +146,8 @@ Begin
End; End;
CB_INSERTSTRING, LB_INSERTSTRING: CB_INSERTSTRING, LB_INSERTSTRING:
Begin Begin
With PLMInsertText(@LMessage)^ Do PLMsg:=@LMInsertText;
With LMInsertText Do
Begin Begin
Msg := LM_INSERTTEXT; Msg := LM_INSERTTEXT;
Position := WParam; Position := WParam;
@ -523,14 +529,14 @@ Begin
List := TMsgArray(GetProp(Window, 'MsgList')); List := TMsgArray(GetProp(Window, 'MsgList'));
If Pointer(List) <> Nil Then If Pointer(List) <> Nil Then
For C := 0 To Length(List) Do For C := 0 To Length(List) Do
If List[C] = LMessage.Msg Then If List[C] = PLMsg^.Msg Then
Begin Begin
DeliverMessage(OwnerObject, LMessage); DeliverMessage(OwnerObject, PLMsg^);
Exit; Exit;
End; End;
{$ELSE VER1_1} {$ELSE VER1_1}
If (OwnerObject <> Nil) And (LMessage.Msg <> -1) Then If (OwnerObject <> Nil) And (PLMsg^.Msg <> -1) Then
DeliverMessage(OwnerObject, LMessage); DeliverMessage(OwnerObject, PLMsg^);
{$ENDIF VER1_1} {$ENDIF VER1_1}
Assert(False, 'Trace:WindowProc - Exit'); Assert(False, 'Trace:WindowProc - Exit');
@ -579,6 +585,9 @@ end;
{ {
$Log$ $Log$
Revision 1.43 2003/07/26 13:26:56 mattias
fixed WindowProc
Revision 1.42 2003/07/26 10:30:44 mattias Revision 1.42 2003/07/26 10:30:44 mattias
rewritten WM_COMMAND by Micha rewritten WM_COMMAND by Micha

5
lcl/lmessages.pp
View File

@ -470,8 +470,6 @@ type
end; end;
TLMKey = record TLMKey = record
Msg: Cardinal; Msg: Cardinal;
CharCode: Word; CharCode: Word;
@ -1059,6 +1057,9 @@ end.
{ {
$Log$ $Log$
Revision 1.50 2003/07/26 13:26:56 mattias
fixed WindowProc
Revision 1.49 2003/07/07 23:58:43 marc Revision 1.49 2003/07/07 23:58:43 marc
+ Implemented TCheckListBox.Checked[] property + Implemented TCheckListBox.Checked[] property