diff --git a/.gitattributes b/.gitattributes index 3321b4807e..c7729db347 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2944,7 +2944,6 @@ lcl/interfaces/carbon/carbonwsarrow.pp svneol=native#text/pascal lcl/interfaces/carbon/carbonwsbuttons.pp svneol=native#text/pascal lcl/interfaces/carbon/carbonwscalendar.pp svneol=native#text/pascal lcl/interfaces/carbon/carbonwschecklst.pp svneol=native#text/pascal -lcl/interfaces/carbon/carbonwsclistbox.pp svneol=native#text/pascal lcl/interfaces/carbon/carbonwscomctrls.pp svneol=native#text/pascal lcl/interfaces/carbon/carbonwscontrols.pp svneol=native#text/pascal lcl/interfaces/carbon/carbonwsdbctrls.pp svneol=native#text/pascal diff --git a/ide/compileroptions.pp b/ide/compileroptions.pp index 8acd6a9ae7..f4f3624274 100644 --- a/ide/compileroptions.pp +++ b/ide/compileroptions.pp @@ -2088,7 +2088,7 @@ Processor specific options: switches := switches + ' ' + ConvertOptionsToCmdLine(' ','-k', InhLinkerOpts); end; - // add Linker options for wigdet set + // add Linker options for widgetset if not (ccloNoLinkerOpts in Flags) then begin LinkerAddition := LCLWidgetLinkerAddition[DirNameToLCLPlatform(GetEffectiveLCLWidgetType)]; diff --git a/lcl/interfaces/carbon/carbonint.pas b/lcl/interfaces/carbon/carbonint.pas index 591cbc1897..d25151ac06 100644 --- a/lcl/interfaces/carbon/carbonint.pas +++ b/lcl/interfaces/carbon/carbonint.pas @@ -143,7 +143,6 @@ uses CarbonWSButtons, // CarbonWSCalendar, CarbonWSCheckLst, -// CarbonWSCListBox, CarbonWSComCtrls, CarbonWSControls, // CarbonWSDbCtrls, @@ -170,7 +169,7 @@ uses CarbonThemes, CarbonCanvas, CarbonStrings, CarbonClipboard, CarbonCaret, CarbonProc, CarbonDbgConsts, CarbonUtils, - Buttons, StdCtrls, PairSplitter, ComCtrls, CListBox, Calendar, Arrow, + Buttons, StdCtrls, PairSplitter, ComCtrls, Calendar, Arrow, Spin, ExtCtrls, FileCtrl, LResources; // the implementation of the utility methods diff --git a/lcl/interfaces/carbon/carbonobject.inc b/lcl/interfaces/carbon/carbonobject.inc index dbc4c71ff2..69467c7cc5 100644 --- a/lcl/interfaces/carbon/carbonobject.inc +++ b/lcl/interfaces/carbon/carbonobject.inc @@ -729,7 +729,7 @@ begin 8, // bits per component bitmapBytesPerRow, colorSpace, - kCGImageAlphaFirst); + kCGImageAlphaNoneSkipFirst); // The function fails with kCGImageAlphaFirst if (context = nil) then begin System.FreeMem(bitmapData); diff --git a/lcl/interfaces/carbon/carbonwsclistbox.pp b/lcl/interfaces/carbon/carbonwsclistbox.pp deleted file mode 100644 index 8857818fb8..0000000000 --- a/lcl/interfaces/carbon/carbonwsclistbox.pp +++ /dev/null @@ -1,63 +0,0 @@ -{ $Id$} -{ - ***************************************************************************** - * CarbonWSCListBox.pp * - * --------------- * - * * - * * - ***************************************************************************** - - ***************************************************************************** - * * - * This file is part of the Lazarus Component Library (LCL) * - * * - * See the file COPYING.modifiedLGPL, included in this distribution, * - * for details about the copyright. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * * - ***************************************************************************** -} -unit CarbonWSCListBox; - -{$mode objfpc}{$H+} - -interface - -uses -//////////////////////////////////////////////////// -// I M P O R T A N T -//////////////////////////////////////////////////// -// To get as little as posible circles, -// uncomment only when needed for registration -//////////////////////////////////////////////////// -// CListBox, -//////////////////////////////////////////////////// - WSCListBox, WSLCLClasses; - -type - - { TCarbonWSCListBox } - - TCarbonWSCListBox = class(TWSCListBox) - private - protected - public - end; - - -implementation - -initialization - -//////////////////////////////////////////////////// -// I M P O R T A N T -//////////////////////////////////////////////////// -// To improve speed, register only classes -// which actually implement something -//////////////////////////////////////////////////// -// RegisterWSComponent(TCListBox, TCarbonWSCListBox); -//////////////////////////////////////////////////// -end. \ No newline at end of file