paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 15:36:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: Remove predefined clipboard format pcfDelphiBitmap (obsolete).

Browse Source 
git-svn-id: trunk@56434 -
This commit is contained in:
wp 2017-11-18 13:18:41 +00:00
parent 30fb8ec20a
commit e9e34f5965
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/include/picture.inc
View File

@ -244,7 +244,7 @@ const
begin
inherited Create;
Add(PredefinedClipboardFormat(pcfBitmap), TBitmap);
Add(PredefinedClipboardFormat(pcfDelphiBitmap), TBitmap);
//Add(PredefinedClipboardFormat(pcfDelphiBitmap), TBitmap);
Add(PredefinedClipboardFormat(pcfPixmap), TPixmap);
//Add(PredefinedClipboardFormat(pcfIcon), TCustomIcon);
Add(ClipboardRegisterFormat(sMimeTypePng), TPortableNetworkGraphic);

4
lcl/include/rasterimage.inc
View File

@ -488,7 +488,7 @@ begin
begin
List.Clear;
List.Add(PredefinedClipboardMimeTypes[pcfBitmap]);
List.Add(PredefinedClipboardMimeTypes[pcfDelphiBitmap]);
//List.Add(PredefinedClipboardMimeTypes[pcfDelphiBitmap]);
List.Add(PredefinedClipboardMimeTypes[pcfPixmap]);
end else
inherited GetSupportedSourceMimeTypes(List);
@ -568,7 +568,7 @@ begin
{$IFDEF VerboseLCLTodos}{$note Make oo}{$ENDIF}
if (ClassType=TBitmap) or (ClassType=TPixmap) or (ClassType=TCustomIcon) then begin
if (AnsiCompareText(AMimeType,PredefinedClipboardMimeTypes[pcfBitmap])=0)
or (AnsiCompareText(AMimeType,PredefinedClipboardMimeTypes[pcfDelphiBitmap])=0)
//or (AnsiCompareText(AMimeType,PredefinedClipboardMimeTypes[pcfDelphiBitmap])=0)
or (AnsiCompareText(AMimeType,PredefinedClipboardMimeTypes[pcfPixmap])=0) then
begin
LoadFromStream(AStream);

4
lcl/interfaces/customdrawn/customdrawnwinapi_win.inc
View File

@ -340,8 +340,8 @@ begin
until (DbgFormatID=0);
Windows.CloseClipboard;
{$ENDIF}
if FormatID=PredefinedClipboardFormat(pcfDelphiBitmap)
then FormatID := CF_BITMAP;
// if FormatID=PredefinedClipboardFormat(pcfDelphiBitmap)
// then FormatID := CF_BITMAP;
if (FormatID=0) or (Stream=nil) or
not Windows.IsClipboardFormatAvailable(FormatID) then exit;

4
lcl/interfaces/win32/win32winapi.inc
View File

@ -407,8 +407,8 @@ begin
until (DbgFormatID=0);
Windows.CloseClipboard;
{$ENDIF}
if FormatID=PredefinedClipboardFormat(pcfDelphiBitmap)
then FormatID := CF_BITMAP;
//if FormatID=PredefinedClipboardFormat(pcfDelphiBitmap)
// then FormatID := CF_BITMAP;
if (FormatID=0) or (Stream=nil) or
not Windows.IsClipboardFormatAvailable(FormatID) then exit;

4
lcl/interfaces/wince/wincewinapi.inc
View File

@ -388,8 +388,8 @@ var
begin
//DebugLn('TWin32WidgetSet.ClipboardGetData - Start');
Result := false;
if FormatID=PredefinedClipboardFormat(pcfDelphiBitmap)
then FormatID := CF_BITMAP;
// if FormatID=PredefinedClipboardFormat(pcfDelphiBitmap)
// then FormatID := CF_BITMAP;
if (FormatID=0) or (Stream=nil) or
not Windows.IsClipboardFormatAvailable(FormatID) then exit;

4
lcl/lcltype.pp
View File

@ -2718,7 +2718,7 @@ type
// Delphi definitions (only for compatibility)
pcfDelphiText,
pcfDelphiBitmap,
// pcfDelphiBitmap,
pcfDelphiPicture,
pcfDelphiMetaFilePict,
pcfDelphiObject,
@ -2744,7 +2744,7 @@ const
// Delphi definitions (only for compatibility)
'text/plain',
'image/delphi.bitmap',
{ 'image/delphi.bitmap', }
'Delphi Picture',
'image/delphi.metafilepict',
'application/delphi.object',