diff --git a/lcl/include/interfacebase.inc b/lcl/include/interfacebase.inc index 6a0b94107d..9b317fd65b 100644 --- a/lcl/include/interfacebase.inc +++ b/lcl/include/interfacebase.inc @@ -98,8 +98,7 @@ begin lcEmulatedMDI: Result := LCL_CAPABILITY_YES; lcSendsUTF8KeyPress: - if IntfSendsUTF8KeyPress() then Result := LCL_CAPABILITY_YES - else Result := LCL_CAPABILITY_NO; + Result := LCL_CAPABILITY_YES; lcAccessibilitySupport: Result := LCL_CAPABILITY_NO; else Result := LCL_CAPABILITY_NO; diff --git a/lcl/include/intfbaselcl.inc b/lcl/include/intfbaselcl.inc index 52e353a844..a9ab173b96 100644 --- a/lcl/include/intfbaselcl.inc +++ b/lcl/include/intfbaselcl.inc @@ -473,7 +473,7 @@ end; function TWidgetSet.IntfSendsUTF8KeyPress: boolean; begin - Result:=false; + Result := GetLCLCapability(lcSendsUTF8KeyPress) = LCL_CAPABILITY_YES; end; function TWidgetSet.InvalidateFrame(aHandle: HWND; ARect: pRect; diff --git a/lcl/interfaces/carbon/carbonlclintf.inc b/lcl/interfaces/carbon/carbonlclintf.inc index f6972ea9cc..9686d1cc7b 100644 --- a/lcl/interfaces/carbon/carbonlclintf.inc +++ b/lcl/interfaces/carbon/carbonlclintf.inc @@ -135,15 +135,6 @@ begin {$ENDIF} end; -{------------------------------------------------------------------------------ - Method: IntfSendsUTF8KeyPress - Returns: If the interface sends UTF-8 key press events - ------------------------------------------------------------------------------} -function TCarbonWidgetSet.IntfSendsUTF8KeyPress: boolean; -begin - Result := True; -end; - {------------------------------------------------------------------------------ Method: IsDesignerDC Params: WindowHandle - Handle of window diff --git a/lcl/interfaces/carbon/carbonlclintfh.inc b/lcl/interfaces/carbon/carbonlclintfh.inc index bce5d8d8c1..c4b0bae151 100644 --- a/lcl/interfaces/carbon/carbonlclintfh.inc +++ b/lcl/interfaces/carbon/carbonlclintfh.inc @@ -40,7 +40,6 @@ function GetControlConstraints(Constraints: TObject): boolean; override; function GetDesignerDC(WindowHandle: HWND): HDC; override; function GetLCLOwnerObject(Handle: HWnd): TObject; override; -function IntfSendsUTF8KeyPress: boolean; override; function IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; override; {procedure LazDeviceAPIs_RequestPositionInfo(AMethod: TLazPositionMethod); override; diff --git a/lcl/interfaces/cocoa/cocoalclintf.inc b/lcl/interfaces/cocoa/cocoalclintf.inc index 1887fdc753..b40a94f7b0 100644 --- a/lcl/interfaces/cocoa/cocoalclintf.inc +++ b/lcl/interfaces/cocoa/cocoalclintf.inc @@ -133,15 +133,6 @@ begin {$ENDIF} end; -{------------------------------------------------------------------------------ - Method: IntfSendsUTF8KeyPress - Returns: If the interface sends UTF-8 key press events - ------------------------------------------------------------------------------} -function TCarbonWidgetSet.IntfSendsUTF8KeyPress: boolean; -begin - Result := True; -end; - {------------------------------------------------------------------------------ Method: IsDesignerDC Params: WindowHandle - Handle of window diff --git a/lcl/interfaces/cocoa/cocoalclintfh.inc b/lcl/interfaces/cocoa/cocoalclintfh.inc index e6ac95d8e3..1374e83180 100644 --- a/lcl/interfaces/cocoa/cocoalclintfh.inc +++ b/lcl/interfaces/cocoa/cocoalclintfh.inc @@ -38,8 +38,6 @@ function GetControlConstraints(Constraints: TObject): boolean; override; function GetDesignerDC(WindowHandle: HWND): HDC; override; function GetLCLOwnerObject(Handle: HWnd): TObject; override; -function IntfSendsUTF8KeyPress: boolean; override; - function IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; override; function PromptUser(const DialogCaption : string; diff --git a/lcl/interfaces/customdrawn/customdrawnlclintf.inc b/lcl/interfaces/customdrawn/customdrawnlclintf.inc index 246b450d29..28d308865b 100644 --- a/lcl/interfaces/customdrawn/customdrawnlclintf.inc +++ b/lcl/interfaces/customdrawn/customdrawnlclintf.inc @@ -305,18 +305,7 @@ begin {$endif} end; -{------------------------------------------------------------------------------ - Function: IntfSendsUTF8KeyPress - Params: - Returns: - ------------------------------------------------------------------------------} - -(*function TQtWidgetSet.IntfSendsUTF8KeyPress: boolean; -begin - Result := True; -end; - -function TQtWidgetSet.IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; +(*function TQtWidgetSet.IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; begin Result := (WindowHandle <> 0) and (TQtWidget(WindowHandle) is TQtDesignWidget); if Result then diff --git a/lcl/interfaces/customdrawn/customdrawnlclintfh.inc b/lcl/interfaces/customdrawn/customdrawnlclintfh.inc index 751904060d..c478b66cb0 100644 --- a/lcl/interfaces/customdrawn/customdrawnlclintfh.inc +++ b/lcl/interfaces/customdrawn/customdrawnlclintfh.inc @@ -53,7 +53,7 @@ function GetNativeHandle(Handle: HWND; AHandleType: TNativeHandleType; AAllowFal procedure HideVirtualKeyboard(); -(*function IntfSendsUTF8KeyPress: boolean; override; +(* function IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; override;*) function IsMobilePlatform: Boolean; override; diff --git a/lcl/interfaces/fpgui/fpguilclintfh.inc b/lcl/interfaces/fpgui/fpguilclintfh.inc index 86bf20da84..9f485b3023 100644 --- a/lcl/interfaces/fpgui/fpguilclintfh.inc +++ b/lcl/interfaces/fpgui/fpguilclintfh.inc @@ -48,8 +48,6 @@ function FontCanUTF8(Font: HFont): boolean; override; {function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; override; function GetControlConstraints(Constraints: TObject): boolean; override; -function IntfSendsUTF8KeyPress: boolean; override; - function RawImage_CreateBitmaps(const ARawImage: TRawImage; out ABitmap, AMask: HBitmap; ASkipMask: Boolean = False): Boolean; override; function RawImage_DescriptionFromBitmap(ABitmap: HBITMAP; out ADesc: TRawImageDescription): Boolean; override; function RawImage_DescriptionFromDevice(ADC: HDC; out ADesc: TRawImageDescription): Boolean; override; diff --git a/lcl/interfaces/gtk/gtklclintf.inc b/lcl/interfaces/gtk/gtklclintf.inc index 016836cb3d..a83a1365ab 100644 --- a/lcl/interfaces/gtk/gtklclintf.inc +++ b/lcl/interfaces/gtk/gtklclintf.inc @@ -854,16 +854,6 @@ begin Result:=nil; end; -{------------------------------------------------------------------------------ - function TGtkWidgetSet.IntfSendsUTF8KeyPress: boolean; - - ------------------------------------------------------------------------------} -function TGtkWidgetSet.IntfSendsUTF8KeyPress: boolean; -begin - Result:=true; -end; - - //##apiwiz##eps## // Do not remove, no wizard declaration after this line diff --git a/lcl/interfaces/gtk/gtklclintfh.inc b/lcl/interfaces/gtk/gtklclintfh.inc index 78adfbcde3..e8e1b54cd4 100644 --- a/lcl/interfaces/gtk/gtklclintfh.inc +++ b/lcl/interfaces/gtk/gtklclintfh.inc @@ -50,8 +50,6 @@ function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState) function GetControlConstraints(Constraints: TObject): boolean; override; function GetLCLOwnerObject(Handle: HWnd): TObject; override; -function IntfSendsUTF8KeyPress: boolean; override; - function RawImage_CreateBitmaps(const ARawImage: TRawImage; out ABitmap, AMask: HBitmap; ASkipMask: boolean = False): boolean; override; function RawImage_DescriptionFromBitmap(ABitmap: HBITMAP; out ADesc: TRawImageDescription): boolean; override; function RawImage_DescriptionFromDevice(ADC: HDC; out ADesc: TRawImageDescription): Boolean; override; diff --git a/lcl/interfaces/gtk2/gtk2lclintf.inc b/lcl/interfaces/gtk2/gtk2lclintf.inc index cf849f4b7b..e394ea88fb 100644 --- a/lcl/interfaces/gtk2/gtk2lclintf.inc +++ b/lcl/interfaces/gtk2/gtk2lclintf.inc @@ -867,15 +867,6 @@ begin Result:=nil; end; -{------------------------------------------------------------------------------ - function TGtk2WidgetSet.IntfSendsUTF8KeyPress: boolean; - - ------------------------------------------------------------------------------} -function TGtk2WidgetSet.IntfSendsUTF8KeyPress: boolean; -begin - Result:=true; -end; - function PromptUserBoxClosed(Widget : PGtkWidget; Event : PGdkEvent; data: gPointer) : GBoolean; cdecl; var diff --git a/lcl/interfaces/gtk2/gtk2lclintfh.inc b/lcl/interfaces/gtk2/gtk2lclintfh.inc index ea03c44011..2c6551d056 100644 --- a/lcl/interfaces/gtk2/gtk2lclintfh.inc +++ b/lcl/interfaces/gtk2/gtk2lclintfh.inc @@ -54,8 +54,6 @@ function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState) function GetControlConstraints(Constraints: TObject): boolean; override; function GetLCLOwnerObject(Handle: HWnd): TObject; override; -function IntfSendsUTF8KeyPress: boolean; override; - function PromptUser(const DialogCaption : string; const DialogMessage : string; DialogType : LongInt; diff --git a/lcl/interfaces/qt/qtlclintf.inc b/lcl/interfaces/qt/qtlclintf.inc index bcda0914b8..c8bfe038c4 100644 --- a/lcl/interfaces/qt/qtlclintf.inc +++ b/lcl/interfaces/qt/qtlclintf.inc @@ -366,17 +366,6 @@ begin Result := GetDC(WindowHandle); end; -{------------------------------------------------------------------------------ - Function: IntfSendsUTF8KeyPress - Params: - Returns: - ------------------------------------------------------------------------------} - -function TQtWidgetSet.IntfSendsUTF8KeyPress: boolean; -begin - Result := True; -end; - function TQtWidgetSet.IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; begin Result := (WindowHandle <> 0) and (TQtWidget(WindowHandle) is TQtDesignWidget); diff --git a/lcl/interfaces/qt/qtlclintfh.inc b/lcl/interfaces/qt/qtlclintfh.inc index 3b4ad2a03a..df94cb2139 100644 --- a/lcl/interfaces/qt/qtlclintfh.inc +++ b/lcl/interfaces/qt/qtlclintfh.inc @@ -54,7 +54,6 @@ function FontIsMonoSpace(Font: HFont): boolean; override; function GetDesignerDC(WindowHandle: HWND): HDC; override; -function IntfSendsUTF8KeyPress: boolean; override; function IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; override; function PromptUser(const DialogCaption : string; diff --git a/lcl/interfaces/win32/win32lclintf.inc b/lcl/interfaces/win32/win32lclintf.inc index ee11393c24..e5f08d7159 100644 --- a/lcl/interfaces/win32/win32lclintf.inc +++ b/lcl/interfaces/win32/win32lclintf.inc @@ -645,19 +645,6 @@ begin Result := Windows.GetDC(OverlayWindow); end; -{------------------------------------------------------------------------------ - function TWin32WidgetSet.IntfSendsUTF8KeyPress: boolean; - - ------------------------------------------------------------------------------} -function TWin32WidgetSet.IntfSendsUTF8KeyPress: boolean; -begin - {$ifdef WindowsUnicodeSupport} - Result := true; - {$else} - Result := false; - {$endif} -end; - function TWin32WidgetSet.IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; var OverlayWindow: HWND; diff --git a/lcl/interfaces/win32/win32lclintfh.inc b/lcl/interfaces/win32/win32lclintfh.inc index 72f5e15e4b..0c03324e72 100644 --- a/lcl/interfaces/win32/win32lclintfh.inc +++ b/lcl/interfaces/win32/win32lclintfh.inc @@ -55,7 +55,6 @@ function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState) function GetControlConstraints(Constraints: TObject): boolean; override; function GetDesignerDC(WindowHandle: HWND): HDC; override; -function IntfSendsUTF8KeyPress: boolean; override; function IsDesignerDC(WindowHandle: HWND; DC: HDC): Boolean; override; function PromptUser(const DialogCaption, DialogMessage: String; DialogType : longint; Buttons : PLongint; ButtonCount, DefaultIndex, EscapeResult : Longint) : Longint; override; diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc index be68b693bc..5ce1dcf79b 100644 --- a/lcl/interfaces/win32/win32object.inc +++ b/lcl/interfaces/win32/win32object.inc @@ -534,6 +534,12 @@ begin lcApplicationWindow: Result := LCL_CAPABILITY_YES; lcLMHelpSupport: Result := LCL_CAPABILITY_YES; lcNeedMininimizeAppWithMainForm: Result := LCL_CAPABILITY_NO; + lcSendsUTF8KeyPress: + {$ifdef WindowsUnicodeSupport} + Result := LCL_CAPABILITY_YES; + {$else} + Result := LCL_CAPABILITY_NO; + {$endif} else Result := inherited; end; diff --git a/lcl/interfaces/wince/wincelclintf.inc b/lcl/interfaces/wince/wincelclintf.inc index 656122e600..90975a0d25 100644 --- a/lcl/interfaces/wince/wincelclintf.inc +++ b/lcl/interfaces/wince/wincelclintf.inc @@ -553,16 +553,6 @@ begin end; -{------------------------------------------------------------------------------ - function TWin32WidgetSet.IntfSendsUTF8KeyPress: boolean; - - ------------------------------------------------------------------------------} -function TWinCEWidgetSet.IntfSendsUTF8KeyPress: boolean; -begin - Result := true; -end; - - {------------------------------------------------------------------------------ Method: CallbackAllocateHWnd Params: None diff --git a/lcl/interfaces/wince/wincelclintfh.inc b/lcl/interfaces/wince/wincelclintfh.inc index 05ae605ede..a7ecf28a8f 100644 --- a/lcl/interfaces/wince/wincelclintfh.inc +++ b/lcl/interfaces/wince/wincelclintfh.inc @@ -52,8 +52,6 @@ function RawImage_FromDevice(out ARawImage: TRawImage; ADC: HDC; const ARect: TR // override only when queried formats are different from screen description function RawImage_QueryDescription(AFlags: TRawImageQueryFlags; var ADesc: TRawImageDescription): Boolean; override; -function IntfSendsUTF8KeyPress: boolean; override; - procedure RemoveEventHandler(var AHandler: PEventHandler); override; procedure RemovePipeEventHandler(var AHandler: PPipeEventHandler); override; procedure RemoveProcessEventHandler(var AHandler: PProcessEventHandler); override;