paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 08:00:34 +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 begin
inherited Create; inherited Create;
Add(PredefinedClipboardFormat(pcfBitmap), TBitmap); Add(PredefinedClipboardFormat(pcfBitmap), TBitmap);
Add(PredefinedClipboardFormat(pcfDelphiBitmap), TBitmap); //Add(PredefinedClipboardFormat(pcfDelphiBitmap), TBitmap);
Add(PredefinedClipboardFormat(pcfPixmap), TPixmap); Add(PredefinedClipboardFormat(pcfPixmap), TPixmap);
//Add(PredefinedClipboardFormat(pcfIcon), TCustomIcon); //Add(PredefinedClipboardFormat(pcfIcon), TCustomIcon);
Add(ClipboardRegisterFormat(sMimeTypePng), TPortableNetworkGraphic); Add(ClipboardRegisterFormat(sMimeTypePng), TPortableNetworkGraphic);

4
lcl/include/rasterimage.inc
View File

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

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

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

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

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

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

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

4
lcl/lcltype.pp
View File

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