summaryrefslogtreecommitdiff
path: root/UMounterPrefs.pas
diff options
context:
space:
mode:
Diffstat (limited to 'UMounterPrefs.pas')
-rw-r--r--UMounterPrefs.pas42
1 files changed, 21 insertions, 21 deletions
diff --git a/UMounterPrefs.pas b/UMounterPrefs.pas
index 76ababd..7194370 100644
--- a/UMounterPrefs.pas
+++ b/UMounterPrefs.pas
@@ -22,8 +22,8 @@ unit UMounterPrefs;
interface
uses
- glib2, gdk2, gtk2, pango, SysUtils, Types, Classes, Variants, GTKControls, GTKForms, GTKStdCtrls, GTKExtCtrls, GTKConsts,
- GTKView, GTKUtils, GTKDialogs, GTKPixbuf, GTKClasses, GTKMenus,
+ lazglib2, lazgobject2, gdk2, gtk2, SysUtils, Classes, Variants, GTKControls, GTKForms, GTKStdCtrls, GTKExtCtrls,
+ GTKView, GTKDialogs, GTKPixbuf, GTKMenus,
UCoreClasses, UGnome;
type
@@ -122,7 +122,7 @@ begin
MounterListTable.BorderWidth := 7;
ListView := TGTKListView.CreateTyped(Self, False, [lcText, lcText, lcText, lcPointer, lcPixbuf]);
- g_signal_connect(ListView.FWidget, 'drag-end', G_CALLBACK(@TGTKListView_drag_end), nil);
+ g_signal_connect_data(PGObject(ListView.FWidget), 'drag-end', TGCallback(@TGTKListView_drag_end), nil, nil, G_CONNECT_DEFAULT);
gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(ListView.FWidget), GDK_BUTTON1_MASK, @row_targets, 1, GDK_ACTION_MOVE or GDK_ACTION_COPY);
gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(ListView.FWidget), @row_targets, 1, GDK_ACTION_MOVE or GDK_ACTION_COPY);
ListView.RulesHint := True;
@@ -280,21 +280,21 @@ begin
- OnDestroy := FormDestroy;
- ListView.OnSelectionChanged := ListViewSelectionChanged;
- UseFSTabDefaultsCheckBox.OnToggled := UseFSTabDefaultsCheckBoxToggled;
- AddItemButton.OnClick := AddItemButtonClick;
- RemoveItemButton.OnClick := RemoveItemButtonClick;
- MoveUpButton.OnClick := MoveUpDownButtonButtonClick;
- MoveDownButton.OnClick := MoveUpDownButtonButtonClick;
- DisplayTextEntry.OnChanged := DisplayTextEntryChanged;
- MountPointEntry.OnChanged := MountPointEntryChanged;
- MountDeviceEntry.OnChanged := MountDeviceEntryChanged;
- MountCommandEntry.OnChanged := MountCommandEntryChanged;
- UmountCommandEntry.OnChanged := UmountCommandEntryChanged;
- DeviceTypeOptionMenu.OnChanged := DeviceTypeOptionMenuChanged;
- if FUseGnomeIconEntry then IconEntry.OnIconChanged := IconEntryChanged
- else IconEntry2.OnClick := IconEntry2Click;
+ OnDestroy := @FormDestroy;
+ ListView.OnSelectionChanged := @ListViewSelectionChanged;
+ UseFSTabDefaultsCheckBox.OnToggled := @UseFSTabDefaultsCheckBoxToggled;
+ AddItemButton.OnClick := @AddItemButtonClick;
+ RemoveItemButton.OnClick := @RemoveItemButtonClick;
+ MoveUpButton.OnClick := @MoveUpDownButtonButtonClick;
+ MoveDownButton.OnClick := @MoveUpDownButtonButtonClick;
+ DisplayTextEntry.OnChanged := @DisplayTextEntryChanged;
+ MountPointEntry.OnChanged := @MountPointEntryChanged;
+ MountDeviceEntry.OnChanged := @MountDeviceEntryChanged;
+ MountCommandEntry.OnChanged := @MountCommandEntryChanged;
+ UmountCommandEntry.OnChanged := @UmountCommandEntryChanged;
+ DeviceTypeOptionMenu.OnChanged := @DeviceTypeOptionMenuChanged;
+ if FUseGnomeIconEntry then IconEntry.OnIconChanged := @IconEntryChanged
+ else IconEntry2.OnClick := @IconEntry2Click;
ListViewSelectionChanged(Self);
ListView.SetFocus;
@@ -319,7 +319,7 @@ begin
if FUseGnomeIconEntry then IconEntry.Filename := '';
Exit;
end;
- Item := ListView.Selected.AsPointer(3);
+ Item := TMounterItem(ListView.Selected.AsPointer(3));
DisplayTextEntry.Text := Item.DisplayText;
MountPointEntry.Text := StrToUTF8(Item.MountPath);
MountDeviceEntry.Text := StrToUTF8(Item.Device);
@@ -358,7 +358,7 @@ procedure TFMounterPrefs.RemoveItemButtonClick(Sender: TObject);
var Item: TMounterItem;
begin
if Assigned(ListView.Selected) and Assigned(ListView.Selected.AsPointer(3)) then begin
- Item := ListView.Selected.AsPointer(3);
+ Item := TMounterItem(ListView.Selected.AsPointer(3));
Item.Free;
InternalMounterList.Remove(Item);
ListView.Items.Delete(ListView.Selected.Index);
@@ -449,7 +449,7 @@ var Pixmap: TGDKPixbuf;
b: boolean;
Data: TMounterItem;
begin
- Data := InternalMounterList[ItemIndex];
+ Data := TMounterItem(InternalMounterList[ItemIndex]);
b := FileExists(Data.IconPath);
Pixmap := nil;
if b then begin