2004-05-22 Radek Doulik <rodo@ximian.com>

* gtk/TreeView.custom(GetPathAtPos): change Gtk.TreeViewColumn
	column parameter to out[put] as gtk_tree_view_get_path_at_pos
	returns column address to column parameter

svn path=/trunk/gtk-sharp/; revision=27857
This commit is contained in:
Radek Doulik 2004-05-22 08:49:58 +00:00
parent 9f54a63375
commit f8da0639b7
2 changed files with 26 additions and 20 deletions

View File

@ -1,3 +1,9 @@
2004-05-22 Radek Doulik <rodo@ximian.com>
* gtk/TreeView.custom(GetPathAtPos): change Gtk.TreeViewColumn
column parameter to out[put] as gtk_tree_view_get_path_at_pos
returns column address to column parameter
2004-05-19 Mike Kestner <mkestner@ximian.com> 2004-05-19 Mike Kestner <mkestner@ximian.com>
* gtk/Container.custom : add CallbackInvoke and use it in OnForall. * gtk/Container.custom : add CallbackInvoke and use it in OnForall.

View File

@ -64,7 +64,7 @@
int x, int x,
int y, int y,
out IntPtr path, out IntPtr path,
IntPtr column, out IntPtr column,
out int cell_x, out int cell_x,
out int cell_y); out int cell_y);
@ -73,24 +73,22 @@
int x, int x,
int y, int y,
out IntPtr path, out IntPtr path,
IntPtr column, out IntPtr column,
IntPtr cell_x, IntPtr cell_x,
IntPtr cell_y); IntPtr cell_y);
public bool GetPathAtPos (int x, int y, out Gtk.TreePath path, Gtk.TreeViewColumn column, out int cell_x, out int cell_y) public bool GetPathAtPos (int x, int y, out Gtk.TreePath path, out Gtk.TreeViewColumn column, out int cell_x, out int cell_y)
{ {
IntPtr col;
if (column == null)
col = IntPtr.Zero;
else
col = column.Handle;
IntPtr pathHandle; IntPtr pathHandle;
bool raw_ret = gtk_tree_view_get_path_at_pos (Handle, x, y, out pathHandle, col, out cell_x, out cell_y); IntPtr columnHandle;
if (raw_ret) bool raw_ret = gtk_tree_view_get_path_at_pos (Handle, x, y, out pathHandle, out columnHandle, out cell_x, out cell_y);
if (raw_ret) {
column = new TreeViewColumn (columnHandle);
path = new TreePath (pathHandle); path = new TreePath (pathHandle);
else } else {
path = null; path = null;
column = null;
}
return raw_ret; return raw_ret;
} }
@ -99,7 +97,8 @@
public bool GetPathAtPos (int x, int y, out Gtk.TreePath path) public bool GetPathAtPos (int x, int y, out Gtk.TreePath path)
{ {
IntPtr pathHandle; IntPtr pathHandle;
bool raw_ret = gtk_tree_view_get_path_at_pos_intptr (Handle, x, y, out pathHandle, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero); IntPtr columnHandle;
bool raw_ret = gtk_tree_view_get_path_at_pos_intptr (Handle, x, y, out pathHandle, out columnHandle, IntPtr.Zero, IntPtr.Zero);
if (raw_ret) if (raw_ret)
path = new TreePath (pathHandle); path = new TreePath (pathHandle);
else else
@ -108,17 +107,18 @@
return raw_ret; return raw_ret;
} }
public bool GetPathAtPos (int x, int y, out Gtk.TreePath path, Gtk.TreeViewColumn column) public bool GetPathAtPos (int x, int y, out Gtk.TreePath path, out Gtk.TreeViewColumn column)
{ {
if (column == null)
return GetPathAtPos (x, y, out path);
IntPtr pathHandle; IntPtr pathHandle;
bool raw_ret = gtk_tree_view_get_path_at_pos_intptr (Handle, x, y, out pathHandle, column.Handle, IntPtr.Zero, IntPtr.Zero); IntPtr columnHandle;
if (raw_ret) bool raw_ret = gtk_tree_view_get_path_at_pos_intptr (Handle, x, y, out pathHandle, out columnHandle, IntPtr.Zero, IntPtr.Zero);
if (raw_ret) {
path = new TreePath (pathHandle); path = new TreePath (pathHandle);
else column = new TreeViewColumn (columnHandle);
} else {
path = null; path = null;
column = null;
}
return raw_ret; return raw_ret;
} }