diff --git a/components/codetools/linkscanner.pas b/components/codetools/linkscanner.pas index a9e5fd7ac3..e38271b28d 100644 --- a/components/codetools/linkscanner.pas +++ b/components/codetools/linkscanner.pas @@ -54,7 +54,7 @@ const PascalCompilerDefine = ExternalMacroStart+'Compiler'; NestedCompilerDefine = ExternalMacroStart+'NestedComments'; - MissingIncludeFileCode = 1; + MissingIncludeFileCode = Pointer(1); type TLinkScanner = class; diff --git a/lcl/include/winapi.inc b/lcl/include/winapi.inc index ae87976c45..76e50167cd 100644 --- a/lcl/include/winapi.inc +++ b/lcl/include/winapi.inc @@ -1193,7 +1193,7 @@ end; function ScrollWindow(hWnd: HWND; XAmount, YAmount: Integer; Rect, ClipRect: PRect): Boolean; begin - Result := ScrollWindowEx(hWnd, XAmount, YAmount, Rect, ClipRect, 0, 0, 0); + Result := ScrollWindowEx(hWnd, XAmount, YAmount, Rect, ClipRect, 0, nil, 0); end; {------------------------------------------------------------------------------ @@ -1297,6 +1297,9 @@ end; { ============================================================================= $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 * Splitted winapi*.inc into a winapi and a lcl interface communication part diff --git a/lcl/interfaces/gtk/gtkint.pp b/lcl/interfaces/gtk/gtkint.pp index 31ea71b22d..28dc193d77 100644 --- a/lcl/interfaces/gtk/gtkint.pp +++ b/lcl/interfaces/gtk/gtkint.pp @@ -307,6 +307,9 @@ uses Buttons, StdCtrls, PairSplitter, Math, GTKWinApiWindow, ComCtrls, CListBox, Calendar, Arrow, Spin, CommCtrl, ExtCtrls, FileCtrl, LResources, gtkglobals, gtkproc; + +const + GtkNil = nil; {$I gtklistsl.inc} {$I gtkobject.inc} @@ -401,6 +404,9 @@ end. { ============================================================================= $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 removed menutype.pas diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc index 215272fd31..9d23c9ca81 100644 --- a/lcl/interfaces/gtk/gtkobject.inc +++ b/lcl/interfaces/gtk/gtkobject.inc @@ -5325,8 +5325,8 @@ begin if Handle <> nil then Begin SetLCLObject(Handle, Sender); - gtk_object_set_data(pgtkObject(Handle),'Style',0); - gtk_object_set_data(pgtkObject(Handle),'ExStyle',0); + gtk_object_set_data(pgtkObject(Handle),'Style',GtkNil); + gtk_object_set_data(pgtkObject(Handle),'ExStyle',GtkNil); end; //-------------------------- @@ -8176,7 +8176,7 @@ const CurSelList := CurSelList^.Next; end; 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} writeln(' ClearTargetLists WWW END'); {$ENDIF} @@ -8202,11 +8202,11 @@ begin if ClipboardWidget<>nil then begin // connect widget to all clipboard signals g_signal_connect(PGtkObject(ClipboardWidget),'selection_received', - TGTKSignalFunc(@ClipboardSelectionReceivedHandler),0); + TGTKSignalFunc(@ClipboardSelectionReceivedHandler),GtkNil); g_signal_connect(PGtkObject(ClipboardWidget),'selection_get', - TGTKSignalFunc(@ClipboardSelectionRequestHandler),0); + TGTKSignalFunc(@ClipboardSelectionRequestHandler),GtkNil); g_signal_connect(PGtkObject(ClipboardWidget),'selection_clear_event', - TGTKSignalFunc(@ClipboardSelectionLostOwnershipHandler),0); + TGTKSignalFunc(@ClipboardSelectionLostOwnershipHandler),GtkNil); // add all supported targets for all clipboard types for c:=Low(TClipboardType) to High(TClipboardType) do begin if (ClipboardTargetEntries[c]<>nil) then begin @@ -8465,6 +8465,9 @@ end; { ============================================================================= $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 fixed fpc 1.9.1 warns diff --git a/lcl/lresources.pp b/lcl/lresources.pp index 1f664784c8..8ed5071145 100644 --- a/lcl/lresources.pp +++ b/lcl/lresources.pp @@ -68,7 +68,7 @@ procedure BinaryToLazarusResourceCode(BinStream, ResStream: TStream; const ResourceName, ResourceType: String); function LFMtoLRSfile(const LFMfilename: string): boolean; // returns true if successful -function LFMtoLRSstream(LFMStream, LFCStream: TStream): boolean; +function LFMtoLRSstream(LFMStream, LRSStream: TStream): boolean; // returns true if successful function FindLFMClassName(LFMStream: TStream):AnsiString; function CreateLFMFile(AComponent: TComponent; LFMStream: TStream): integer; @@ -252,7 +252,7 @@ begin end; end; -function LFMtoLRSstream(LFMStream,LRSStream:TStream):boolean; +function LFMtoLRSstream(LFMStream, LRSStream: TStream):boolean; // returns true if successful var FormClassName:ansistring; BinStream:TMemoryStream;