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

* fix input / output with GTK2 in TEDIT

Browse Source 
git-svn-id: trunk@6004 -
This commit is contained in:
mazen 2004-09-15 14:00:16 +00:00
parent 3b2777f011
commit 6f629054b9
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/interfaces/gtk/gtkwscontrols.pp
View File

@ -151,7 +151,6 @@ begin
AText := StrPas(gtk_entry_get_text(PGtkEntry(PGtkCombo(Handle)^.entry))); AText := StrPas(gtk_entry_get_text(PGtkEntry(PGtkCombo(Handle)^.entry)));
end; end;
{$IfDef GTK1}
csEdit, csSpinEdit: csEdit, csSpinEdit:
AText:= StrPas(gtk_entry_get_text(PgtkEntry(Handle))); AText:= StrPas(gtk_entry_get_text(PgtkEntry(Handle)));
@ -161,7 +160,6 @@ begin
AText := StrPas(CS); AText := StrPas(CS);
g_free(CS); g_free(CS);
end; end;
{$EndIf}
else else
Result := false; Result := false;
end; end;
@ -391,7 +389,6 @@ begin
csGroupBox : gtk_frame_set_label(pgtkFrame(P),pLabel); csGroupBox : gtk_frame_set_label(pgtkFrame(P),pLabel);
{$IfDef GTK1}
csEdit : begin csEdit : begin
LockOnChange(PGtkObject(p),+1); LockOnChange(PGtkObject(p),+1);
gtk_entry_set_text(pGtkEntry(P), pLabel); gtk_entry_set_text(pGtkEntry(P), pLabel);
@ -408,7 +405,6 @@ begin
gtk_text_thaw(PGtkText(P)); gtk_text_thaw(PGtkText(P));
end; end;
{$EndIf}
csPage: csPage:
SetNotebookPageTabLabel; SetNotebookPageTabLabel;

10
lcl/interfaces/gtk/gtkwsstdctrls.pp
View File

@ -308,33 +308,25 @@ end;
function TGtkWSCustomEdit.GetSelStart(const ACustomEdit: TCustomEdit): integer; function TGtkWSCustomEdit.GetSelStart(const ACustomEdit: TCustomEdit): integer;
begin begin
{$IfDef GTK1}
Result := WidgetGetSelStart(GetWidgetInfo(Pointer(ACustomEdit.Handle), true)^.CoreWidget); Result := WidgetGetSelStart(GetWidgetInfo(Pointer(ACustomEdit.Handle), true)^.CoreWidget);
{$EndIf}
end; end;
function TGtkWSCustomEdit.GetSelLength(const ACustomEdit: TCustomEdit): integer; function TGtkWSCustomEdit.GetSelLength(const ACustomEdit: TCustomEdit): integer;
begin begin
{$IfDef GTK1}
with PGtkOldEditable(GetWidgetInfo(Pointer(ACustomEdit.Handle), true)^.CoreWidget)^ do begin with PGtkOldEditable(GetWidgetInfo(Pointer(ACustomEdit.Handle), true)^.CoreWidget)^ do begin
Result:=Abs(integer(selection_end_pos)-integer(selection_start_pos)); Result:=Abs(integer(selection_end_pos)-integer(selection_start_pos));
end; end;
{$EndIf}
end; end;
procedure TGtkWSCustomEdit.SetSelStart(const ACustomEdit: TCustomEdit; NewStart: integer); procedure TGtkWSCustomEdit.SetSelStart(const ACustomEdit: TCustomEdit; NewStart: integer);
begin begin
{$IfDef GTK1}
gtk_editable_set_position(PGtkOldEditable(GetWidgetInfo( gtk_editable_set_position(PGtkOldEditable(GetWidgetInfo(
Pointer(ACustomEdit.Handle), true)^.CoreWidget), NewStart); Pointer(ACustomEdit.Handle), true)^.CoreWidget), NewStart);
{$EndIf}
end; end;
procedure TGtkWSCustomEdit.SetSelLength(const ACustomEdit: TCustomEdit; NewLength: integer); procedure TGtkWSCustomEdit.SetSelLength(const ACustomEdit: TCustomEdit; NewLength: integer);
begin begin
{$IfDef GTK1}
WidgetSetSelLength(GetWidgetInfo(Pointer(ACustomEdit.Handle), true)^.CoreWidget, NewLength); WidgetSetSelLength(GetWidgetInfo(Pointer(ACustomEdit.Handle), true)^.CoreWidget, NewLength);
{$EndIf}
end; end;
{ TGtkWSCustomMemo } { TGtkWSCustomMemo }
@ -347,13 +339,11 @@ begin
if Length(AText) = 0 then if Length(AText) = 0 then
exit; exit;
{$IfDef GTK1}
Widget:=GetWidgetInfo(Pointer(ACustomMemo.Handle), true)^.CoreWidget; Widget:=GetWidgetInfo(Pointer(ACustomMemo.Handle), true)^.CoreWidget;
gtk_text_freeze(PGtkText(Widget)); gtk_text_freeze(PGtkText(Widget));
CurMemoLen := gtk_text_get_length(PGtkText(Widget)); CurMemoLen := gtk_text_get_length(PGtkText(Widget));
gtk_editable_insert_text(PGtkOldEditable(Widget), PChar(AText), Length(AText), @CurMemoLen); gtk_editable_insert_text(PGtkOldEditable(Widget), PChar(AText), Length(AText), @CurMemoLen);
gtk_text_thaw(PGtkText(Widget)); gtk_text_thaw(PGtkText(Widget));
{$EndIf}
end; end;
initialization initialization