mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-06-11 07:58:15 +02:00
LCL: Remove deprecated function FontCanUTF8. All widgetsets returned True, including GTK(2) and QT(5). Not implementing it caused bugs.
git-svn-id: trunk@62425 -
This commit is contained in:
parent
0fa939d56e
commit
b46b72fb2b
@ -8407,8 +8407,7 @@ begin
|
|||||||
Style := []; // Reserved for Highlighter
|
Style := []; // Reserved for Highlighter
|
||||||
end;
|
end;
|
||||||
//debugln(['TCustomSynEdit.RecalcCharExtent ',fFontDummy.Name,' ',fFontDummy.Size]);
|
//debugln(['TCustomSynEdit.RecalcCharExtent ',fFontDummy.Name,' ',fFontDummy.Size]);
|
||||||
//debugln('TCustomSynEdit.RecalcCharExtent A UseUTF8=',dbgs(UseUTF8),
|
//debugln('TCustomSynEdit.RecalcCharExtent A UseUTF8=',dbgs(UseUTF8),' CharHeight=',dbgs(CharHeight));
|
||||||
// ' Font.CanUTF8='+dbgs(Font.CanUTF8)+' CharHeight=',dbgs(CharHeight));
|
|
||||||
|
|
||||||
fTextDrawer.BaseFont := FFontDummy;
|
fTextDrawer.BaseFont := FFontDummy;
|
||||||
if Assigned(fHighlighter) then
|
if Assigned(fHighlighter) then
|
||||||
@ -8435,7 +8434,7 @@ begin
|
|||||||
finally
|
finally
|
||||||
DecStatusChangeLock;
|
DecStatusChangeLock;
|
||||||
end;
|
end;
|
||||||
//debugln('TCustomSynEdit.RecalcCharExtent UseUTF8=',dbgs(UseUTF8),' Font.CanUTF8=',dbgs(Font.CanUTF8));
|
//debugln('TCustomSynEdit.RecalcCharExtent UseUTF8=',dbgs(UseUTF8));
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TCustomSynEdit.HighlighterAttrChanged(Sender: TObject);
|
procedure TCustomSynEdit.HighlighterAttrChanged(Sender: TObject);
|
||||||
|
@ -964,8 +964,8 @@ end;
|
|||||||
function TheTextDrawer.GetUseUTF8: boolean;
|
function TheTextDrawer.GetUseUTF8: boolean;
|
||||||
begin
|
begin
|
||||||
FFontStock.BaseFont.Reference;
|
FFontStock.BaseFont.Reference;
|
||||||
Result:=FFontStock.BaseFont.CanUTF8;
|
Result:=True;
|
||||||
//debugln('TheTextDrawer.GetUseUTF8 ',FFontStock.BaseFont.Name,' ',dbgs(FFontStock.BaseFont.CanUTF8),' ',dbgs(FFontStock.BaseFont.HandleAllocated));
|
//debugln('TheTextDrawer.GetUseUTF8 ',FFontStock.BaseFont.Name,' ',dbgs(FFontStock.BaseFont.HandleAllocated));
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TheTextDrawer.GetMonoSpace: boolean;
|
function TheTextDrawer.GetMonoSpace: boolean;
|
||||||
|
@ -480,8 +480,6 @@ type
|
|||||||
|
|
||||||
TFont = class(TFPCustomFont)
|
TFont = class(TFPCustomFont)
|
||||||
private
|
private
|
||||||
FCanUTF8: boolean;
|
|
||||||
FCanUTF8Valid: boolean;
|
|
||||||
FIsMonoSpace: boolean;
|
FIsMonoSpace: boolean;
|
||||||
FIsMonoSpaceValid: boolean;
|
FIsMonoSpaceValid: boolean;
|
||||||
FOrientation: Integer;
|
FOrientation: Integer;
|
||||||
@ -497,7 +495,6 @@ type
|
|||||||
FHeight: integer; // FHeight = -(FSize * FPixelsPerInch) div 72
|
FHeight: integer; // FHeight = -(FSize * FPixelsPerInch) div 72
|
||||||
FReference: TWSFontReference;
|
FReference: TWSFontReference;
|
||||||
procedure FreeReference;
|
procedure FreeReference;
|
||||||
function GetCanUTF8: boolean;
|
|
||||||
function GetHandle: HFONT;
|
function GetHandle: HFONT;
|
||||||
function GetData: TFontData;
|
function GetData: TFontData;
|
||||||
function GetIsMonoSpace: boolean;
|
function GetIsMonoSpace: boolean;
|
||||||
@ -547,7 +544,6 @@ type
|
|||||||
function IsEqual(AFont: TFont): boolean; virtual;
|
function IsEqual(AFont: TFont): boolean; virtual;
|
||||||
property IsMonoSpace: boolean read GetIsMonoSpace;
|
property IsMonoSpace: boolean read GetIsMonoSpace;
|
||||||
procedure SetDefault;
|
procedure SetDefault;
|
||||||
property CanUTF8: boolean read GetCanUTF8; deprecated;
|
|
||||||
property PixelsPerInch: Integer read FPixelsPerInch write SetPixelsPerInch;
|
property PixelsPerInch: Integer read FPixelsPerInch write SetPixelsPerInch;
|
||||||
property Reference: TWSFontReference read GetReference;
|
property Reference: TWSFontReference read GetReference;
|
||||||
published
|
published
|
||||||
|
@ -1169,7 +1169,6 @@ begin
|
|||||||
finally
|
finally
|
||||||
FontResourceCache.Unlock;
|
FontResourceCache.Unlock;
|
||||||
end;
|
end;
|
||||||
FCanUTF8Valid := False;
|
|
||||||
FIsMonoSpaceValid := False;
|
FIsMonoSpaceValid := False;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -1230,16 +1229,6 @@ begin
|
|||||||
FReference._lclHandle := 0;
|
FReference._lclHandle := 0;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TFont.GetCanUTF8: boolean;
|
|
||||||
begin
|
|
||||||
if not FCanUTF8Valid then
|
|
||||||
begin
|
|
||||||
FCanUTF8 := {%H-}FontCanUTF8(HFONT(Reference.Handle));
|
|
||||||
FCanUTF8Valid := True;
|
|
||||||
end;
|
|
||||||
Result := FCanUTF8;
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TFont.GetCharSet: TFontCharSet;
|
function TFont.GetCharSet: TFontCharSet;
|
||||||
begin
|
begin
|
||||||
Result := FCharSet;
|
Result := FCharSet;
|
||||||
|
@ -333,12 +333,6 @@ begin
|
|||||||
Result:=TextOut(DC,X,Y,Str,Count);
|
Result:=TextOut(DC,X,Y,Str,Count);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
function TWidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result:=false;
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TWidgetSet.FontIsMonoSpace(Font: HFont): boolean;
|
function TWidgetSet.FontIsMonoSpace(Font: HFont): boolean;
|
||||||
begin
|
begin
|
||||||
Result:=false;
|
Result:=false;
|
||||||
|
@ -188,11 +188,6 @@ begin
|
|||||||
Result := WidgetSet.TextUTF8Out(DC,X,Y,Str,Count);
|
Result := WidgetSet.TextUTF8Out(DC,X,Y,Str,Count);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result := WidgetSet.FontCanUTF8(Font){%H-};
|
|
||||||
end;
|
|
||||||
|
|
||||||
function FontIsMonoSpace(Font: HFont): boolean;
|
function FontIsMonoSpace(Font: HFont): boolean;
|
||||||
begin
|
begin
|
||||||
Result := WidgetSet.FontIsMonoSpace(Font);
|
Result := WidgetSet.FontIsMonoSpace(Font);
|
||||||
|
@ -62,8 +62,6 @@ procedure DrawDefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImage
|
|||||||
procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
|
procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
|
||||||
|
|
||||||
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
|
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
|
||||||
|
|
||||||
function FontCanUTF8(Font: HFont): boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} deprecated;
|
|
||||||
function FontIsMonoSpace(Font: HFont): boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
|
function FontIsMonoSpace(Font: HFont): boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
|
||||||
function Frame3d(DC: HDC; var ARect: TRect; const FrameWidth : integer; const Style : TGraphicsBevelCut): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
|
function Frame3d(DC: HDC; var ARect: TRect; const FrameWidth : integer; const Style : TGraphicsBevelCut): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
|
||||||
|
|
||||||
|
@ -7260,8 +7260,7 @@ begin
|
|||||||
//debugln('TWinControl.CNChar B ',DbgSName(Self),' ',dbgs(Message.CharCode),' ',dbgs(IntfSendsUTF8KeyPress));
|
//debugln('TWinControl.CNChar B ',DbgSName(Self),' ',dbgs(Message.CharCode),' ',dbgs(IntfSendsUTF8KeyPress));
|
||||||
if Widgetset.GetLCLCapability(lcSendsUTF8KeyPress) = LCL_CAPABILITY_NO then
|
if Widgetset.GetLCLCapability(lcSendsUTF8KeyPress) = LCL_CAPABILITY_NO then
|
||||||
begin
|
begin
|
||||||
// current interface does not (yet) send UTF8 key press notifications
|
// current interface does not (yet) send UTF8 key press notifications -> emulate
|
||||||
// -> emulate
|
|
||||||
if (Message.CharCode < %11000000) then
|
if (Message.CharCode < %11000000) then
|
||||||
begin
|
begin
|
||||||
c:=chr(Message.CharCode);
|
c:=chr(Message.CharCode);
|
||||||
|
@ -69,11 +69,6 @@ begin
|
|||||||
TCarbonDeviceContext(DC).DrawGrid(R, DX, DY);
|
TCarbonDeviceContext(DC).DrawGrid(R, DX, DY);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCarbonWidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result := True;
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TCarbonWidgetSet.GetAcceleratorString(const AVKey: Byte;
|
function TCarbonWidgetSet.GetAcceleratorString(const AVKey: Byte;
|
||||||
const AShiftState: TShiftState): String;
|
const AShiftState: TShiftState): String;
|
||||||
begin
|
begin
|
||||||
|
@ -24,8 +24,6 @@
|
|||||||
function CreateStandardCursor(ACursor: SmallInt): hCursor; override;
|
function CreateStandardCursor(ACursor: SmallInt): hCursor; override;
|
||||||
procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); override;
|
procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); override;
|
||||||
|
|
||||||
function FontCanUTF8({%H-}Font: HFont): boolean; override;
|
|
||||||
|
|
||||||
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
||||||
function GetControlConstraints(Constraints: TObject): boolean; override;
|
function GetControlConstraints(Constraints: TObject): boolean; override;
|
||||||
function GetDesignerDC(WindowHandle: HWND): HDC; override;
|
function GetDesignerDC(WindowHandle: HWND): HDC; override;
|
||||||
|
@ -62,12 +62,6 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCocoaWidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
// no so deprecated, after all. SynEdit is still using it and caused the issue #34594
|
|
||||||
Result:=true;
|
|
||||||
end;
|
|
||||||
|
|
||||||
(*
|
(*
|
||||||
{------------------------------------------------------------------------------
|
{------------------------------------------------------------------------------
|
||||||
Method: DrawGrid
|
Method: DrawGrid
|
||||||
@ -94,11 +88,6 @@ begin
|
|||||||
Result:=inherited ExtUTF8Out(DC, X, Y, Options, Rect, Str, Count, Dx);
|
Result:=inherited ExtUTF8Out(DC, X, Y, Options, Rect, Str, Count, Dx);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCarbonWidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result := True;
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TCarbonWidgetSet.GetAcceleratorString(const AVKey: Byte;
|
function TCarbonWidgetSet.GetAcceleratorString(const AVKey: Byte;
|
||||||
const AShiftState: TShiftState): String;
|
const AShiftState: TShiftState): String;
|
||||||
begin
|
begin
|
||||||
|
@ -24,9 +24,7 @@ function CreateStandardCursor(ACursor: SmallInt): hCursor; override;
|
|||||||
|
|
||||||
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
||||||
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
||||||
}
|
|
||||||
function FontCanUTF8(Font: HFont): boolean; override;
|
|
||||||
{
|
|
||||||
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
||||||
function GetControlConstraints(Constraints: TObject): boolean; override;
|
function GetControlConstraints(Constraints: TObject): boolean; override;
|
||||||
function GetDesignerDC(WindowHandle: HWND): HDC; override;
|
function GetDesignerDC(WindowHandle: HWND): HDC; override;
|
||||||
|
@ -202,16 +202,6 @@ begin
|
|||||||
QWidget_destroy(QRubberBandH(ARubberBand));
|
QWidget_destroy(QRubberBandH(ARubberBand));
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
|
||||||
Function: FontCanUTF8
|
|
||||||
Params:
|
|
||||||
Returns:
|
|
||||||
------------------------------------------------------------------------------}
|
|
||||||
function TQtWidgetSet.FontCanUTF8(Font: HFont): Boolean;
|
|
||||||
begin
|
|
||||||
Result := IsValidGDIObject(Font);
|
|
||||||
end;
|
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
{------------------------------------------------------------------------------
|
||||||
Function: FontIsMonoSpace
|
Function: FontIsMonoSpace
|
||||||
Params:
|
Params:
|
||||||
|
@ -34,11 +34,9 @@ function CreateEmptyRegion: hRGN; override;
|
|||||||
function CreateRubberBand(const ARect: TRect; const ABrush: HBrush = 0): HWND; override;
|
function CreateRubberBand(const ARect: TRect; const ABrush: HBrush = 0): HWND; override;
|
||||||
procedure DrawDefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation); override;
|
procedure DrawDefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation); override;
|
||||||
procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); override;
|
procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); override;
|
||||||
procedure DestroyRubberBand(ARubberBand: HWND); override;*)
|
procedure DestroyRubberBand(ARubberBand: HWND); override;
|
||||||
|
function FontIsMonoSpace(Font: HFont): boolean; override;
|
||||||
(*function FontCanUTF8(Font: HFont): boolean; override; // Dont implement, deprecated
|
*)
|
||||||
function FontIsMonoSpace(Font: HFont): boolean; override;*)
|
|
||||||
|
|
||||||
function GetAvailableNativeCanvasTypes(DC: HDC; AAllowFallbackToParent: Boolean = False): TNativeCanvasTypes; override;
|
function GetAvailableNativeCanvasTypes(DC: HDC; AAllowFallbackToParent: Boolean = False): TNativeCanvasTypes; override;
|
||||||
function GetAvailableNativeHandleTypes(Handle: HWND; AAllowFallbackToParent: Boolean = False): TNativeHandleTypes; override;
|
function GetAvailableNativeHandleTypes(Handle: HWND; AAllowFallbackToParent: Boolean = False): TNativeHandleTypes; override;
|
||||||
//function GetDesignerDC(WindowHandle: HWND): HDC; override;
|
//function GetDesignerDC(WindowHandle: HWND): HDC; override;
|
||||||
|
@ -43,18 +43,6 @@ const
|
|||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
|
||||||
function FontCanUTF8(Font: HFont): boolean;
|
|
||||||
|
|
||||||
True if font recognizes Unicode UTF8 encoding.
|
|
||||||
|
|
||||||
FPGUI supports only Unicode
|
|
||||||
------------------------------------------------------------------------------}
|
|
||||||
function TFpGuiWidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result := True;
|
|
||||||
end;
|
|
||||||
|
|
||||||
function TFpGuiWidgetSet.PromptUser(const DialogCaption, DialogMessage: String;
|
function TFpGuiWidgetSet.PromptUser(const DialogCaption, DialogMessage: String;
|
||||||
DialogType: longint; Buttons: PLongint; ButtonCount, DefaultIndex,
|
DialogType: longint; Buttons: PLongint; ButtonCount, DefaultIndex,
|
||||||
EscapeResult: Longint): Longint;
|
EscapeResult: Longint): Longint;
|
||||||
|
@ -35,11 +35,9 @@ procedure DeallocateHWnd(Wnd: HWND); override;
|
|||||||
procedure DrawDefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation); override;
|
procedure DrawDefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation); override;
|
||||||
|
|
||||||
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
||||||
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;}
|
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
||||||
|
|
||||||
function FontCanUTF8(Font: HFont): boolean; override;
|
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
||||||
|
|
||||||
{function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
|
||||||
function GetControlConstraints(Constraints: TObject): boolean; override;
|
function GetControlConstraints(Constraints: TObject): boolean; override;
|
||||||
}
|
}
|
||||||
function PromptUser(const DialogCaption, DialogMessage: String; DialogType: longint;
|
function PromptUser(const DialogCaption, DialogMessage: String; DialogType: longint;
|
||||||
|
@ -170,20 +170,6 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
|
||||||
function TGTKWidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
|
|
||||||
True if font recognizes Unicode UTF8 encoding.
|
|
||||||
------------------------------------------------------------------------------}
|
|
||||||
function TGTKWidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result:=IsValidGDIObject(Font)
|
|
||||||
{$IFDEF Gtk1}
|
|
||||||
and FontIsDoubleByteCharsFont(PGdiObject(Font)^.GDIFontObject)
|
|
||||||
{$ENDIF}
|
|
||||||
;
|
|
||||||
end;
|
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
{------------------------------------------------------------------------------
|
||||||
function TGTKWidgetSet.FontIsMonoSpace(Font: HFont): boolean;
|
function TGTKWidgetSet.FontIsMonoSpace(Font: HFont): boolean;
|
||||||
|
|
||||||
|
@ -36,8 +36,6 @@ procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); override;
|
|||||||
|
|
||||||
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
||||||
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
||||||
|
|
||||||
function FontCanUTF8(Font: HFont): boolean; override;
|
|
||||||
function FontIsMonoSpace(Font: HFont): boolean; override;
|
function FontIsMonoSpace(Font: HFont): boolean; override;
|
||||||
|
|
||||||
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
||||||
|
@ -189,16 +189,6 @@ begin
|
|||||||
Result := TextOut(DC, X, Y, Str, Count);
|
Result := TextOut(DC, X, Y, Str, Count);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
|
||||||
function TGtk2WidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
|
|
||||||
True if font recognizes Unicode UTF8 encoding.
|
|
||||||
------------------------------------------------------------------------------}
|
|
||||||
function TGtk2WidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result:=IsValidGDIObject(Font);
|
|
||||||
end;
|
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
{------------------------------------------------------------------------------
|
||||||
function TGtk2WidgetSet.FontIsMonoSpace(Font: HFont): boolean;
|
function TGtk2WidgetSet.FontIsMonoSpace(Font: HFont): boolean;
|
||||||
|
|
||||||
|
@ -40,8 +40,6 @@ procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); override;
|
|||||||
|
|
||||||
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
||||||
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
||||||
|
|
||||||
function FontCanUTF8(Font: HFont): boolean; override;
|
|
||||||
function FontIsMonoSpace(Font: HFont): boolean; override;
|
function FontIsMonoSpace(Font: HFont): boolean; override;
|
||||||
|
|
||||||
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
||||||
|
@ -155,16 +155,6 @@ begin
|
|||||||
Result := TextOut(DC, X, Y, Str, Count);
|
Result := TextOut(DC, X, Y, Str, Count);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
|
||||||
function TGtk3WidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
|
|
||||||
True if font recognizes Unicode UTF8 encoding.
|
|
||||||
------------------------------------------------------------------------------}
|
|
||||||
function TGtk3WidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result := True; // IsValidGDIObject(Font);
|
|
||||||
end;
|
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
{------------------------------------------------------------------------------
|
||||||
function TGtk3WidgetSet.FontIsMonoSpace(Font: HFont): boolean;
|
function TGtk3WidgetSet.FontIsMonoSpace(Font: HFont): boolean;
|
||||||
|
|
||||||
|
@ -35,8 +35,6 @@ procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); override;
|
|||||||
|
|
||||||
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
||||||
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
||||||
|
|
||||||
function FontCanUTF8(Font: HFont): boolean; override;
|
|
||||||
function FontIsMonoSpace(Font: HFont): boolean; override;
|
function FontIsMonoSpace(Font: HFont): boolean; override;
|
||||||
|
|
||||||
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
||||||
|
@ -313,16 +313,6 @@ begin
|
|||||||
QWidget_destroy(QRubberBandH(ARubberBand));
|
QWidget_destroy(QRubberBandH(ARubberBand));
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
|
||||||
Function: FontCanUTF8
|
|
||||||
Params:
|
|
||||||
Returns:
|
|
||||||
------------------------------------------------------------------------------}
|
|
||||||
function TQtWidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result := IsValidGDIObject(Font);
|
|
||||||
end;
|
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
{------------------------------------------------------------------------------
|
||||||
Function: FontIsMonoSpace
|
Function: FontIsMonoSpace
|
||||||
Params:
|
Params:
|
||||||
|
@ -44,7 +44,6 @@ procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); override;
|
|||||||
procedure DestroyRubberBand(ARubberBand: HWND); override;
|
procedure DestroyRubberBand(ARubberBand: HWND); override;
|
||||||
|
|
||||||
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
||||||
function FontCanUTF8(Font: HFont): boolean; override;
|
|
||||||
function FontIsMonoSpace(Font: HFont): boolean; override;
|
function FontIsMonoSpace(Font: HFont): boolean; override;
|
||||||
|
|
||||||
function GetDesignerDC(WindowHandle: HWND): HDC; override;
|
function GetDesignerDC(WindowHandle: HWND): HDC; override;
|
||||||
|
@ -311,16 +311,6 @@ begin
|
|||||||
QWidget_destroy(QRubberBandH(ARubberBand));
|
QWidget_destroy(QRubberBandH(ARubberBand));
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
|
||||||
Function: FontCanUTF8
|
|
||||||
Params:
|
|
||||||
Returns:
|
|
||||||
------------------------------------------------------------------------------}
|
|
||||||
function TQtWidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result := IsValidGDIObject(Font);
|
|
||||||
end;
|
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
{------------------------------------------------------------------------------
|
||||||
Function: FontIsMonoSpace
|
Function: FontIsMonoSpace
|
||||||
Params:
|
Params:
|
||||||
|
@ -44,12 +44,9 @@ procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); override;
|
|||||||
procedure DestroyRubberBand(ARubberBand: HWND); override;
|
procedure DestroyRubberBand(ARubberBand: HWND); override;
|
||||||
|
|
||||||
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
||||||
|
|
||||||
function FontCanUTF8(Font: HFont): boolean; override;
|
|
||||||
function FontIsMonoSpace(Font: HFont): boolean; override;
|
function FontIsMonoSpace(Font: HFont): boolean; override;
|
||||||
|
|
||||||
function GetDesignerDC(WindowHandle: HWND): HDC; override;
|
function GetDesignerDC(WindowHandle: HWND): HDC; override;
|
||||||
|
|
||||||
function IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; override;
|
function IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; override;
|
||||||
|
|
||||||
function PromptUser(const DialogCaption : string;
|
function PromptUser(const DialogCaption : string;
|
||||||
|
@ -93,16 +93,6 @@ begin
|
|||||||
Result := ExtTextOut(DC, X, Y, Options, Rect, Str, Count, Dx);
|
Result := ExtTextOut(DC, X, Y, Options, Rect, Str, Count, Dx);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{------------------------------------------------------------------------------
|
|
||||||
function FontCanUTF8(Font: HFont): boolean;
|
|
||||||
|
|
||||||
True if font recognizes Unicode UTF8 encoding.
|
|
||||||
------------------------------------------------------------------------------}
|
|
||||||
function TWin32WidgetSet.FontCanUTF8(Font: HFont): boolean;
|
|
||||||
begin
|
|
||||||
Result := True;
|
|
||||||
end;
|
|
||||||
|
|
||||||
type
|
type
|
||||||
TFontIsMonoSpaceRec = record
|
TFontIsMonoSpaceRec = record
|
||||||
Name: string;
|
Name: string;
|
||||||
|
@ -42,8 +42,6 @@ procedure DrawGrid(DC: HDC; const R: TRect; DX, DY: Integer); override;
|
|||||||
|
|
||||||
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;
|
||||||
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
||||||
|
|
||||||
function FontCanUTF8({%H-}Font: HFont): boolean; override;
|
|
||||||
function FontIsMonoSpace(Font: HFont): boolean; override;
|
function FontIsMonoSpace(Font: HFont): boolean; override;
|
||||||
|
|
||||||
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override;
|
||||||
|
Loading…
Reference in New Issue
Block a user