Browse Source

* fix Previous Help Topic

pierre 24 years ago
parent
commit
d1c220f87d
7 changed files with 41 additions and 23 deletions
  1. 7 4
      ide/whelp.pas
  2. 8 5
      ide/whtmlhlp.pas
  3. 6 3
      ide/wnghelp.pas
  4. 2 2
      ide/woahelp.pas
  5. 6 3
      ide/wos2help.pas
  6. 6 3
      ide/wvphelp.pas
  7. 6 3
      ide/wwinhelp.pas

+ 7 - 4
ide/whelp.pas

@@ -144,7 +144,7 @@ type
         function  SearchTopicOwner(SourceFileID: word; Context: THelpCtx): PHelpFile;
       end;
 
-      THelpFileOpenProc = function(const FileName,Param: string): PHelpFile;
+      THelpFileOpenProc = function(const FileName,Param: string;Index : longint): PHelpFile;
 
       PHelpFileType = ^THelpFileType;
       THelpFileType = record
@@ -649,7 +649,7 @@ begin
   for I:=0 to GetHelpFileTypeCount-1 do
   begin
     GetHelpFileType(I,HT);
-    H:=HT.OpenProc(FileName,Param);
+    H:=HT.OpenProc(FileName,Param,LastID+1);
     if Assigned(H) then
       Break;
   end;
@@ -665,7 +665,7 @@ begin
     begin
       HelpFiles^.Insert(H);
       Inc(LastID);
-      H^.ID:=LastID;
+      { H^.ID:=LastID; now already set by OpenProc PM }
     end;
   AddHelpFile:=H<>nil;
 end;
@@ -853,7 +853,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:25  peter
+  Revision 1.2  2001-09-18 11:33:53  pierre
+   * fix Previous Help Topic
+
+  Revision 1.1  2001/08/04 11:30:25  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.6  2001/03/20 00:20:44  pierre

+ 8 - 5
ide/whtmlhlp.pas

@@ -882,21 +882,21 @@ begin
   LoadIndex:=OK;
 end;
 
-function CreateProcHTML(const FileName,Param: string): PHelpFile; {$ifndef FPC}far;{$endif}
+function CreateProcHTML(const FileName,Param: string;Index : longint): PHelpFile; {$ifndef FPC}far;{$endif}
 var H: PHelpFile;
 begin
   H:=nil;
   if CompareText(copy(ExtOf(FileName),1,length(extHTML)),extHTML)=0 then
-    H:=New(PHTMLHelpFile, Init(FileName,0,Param));
+    H:=New(PHTMLHelpFile, Init(FileName,Index,Param));
   CreateProcHTML:=H;
 end;
 
-function CreateProcHTMLIndex(const FileName,Param: string): PHelpFile; {$ifndef FPC}far;{$endif}
+function CreateProcHTMLIndex(const FileName,Param: string;Index : longint): PHelpFile; {$ifndef FPC}far;{$endif}
 var H: PHelpFile;
 begin
   H:=nil;
   if CompareText(ExtOf(FileName),extHTMLIndex)=0 then
-    H:=New(PHTMLIndexHelpFile, Init(FileName,0));
+    H:=New(PHTMLIndexHelpFile, Init(FileName,Index));
   CreateProcHTMLIndex:=H;
 end;
 
@@ -910,7 +910,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:25  peter
+  Revision 1.2  2001-09-18 11:33:53  pierre
+   * fix Previous Help Topic
+
+  Revision 1.1  2001/08/04 11:30:25  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.6  2001/06/07 16:41:14  jonas

+ 6 - 3
ide/wnghelp.pas

@@ -507,9 +507,9 @@ begin
   inherited Done;
 end;
 
-function CreateProc(const FileName,Param: string): PHelpFile; {$ifndef FPC}far;{$endif}
+function CreateProc(const FileName,Param: string;Index : longint): PHelpFile; {$ifndef FPC}far;{$endif}
 begin
-  CreateProc:=New(PNGHelpFile, Init(FileName,0));
+  CreateProc:=New(PNGHelpFile, Init(FileName,Index));
 end;
 
 procedure RegisterHelpType;
@@ -520,7 +520,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:26  peter
+  Revision 1.2  2001-09-18 11:33:54  pierre
+   * fix Previous Help Topic
+
+  Revision 1.1  2001/08/04 11:30:26  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.3  2001/06/07 16:41:14  jonas

+ 2 - 2
ide/woahelp.pas

@@ -544,9 +544,9 @@ begin
   inherited Done;
 end;
 
-function CreateProc(const FileName,Param: string): PHelpFile; {$ifndef FPC}far;{$endif}
+function CreateProc(const FileName,Param: string;Index : longint): PHelpFile; {$ifndef FPC}far;{$endif}
 begin
-  CreateProc:=New(POAHelpFile, Init(FileName,0));
+  CreateProc:=New(POAHelpFile, Init(FileName,Index));
 end;
 
 procedure RegisterHelpType;

+ 6 - 3
ide/wos2help.pas

@@ -601,9 +601,9 @@ begin
   inherited Done;
 end;
 
-function CreateProc(const FileName,Param: string): PHelpFile; {$ifndef FPC}far;{$endif}
+function CreateProc(const FileName,Param: string;Index : longint): PHelpFile; {$ifndef FPC}far;{$endif}
 begin
-  CreateProc:=New(POS2HelpFile, Init(FileName,0));
+  CreateProc:=New(POS2HelpFile, Init(FileName,Index));
 end;
 
 procedure RegisterHelpType;
@@ -614,7 +614,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:26  peter
+  Revision 1.2  2001-09-18 11:33:54  pierre
+   * fix Previous Help Topic
+
+  Revision 1.1  2001/08/04 11:30:26  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.3  2001/06/07 16:41:15  jonas

+ 6 - 3
ide/wvphelp.pas

@@ -170,9 +170,9 @@ begin
   inherited Done;
 end;
 
-function CreateProc(const FileName,Param: string): PHelpFile; {$ifndef FPC}far;{$endif}
+function CreateProc(const FileName,Param: string;Index : longint): PHelpFile; {$ifndef FPC}far;{$endif}
 begin
-  CreateProc:=New(PVPHHelpFile, Init(FileName,0));
+  CreateProc:=New(PVPHHelpFile, Init(FileName,Index));
 end;
 
 procedure RegisterHelpType;
@@ -183,7 +183,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:26  peter
+  Revision 1.2  2001-09-18 11:33:54  pierre
+   * fix Previous Help Topic
+
+  Revision 1.1  2001/08/04 11:30:26  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.2  2001/06/07 16:41:15  jonas

+ 6 - 3
ide/wwinhelp.pas

@@ -1664,9 +1664,9 @@ begin
   inherited Done;
 end;
 
-function CreateProc(const FileName,Param: string): PHelpFile; {$ifndef FPC}far;{$endif}
+function CreateProc(const FileName,Param: string;Index : longint): PHelpFile; {$ifndef FPC}far;{$endif}
 begin
-  CreateProc:=New(PWinHelpFile, Init(FileName,0));
+  CreateProc:=New(PWinHelpFile, Init(FileName,Index));
 end;
 
 procedure RegisterHelpType;
@@ -1677,7 +1677,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:26  peter
+  Revision 1.2  2001-09-18 11:33:54  pierre
+   * fix Previous Help Topic
+
+  Revision 1.1  2001/08/04 11:30:26  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.2  2000/11/27 12:06:52  pierre