Small fix for screenshot taking on carbon and removes carbon clistbox.

git-svn-id: trunk@14230 -
This commit is contained in:
sekelsenmat 2008-02-22 09:46:02 +00:00
parent 238ef21fad
commit d8d0de7c0e
5 changed files with 3 additions and 68 deletions

1
.gitattributes vendored
View File

@ -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/carbonwsbuttons.pp svneol=native#text/pascal
lcl/interfaces/carbon/carbonwscalendar.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/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/carbonwscomctrls.pp svneol=native#text/pascal
lcl/interfaces/carbon/carbonwscontrols.pp svneol=native#text/pascal lcl/interfaces/carbon/carbonwscontrols.pp svneol=native#text/pascal
lcl/interfaces/carbon/carbonwsdbctrls.pp svneol=native#text/pascal lcl/interfaces/carbon/carbonwsdbctrls.pp svneol=native#text/pascal

View File

@ -2088,7 +2088,7 @@ Processor specific options:
switches := switches + ' ' + ConvertOptionsToCmdLine(' ','-k', InhLinkerOpts); switches := switches + ' ' + ConvertOptionsToCmdLine(' ','-k', InhLinkerOpts);
end; end;
// add Linker options for wigdet set // add Linker options for widgetset
if not (ccloNoLinkerOpts in Flags) then if not (ccloNoLinkerOpts in Flags) then
begin begin
LinkerAddition := LCLWidgetLinkerAddition[DirNameToLCLPlatform(GetEffectiveLCLWidgetType)]; LinkerAddition := LCLWidgetLinkerAddition[DirNameToLCLPlatform(GetEffectiveLCLWidgetType)];

View File

@ -143,7 +143,6 @@ uses
CarbonWSButtons, CarbonWSButtons,
// CarbonWSCalendar, // CarbonWSCalendar,
CarbonWSCheckLst, CarbonWSCheckLst,
// CarbonWSCListBox,
CarbonWSComCtrls, CarbonWSComCtrls,
CarbonWSControls, CarbonWSControls,
// CarbonWSDbCtrls, // CarbonWSDbCtrls,
@ -170,7 +169,7 @@ uses
CarbonThemes, CarbonCanvas, CarbonStrings, CarbonClipboard, CarbonCaret, CarbonThemes, CarbonCanvas, CarbonStrings, CarbonClipboard, CarbonCaret,
CarbonProc, CarbonDbgConsts, CarbonUtils, CarbonProc, CarbonDbgConsts, CarbonUtils,
Buttons, StdCtrls, PairSplitter, ComCtrls, CListBox, Calendar, Arrow, Buttons, StdCtrls, PairSplitter, ComCtrls, Calendar, Arrow,
Spin, ExtCtrls, FileCtrl, LResources; Spin, ExtCtrls, FileCtrl, LResources;
// the implementation of the utility methods // the implementation of the utility methods

View File

@ -729,7 +729,7 @@ begin
8, // bits per component 8, // bits per component
bitmapBytesPerRow, bitmapBytesPerRow,
colorSpace, colorSpace,
kCGImageAlphaFirst); kCGImageAlphaNoneSkipFirst); // The function fails with kCGImageAlphaFirst
if (context = nil) then if (context = nil) then
begin begin
System.FreeMem(bitmapData); System.FreeMem(bitmapData);

View File

@ -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.