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

MWE:

Browse Source 
* Fixed some syntax errors for the latest 1.0.5 compiler

git-svn-id: trunk@289 -
This commit is contained in:
lazarus 2001-06-14 23:13:30 +00:00
parent d175a3aca2
commit 1e8f005ddf
9 changed files with 65 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/synedit/syntextdrawer.pp
View File

@ -352,10 +352,10 @@ end;
{$ENDIF} {$ENDIF}
{$IFNDEF HE_COMPAREMEM} {$IFNDEF HE_COMPAREMEM}
{$IFDEF FPC} {$IFDEF SYN_LAZARUS}
function CompareMem(P1, P2: Pointer; Length: Integer): Boolean; function CompareMem(P1, P2: Pointer; Length: Integer): Boolean;
begin begin
Result:=CompareByte(P1^,P2^,Length)=0; Result := CompareByte(P1^, P2^, Length) = 0;
end; end;
{$ELSE} {$ELSE}
function CompareMem(P1, P2: Pointer; Length: Integer): Boolean; assembler; function CompareMem(P1, P2: Pointer; Length: Integer): Boolean; assembler;
@ -480,13 +480,8 @@ begin
for i := 0 to FFontsInfo.Count - 1 do for i := 0 to FFontsInfo.Count - 1 do
begin begin
Result := PheSharedFontsInfo(FFontsInfo[i]); Result := PheSharedFontsInfo(FFontsInfo[i]);
{$IFDEF FPC}
if CompareByte(Result^.BaseLF, LF, SizeOf(TLogFont))=0 then
Exit;
{$ELSE}
if CompareMem(@(Result^.BaseLF), @LF, SizeOf(TLogFont)) then if CompareMem(@(Result^.BaseLF), @LF, SizeOf(TLogFont)) then
Exit; Exit;
{$ENDIF}
end; end;
Result := nil; Result := nil;
end; end;

2
ide/editoroptions.pp
View File

@ -2507,7 +2507,7 @@ begin
with DisplayPreview do begin with DisplayPreview do begin
Name:='DisplayPreview'; Name:='DisplayPreview';
Parent:=MainNoteBook.Page[1]; Parent:=MainNoteBook.Page[1];
BorderStyle:=bsSizeable; BorderStyle:=bsSingle;
Top:=EditorFontGroupBox.Top+EditorFontGroupBox.Height+5; Top:=EditorFontGroupBox.Top+EditorFontGroupBox.Height+5;
Left:=EditorFontGroupBox.Left+2; Left:=EditorFontGroupBox.Left+2;
Width:=EditorFontGroupBox.Width-2; Width:=EditorFontGroupBox.Width-2;

8
lcl/include/interfacebase.inc
View File

@ -298,7 +298,7 @@ Begin
Result := True; Result := True;
end; end;
function TInterfaceBase.ReleaseDC(hWnd: HWND; hDC: HDC): Integer; function TInterfaceBase.ReleaseDC(hWnd: HWND; DC: HDC): Integer;
begin begin
Result := 0; Result := 0;
end; end;
@ -401,7 +401,7 @@ begin
Result := -1; Result := -1;
end; end;
Function TInterfaceBase.SetWindowOrgEx(dc : hdc; NewX, NewY : Integer; Var lpPoint : TPoint) : Boolean; Function TInterfaceBase.SetWindowOrgEx(dc : hdc; NewX, NewY : Integer; var Point: TPoint) : Boolean;
Begin Begin
Result := False; Result := False;
end; end;
@ -448,6 +448,10 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.15 2001/06/14 23:13:30 lazarus
MWE:
* Fixed some syntax errors for the latest 1.0.5 compiler
Revision 1.14 2001/04/06 22:25:14 lazarus Revision 1.14 2001/04/06 22:25:14 lazarus
* TTimer uses winapi-interface now instead of sendmessage-interface, stoppok * TTimer uses winapi-interface now instead of sendmessage-interface, stoppok

6
lcl/include/toolbar.inc
View File

@ -512,7 +512,7 @@ end;
procedure TToolBar.UpdateButtons; procedure TToolBar.UpdateButtons;
const const
BlankButton: TTBButton = (iBitmap: 0; idCommand: 0; fsState: 0; BlankButton: TTBButton = (iBitmap: 0; idCommand: 0; fsState: 0;
fsStyle: TBSTYLE_BUTTON; dwData: 0; iString: 0); fsStyle: TBSTYLE_BUTTON; bReserved: (0, 0); dwData: 0; iString: 0);
var var
I: Integer; I: Integer;
Count: Integer; Count: Integer;
@ -1465,6 +1465,10 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.4 2001/06/14 23:13:30 lazarus
MWE:
* Fixed some syntax errors for the latest 1.0.5 compiler
Revision 1.3 2001/06/14 14:57:58 lazarus Revision 1.3 2001/06/14 14:57:58 lazarus
MG: small bugfixes and less notes MG: small bugfixes and less notes

11
lcl/include/winapi.inc
View File

@ -401,13 +401,12 @@ begin
Result := InterfaceObject.SetWindowLong(handle, Idx, NewLong); Result := InterfaceObject.SetWindowLong(handle, Idx, NewLong);
end; end;
Function SetWindowOrgEx(dc : hdc; NewX, NewY : Integer; Var lpPoint : TPoint) : Boolean; function SetWindowOrgEx(dc : hdc; NewX, NewY : Integer; var Point: TPoint) : Boolean;
begin begin
Result := InterfaceObject.SetWindowOrgEx(dc,NewX,NewY,lpPoint); Result := InterfaceObject.SetWindowOrgEx(dc, NewX, NewY, Point);
end; end;
function SetWindowPos(hWnd: HWND; hWndInsertAfter: HWND; function SetWindowPos(hWnd: HWND; hWndInsertAfter: HWND; X, Y, cx, cy: Integer; uFlags: UINT): Boolean;
X, Y, cx, cy: Integer; uFlags: UINT): Boolean;
begin begin
Result:=false; Result:=false;
end; end;
@ -981,6 +980,10 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.14 2001/06/14 23:13:30 lazarus
MWE:
* Fixed some syntax errors for the latest 1.0.5 compiler
Revision 1.13 2001/04/06 22:25:14 lazarus Revision 1.13 2001/04/06 22:25:14 lazarus
* TTimer uses winapi-interface now instead of sendmessage-interface, stoppok * TTimer uses winapi-interface now instead of sendmessage-interface, stoppok

8
lcl/include/winapih.inc
View File

@ -100,7 +100,7 @@ function PostMessage(hWnd: HWND; Msg: Cardinal; wParam: LongInt; lParam: LongInt
function RealizePalette(DC: HDC): Cardinal; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function RealizePalette(DC: HDC): Cardinal; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function Rectangle(DC: HDC; X1, Y1, X2, Y2: Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function Rectangle(DC: HDC; X1, Y1, X2, Y2: Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function ReleaseCapture : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function ReleaseCapture : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function ReleaseDC(hWnd: HWND; hDC: HDC): Integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function ReleaseDC(hWnd: HWND; DC: HDC): Integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function RestoreDC(DC: HDC; SavedDC: Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function RestoreDC(DC: HDC; SavedDC: Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function SaveDC(DC: HDC): Integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function SaveDC(DC: HDC): Integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
@ -126,7 +126,7 @@ Function SetTextCharacterExtra(_hdc : hdc; nCharExtra : Integer):Integer; {$IFDE
function SetTextColor(DC: HDC; Color: TColorRef): TColorRef; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function SetTextColor(DC: HDC; Color: TColorRef): TColorRef; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function SetTimer(hWnd: HWND; nIDEvent, uElapse: integer; lpTimerFunc: TFNTimerProc) : integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function SetTimer(hWnd: HWND; nIDEvent, uElapse: integer; lpTimerFunc: TFNTimerProc) : integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function SetWindowLong(Handle: HWND; Idx: Integer; NewLong : Longint): Longint;{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function SetWindowLong(Handle: HWND; Idx: Integer; NewLong : Longint): Longint;{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function SetWindowOrgEx(dc : hdc; NewX, NewY : Integer; Var Point : TPoint): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function SetWindowOrgEx(dc : hdc; NewX, NewY : Integer; var Point: TPoint): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function SetWindowPos(hWnd: HWND; hWndInsertAfter: HWND; function SetWindowPos(hWnd: HWND; hWndInsertAfter: HWND;
X, Y, cx, cy: Integer; uFlags: UINT): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} X, Y, cx, cy: Integer; uFlags: UINT): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function ShowCaret(hWnd: HWND): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function ShowCaret(hWnd: HWND): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
@ -226,6 +226,10 @@ function UnionRect(var lprcDst: TRect; const lprcSrc1, lprcSrc2: TRect): Boolean
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.11 2001/06/14 23:13:30 lazarus
MWE:
* Fixed some syntax errors for the latest 1.0.5 compiler
Revision 1.10 2001/04/06 22:25:14 lazarus Revision 1.10 2001/04/06 22:25:14 lazarus
* TTimer uses winapi-interface now instead of sendmessage-interface, stoppok * TTimer uses winapi-interface now instead of sendmessage-interface, stoppok

10
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -3295,13 +3295,13 @@ begin
Assert(False, Format('Trace:< [TgtkObject.SETWINDOWLONG] HWND: 0x%x, idx: 0x%x(%d), Value: 0x%x(%d) --> 0x%x(%d)', [Handle, idx, idx, newlong, newlong, Result, Result])); Assert(False, Format('Trace:< [TgtkObject.SETWINDOWLONG] HWND: 0x%x, idx: 0x%x(%d), Value: 0x%x(%d) --> 0x%x(%d)', [Handle, idx, idx, newlong, newlong, Result, Result]));
end; end;
Function TgtkObject.SetWindowOrgEx(dc : hdc; NewX, NewY : Integer; Var lpPoint : TPoint) : Boolean; Function TgtkObject.SetWindowOrgEx(dc : hdc; NewX, NewY : Integer; var Point: TPoint) : Boolean;
begin begin
//writeln('[TgtkObject.SetWindowOrgEx] ',NewX,' ',NewY); //writeln('[TgtkObject.SetWindowOrgEx] ',NewX,' ',NewY);
// ToDo: move origin // ToDo: move origin
lpPoint.X := NewX; Point.X := NewX;
lpPoint.Y := NewY; Point.Y := NewY;
Result := True; Result := True;
end; end;
@ -3520,6 +3520,10 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.37 2001/06/14 23:13:30 lazarus
MWE:
* Fixed some syntax errors for the latest 1.0.5 compiler
Revision 1.36 2001/06/14 14:57:59 lazarus Revision 1.36 2001/06/14 14:57:59 lazarus
MG: small bugfixes and less notes MG: small bugfixes and less notes

8
lcl/interfaces/gtk/gtkwinapih.inc
View File

@ -73,7 +73,7 @@ function PostMessage(hWnd: HWND; Msg: Cardinal; wParam: LongInt; lParam: LongInt
function RealizePalette(DC: HDC): Cardinal; override; function RealizePalette(DC: HDC): Cardinal; override;
function Rectangle(DC: HDC; X1, Y1, X2, Y2: Integer): Boolean; override; function Rectangle(DC: HDC; X1, Y1, X2, Y2: Integer): Boolean; override;
Function ReleaseCapture : Boolean; override; Function ReleaseCapture : Boolean; override;
function ReleaseDC(hWnd: HWND; hDC: HDC): Integer; override; function ReleaseDC(hWnd: HWND; DC: HDC): Integer; override;
function RestoreDC(DC: HDC; SavedDC: Integer): Boolean; override; function RestoreDC(DC: HDC; SavedDC: Integer): Boolean; override;
function SaveDC(DC: HDC): Integer; override; function SaveDC(DC: HDC): Integer; override;
@ -94,7 +94,7 @@ Function SetTextCharacterExtra(_hdc : hdc; nCharExtra : Integer):Integer; overri
function SetTextColor(DC: HDC; Color: TColorRef): TColorRef; override; function SetTextColor(DC: HDC; Color: TColorRef): TColorRef; override;
function SetTimer(hWnd: HWND; nIDEvent, uElapse: integer; lpTimerFunc: TFNTimerProc) : integer; override; function SetTimer(hWnd: HWND; nIDEvent, uElapse: integer; lpTimerFunc: TFNTimerProc) : integer; override;
function SetWindowLong(Handle: HWND; Idx: Integer; NewLong : Longint): LongInt; function SetWindowLong(Handle: HWND; Idx: Integer; NewLong : Longint): LongInt;
function SetWindowOrgEx(dc : hdc; NewX, NewY : Integer; Var lpPoint : TPoint) : Boolean; override; function SetWindowOrgEx(dc : hdc; NewX, NewY : Integer; var Point: TPoint) : Boolean; override;
function SetWindowPos(hWnd: HWND; hWndInsertAfter: HWND; function SetWindowPos(hWnd: HWND; hWndInsertAfter: HWND;
X, Y, cx, cy: Integer; uFlags: UINT): Boolean; override; X, Y, cx, cy: Integer; uFlags: UINT): Boolean; override;
function ShowCaret(hWnd: HWND): Boolean; override; function ShowCaret(hWnd: HWND): Boolean; override;
@ -111,6 +111,10 @@ Function WindowFromPoint(Point : TPoint) : HWND; override;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.15 2001/06/14 23:13:30 lazarus
MWE:
* Fixed some syntax errors for the latest 1.0.5 compiler
Revision 1.14 2001/04/06 22:25:15 lazarus Revision 1.14 2001/04/06 22:25:15 lazarus
* TTimer uses winapi-interface now instead of sendmessage-interface, stoppok * TTimer uses winapi-interface now instead of sendmessage-interface, stoppok

41
lcl/interfaces/gtk/gtkwinapiwindow.pp
View File

@ -198,7 +198,8 @@ begin
Result := gtk_False; Result := gtk_False;
end; end;
procedure GTKAPIWidgetClient_ClassInit(theClass: PGTKAPIWidgetClientClass);cdecl; procedure GTKAPIWidgetClient_ClassInit(theClass: Pointer);cdecl;
// theClass: PGTKAPIWidgetClientClass
var var
ObjectClass: PGTKObjectClass; ObjectClass: PGTKObjectClass;
WidgetClass: PGTKWidgetClass; WidgetClass: PGTKWidgetClass;
@ -211,7 +212,7 @@ begin
'set_scroll_adjustments', 'set_scroll_adjustments',
GTK_RUN_FIRST, GTK_RUN_FIRST,
ObjectClass^.thetype, ObjectClass^.thetype,
(@theClass^.set_scroll_adjustments - Pointer(theClass)), (@PGTKAPIWidgetClientClass(theClass)^.set_scroll_adjustments - Pointer(theClass)),
@gtk_marshal_NONE__POINTER_POINTER, @gtk_marshal_NONE__POINTER_POINTER,
GTK_TYPE_NONE, GTK_TYPE_NONE,
2, 2,
@ -228,15 +229,17 @@ begin
focus_out_event := @GTKAPIWidgetClient_FocusOut; focus_out_event := @GTKAPIWidgetClient_FocusOut;
end; end;
theClass^.set_scroll_adjustments := nil; PGTKAPIWidgetClientClass(theClass)^.set_scroll_adjustments := nil;
end; end;
procedure GTKAPIWidgetClient_Init(Client: PGTKAPIWidgetClient; procedure GTKAPIWidgetClient_Init(Client, theClass: Pointer); cdecl;
theClass: PGTKAPIWidgetClientClass); cdecl; // Client: PGTKAPIWidgetClient
// theClass: PGTKAPIWidgetClientClass
begin begin
gtk_widget_set_flags(PGTKWidget(Client), GTK_CAN_FOCUS); gtk_widget_set_flags(PGTKWidget(Client), GTK_CAN_FOCUS);
with Client^.Caret do begin with PGTKAPIWidgetClient(Client)^.Caret do
begin
Visible := False; Visible := False;
IsDrawn := False; IsDrawn := False;
Blinking := True; Blinking := True;
@ -449,37 +452,39 @@ begin
end; end;
procedure GTKAPIWidget_ClassInit(wawClass: PGTKAPIWidgetClass); cdecl; procedure GTKAPIWidget_ClassInit(wawClass: Pointer); cdecl;
//wawClass: PGTKAPIWidgetClass
var var
// ObjectClass: PGTKObjectClass;
WidgetClass: PGTKWidgetClass; WidgetClass: PGTKWidgetClass;
begin begin
// ObjectClass := PGTKObjectClass(wawClass);
WidgetClass := PGTKWidgetClass(wawClass); WidgetClass := PGTKWidgetClass(wawClass);
WidgetClass^.focus_in_event := @GTKAPIWidget_FocusIn; WidgetClass^.focus_in_event := @GTKAPIWidget_FocusIn;
WidgetClass^.focus_out_event := @GTKAPIWidget_FocusOut; WidgetClass^.focus_out_event := @GTKAPIWidget_FocusOut;
end; end;
procedure GTKAPIWidget_Init(waw: PGTKAPIWidget; procedure GTKAPIWidget_Init(waw, theClass: Pointer); cdecl;
theClass: PGTKAPIWidgetClass); cdecl; // waw: PGTKAPIWidget;
// theClass: PGTKAPIWidgetClass
var var
Widget: PGTKWidget; Widget: PGTKWidget;
APIWidget: PGTKAPIWidget;
begin begin
Widget := PGTKWidget(waw); Widget := PGTKWidget(waw);
APIWidget := PGTKAPIWidget(waw);
gtk_widget_set_flags(Widget, GTK_CAN_FOCUS); gtk_widget_set_flags(Widget, GTK_CAN_FOCUS);
waw^.Client := GTKAPIWidgetClient_New; APIWidget^.Client := GTKAPIWidgetClient_New;
gtk_object_set_data(PGTKObject(Widget), 'Fixed', waw^.Client); gtk_object_set_data(PGTKObject(Widget), 'Fixed', APIWidget^.Client);
gtk_object_set_data(PGTKObject(waw^.Client), 'Main', Widget); gtk_object_set_data(PGTKObject(APIWidget^.Client), 'Main', Widget);
gtk_widget_show(waw^.Client); gtk_widget_show(APIWidget^.Client);
writeln('(gtkwinapiwindow.pp) GTKAPIWidget_Init B check this:'); writeln('(gtkwinapiwindow.pp) GTKAPIWidget_Init B check this:');
// MG: range check GTK-Critical warnings results possibly from // MG: range check GTK-Critical warnings results possibly from
// function GTKAPIwidget_new. // function GTKAPIwidget_new.
// ToDo: check nil parameters // ToDo: check nil parameters
gtk_container_add(PGTKContainer(Widget), waw^.Client); gtk_container_add(PGTKContainer(Widget), APIWidget^.Client);
writeln('GTKAPIWidget_Init END'); writeln('GTKAPIWidget_Init END');
end; end;
@ -569,6 +574,10 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.9 2001/06/14 23:13:30 lazarus
MWE:
* Fixed some syntax errors for the latest 1.0.5 compiler
Revision 1.8 2001/06/12 18:31:01 lazarus Revision 1.8 2001/06/12 18:31:01 lazarus
MG: small bugfixes MG: small bugfixes