From e9e34f5965e349e229adf2c96a123ec632b99d72 Mon Sep 17 00:00:00 2001
From: wp <wp.no-reply@lazarus-ide-org>
Date: Sat, 18 Nov 2017 13:18:41 +0000
Subject: [PATCH] LCL: Remove predefined clipboard format pcfDelphiBitmap
 (obsolete).

git-svn-id: trunk@56434 -
---
 lcl/include/picture.inc                              | 2 +-
 lcl/include/rasterimage.inc                          | 4 ++--
 lcl/interfaces/customdrawn/customdrawnwinapi_win.inc | 4 ++--
 lcl/interfaces/win32/win32winapi.inc                 | 4 ++--
 lcl/interfaces/wince/wincewinapi.inc                 | 4 ++--
 lcl/lcltype.pp                                       | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lcl/include/picture.inc b/lcl/include/picture.inc
index f06612095f..4b1f3676b9 100644
--- a/lcl/include/picture.inc
+++ b/lcl/include/picture.inc
@@ -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);
diff --git a/lcl/include/rasterimage.inc b/lcl/include/rasterimage.inc
index 7fd5d76120..fe880ef8db 100644
--- a/lcl/include/rasterimage.inc
+++ b/lcl/include/rasterimage.inc
@@ -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);
diff --git a/lcl/interfaces/customdrawn/customdrawnwinapi_win.inc b/lcl/interfaces/customdrawn/customdrawnwinapi_win.inc
index 92e7eb52fa..dfd004c7c2 100644
--- a/lcl/interfaces/customdrawn/customdrawnwinapi_win.inc
+++ b/lcl/interfaces/customdrawn/customdrawnwinapi_win.inc
@@ -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;
 
diff --git a/lcl/interfaces/win32/win32winapi.inc b/lcl/interfaces/win32/win32winapi.inc
index 387e5d02e5..a506bae19a 100644
--- a/lcl/interfaces/win32/win32winapi.inc
+++ b/lcl/interfaces/win32/win32winapi.inc
@@ -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;
 
diff --git a/lcl/interfaces/wince/wincewinapi.inc b/lcl/interfaces/wince/wincewinapi.inc
index 4661aa02f6..c850445999 100644
--- a/lcl/interfaces/wince/wincewinapi.inc
+++ b/lcl/interfaces/wince/wincewinapi.inc
@@ -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;
 
diff --git a/lcl/lcltype.pp b/lcl/lcltype.pp
index 7fc5b53d52..bdf14d9e89 100644
--- a/lcl/lcltype.pp
+++ b/lcl/lcltype.pp
@@ -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',