From d8abfdaf6a4c4bf7c40beddb1029cc3f0fdab99b Mon Sep 17 00:00:00 2001 From: lazarus Date: Thu, 24 Oct 2002 10:05:51 +0000 Subject: [PATCH] MG: broke graphics.pp <-> clipbrd.pp circle git-svn-id: trunk@3549 - --- lcl/clipbrd.pp | 73 ++--------------------------------------- lcl/dialogs.pp | 6 +++- lcl/include/clipbrd.inc | 9 +++-- lcl/lcllinux.pp | 34 ++++++++++++++++++- lcl/lcltype.pp | 64 ++++++++++++++++++++++++++++++++++-- lcl/stdctrls.pp | 8 +++-- 6 files changed, 115 insertions(+), 79 deletions(-) diff --git a/lcl/clipbrd.pp b/lcl/clipbrd.pp index 0d6d490a31..01049d5c63 100644 --- a/lcl/clipbrd.pp +++ b/lcl/clipbrd.pp @@ -135,61 +135,6 @@ type FormatID: TClipboardFormat; Stream: TMemoryStream; end; - -type - TPredefinedClipboardFormat = ( - pcfText, - pcfBitmap, - pcfPixmap, - pcfIcon, - pcfPicture, - pcfObject, - pcfComponent, - pcfCustomData, - - // Delphi definitions (only for compatibility) - pcfDelphiText, - pcfDelphiBitmap, - pcfDelphiPicture, - pcfDelphiMetaFilePict, - pcfDelphiObject, - pcfDelphiComponent, - - // Kylix definitions (only for compatibility) - pcfKylixPicture, - pcfKylixBitmap, - pcfKylixDrawing, - pcfKylixComponent - ); - -const - PredefinedClipboardMimeTypes : array[TPredefinedClipboardFormat] of string = ( - 'text/plain', - 'image/lcl.bitmap', - 'image/lcl.pixmap', - 'image/lcl.icon', - 'image/lcl.picture', - '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' - ); - -function PredefinedClipboardFormat( - AFormat: TPredefinedClipboardFormat): TClipboardFormat; { for delphi compatibility: @@ -291,8 +236,6 @@ implementation var FClipboards: array[TClipboardType] of TClipboard; - FPredefinedClipboardFormats: - array[TPredefinedClipboardFormat] of TClipboardFormat; {$I clipbrd.inc} @@ -341,15 +284,6 @@ begin Result := FClipboards[ClipboardType]; end; -function PredefinedClipboardFormat(AFormat: TPredefinedClipboardFormat - ): TClipboardFormat; -begin - if FPredefinedClipboardFormats[AFormat]=0 then - FPredefinedClipboardFormats[AFormat]:= - ClipboardRegisterFormat(PredefinedClipboardMimeTypes[AFormat]); - Result:=FPredefinedClipboardFormats[AFormat]; -end; - function CF_Text: TClipboardFormat; begin Result:=PredefinedClipboardFormat(pcfDelphiText); @@ -392,13 +326,9 @@ end; procedure InternalInit; var AClipboardType: TClipboardType; - AClipboardFormat: TPredefinedClipboardFormat; begin for AClipboardType:=Low(TClipboardType) to High(TClipboardType) do FClipboards[AClipboardType]:=nil; - for AClipboardFormat:=Low(TPredefinedClipboardFormat) to - High(TPredefinedClipboardFormat) do - FPredefinedClipboardFormats[AClipboardFormat]:=0; end; procedure InternalFinal; @@ -416,6 +346,9 @@ end. { $Log$ + Revision 1.10 2002/10/24 10:05:50 lazarus + MG: broke graphics.pp <-> clipbrd.pp circle + Revision 1.9 2002/05/10 06:05:48 lazarus MG: changed license to LGPL diff --git a/lcl/dialogs.pp b/lcl/dialogs.pp index 987c935b59..d729e686bd 100644 --- a/lcl/dialogs.pp +++ b/lcl/dialogs.pp @@ -36,7 +36,8 @@ unit Dialogs; interface -uses Classes, Forms, Controls, VCLGlobals, LMessages, GraphType, Graphics; +uses + Classes, Forms, Controls, VCLGlobals, LMessages, GraphType, Graphics; //type // TDialogButtons = (mbYes, mbNo, mbOK, mbCancel, mbAbort, mbRetry, @@ -294,6 +295,9 @@ end. { ============================================================================= $Log$ + Revision 1.21 2002/10/24 10:05:51 lazarus + MG: broke graphics.pp <-> clipbrd.pp circle + Revision 1.20 2002/10/11 16:00:39 lazarus AJ: made InputQuery Interface Dependant diff --git a/lcl/include/clipbrd.inc b/lcl/include/clipbrd.inc index c1697fa3e6..cbf69ae618 100644 --- a/lcl/include/clipbrd.inc +++ b/lcl/include/clipbrd.inc @@ -447,7 +447,7 @@ begin try for f:=Low(TPredefinedClipboardFormat) to High(TPredefinedClipboardFormat) do begin - Result:=FPredefinedClipboardFormats[f]; + Result:=PredefinedClipboardFormat(f); if (f in PicFormats) and (Result<>0) then begin if not FAllocated then begin for i:=0 to cnt-1 do @@ -488,8 +488,8 @@ begin end; if not Result then begin Result:= - ((FPredefinedClipboardFormats[pcfPicture]=FormatID) - or (FPredefinedClipboardFormats[pcfDelphiPicture]=FormatID)) + ((PredefinedClipboardFormat(pcfPicture)=FormatID) + or (PredefinedClipboardFormat(pcfDelphiPicture)=FormatID)) and (HasPictureFormat); end; end else @@ -610,6 +610,9 @@ end; { $Log$ + Revision 1.10 2002/10/24 10:05:51 lazarus + MG: broke graphics.pp <-> clipbrd.pp circle + Revision 1.9 2002/05/10 06:05:51 lazarus MG: changed license to LGPL diff --git a/lcl/lcllinux.pp b/lcl/lcllinux.pp index 7db5e0a754..122dbaba90 100644 --- a/lcl/lcllinux.pp +++ b/lcl/lcllinux.pp @@ -54,12 +54,19 @@ uses Classes, LCLType, VCLGlobals, GraphType; function MakeLong(A,B : Word) : LongInt; function MakeWord(A,B : Byte) : Word; +function PredefinedClipboardFormat( + AFormat: TPredefinedClipboardFormat): TClipboardFormat; + + implementation uses - SysUtils, Interfaces, Strings, Math; +var + FPredefinedClipboardFormats: + array[TPredefinedClipboardFormat] of TClipboardFormat; + function MakeLong(A,B : Word) : LongInt; begin Result := A or B shl 16; @@ -70,12 +77,37 @@ Begin Result := A or B shl 8; end; +function PredefinedClipboardFormat(AFormat: TPredefinedClipboardFormat + ): TClipboardFormat; +begin + if FPredefinedClipboardFormats[AFormat]=0 then + FPredefinedClipboardFormats[AFormat]:= + ClipboardRegisterFormat(PredefinedClipboardMimeTypes[AFormat]); + Result:=FPredefinedClipboardFormats[AFormat]; +end; + + {$I winapi.inc} +procedure InternalInit; +var + AClipboardFormat: TPredefinedClipboardFormat; +begin + for AClipboardFormat:=Low(TPredefinedClipboardFormat) to + High(TPredefinedClipboardFormat) do + FPredefinedClipboardFormats[AClipboardFormat]:=0; +end; + +initialization + InternalInit; + end. { $Log$ + Revision 1.20 2002/10/24 10:05:51 lazarus + MG: broke graphics.pp <-> clipbrd.pp circle + Revision 1.19 2002/06/04 15:17:21 lazarus MG: improved TFont for XLFD font names diff --git a/lcl/lcltype.pp b/lcl/lcltype.pp index 82f1416190..999da51dfd 100644 --- a/lcl/lcltype.pp +++ b/lcl/lcltype.pp @@ -1560,10 +1560,14 @@ type _MSG = tagMSG; +//------------------------------------------------------------------------------ // prototype for timer callback -TFNTimerProc = procedure(Handle: HWND; Message : cardinal; IDEvent: Integer; Time: Cardinal); +type + TFNTimerProc = procedure(Handle: HWND; Message : cardinal; IDEvent: Integer; + Time: Cardinal); +//------------------------------------------------------------------------------ // clipboard type TClipboardFormat = cardinal; @@ -1579,10 +1583,62 @@ const 'primary selection', 'secondary selection', 'clipboard' ); +type + TPredefinedClipboardFormat = ( + pcfText, + pcfBitmap, + pcfPixmap, + pcfIcon, + pcfPicture, + pcfObject, + pcfComponent, + pcfCustomData, + + // Delphi definitions (only for compatibility) + pcfDelphiText, + pcfDelphiBitmap, + pcfDelphiPicture, + pcfDelphiMetaFilePict, + pcfDelphiObject, + pcfDelphiComponent, + + // Kylix definitions (only for compatibility) + pcfKylixPicture, + pcfKylixBitmap, + pcfKylixDrawing, + pcfKylixComponent + ); + +const + PredefinedClipboardMimeTypes : array[TPredefinedClipboardFormat] of string = ( + 'text/plain', + 'image/lcl.bitmap', + 'image/lcl.pixmap', + 'image/lcl.icon', + 'image/lcl.picture', + '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' + ); -function MapIrregularVirtualKey(vk: word): word; +// key mapping Function Char2VK(C : Char) : Word; +function MapIrregularVirtualKey(vk: word): word; implementation @@ -1618,10 +1674,14 @@ begin end; end; + end. { $Log$ + Revision 1.23 2002/10/24 10:05:51 lazarus + MG: broke graphics.pp <-> clipbrd.pp circle + Revision 1.22 2002/10/15 17:09:53 lazarus AJ: fixed GTK DrawText to use WordWrap, and add DT_EditControl diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp index faaf810472..1ffb3247bc 100644 --- a/lcl/stdctrls.pp +++ b/lcl/stdctrls.pp @@ -38,7 +38,7 @@ interface uses VCLGlobals, Classes, SysUtils, LCLType, Graphics, GraphType, LMessages, - Controls, Forms, ExtendedStrings; + Controls, Forms, ExtendedStrings, LCLLinux, GraphicsMath; type @@ -880,7 +880,8 @@ Function DeleteAmpersands(var Str : String) : Longint; implementation -uses LCLLinux, Interfaces, Math, GraphicsMath; +uses + Interfaces, Math; type @@ -1405,6 +1406,9 @@ end. { ============================================================================= $Log$ + Revision 1.60 2002/10/24 10:05:51 lazarus + MG: broke graphics.pp <-> clipbrd.pp circle + Revision 1.59 2002/10/23 20:47:26 lazarus AJ: Started Form Scrolling Started StaticText FocusControl