paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 10:50:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

applied clipbrd patch from Vincent

Browse Source 
git-svn-id: trunk@1365 -
This commit is contained in:
mattias 2002-02-09 01:48:20 +00:00
parent 810f770ad3
commit 1997f7ee21
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/interfaces/win32/win32int.pp
View File

@ -66,7 +66,6 @@ Type
FMenu: HMENU; // Main menu/menu bar
FParentWindow: HWND; // The parent window
FSubMenu: HMENU; // current sub menu
FWndProc: WNDPROC;
FStockNullBrush: HBRUSH;
FStockBlackBrush: HBRUSH;
@ -169,11 +168,10 @@ Type
Const
BOOL_RESULT: Array[Boolean] Of String = ('False', 'True');
ClsName : array[0..20] of char = 'LazarusForm';
TimerClsName : array[0..20] of char = 'LCLTimerWindow';
ClsName : array[0..20] of char = 'LazarusForm'#0;
TimerClsName : array[0..20] of char = 'LCLTimerWindow'#0;
Var
OldClipboardViewer: HWND;
WndList: TList;
{$I win32proc.inc}
@ -197,6 +195,9 @@ End.
{ =============================================================================
$Log$
Revision 1.21 2002/11/26 20:51:05 mattias
applied clipbrd patch from Vincent
Revision 1.20 2002/11/23 13:48:48 mattias
added Timer patch from Vincent Snijders

18
lcl/interfaces/win32/win32object.inc
View File

@ -37,7 +37,6 @@ Begin
FAccelGroup := CreateAcceleratorTable(LPACCEL(@AcTbl), High(AcTbl));
FTimerData := TList.Create;
FTimerWindow := 0;
FWndProc := WNDPROC(@WindowProc);
End;
{------------------------------------------------------------------------------
@ -66,7 +65,7 @@ Begin
FTimerData.Delete(n);
end;
end;
Assert(False,'FTimerWindow: ' + IntToStr(FTimerWindow));
Assert(False,'Trace:FTimerWindow: ' + IntToStr(FTimerWindow));
if FTimerWindow<>0 then
begin
DestroyWindow(FTimerWindow);
@ -122,7 +121,7 @@ Begin
writeln('Exception: ',E.Message);
end;
end;
Assert(False,'FTimerWindow: ' + IntToStr(FTimerWindow));
Assert(False,'Trace:FTimerWindow: ' + IntToStr(FTimerWindow));
//Init stock objects;
LogBrush.lbStyle := BS_NULL;
FStockNullBrush := CreateBrushIndirect(LogBrush);
@ -1759,11 +1758,11 @@ Begin
// If Height = 0 Then
// Width := CW_USEDEFAULT;
// Window := CreateWindow(ClsName, StrTemp, WS_OVERLAPPEDWINDOW, Left, Top, Width, Height, Parent, HMENU(Nil), HInstance, Nil);
Window := CreateWindow(ClsName, StrTemp, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, Parent, HMENU(Nil), HInstance, Nil);
If Sender Is TForm Then
OldClipboardViewer := SetClipboardViewer(Window);
try
Window := CreateWindow(ClsName, StrTemp, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, Parent, HMENU(Nil), HInstance, Nil);
except
writeln('Exception occured creating window');
end;
If (FMainForm = Nil) And (Application.MainForm = Nil) Then
FMainForm := TForm(Sender);
FParentWindow := Window;
@ -2624,6 +2623,9 @@ End;
{
$Log$
Revision 1.28 2002/11/26 20:51:05 mattias
applied clipbrd patch from Vincent
Revision 1.27 2002/11/23 13:48:48 mattias
added Timer patch from Vincent Snijders