paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 23:38:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl, widgetsets: remove IntfSendsUTF8KeyPress from the widgetset interfaces implementation and call GetLCLCapability instead inside the generic function body

Browse Source 
git-svn-id: trunk@36446 -
This commit is contained in:
paul 2012-03-30 08:28:34 +00:00
parent e133b24a34
commit df6f72a520
20 changed files with 10 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/include/interfacebase.inc
View File

@ -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;

2
lcl/include/intfbaselcl.inc
View File

@ -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;

9
lcl/interfaces/carbon/carbonlclintf.inc
View File

@ -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

1
lcl/interfaces/carbon/carbonlclintfh.inc
View File

@ -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;

9
lcl/interfaces/cocoa/cocoalclintf.inc
View File

@ -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

2
lcl/interfaces/cocoa/cocoalclintfh.inc
View File

@ -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;

13
lcl/interfaces/customdrawn/customdrawnlclintf.inc
View File

@ -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

2
lcl/interfaces/customdrawn/customdrawnlclintfh.inc
View File

@ -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;

2
lcl/interfaces/fpgui/fpguilclintfh.inc
View File

@ -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;

10
lcl/interfaces/gtk/gtklclintf.inc
View File

@ -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

2
lcl/interfaces/gtk/gtklclintfh.inc
View File

@ -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;

9
lcl/interfaces/gtk2/gtk2lclintf.inc
View File

@ -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

2
lcl/interfaces/gtk2/gtk2lclintfh.inc
View File

@ -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;

11
lcl/interfaces/qt/qtlclintf.inc
View File

@ -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);

1
lcl/interfaces/qt/qtlclintfh.inc
View File

@ -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;

13
lcl/interfaces/win32/win32lclintf.inc
View File

@ -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;

1
lcl/interfaces/win32/win32lclintfh.inc
View File

@ -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;

6
lcl/interfaces/win32/win32object.inc
View File

@ -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;

10
lcl/interfaces/wince/wincelclintf.inc
View File

@ -553,16 +553,6 @@ begin
end;
{------------------------------------------------------------------------------
function TWin32WidgetSet.IntfSendsUTF8KeyPress: boolean;
------------------------------------------------------------------------------}
function TWinCEWidgetSet.IntfSendsUTF8KeyPress: boolean;
begin
Result := true;
end;
{------------------------------------------------------------------------------
Method: CallbackAllocateHWnd
Params: None

2
lcl/interfaces/wince/wincelclintfh.inc
View File

@ -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;