Fix casts from void* to int on x86_64 gcc by using wxUIntPtr instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -283,7 +283,7 @@ wxgtk_list_store_get_path (GtkTreeModel *tree_model,
|
|||||||
|
|
||||||
GtkTreePath *retval = gtk_tree_path_new ();
|
GtkTreePath *retval = gtk_tree_path_new ();
|
||||||
// user_data is just the index
|
// user_data is just the index
|
||||||
int i = (int) iter->user_data;
|
int i = (wxUIntPtr) iter->user_data;
|
||||||
gtk_tree_path_append_index (retval, i);
|
gtk_tree_path_append_index (retval, i);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
@@ -341,7 +341,7 @@ wxgtk_list_store_iter_next (GtkTreeModel *tree_model,
|
|||||||
|
|
||||||
g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE);
|
g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE);
|
||||||
|
|
||||||
int n = (int) iter->user_data;
|
int n = (wxUIntPtr) iter->user_data;
|
||||||
|
|
||||||
if (n == -1)
|
if (n == -1)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
Reference in New Issue
Block a user