From e4411fa77d0adaffaf06dfcb9944714e06a70a40 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 23 Sep 2005 18:08:56 +0000
Subject: [PATCH] fixed jumping to bookmark via popupmenu

git-svn-id: trunk@7797 -
---
 ide/uniteditor.pp       | 14 ++++++------
 packager/pkgmanager.pas | 48 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp
index ba37a4009f..fb776c52ba 100644
--- a/ide/uniteditor.pp
+++ b/ide/uniteditor.pp
@@ -4296,10 +4296,10 @@ end;
 Procedure TSourceNotebook.BookMarkGotoClicked(Sender: TObject);
 // popup menu goto bookmark clicked
 var
-  MenuItem: TMenuItem;
+  MenuItem: TIDEMenuItem;
 Begin
-  MenuItem := TMenuItem(sender);
-  GotoBookMark(MenuItem.MenuIndex);
+  MenuItem := Sender as TIDEMenuItem;
+  GotoBookMark(MenuItem.SectionIndex);
 end;
 
 Procedure TSourceNotebook.ReadOnlyClicked(Sender: TObject);
@@ -4362,12 +4362,12 @@ end;
 
 Procedure TSourceNotebook.ToggleLineNumbersClicked(Sender: TObject);
 var
-  MenuITem: TMenuItem;
+  MenuITem: TIDEMenuCommand;
   ActEdit:TSourceEditor;
   i: integer;
   ShowLineNumbers: boolean;
 begin
-  MenuItem := TMenuITem(Sender);
+  MenuItem := Sender as TIDEMenuCommand;
   ActEdit:=GetActiveSE;
   MenuItem.Checked := not(ActEdit.EditorComponent.Gutter.ShowLineNumbers);
   ShowLineNumbers:=MenuItem.Checked;
@@ -4415,10 +4415,10 @@ end;
 
 Procedure TSourceNotebook.BookMarkToggle(Value: Integer);
 var
-  MenuItem: TMenuItem;
+  MenuItem: TIDEMenuCommand;
   ActEdit,AnEdit:TSourceEditor;
 Begin
-  MenuItem := SrcEditSubMenuSetBookmarks.Items[Value].MenuItem;
+  MenuItem := SrcEditSubMenuSetBookmarks.Items[Value] as TIDEMenuCommand;
   MenuItem.Checked := not MenuItem.Checked;
   ActEdit:=GetActiveSE;
 
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index 517c2e6b2d..07cde25847 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -1172,9 +1172,55 @@ begin
 end;
 
 function TPkgManager.DoWriteMakefile(APackage: TLazPackage): TModalResult;
+var
+  s: String;
+  e: Char;
 begin
   Result:=mrCancel;
-  
+  s:='';
+  e:=LineEnding;
+  s:=s+'#   Makefile.fpc for '+APackage.IDAsString+e;
+  s:=s+''+e;
+  s:=s+'[package]'+e;
+  s:=s+'name='+lowercase(APackage.Name)+e;
+  s:=s+'version='+APackage.Version.AsString+e;
+  s:=s+''+e;
+  s:=s+'[compiler]'+e;
+  s:=s+'unittargetdir='+APackage.CompilerOptions.GetUnitOutPath(true)+e;
+  s:=s+'unitdir='+APackage.CompilerOptions.GetUnitPath(true)+e;
+  s:=s+'options=-gl'+e; // ToDo do the other options
+  s:=s+''+e;
+  s:=s+'[target]'+e;
+  s:=s+'units='+e;
+  s:=s+'implicitunits=syntextdrawer syneditkeycmds synedittypes syneditstrconst \'+e;
+  s:=s+'  syneditsearch syneditmiscprocs syneditmiscclasses synedittextbuffer \'+e;
+  s:=s+'  synedit synedithighlighter synhighlightermulti synregexpr synexporthtml \'+e;
+  s:=s+'  syneditexport synmemo synmacrorecorder syneditplugins syneditregexsearch \'+e;
+  s:=s+'  synhighlighterposition synhighlighterjava synhighlightercss \'+e;
+  s:=s+'  synhighlighterphp synhighlightertex synhighlighterhashentries \'+e;
+  s:=s+'  synhighlightersql'+e;
+  s:=s+''+e;
+  s:=s+'[require]'+e;
+  s:=s+'# Adding lcl does not work, because it adds the source path.'+e;
+  s:=s+'#packages=lcl'+e;
+  s:=s+'packages=fcl regexpr'+e;
+  s:=s+''+e;
+  s:=s+'[default]'+e;
+  s:=s+'#lcldir=../../lcl'+e;
+  s:=s+''+e;
+  s:=s+'[clean]'+e;
+  s:=s+'files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \'+e;
+  s:=s+'      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \'+e;
+  s:=s+'      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \'+e;
+  s:=s+'      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))'+e;
+  s:=s+''+e;
+  s:=s+'[rules]'+e;
+  s:=s+'.PHONY: cleartarget all'+e;
+  s:=s+''+e;
+  s:=s+'cleartarget:'+e;
+  s:=s+'        -$(DEL) $(COMPILER_UNITTARGETDIR)/allsyneditunits$(PPUEXT)'+e;
+  s:=s+''+e;
+  s:=s+'all: cleartarget $(COMPILER_UNITTARGETDIR) allsyneditunits$(PPUEXT)'+e;
 end;
 
 function TPkgManager.CompileRequiredPackages(APackage: TLazPackage;