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

+ TCharater type used to allow UTF8 keyboard with gtk2

Browse Source 
git-svn-id: trunk@5781 -
This commit is contained in:
mazen 2004-08-13 16:40:47 +00:00
parent 0394698db3
commit c4db8f2797
15 changed files with 101 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/synedit/syncompletion.pas
View File

@ -86,7 +86,7 @@ type
{$ENDIF}
procedure SetCurrentString(const Value: string);
procedure KeyDown(var Key: Word; Shift: TShiftState); override;
procedure KeyPress(var Key: char); override;
procedure KeyPress(var Key: TCharacter); override;
procedure Paint; override;
procedure ScrollGetFocus(Sender: TObject);
procedure Deactivate; override;
@ -217,9 +217,9 @@ type
procedure backspace(Sender: TObject);
procedure Cancel(Sender: TObject);
procedure Validate(Sender: TObject; Shift: TShiftState);
procedure KeyPress(Sender: TObject; var Key: Char);
procedure KeyPress(Sender: TObject; var Key: TCharacter);
procedure EditorKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure EditorKeyPress(Sender: TObject; var Key: char);
procedure EditorKeyPress(Sender: TObject; var Key: TCharacter);
function GetPreviousToken(FEditor: TCustomSynEdit): string;
function GetFEditor: TCustomSynEdit;
function GetEditor(i: integer): TCustomSynEdit;
@ -260,7 +260,7 @@ type
override;
procedure EditorKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
virtual;
procedure EditorKeyPress(Sender: TObject; var Key: char); virtual;
procedure EditorKeyPress(Sender: TObject; var Key: TCharacter); virtual;
function GetPreviousToken(aEditor: TCustomSynEdit): string;
public
constructor Create(AOwner: TComponent); override;
@ -402,7 +402,7 @@ begin
{$ENDIF}
end;
procedure TSynBaseCompletionForm.KeyPress(var Key: char);
procedure TSynBaseCompletionForm.KeyPress(var Key: TCharacter);
begin
case key of //
#33..'z': begin
@ -1020,7 +1020,7 @@ begin
end;
end;
procedure TSynCompletion.KeyPress(Sender: TObject; var Key: Char);
procedure TSynCompletion.KeyPress(Sender: TObject; var Key: TCharacter);
var
F: TSynBaseCompletionForm;
begin
@ -1126,7 +1126,7 @@ begin
result := '';
end;
procedure TSynCompletion.EditorKeyPress(Sender: TObject; var Key: char);
procedure TSynCompletion.EditorKeyPress(Sender: TObject; var Key: TCharacter);
var
i: integer;
begin
@ -1290,7 +1290,7 @@ begin
end;
end;
procedure TSynAutoComplete.EditorKeyPress(Sender: TObject; var Key: char);
procedure TSynAutoComplete.EditorKeyPress(Sender: TObject; var Key: TCharacter);
var
i: integer;
begin

24
components/synedit/synedit.pp
View File

@ -131,13 +131,13 @@ type
of object;
THookedCommandEvent = procedure(Sender: TObject; AfterProcessing: boolean;
var Handled: boolean; var Command: TSynEditorCommand; var AChar: char;
var Handled: boolean; var Command: TSynEditorCommand; var AChar: TCharacter;
Data: pointer; HandlerData: pointer) of object;
TPaintEvent = procedure(Sender: TObject; ACanvas: TCanvas) of object;
TProcessCommandEvent = procedure(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer) of object;
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer) of object;
TReplaceTextEvent = procedure(Sender: TObject; const ASearch, AReplace:
string; Line, Column: integer; var ReplaceAction: TSynReplaceAction) of object;
@ -510,7 +510,7 @@ type
procedure InvalidateBracketHighlight(OnlyIfCaretMoved: boolean);
{$ENDIF}
procedure KeyDown(var Key: Word; Shift: TShiftState); override;
procedure KeyPress(var Key: Char); override;
procedure KeyPress(var Key: TCharacter); override;
{$IFDEF SYN_LAZARUS}
procedure KeyUp(var Key : Word; Shift : TShiftState); override;
{$ENDIF}
@ -532,7 +532,7 @@ type
procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
override;
procedure NotifyHookedCommandHandlers(AfterProcessing: boolean;
var Command: TSynEditorCommand; var AChar: char; Data: pointer); virtual;
var Command: TSynEditorCommand; var AChar: Tcharacter; Data: pointer); virtual;
procedure Paint; override;
procedure PaintGutter(AClip: TRect; FirstLine, LastLine: integer); virtual;
procedure PaintTextLines(AClip: TRect; FirstLine, LastLine,
@ -563,14 +563,14 @@ type
{$ENDIF}
SavedCanvas: TCanvas; // the normal TCustomControl canvas during paint
procedure DoOnClearBookmark(var Mark: TSynEditMark); virtual; // djlp - 2000-08-29
procedure DoOnCommandProcessed(Command: TSynEditorCommand; AChar: char;
procedure DoOnCommandProcessed(Command: TSynEditorCommand; AChar: TCharacter;
Data: pointer); virtual;
// no method DoOnDropFiles, intercept the WM_DROPFILES instead
procedure DoOnGutterClick(X, Y: integer); virtual;
procedure DoOnPaint; virtual;
procedure DoOnPlaceMark(var Mark: TSynEditMark); virtual;
procedure DoOnProcessCommand(var Command: TSynEditorCommand;
var AChar: char; Data: pointer); virtual;
var AChar: TCharacter; Data: pointer); virtual;
function DoOnReplaceText(const ASearch, AReplace: string;
Line, Column: integer): TSynReplaceAction; virtual;
function DoOnSpecialLineColors(Line: integer;
@ -589,7 +589,7 @@ type
procedure ClearAll;
procedure ClearBookMark(BookMark: Integer);
procedure ClearSelection;
procedure CommandProcessor(Command: TSynEditorCommand; AChar: char;
procedure CommandProcessor(Command: TSynEditorCommand; AChar: TCharacter;
Data: pointer); virtual;
procedure ClearUndo;
procedure CopyToClipboard;
@ -1823,7 +1823,7 @@ begin
GutterChanged(Self);
end;
procedure TCustomSynEdit.KeyPress(var Key: Char);
procedure TCustomSynEdit.KeyPress(var Key: TCharacter);
begin
{$IFDEF SYN_MBCSSUPPORT}
if (fImeCount > 0) then begin
@ -5785,7 +5785,7 @@ begin
end;
procedure TCustomSynEdit.CommandProcessor(Command: TSynEditorCommand;
AChar: char; Data: pointer);
AChar: TCharacter; Data: pointer);
begin
{$IFDEF VerboseKeys}
DebugLn('[TCustomSynEdit.CommandProcessor] ',Command
@ -6459,14 +6459,14 @@ begin
end;
procedure TCustomSynEdit.DoOnCommandProcessed(Command: TSynEditorCommand;
AChar: char; Data: pointer);
AChar: TCharacter; Data: pointer);
begin
if Assigned(fOnCommandProcessed) then
fOnCommandProcessed(Self, Command, AChar, Data);
end;
procedure TCustomSynEdit.DoOnProcessCommand(var Command: TSynEditorCommand;
var AChar: char; Data: pointer);
var AChar: TCharacter; Data: pointer);
begin
if Command < ecUserFirst then begin
if Assigned(FOnProcessCommand) then
@ -8114,7 +8114,7 @@ begin
end;
procedure TCustomSynEdit.NotifyHookedCommandHandlers(AfterProcessing: boolean;
var Command: TSynEditorCommand; var AChar: char; Data: pointer);
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer);
var
Handled: boolean;
i: integer;

7
components/synedit/syneditautocomplete.pp
View File

@ -49,7 +49,8 @@ uses
{$ELSE}
Windows,
{$ENDIF}
Classes, SynEdit, SynEditKeyCmds;
Classes, SynEdit, SynEditKeyCmds,
Controls;
type
{$IFDEF SYN_LAZARUS}
@ -82,7 +83,7 @@ type
procedure SetAutoCompleteList(Value: TStrings); virtual;
procedure SetEditor(Value: TCustomSynEdit);
procedure SynEditCommandHandler(Sender: TObject; AfterProcessing: boolean;
var Handled: boolean; var Command: TSynEditorCommand; var AChar: char;
var Handled: boolean; var Command: TSynEditorCommand; var AChar: TCharacter;
Data: pointer; HandlerData: pointer);
public
constructor Create(AOwner: TComponent); override;
@ -562,7 +563,7 @@ end;
procedure TCustomSynAutoComplete.SynEditCommandHandler(Sender: TObject;
AfterProcessing: boolean; var Handled: boolean;
var Command: TSynEditorCommand; var AChar: char; Data: pointer;
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer;
HandlerData: pointer);
begin
if not AfterProcessing and not Handled and (Command = ecAutoCompletion) then

9
components/synedit/syneditplugins.pas
View File

@ -55,7 +55,8 @@ uses
Menus,
{$ENDIF}
SynEdit,
SynEditKeyCmds;
SynEditKeyCmds,
Controls;
type
TAbstractSynPlugin = class(TComponent)
@ -87,7 +88,7 @@ type
procedure UnHookEditor(aEditor: TCustomSynEdit;
aCommandID: TSynEditorCommand; aShortCut: TShortCut);
procedure OnCommand(Sender: TObject; AfterProcessing: boolean;
var Handled: boolean; var Command: TSynEditorCommand; var aChar: char;
var Handled: boolean; var Command: TSynEditorCommand; var aChar: TCharacter;
Data: pointer; HandlerData: pointer); virtual; abstract;
end;
@ -132,7 +133,7 @@ type
protected
procedure SetCurrentString(const Value: String); virtual;
procedure OnCommand(Sender: TObject; AfterProcessing: boolean;
var Handled: boolean; var Command: TSynEditorCommand; var aChar: char;
var Handled: boolean; var Command: TSynEditorCommand; var aChar: TCharacter;
Data: pointer; HandlerData: pointer); override;
procedure DoExecute; override;
procedure DoAccept; override;
@ -483,7 +484,7 @@ end;
procedure TAbstractSynCompletion.OnCommand(Sender: TObject;
AfterProcessing: boolean; var Handled: boolean;
var Command: TSynEditorCommand; var aChar: char; Data,
var Command: TSynEditorCommand; var aChar: TCharacter; Data,
HandlerData: pointer);
var
iString: String;

4
components/synedit/synmacrorecorder.pas
View File

@ -204,7 +204,7 @@ type
procedure DoAddEditor(aEditor: TCustomSynEdit); override;
procedure DoRemoveEditor(aEditor: TCustomSynEdit); override;
procedure OnCommand(Sender: TObject; AfterProcessing: boolean;
var Handled: boolean; var Command: TSynEditorCommand; var aChar: char;
var Handled: boolean; var Command: TSynEditorCommand; var aChar: TCharacter;
Data: pointer; HandlerData: pointer); override;
function CreateMacroEvent(aCmd: TSynEditorCommand): TSynMacroEvent;
protected
@ -502,7 +502,7 @@ end;
procedure TCustomSynMacroRecorder.OnCommand(Sender: TObject;
AfterProcessing: boolean; var Handled: boolean;
var Command: TSynEditorCommand; var aChar: char; Data,
var Command: TSynEditorCommand; var aChar: TCharacter; Data,
HandlerData: pointer);
var
iEvent: TSynMacroEvent;

22
ide/uniteditor.pp
View File

@ -168,11 +168,11 @@ type
Procedure ReParent(AParent: TWinControl);
Procedure ProcessCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer);
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer);
Procedure ProcessUserCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer);
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer);
Procedure UserCommandProcessed(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer);
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer);
Procedure ccOnTimer(sender: TObject);
Procedure ccAddMessage(Texts: String);
@ -454,10 +454,10 @@ type
procedure MoveActivePageLeft;
procedure MoveActivePageRight;
Procedure ProcessParentCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer;
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer;
var Handled: boolean);
Procedure ParentCommandProcessed(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer;
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer;
var Handled: boolean);
// marks
@ -902,7 +902,7 @@ begin
end;
Procedure TSourceEditor.ProcessCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer);
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer);
begin
if (FSourceNoteBook<>nil)
and (snIncrementalFind in FSourceNoteBook.States) then begin
@ -961,7 +961,7 @@ begin
end;
Procedure TSourceEditor.ProcessUserCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer);
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer);
var
I: Integer;
P: TPoint;
@ -1125,7 +1125,7 @@ Begin
end;
Procedure TSourceEditor.UserCommandProcessed(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer);
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer);
var Handled: boolean;
begin
Handled:=true;
@ -3846,7 +3846,7 @@ end;
procedure TSourceNotebook.ViewCallStackClick(Sender: TObject);
var
Command: TSynEditorCommand;
AChar: char;
AChar: TCharacter;
Data: pointer;
Handled: boolean;
begin
@ -4180,7 +4180,7 @@ Begin
end;
Procedure TSourceNotebook.ProcessParentCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer;
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer;
var Handled: boolean);
begin
FProcessingCommand:=true;
@ -4253,7 +4253,7 @@ begin
end;
Procedure TSourceNotebook.ParentCommandProcessed(Sender: TObject;
var Command: TSynEditorCommand; var AChar: char; Data: pointer;
var Command: TSynEditorCommand; var AChar: TCharacter; Data: pointer;
var Handled: boolean);
begin
if Assigned(FOnUserCommandProcessed) then begin

12
lcl/controls.pp
View File

@ -159,6 +159,11 @@ const
type
{$IFDEF GTK2}
TCharacter = WideChar;
{$ELSE GTK2}
TCharacter = Char;
{$ENDIF GTK2}
TWinControl = class;
TControl = class;
TWinControlClass = class of TWinControl;
@ -330,7 +335,7 @@ type
TKeyEvent = procedure(Sender: TObject; var Key: Word; Shift:TShiftState) of Object;
TKeyPressEvent = procedure(Sender: TObject; var Key: Char) of Object;
TKeyPressEvent = procedure(Sender: TObject; var Key: TCharacter) of Object;
TMouseEvent = Procedure(Sender : TOBject; Button: TMouseButton;
Shift : TShiftState; X, Y: Integer) of object;
@ -1426,7 +1431,7 @@ type
procedure KeyDown(var Key: Word; Shift: TShiftState); dynamic;
procedure KeyDownBeforeInterface(var Key: Word; Shift: TShiftState); dynamic;
procedure KeyDownAfterInterface(var Key: Word; Shift: TShiftState); dynamic;
procedure KeyPress(var Key: Char); dynamic;
procedure KeyPress(var Key: TCharacter); dynamic;
procedure KeyUp(var Key: Word; Shift: TShiftState); dynamic;
protected
Function FindNextControl(CurrentControl: TControl; GoForward,
@ -2390,6 +2395,9 @@ end.
{ =============================================================================
$Log$
Revision 1.234 2004/08/13 16:40:47 mazen
+ TCharater type used to allow UTF8 keyboard with gtk2
Revision 1.233 2004/08/09 21:12:42 mattias
implemented FormStyle fsSplash for splash screens

7
lcl/dbctrls.pp
View File

@ -130,7 +130,7 @@ Type
procedure SetDataField(Value: string);
procedure SetDataSource(Value: TDataSource);
protected
procedure KeyPress(var Key: Char); override;
procedure KeyPress(var Key: TCharacter); override;
procedure Loaded; override;
procedure Notification(AComponent: TComponent;
@ -257,7 +257,7 @@ Type
procedure SetDataField(Value: string);
procedure SetDataSource(Value: TDataSource);
protected
procedure KeyPress(var Key: Char); override;
procedure KeyPress(var Key: TCharacter); override;
procedure Loaded; override;
procedure Notification(AComponent: TComponent;
@ -1248,6 +1248,9 @@ end.
{ =============================================================================
$Log$
Revision 1.17 2004/08/13 16:40:47 mazen
+ TCharater type used to allow UTF8 keyboard with gtk2
Revision 1.16 2004/08/08 20:51:15 mattias
replaced TDBEdit.WMKillFocus by EditingDone, Change Class basically working

22
lcl/extdlgs.pas
View File

@ -134,7 +134,7 @@ type
function TitleStored: Boolean;
protected
procedure Change; dynamic;
procedure CalcKey(var Key: Char); dynamic;
procedure CalcKey(var Key: TCharacter); dynamic;
procedure DisplayChange; dynamic;
public
constructor Create(AOwner: TComponent); override;
@ -163,7 +163,7 @@ type
FCalcPanel: TPanel;
FDisplayPanel: TPanel;
FDisplayLabel: TLabel;
procedure FormKeyPress(Sender: TObject; var Key: Char);
procedure FormKeyPress(Sender: TObject; var Key: TCharacter);
procedure CopyItemClick(Sender: TObject);
function GetValue: Double;
procedure PasteItemClick(Sender: TObject);
@ -171,7 +171,7 @@ type
protected
procedure OkClick(Sender: TObject);
procedure CancelClick(Sender: TObject);
procedure CalcKey(Sender: TObject; var Key: Char);
procedure CalcKey(Sender: TObject; var Key: TCharacter);
procedure DisplayChange(Sender: TObject);
Procedure InitForm(ALayout : TCalculatorLayout); virtual;
Property MainPanel: TPanel Read FMainPanel;
@ -573,7 +573,7 @@ type
FControl: TControl;
procedure SetCalcText(const Value: string);
procedure CheckFirst;
procedure CalcKey(Key: Char);
procedure CalcKey(Key: TCharacter);
procedure Clear;
procedure Error;
procedure SetDisplay(R: Double);
@ -586,7 +586,7 @@ type
procedure TextChanged; virtual;
public
constructor CreateLayout(AOwner: TComponent; ALayout: TCalculatorLayout);
procedure CalcKeyPress(Sender: TObject; var Key: Char);
procedure CalcKeyPress(Sender: TObject; var Key: TCharacter);
procedure Copy;
procedure Paste;
Function WorkingPrecision : Integer;
@ -751,11 +751,13 @@ begin
end;
procedure TCalculatorPanel.CalcKey(Key: Char);
procedure TCalculatorPanel.CalcKey(Key: TCharacter);
var
R: Double;
begin
{$IFDEF GTK1}
Key:=UpCase(Key);
{$ENDIF GTK1}
if (FStatus = csError) and (Key <> 'C') then
Key:=#0;
if Assigned(FOnCalcKey) then
@ -851,7 +853,7 @@ begin
FOperator:='=';
end;
procedure TCalculatorPanel.CalcKeyPress(Sender: TObject; var Key: Char);
procedure TCalculatorPanel.CalcKeyPress(Sender: TObject; var Key: TCharacter);
var
Btn: TCustomSpeedButton;
@ -1008,7 +1010,7 @@ begin
else Result:=FValue;
end;
procedure TCalculatorDialog.CalcKey(var Key: Char);
procedure TCalculatorDialog.CalcKey(var Key: TCharacter);
begin
if Assigned(FOnCalcKey) then FOnCalcKey(Self, Key);
end;
@ -1131,7 +1133,7 @@ begin
end;
procedure TCalculatorForm.FormKeyPress(Sender: TObject; var Key: Char);
procedure TCalculatorForm.FormKeyPress(Sender: TObject; var Key: TCharacter);
begin
TCalculatorPanel(FCalcPanel).CalcKeyPress(Sender, Key);
end;
@ -1166,7 +1168,7 @@ begin
ModalResult:=mrCancel;
end;
procedure TCalculatorForm.CalcKey(Sender: TObject; var Key: Char);
procedure TCalculatorForm.CalcKey(Sender: TObject; var Key: TCharacter);
begin
if (Owner <> nil) and (Owner is TCalculatorDialog) then
TCalculatorDialog(Owner).CalcKey(Key);

5
lcl/include/customcombobox.inc
View File

@ -406,7 +406,7 @@ begin
inherited KeyDown(Key, Shift);
end;
procedure TCustomComboBox.KeyPress(var Key : Char);
procedure TCustomComboBox.KeyPress(var Key : TCharacter);
begin
if (Style=csDropDownList) and (Ord(Key)>31) then
Key:=#0
@ -790,6 +790,9 @@ end;
{
$Log$
Revision 1.42 2004/08/13 16:40:47 mazen
+ TCharater type used to allow UTF8 keyboard with gtk2
Revision 1.41 2004/07/16 21:49:00 mattias
added RTTI controls

5
lcl/include/dbedit.inc
View File

@ -122,7 +122,7 @@ begin
end;
{ Protected Methods}
procedure TDBEdit.KeyPress(var Key: Char);
procedure TDBEdit.KeyPress(var Key: TCharacter);
begin
inherited KeyPress(Key);
case Key of
@ -224,6 +224,9 @@ end;
{ =============================================================================
$Log$
Revision 1.7 2004/08/13 16:40:47 mazen
+ TCharater type used to allow UTF8 keyboard with gtk2
Revision 1.6 2004/08/08 20:51:15 mattias
replaced TDBEdit.WMKillFocus by EditingDone, Change Class basically working

5
lcl/include/dblistbox.inc
View File

@ -110,7 +110,7 @@ begin
end;
{ Protected Methods}
procedure TDBListBox.KeyPress(var Key: Char);
procedure TDBListBox.KeyPress(var Key: TCharacter);
begin
inherited KeyPress(Key);
case Key of
@ -200,6 +200,9 @@ end;
{ =============================================================================
$Log$
Revision 1.5 2004/08/13 16:40:47 mazen
+ TCharater type used to allow UTF8 keyboard with gtk2
Revision 1.4 2004/04/10 17:58:57 mattias
implemented mainunit hints for include files

10
lcl/include/wincontrol.inc
View File

@ -2138,7 +2138,7 @@ end;
{------------------------------------------------------------------------------
TWinControl KeyPress
------------------------------------------------------------------------------}
Procedure TWinControl.KeyPress(var Key: Char);
Procedure TWinControl.KeyPress(var Key: TCharacter);
begin
if Assigned(FOnKeyPress) then FOnKeyPress(Self, Key);
end;
@ -2234,7 +2234,7 @@ end;
Function TWinControl.DoKeyPress(Var Message : TLMKey): Boolean;
var
F: TCustomForm;
C: Char;
C: TCharacter;
begin
Result := True;
F := GetParentForm(Self);
@ -2245,7 +2245,8 @@ begin
if not (csNoStdEvents in ControlStyle)
then with Message do
begin
C := Char(CharCode);
C := TCharacter(CharCode);
writeLn('[TWinControl.DoKeyPress] ',HexStr(ord(C),4));
KeyPress(C);
CharCode := Ord(C);
if Char(CharCode) = #0 then Exit;
@ -3791,6 +3792,9 @@ end;
{ =============================================================================
$Log$
Revision 1.260 2004/08/13 16:40:47 mazen
+ TCharater type used to allow UTF8 keyboard with gtk2
Revision 1.259 2004/08/04 07:32:01 micha
fix win32 keyhandling, send cn_char

18
lcl/maskedit.pp
View File

@ -82,8 +82,8 @@ type
FOldValue: string;
function IsCharAlpha(AChar: Char): Boolean;
function IsCharAlphaNumeric(AChar: Char): Boolean;
function DoInputChar(var NewChar: Char; MaskOffset: Integer): Boolean;
function InputChar(var NewChar: Char; Offset: Integer): Boolean;
function DoInputChar(var NewChar: TCharacter; MaskOffset: Integer): Boolean;
function InputChar(var NewChar: TCharacter; Offset: Integer): Boolean;
function DeleteSelection(var Value: string; Offset: Integer;
Len: Integer): Boolean;
function InputString(var Value: string; const NewValue: string;
@ -95,7 +95,7 @@ type
function GetMasked: Boolean;
function GetMaskText: string;
function GetMaxLength: Integer;
function CharKeys(var CharCode: Char): Boolean;
function CharKeys(var CharCode: TCharacter): Boolean;
procedure SetEditText(const Value: string);
procedure SetEditMask(const Value: string);
procedure SetMaxLength(Value: Integer);
@ -111,7 +111,7 @@ type
procedure SetCursor(Pos: Integer);
procedure KeyDown(var Key: Word; Shift: TShiftState); override;
procedure KeyUp(var Key: Word; Shift: TShiftState); override;
procedure KeyPress(var Key: Char); override;
procedure KeyPress(var Key: TCharacter); override;
function EditCanModify: Boolean; virtual;
procedure MouseDown(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override;
procedure MouseUp(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override;
@ -622,7 +622,7 @@ begin
end;
end;
procedure TCustomMaskEdit.KeyPress(var Key: Char);
procedure TCustomMaskEdit.KeyPress(var Key: TCharacter);
begin
inherited KeyPress(Key);
if IsMasked and (Key <> #0) and not (Char(Key) in [^V, ^X, ^C]) then
@ -843,7 +843,7 @@ begin
end;
end;
function TCustomMaskEdit.CharKeys(var CharCode: Char): Boolean;
function TCustomMaskEdit.CharKeys(var CharCode: TCharacter): Boolean;
var
Txt: string;
OldPos: Integer;
@ -1187,7 +1187,7 @@ begin
end;
end;
function TCustomMaskEdit.InputChar(var NewChar: Char; Offset: Integer): Boolean;
function TCustomMaskEdit.InputChar(var NewChar: TCharacter; Offset: Integer): Boolean;
var
MaskOffset: Integer;
CType: TMaskCharType;
@ -1237,7 +1237,7 @@ begin
if AChar in MyCharSet then result := True;
end;
function TCustomMaskEdit.DoInputChar(var NewChar: Char; MaskOffset: Integer): Boolean;
function TCustomMaskEdit.DoInputChar(var NewChar: TCharacter; MaskOffset: Integer): Boolean;
var
Dir: TMaskDirectives;
Str: string;
@ -1383,7 +1383,7 @@ var
NewOffset, MaskOffset, Temp: Integer;
CType: TMaskCharType;
NewVal: string;
NewChar: Char;
NewChar: TCharacter;
begin
Result := Offset;
if NewValue = '' then Exit;

5
lcl/stdctrls.pp
View File

@ -248,7 +248,7 @@ type
procedure SetSorted(Val : boolean); virtual;
procedure SetStyle(Val : TComboBoxStyle); virtual;
procedure KeyDown(var Key : Word; Shift : TShiftState); override;
procedure KeyPress(var Key : Char); override;
procedure KeyPress(var Key : TCharacter); override;
property DropDownCount: Integer read FDropDownCount write SetDropDownCount default 8;
property Items: TStrings read FItems write SetItems;
@ -1158,6 +1158,9 @@ end.
{ =============================================================================
$Log$
Revision 1.158 2004/08/13 16:40:47 mazen
+ TCharater type used to allow UTF8 keyboard with gtk2
Revision 1.157 2004/08/13 10:20:19 mattias
fixed codetools ConstSet, implemented notifying TApplication whenmenu popups