diff options
author | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-07-23 08:31:53 +0000 |
---|---|---|
committer | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-07-23 08:31:53 +0000 |
commit | ad260042ca17b2a381a6be1b6ac9dd549e4d5956 (patch) | |
tree | a89f7f5823a1161070b929dec1a6fcd396bd05c7 | |
parent | 5434f4524e3ac3fc4be33ab4077ae8b2557784bb (diff) | |
download | fpGUI-ad260042ca17b2a381a6be1b6ac9dd549e4d5956.tar.xz |
* Minor parameter type change in Clipboard classes from String to TfpgString.
-rw-r--r-- | src/corelib/gdi/gfx_gdi.pas | 16 | ||||
-rw-r--r-- | src/corelib/gfxbase.pas | 6 | ||||
-rw-r--r-- | src/corelib/x11/gfx_x11.pas | 10 |
3 files changed, 13 insertions, 19 deletions
diff --git a/src/corelib/gdi/gfx_gdi.pas b/src/corelib/gdi/gfx_gdi.pas index afcd8b63..2dc6dd1d 100644 --- a/src/corelib/gdi/gfx_gdi.pas +++ b/src/corelib/gdi/gfx_gdi.pas @@ -138,8 +138,6 @@ type end; - { TfpgWindowImpl } - TfpgWindowImpl = class(TfpgWindowBase) private FMouseInWindow: boolean; @@ -176,8 +174,6 @@ type end; - { TfpgApplicationImpl } - TfpgApplicationImpl = class(TfpgApplicationBase) protected FDisplay: HDC; @@ -223,15 +219,13 @@ type TfpgClipboardImpl = class(TfpgClipboardBase) protected - FClipboardText: string; - function DoGetText: string; override; - procedure DoSetText(const AValue: string); override; + FClipboardText: TfpgString; + function DoGetText: TfpgString; override; + procedure DoSetText(const AValue: TfpgString); override; procedure InitClipboard; override; end; - { TfpgFileListImpl } - TfpgFileListImpl = class(TfpgFileListBase) function EncodeAttributesString(attrs: longword): TFileModeString; constructor Create; override; @@ -2129,7 +2123,7 @@ end; { TfpgClipboardImpl } -function TfpgClipboardImpl.DoGetText: string; +function TfpgClipboardImpl.DoGetText: TfpgString; var h: THANDLE; p: PChar; @@ -2155,7 +2149,7 @@ begin Result := FClipboardText; end; -procedure TfpgClipboardImpl.DoSetText(const AValue: string); +procedure TfpgClipboardImpl.DoSetText(const AValue: TfpgString); begin FClipboardText := AValue; if OpenClipboard(FClipboardWndHandle) then diff --git a/src/corelib/gfxbase.pas b/src/corelib/gfxbase.pas index b8364c25..fa01996c 100644 --- a/src/corelib/gfxbase.pas +++ b/src/corelib/gfxbase.pas @@ -482,12 +482,12 @@ type TfpgClipboardBase = class(TObject) protected FClipboardWndHandle: TfpgWinHandle; - function DoGetText: string; virtual; abstract; - procedure DoSetText(const AValue: string); virtual; abstract; + function DoGetText: TfpgString; virtual; abstract; + procedure DoSetText(const AValue: TfpgString); virtual; abstract; procedure InitClipboard; virtual; abstract; public constructor Create; - property Text: string read DoGetText write DoSetText; + property Text: TfpgString read DoGetText write DoSetText; end; diff --git a/src/corelib/x11/gfx_x11.pas b/src/corelib/x11/gfx_x11.pas index 92456bff..66834fcb 100644 --- a/src/corelib/x11/gfx_x11.pas +++ b/src/corelib/x11/gfx_x11.pas @@ -259,9 +259,9 @@ type private FWaitingForSelection: Boolean; protected - FClipboardText: string; - function DoGetText: string; override; - procedure DoSetText(const AValue: string); override; + FClipboardText: TfpgString; + function DoGetText: TfpgString; override; + procedure DoSetText(const AValue: TfpgString); override; procedure InitClipboard; override; end; @@ -2241,7 +2241,7 @@ end; { TfpgClipboardImpl } -function TfpgClipboardImpl.DoGetText: string; +function TfpgClipboardImpl.DoGetText: TfpgString; begin XConvertSelection(xapplication.Display, xapplication.xia_clipboard, XA_STRING, xapplication.xia_clipboard, FClipboardWndHandle, 0); @@ -2257,7 +2257,7 @@ begin Result := FClipboardText; end; -procedure TfpgClipboardImpl.DoSetText(const AValue: string); +procedure TfpgClipboardImpl.DoSetText(const AValue: TfpgString); begin FClipboardText := AValue; XSetSelectionOwner(xapplication.Display, xapplication.xia_clipboard, |