fixed compilation of ipro

git-svn-id: trunk@6112 -
2025-11-04 15:49:32 +01:00 · 2004-10-04 09:36:23 +00:00 · 2004-10-04 09:36:23 +00:00 · 82eee573aa
commit 82eee573aa
parent a690fc37d1
4 changed files with 162 additions and 41 deletions
--- a/components/turbopower_ipro/iphtml.pas
+++ b/components/turbopower_ipro/iphtml.pas
@ -2940,9 +2940,7 @@ const
 procedure THtmlRadioButton.CreateWnd;
 begin
  inherited CreateWnd;
-  {$IFDEF IP_LAZARUS}
-  CNSendMessage(LM_SetValue,Self,@CheckStates[FChecked]);
-  {$ELSE}
+  {$IFNDEF IP_LAZARUS}
  SendMessage(Handle, BM_SETCHECK, Integer(FChecked), 0);
  {$ENDIF}
 end;
@ -2953,6 +2951,11 @@ begin
 end;

 procedure THtmlRadioButton.SetChecked(Value: Boolean);
+{$IFDEF IP_LAZARUS}
+begin
+  inherited SetChecked(Value);
+end;
+{$ELSE IP_LAZARUS}

  procedure TurnSiblingsOff;
  var
@ -2976,11 +2979,7 @@ begin
    FChecked := Value;
    TabStop := Value;
    if HandleAllocated then
-      {$IFDEF IP_LAZARUS}
-      CNSendMessage(LM_SetValue,Self,@CheckStates[FChecked]);
-      {$ELSE}
      SendMessage(Handle, BM_SETCHECK, Integer(FChecked), 0);
-      {$ENDIF}
    if Value then begin
      TurnSiblingsOff;
      inherited Changed;
@ -2989,6 +2988,8 @@ begin
    end;
  end;
 end;
+{$ENDIF IP_LAZARUS}
+
 {$ENDIF}


@ -17186,7 +17187,7 @@ end;

 procedure TIpHtmlCustomPanel.WMGetDlgCode(var Msg: TMessage);
 begin
-  { we want 'em all!}
+  { we want 'em all!  For Lazarus: Then use OnKeyDown }
  Msg.Result := DLGC_WANTALLKEYS +
                DLGC_WANTARROWS +
                DLGC_WANTCHARS +
@ -17591,6 +17592,9 @@ initialization
  InitScrollProcs;
 {
  $Log$
+  Revision 1.16  2004/10/04 09:36:22  mattias
+  fixed compilation of ipro
+
  Revision 1.15  2004/08/30 16:02:17  mattias
  started project interface

--- a/components/turbopower_ipro/ipstrms.pas
+++ b/components/turbopower_ipro/ipstrms.pas
@ -381,14 +381,16 @@ end;
 {-----------------------------------------------------------------------------}

 procedure TIpMemMapStream.OpenFile;
+{$IFDEF IP_LAZARUS}
+begin
+  writeln('TIpMemMapStream.OpenFile ToDo');
+end;
+{$ELSE}
 var
  CreateMode,
  Flags,
  OpenMode : DWORD;
 begin
-  {$IFDEF IP_LAZARUS}
-  writeln('TIpMemMapStream.OpenFile ToDo');
-  {$ELSE}

  { Check requirements. }
  CheckFileName;
@ -422,21 +424,23 @@ begin
    { Raise exception. }
    raise EIpBaseException.Create(SysErrorMessage(GetLastError) + SFilename +
                                  mmFileName);
-  {$ENDIF}
 end;
+{$ENDIF}

 {-----------------------------------------------------------------------------}

 procedure TIpMemMapStream.OpenMap;
+{$IFDEF IP_LAZARUS}
+begin
+  writeln('TIpMemMapStream.OpenMap ToDo');
+end;
+{$ELSE}
 var
  AccessMode,
  ProtectMode,
  SizeHigh : DWORD;
  Size : DWORD;
 begin
-  {$IFDEF IP_LAZARUS}
-  writeln('TIpMemMapStream.OpenMap ToDo');
-  {$ELSE}
  { If this was an existing file then get the size of the file. }
  if mmFileExists then begin
    SizeHigh := 0;
@ -473,8 +477,8 @@ begin
    raise EIpBaseException.Create(SysErrorMessage(GetLastError) + SFilename +
                                  mmFileName);
  mmPos := 0;
-  {$ENDIF}
 end;
+{$ENDIF}

 {-----------------------------------------------------------------------------}

@ -1617,21 +1621,23 @@ begin
 end;

 function TIpDownloadFileStream.Read(var Buffer; Count : Longint) : Longint;
+{$IFDEF IP_LAZARUS}
+begin
+  writeln('ToDo: TIpDownloadFileStream.Read ');
+  Result:=0;
+end;
+{$ELSE}
 var
  ReadOK : Bool;
 begin
-  {$IFDEF IP_LAZARUS}
-  writeln('ToDo: TIpDownloadFileStream.Read ');
-  Result:=0;
-  {$ELSE}
  ReadOK := ReadFile(Handle, Buffer, Count, DWord(Result), nil);

  if not ReadOK then begin
    raise EIpBaseException.Create(SysErrorMessage(GetLastError) + SFilename + FFileName);
    Result := 0;
  end;
-  {$ENDIF}
 end;
+{$ENDIF}

 procedure TIpDownloadFileStream.Rename(aNewName : string);
 var
@ -1724,21 +1730,23 @@ begin
 end;

 function TIpDownloadFileStream.Write(const Buffer; Count : Longint) : Longint;
+{$IFDEF IP_LAZARUS}
+begin
+  writeln('ToDo: TIpDownloadFileStream.Write');
+  Result:=Count;
+end;
+{$ELSE}
 var
  WriteOK : Bool;
 begin
-  {$IFDEF IP_LAZARUS}
-  writeln('ToDo: TIpDownloadFileStream.Write');
-  Result:=Count;
-  {$ELSE}
  WriteOK := WriteFile(Handle, Buffer, Count, DWord(Result), nil);

  if not WriteOK then begin
    raise EIpBaseException.Create(SysErrorMessage(GetLastError) + SFilename + FFileName);
    Result := 0
  end;
-  {$ENDIF}
 end;
+{$ENDIF}


 { TIpByteStream }
@ -1780,6 +1788,9 @@ end;

 {
  $Log$
+  Revision 1.4  2004/10/04 09:36:23  mattias
+  fixed compilation of ipro
+
  Revision 1.3  2004/02/04 22:17:59  mattias
  TipHtmlPanel can now show fpdoc html output

--- a/components/turbopower_ipro/iputils.pas
+++ b/components/turbopower_ipro/iputils.pas
@ -41,7 +41,7 @@ uses
  GraphType,
  LCLIntf,
  LMessages,
-  FileCtrl,
+  FileUtil,
  {$ELSE}
  Messages,
  Windows,
@ -504,19 +504,19 @@ end;
 { Returns True if a given address is a Class B address }
 function InClassB(Addr : LongInt) : Boolean;
 begin
-  Result := (Addr and $C0000000) = $80000000;
+  Result := (Cardinal(Addr) and $C0000000) = $80000000;
 end;

 { Returns True if a given address is a Class C address }
 function InClassC(Addr : LongInt) : Boolean;
 begin
-  Result := (Addr and $E0000000) = $C0000000;
+  Result := (Cardinal(Addr) and $E0000000) = $C0000000;
 end;

 { Returns True if a given address is a Class D address }
 function InClassD(Addr : LongInt) : Boolean;
 begin
-  Result := (Addr and $F0000000) = $E0000000;
+  Result := (Cardinal(Addr) and $F0000000) = $E0000000;
 end;

 { Returns True if a given address is a multicast address }
@ -2686,7 +2686,7 @@ end;
 function GetTemporaryFile(const Path : string) : string;
 {$IFDEF IP_LAZARUS}
 begin
-  Result:=FileCtrl.GetTempFileName(Path,'IP_');
+  Result:=FileUtil.GetTempFileName(Path,'IP_');
 end;
 {$ELSE}
 var
--- a/examples/turbopower_ipro/tpiproexample.lpi
+++ b/examples/turbopower_ipro/tpiproexample.lpi
@ -1,20 +1,73 @@
 <?xml version="1.0"?>
 <CONFIG>
  <ProjectOptions>
-    <Version Value="3"/>
+    <Version Value="5"/>
    <General>
-      <ProjectType Value="Application"/>
-      <Flags>
-        <SaveClosedFiles Value="False"/>
-        <SaveOnlyProjectUnits Value="True"/>
-      </Flags>
      <MainUnit Value="0"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <ActiveEditorIndexAtStart Value="3"/>
      <IconPath Value="./"/>
      <TargetFileExt Value=""/>
      <Title Value="tpiproexample"/>
    </General>
-    <Units Count="3">
+    <JumpHistory Count="14" HistoryIndex="9">
+      <Position1>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/iputils.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position1>
+      <Position2>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/iputils.pas"/>
+        <Caret Line="2672" Column="11" TopLine="2648"/>
+      </Position2>
+      <Position3>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/iputils.pas"/>
+        <Caret Line="44" Column="11" TopLine="1"/>
+      </Position3>
+      <Position4>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/iphtml.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position4>
+      <Position5>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/iputils.pas"/>
+        <Caret Line="2689" Column="19" TopLine="2667"/>
+      </Position5>
+      <Position6>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/ipstrms.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position6>
+      <Position7>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/ipstrms.pas"/>
+        <Caret Line="428" Column="1" TopLine="390"/>
+      </Position7>
+      <Position8>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/ipstrms.pas"/>
+        <Caret Line="387" Column="3" TopLine="365"/>
+      </Position8>
+      <Position9>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/ipstrms.pas"/>
+        <Caret Line="481" Column="1" TopLine="438"/>
+      </Position9>
+      <Position10>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/ipstrms.pas"/>
+        <Caret Line="433" Column="3" TopLine="411"/>
+      </Position10>
+      <Position11>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/iphtml.pas"/>
+        <Caret Line="2944" Column="3" TopLine="2920"/>
+      </Position11>
+      <Position12>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/iphtml.pas"/>
+        <Caret Line="17646" Column="33" TopLine="17607"/>
+      </Position12>
+      <Position13>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/ipstrms.pas"/>
+        <Caret Line="434" Column="3" TopLine="412"/>
+      </Position13>
+      <Position14>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/iphtml.pas"/>
+        <Caret Line="16503" Column="1" TopLine="16503"/>
+      </Position14>
+    </JumpHistory>
+    <Units Count="9">
      <Unit0>
        <CursorPos X="5" Y="6"/>
        <Filename Value="tpiproexample.lpr"/>
@ -24,14 +77,14 @@
        <UsageCount Value="25"/>
      </Unit0>
      <Unit1>
-        <CursorPos X="15" Y="81"/>
+        <CursorPos X="11" Y="72"/>
        <EditorIndex Value="0"/>
        <Filename Value="mainunit.pas"/>
        <ComponentName Value="MainForm"/>
        <IsPartOfProject Value="True"/>
        <Loaded Value="True"/>
        <ResourceFilename Value="mainunit.lrs"/>
-        <TopLine Value="54"/>
+        <TopLine Value="51"/>
        <UnitName Value="MainUnit"/>
        <UsageCount Value="25"/>
      </Unit1>
@ -43,6 +96,59 @@
        <TopLine Value="1"/>
        <UsageCount Value="25"/>
      </Unit2>
+      <Unit3>
+        <CursorPos X="28" Y="519"/>
+        <EditorIndex Value="1"/>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/iputils.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="485"/>
+        <UnitName Value="IpUtils"/>
+        <UsageCount Value="10"/>
+      </Unit3>
+      <Unit4>
+        <CursorPos X="1" Y="29"/>
+        <EditorIndex Value="6"/>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/lcl/fileutil.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="1"/>
+        <UnitName Value="FileUtil"/>
+        <UsageCount Value="10"/>
+      </Unit4>
+      <Unit5>
+        <CursorPos X="1" Y="2991"/>
+        <EditorIndex Value="3"/>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/iphtml.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="2964"/>
+        <UnitName Value="IpHtml"/>
+        <UsageCount Value="10"/>
+      </Unit5>
+      <Unit6>
+        <CursorPos X="3" Y="434"/>
+        <EditorIndex Value="2"/>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/components/turbopower_ipro/ipstrms.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="412"/>
+        <UnitName Value="IpStrms"/>
+        <UsageCount Value="10"/>
+      </Unit6>
+      <Unit7>
+        <CursorPos X="15" Y="820"/>
+        <EditorIndex Value="4"/>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/lcl/stdctrls.pp"/>
+        <Loaded Value="True"/>
+        <TopLine Value="798"/>
+        <UnitName Value="StdCtrls"/>
+        <UsageCount Value="10"/>
+      </Unit7>
+      <Unit8>
+        <CursorPos X="3" Y="142"/>
+        <EditorIndex Value="5"/>
+        <Filename Value="/home/mattias/pascal/wichtig/lazarus/lcl/include/customcheckbox.inc"/>
+        <Loaded Value="True"/>
+        <TopLine Value="131"/>
+        <UsageCount Value="10"/>
+      </Unit8>
    </Units>
    <PublishOptions>
      <Version Value="2"/>