diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2014-03-26 03:46:53 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2014-03-26 03:46:53 +0000 |
| commit | 0e4ff13b2a31cfc0ae4a820f4b385f3b38335c66 (patch) | |
| tree | cb457a98e49a720555ec654e23377110652f8e37 /editors | |
| parent | 79095ad0305331a838141f3c851ed00cdb974d93 (diff) | |
| download | ports-0e4ff13b2a31cfc0ae4a820f4b385f3b38335c66.tar.gz ports-0e4ff13b2a31cfc0ae4a820f4b385f3b38335c66.zip | |
- Add new patch files. It fix a problem when qt or carbon is used like main
interface
Notes
Notes:
svn path=/head/; revision=349221
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp | 31 | ||||
| -rw-r--r-- | editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp | 11 |
2 files changed, 42 insertions, 0 deletions
diff --git a/editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp b/editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp new file mode 100644 index 000000000000..98a2eb24a39d --- /dev/null +++ b/editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp @@ -0,0 +1,31 @@ +--- lcl/interfaces/carbon/carbonstrings.pp 2014-03-25 21:13:32.000000000 -0500 ++++ lcl/interfaces/carbon/carbonstrings.pp 2014-03-25 21:15:20.000000000 -0500 +@@ -18,6 +18,10 @@ + // defines + {$I carbondefines.inc} + ++{$if (FPC_FULLVERSION>=20701) OR (FPC_FULLVERSION>=20603)} ++{$define HAS_INHERITED_INSERTITEM} ++{$endif} ++ + uses + // rtl+ftl + Classes, SysUtils, +@@ -34,7 +38,7 @@ + FOwner: TCarbonComboBox; // Carbon combo box control owning strings + protected + procedure Put(Index: Integer; const S: string); override; +- {$IF FPC_FULLVERSION<20701} ++ {$IFNDEF HAS_INHERITED_INSERTITEM} + // before fpc 2.7.1 InsertItem(Index,S) did not call InsertItem(Index,S,nil) + procedure InsertItem(Index: Integer; const S: string); override; + {$ENDIF} +@@ -113,7 +117,7 @@ + FOwner.Insert(Index, S); + end; + +-{$IF FPC_FULLVERSION<20701} ++{$IFNDEF HAS_INHERITED_INSERTITEM} + {------------------------------------------------------------------------------ + Method: TCarbonComboBoxStrings.InsertItem + Params: Index - Line index diff --git a/editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp b/editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp new file mode 100644 index 000000000000..ced64075c484 --- /dev/null +++ b/editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp @@ -0,0 +1,11 @@ +--- lcl/interfaces/qt/qtprivate.pp 2014-03-25 21:10:58.000000000 -0500 ++++ lcl/interfaces/qt/qtprivate.pp 2014-03-25 21:12:20.000000000 -0500 +@@ -23,7 +23,7 @@ + + // todo: check if build macros can handle this and define it + // in package LCL instead (it's needed for several widgetsets) +-{$if (FPC_FULLVERSION>=20701)} ++{$if (FPC_FULLVERSION>=20701) OR (FPC_FULLVERSION=20603)} + {$define HAS_INHERITED_INSERTITEM} + {$endif} + |