LCL: Delete the pcfDelphi* and pcfKylix* clipboard formats. Issue #27194.

git-svn-id: trunk@56488 -

lcl/clipbrd.pp

@@ -308,22 +308,22 @@ end;
 
 function CF_Picture: TClipboardFormat;
 begin
-  Result:=PredefinedClipboardFormat(pcfDelphiPicture);
+  Result:=PredefinedClipboardFormat(pcfPicture);
 end;
 
 function CF_MetaFilePict: TClipboardFormat;
 begin
-  Result:=PredefinedClipboardFormat(pcfDelphiMetaFilePict);
+  Result:=PredefinedClipboardFormat(pcfMetaFilePict);
 end;
 
 function CF_Object: TClipboardFormat;
 begin
-  Result:=PredefinedClipboardFormat(pcfDelphiObject);
+  Result:=PredefinedClipboardFormat(pcfObject);
 end;
 
 function CF_Component: TClipboardFormat;
 begin
-  Result:=PredefinedClipboardFormat(pcfDelphiComponent);
+  Result:=PredefinedClipboardFormat(pcfComponent);
 end;
 
 procedure FreeAllClipboards;

lcl/include/clipbrd.inc

@@ -619,10 +619,7 @@ begin
       if List<>nil then FreeMem(List);
     end;
     if not Result then begin
-      Result:=
-            ((PredefinedClipboardFormat(pcfPicture)=FormatID)
-        or (PredefinedClipboardFormat(pcfDelphiPicture)=FormatID))
-        and (HasPictureFormat);
+      Result := (PredefinedClipboardFormat(pcfPicture)=FormatID) and (HasPictureFormat);
     end;
   end else
     Result:=false;

lcl/include/picture.inc

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

lcl/include/rasterimage.inc

@@ -488,7 +488,6 @@ begin
   begin
     List.Clear;
     List.Add(PredefinedClipboardMimeTypes[pcfBitmap]);
-    //List.Add(PredefinedClipboardMimeTypes[pcfDelphiBitmap]);
     List.Add(PredefinedClipboardMimeTypes[pcfPixmap]);
   end else
     inherited GetSupportedSourceMimeTypes(List);
@@ -568,7 +567,6 @@ 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[pcfPixmap])=0) then
     begin
       LoadFromStream(AStream);

lcl/interfaces/customdrawn/customdrawnwinapi_win.inc

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

lcl/interfaces/win32/win32winapi.inc

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

lcl/interfaces/wince/wincewinapi.inc

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

lcl/lcltype.pp

@@ -2712,23 +2712,10 @@ type
       pcfPixmap,
       pcfIcon,
       pcfPicture,
+      pcfMetaFilePict,
       pcfObject,
       pcfComponent,
-      pcfCustomData,
-
-      // Delphi definitions (only for compatibility)
-      pcfDelphiText,
-//      pcfDelphiBitmap,
-      pcfDelphiPicture,
-      pcfDelphiMetaFilePict,
-      pcfDelphiObject,
-      pcfDelphiComponent {,
-
-      // Kylix definitions (only for compatibility)
-      pcfKylixPicture,
-      pcfKylixBitmap,
-      pcfKylixDrawing,
-      pcfKylixComponent }
+      pcfCustomData
     );
 
 const
@@ -2738,23 +2725,10 @@ const
      'image/xpm',
      'image/lcl.icon',
      'image/lcl.picture',
+     'image/lcl.metafilepict',
      'application/lcl.object',
      'application/lcl.component',
-     'application/lcl.customdata',
-
-     // Delphi definitions (only for compatibility)
-     'text/plain',
-{    'image/delphi.bitmap', }
-     'Delphi Picture',
-     'image/delphi.metafilepict',
-     'application/delphi.object',
-     'Delphi Component' {,
-
-     // Kylix definitons (only for compatibility)
-     'image/delphi.picture',
-     'image/delphi.bitmap',
-     'image/delphi.drawing',
-     'application/delphi.component' }
+     'application/lcl.customdata'
   );