paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-19 16:28:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed compilation gtk and fpc 1.9

Browse Source 
git-svn-id: trunk@4892 -
This commit is contained in:
mattias 2003-12-16 14:01:27 +00:00
parent e758407c49
commit 2d402a5596
5 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/linkscanner.pas
View File

@ -54,7 +54,7 @@ const
PascalCompilerDefine = ExternalMacroStart+'Compiler'; PascalCompilerDefine = ExternalMacroStart+'Compiler';
NestedCompilerDefine = ExternalMacroStart+'NestedComments'; NestedCompilerDefine = ExternalMacroStart+'NestedComments';
MissingIncludeFileCode = 1; MissingIncludeFileCode = Pointer(1);
type type
TLinkScanner = class; TLinkScanner = class;

5
lcl/include/winapi.inc
View File

@ -1193,7 +1193,7 @@ end;
function ScrollWindow(hWnd: HWND; XAmount, YAmount: Integer; function ScrollWindow(hWnd: HWND; XAmount, YAmount: Integer;
Rect, ClipRect: PRect): Boolean; Rect, ClipRect: PRect): Boolean;
begin begin
Result := ScrollWindowEx(hWnd, XAmount, YAmount, Rect, ClipRect, 0, 0, 0); Result := ScrollWindowEx(hWnd, XAmount, YAmount, Rect, ClipRect, 0, nil, 0);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -1297,6 +1297,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.105 2003/12/16 14:01:27 mattias
fixed compilation gtk and fpc 1.9
Revision 1.104 2003/11/24 11:03:07 marc Revision 1.104 2003/11/24 11:03:07 marc
* Splitted winapi*.inc into a winapi and a lcl interface communication part * Splitted winapi*.inc into a winapi and a lcl interface communication part

6
lcl/interfaces/gtk/gtkint.pp
View File

@ -308,6 +308,9 @@ uses
GTKWinApiWindow, ComCtrls, CListBox, Calendar, Arrow, Spin, CommCtrl, GTKWinApiWindow, ComCtrls, CListBox, Calendar, Arrow, Spin, CommCtrl,
ExtCtrls, FileCtrl, LResources, gtkglobals, gtkproc; ExtCtrls, FileCtrl, LResources, gtkglobals, gtkproc;
const
GtkNil = nil;
{$I gtklistsl.inc} {$I gtklistsl.inc}
{$I gtkobject.inc} {$I gtkobject.inc}
{$I gtkwinapi.inc} {$I gtkwinapi.inc}
@ -401,6 +404,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.161 2003/12/16 14:01:27 mattias
fixed compilation gtk and fpc 1.9
Revision 1.160 2003/11/27 23:02:30 mattias Revision 1.160 2003/11/27 23:02:30 mattias
removed menutype.pas removed menutype.pas

15
lcl/interfaces/gtk/gtkobject.inc
View File

@ -5325,8 +5325,8 @@ begin
if Handle <> nil then if Handle <> nil then
Begin Begin
SetLCLObject(Handle, Sender); SetLCLObject(Handle, Sender);
gtk_object_set_data(pgtkObject(Handle),'Style',0); gtk_object_set_data(pgtkObject(Handle),'Style',GtkNil);
gtk_object_set_data(pgtkObject(Handle),'ExStyle',0); gtk_object_set_data(pgtkObject(Handle),'ExStyle',GtkNil);
end; end;
//-------------------------- //--------------------------
@ -8176,7 +8176,7 @@ const
CurSelList := CurSelList^.Next; CurSelList := CurSelList^.Next;
end; end;
g_list_free(SelectionLists); g_list_free(SelectionLists);
gtk_object_set_data (PGtkObject(Widget),gtk_selection_handler_key,0); gtk_object_set_data (PGtkObject(Widget),gtk_selection_handler_key,GtkNil);
{$IFDEF DEBUG_CLIPBOARD} {$IFDEF DEBUG_CLIPBOARD}
writeln(' ClearTargetLists WWW END'); writeln(' ClearTargetLists WWW END');
{$ENDIF} {$ENDIF}
@ -8202,11 +8202,11 @@ begin
if ClipboardWidget<>nil then begin if ClipboardWidget<>nil then begin
// connect widget to all clipboard signals // connect widget to all clipboard signals
g_signal_connect(PGtkObject(ClipboardWidget),'selection_received', g_signal_connect(PGtkObject(ClipboardWidget),'selection_received',
TGTKSignalFunc(@ClipboardSelectionReceivedHandler),0); TGTKSignalFunc(@ClipboardSelectionReceivedHandler),GtkNil);
g_signal_connect(PGtkObject(ClipboardWidget),'selection_get', g_signal_connect(PGtkObject(ClipboardWidget),'selection_get',
TGTKSignalFunc(@ClipboardSelectionRequestHandler),0); TGTKSignalFunc(@ClipboardSelectionRequestHandler),GtkNil);
g_signal_connect(PGtkObject(ClipboardWidget),'selection_clear_event', g_signal_connect(PGtkObject(ClipboardWidget),'selection_clear_event',
TGTKSignalFunc(@ClipboardSelectionLostOwnershipHandler),0); TGTKSignalFunc(@ClipboardSelectionLostOwnershipHandler),GtkNil);
// add all supported targets for all clipboard types // add all supported targets for all clipboard types
for c:=Low(TClipboardType) to High(TClipboardType) do begin for c:=Low(TClipboardType) to High(TClipboardType) do begin
if (ClipboardTargetEntries[c]<>nil) then begin if (ClipboardTargetEntries[c]<>nil) then begin
@ -8465,6 +8465,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.441 2003/12/16 14:01:27 mattias
fixed compilation gtk and fpc 1.9
Revision 1.440 2003/11/30 18:35:19 mattias Revision 1.440 2003/11/30 18:35:19 mattias
fixed fpc 1.9.1 warns fixed fpc 1.9.1 warns

4
lcl/lresources.pp
View File

@ -68,7 +68,7 @@ procedure BinaryToLazarusResourceCode(BinStream, ResStream: TStream;
const ResourceName, ResourceType: String); const ResourceName, ResourceType: String);
function LFMtoLRSfile(const LFMfilename: string): boolean; function LFMtoLRSfile(const LFMfilename: string): boolean;
// returns true if successful // returns true if successful
function LFMtoLRSstream(LFMStream, LFCStream: TStream): boolean; function LFMtoLRSstream(LFMStream, LRSStream: TStream): boolean;
// returns true if successful // returns true if successful
function FindLFMClassName(LFMStream: TStream):AnsiString; function FindLFMClassName(LFMStream: TStream):AnsiString;
function CreateLFMFile(AComponent: TComponent; LFMStream: TStream): integer; function CreateLFMFile(AComponent: TComponent; LFMStream: TStream): integer;
@ -252,7 +252,7 @@ begin
end; end;
end; end;
function LFMtoLRSstream(LFMStream,LRSStream:TStream):boolean; function LFMtoLRSstream(LFMStream, LRSStream: TStream):boolean;
// returns true if successful // returns true if successful
var FormClassName:ansistring; var FormClassName:ansistring;
BinStream:TMemoryStream; BinStream:TMemoryStream;