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

Gtk2: cleanup of spinedit code, also added proper cast when control is spinedit. Removed usage of PGtkOldEditable

Browse Source 
git-svn-id: trunk@36019 -
This commit is contained in:
zeljko 2012-03-15 07:33:58 +00:00
parent a77dbf1589
commit 290986b478
3 changed files with 38 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/interfaces/gtk2/gtk2wscontrols.pp
View File

@ -243,12 +243,13 @@ begin
AText := StrPas(gtk_entry_get_text(PGtkEntry(PGtkCombo(Handle)^.entry)));
end;
csEdit, csSpinEdit:
AText:= StrPas(gtk_entry_get_text(PgtkEntry(Handle)));
csEdit: AText:= StrPas(gtk_entry_get_text(PgtkEntry(Handle)));
csSpinEdit: AText:= StrPas(gtk_entry_get_text(@PGtkSpinButton(Handle)^.entry));
csMemo:
begin
CS := gtk_editable_get_chars(PGtkOldEditable(
CS := gtk_editable_get_chars(PGtkEditable(
GetWidgetInfo(Pointer(Handle), True)^.CoreWidget), 0, -1);
AText := StrPas(CS);
g_free(CS);

56
lcl/interfaces/gtk2/gtk2wsspin.pp
View File

@ -33,7 +33,7 @@ uses
Math, Controls, LCLType, LCLProc, Spin, StdCtrls,
// Widgetset
Gtk2Extra, Gtk2Def, Gtk2Int, Gtk2WSControls, Gtk2WSStdCtrls,
Gtk2Proc, WSLCLClasses, WSSpin;
Gtk2Proc, WSLCLClasses, WSProc, WSSpin;
type
@ -55,29 +55,14 @@ type
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
end;
function GetGtkSpinEntry(Spin: PGtkSpinButton): PGtkEntry;
function GetSpinGtkEntry(const Spin: TWinControl): PGtkEntry;
function GetGtkFloatSpinEditable(Spin: PGtkSpinButton): PGtkOldEditable;
function GetSpinGtkEditable(const Spin: TWinControl): PGtkOldEditable;
implementation
function GetGtkSpinEntry(Spin: PGtkSpinButton): PGtkEntry;
function GetGtkFloatSpinEditable(Spin: PGtkSpinButton): PGtkEntry;
begin
Result:=PGtkEntry(@(Spin^.entry));
end;
function GetSpinGtkEntry(const Spin: TWinControl): PGtkEntry;
begin
Result:=GetGtkSpinEntry(PGtkSpinButton(Spin.Handle));
end;
function GetGtkFloatSpinEditable(Spin: PGtkSpinButton): PGtkOldEditable;
begin
Result:=PGtkOldEditable(@(Spin^.entry));
end;
function GetSpinGtkEditable(const Spin: TWinControl): PGtkOldEditable;
function GetSpinGtkEditable(const Spin: TWinControl): PGtkEntry;
begin
Result:=GetGtkFloatSpinEditable(PGtkSpinButton(Spin.Handle));
end;
@ -91,22 +76,30 @@ begin
end;
class function TGtk2WSCustomFloatSpinEdit.GetSelStart(const ACustomEdit: TCustomEdit): integer;
var
Entry: PGtkEntry;
begin
Result :=WidgetGetSelStart(PGtkWidget(GetSpinGtkEntry(ACustomEdit)));
if not WSCheckHandleAllocated(ACustomEdit, 'GetSelStart') then
Exit(0);
Entry := @PGtkSpinButton(ACustomEdit.Handle)^.entry;
Result := Min(Entry^.current_pos, Entry^.selection_bound)
end;
class function TGtk2WSCustomFloatSpinEdit.GetSelLength(const ACustomEdit: TCustomEdit): integer;
var
AStart, AEnd: gint;
begin
with GetSpinGtkEditable(ACustomEdit)^ do
Result := Abs(integer(selection_end_pos)-integer(selection_start_pos));
Result := 0;
if not WSCheckHandleAllocated(ACustomEdit, 'GetSelLength') then
Exit;
if gtk_editable_get_selection_bounds(PGtkEditable(GetSpinGtkEditable(ACustomEdit)), @AStart, @AEnd) then
Result := Abs(AEnd-AStart);
end;
class function TGtk2WSCustomFloatSpinEdit.GetValue(
const ACustomFloatSpinEdit: TCustomFloatSpinEdit): Double;
begin
// developer.gnome.org/doc/API/2.2/gtk/GtkSpinButton.html:
// "function gtk_spin_button_get_value_as_float is deprecated, use gtk_spin_button_get_value() instead"
Result:=gtk_spin_button_get_value(PGtkSpinButton(ACustomFloatSpinEdit.Handle));
Result := gtk_spin_button_get_value(PGtkSpinButton(ACustomFloatSpinEdit.Handle));
end;
class procedure TGtk2WSCustomFloatSpinEdit.SetSelStart(const ACustomEdit: TCustomEdit;
@ -117,9 +110,17 @@ end;
class procedure TGtk2WSCustomFloatSpinEdit.SetSelLength(const ACustomEdit: TCustomEdit;
NewLength: integer);
var
Entry: PGtkEntry;
SelStart: Integer;
begin
WidgetSetSelLength(PGtkWidget(GetSpinGtkEntry(ACustomEdit)),
NewLength);
if not WSCheckHandleAllocated(ACustomEdit, 'SetSelLength') then
Exit;
Entry := @PGtkSpinButton(ACustomEdit.Handle)^.entry;
SelStart := GetSelStart(ACustomEdit);
gtk_entry_select_region(Entry,
SelStart,
SelStart + NewLength);
end;
class procedure TGtk2WSCustomFloatSpinEdit.SetReadOnly(const ACustomEdit: TCustomEdit; ReadOnly: boolean);
@ -204,6 +205,9 @@ begin
WidgetInfo := CreateWidgetInfo(Widget, AWinControl, AParams);
Set_RC_Name(AWinControl, Widget);
SetCallbacks(Widget, WidgetInfo);
if Result <> 0 then
g_object_set(gtk_widget_get_settings(@PGtkSpinButton(Result)^.entry),
'gtk-entry-select-on-focus', [0, nil]);
end;
end.

32
lcl/interfaces/gtk2/gtk2wsstdctrls.pp
View File

@ -383,9 +383,6 @@ type
{$I gtk2memostrings.inc}
{$UNDEF MEMOHEADER}
function WidgetGetSelStart(const Widget: PGtkWidget): integer;
procedure WidgetSetSelLength(const Widget: PGtkWidget; NewLength: integer);
function GetComboBoxEntry(Widget: PGtkWidget): PGtkEntry;
implementation
@ -410,30 +407,6 @@ begin
Result := nil;
end;
function WidgetGetSelStart(const Widget: PGtkWidget): integer;
begin
if Widget <> nil then
begin
if PGtkOldEditable(Widget)^.selection_start_pos
< PGtkOldEditable(Widget)^.selection_end_pos
then
Result:= PGtkOldEditable(Widget)^.selection_start_pos
else
Result:= PGtkOldEditable(Widget)^.current_pos;// selection_end_pos
end else
Result:= 0;
end;
procedure WidgetSetSelLength(const Widget: PGtkWidget; NewLength: integer);
begin
if Widget<>nil then
begin
gtk_editable_select_region(PGtkOldEditable(Widget),
gtk_editable_get_position(PGtkOldEditable(Widget)),
gtk_editable_get_position(PGtkOldEditable(Widget)) + NewLength);
end;
end;
{$I gtk2memostrings.inc}
{ TGtk2WSCustomListBox }
@ -1077,7 +1050,10 @@ begin
// see bug http://bugs.freepascal.org/view.php?id=14615
LockOnChange(PgtkObject(Widget), +1);
try
gtk_entry_set_text(PGtkEntry(Widget), PChar(AText));
if GTK_IS_SPIN_BUTTON(Widget) then
gtk_entry_set_text(@PGtkSpinButton(Widget)^.entry, PChar(AText))
else
gtk_entry_set_text(PGtkEntry(Widget), PChar(AText));
finally
LockOnChange(PgtkObject(Widget), -1);
end;