Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cast from pointer to int in wxDataViewCtrl.

Browse Source 
This fixes compilation in 64 bit.

Closes #12073.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-05-21 11:46:13 +00:00
parent 747eb0f686
commit 74035a191b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/dataview.cpp
View File

@@ -111,7 +111,7 @@ public:
wxDataViewCtrl* GetOwner() { return m_owner; } wxDataViewCtrl* GetOwner() { return m_owner; }
GtkWxTreeModel* GetGtkModel() { return m_gtk_model; } GtkWxTreeModel* GetGtkModel() { return m_gtk_model; }
// item can be deleted already in the model // item can be deleted already in the model
int GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item ); int GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item );
protected: protected:
@@ -1419,7 +1419,7 @@ bool wxGtkDataViewModelNotifier::ItemDeleted( const wxDataViewItem &parent, cons
int index = m_owner->GtkGetInternal()->GetIndexOf( parent, item ); int index = m_owner->GtkGetInternal()->GetIndexOf( parent, item );
gtk_tree_path_append_index( path, index ); gtk_tree_path_append_index( path, index );
#endif #endif
gtk_tree_model_row_deleted( gtk_tree_model_row_deleted(
GTK_TREE_MODEL(m_wxgtk_model), path ); GTK_TREE_MODEL(m_wxgtk_model), path );
gtk_tree_path_free (path); gtk_tree_path_free (path);
@@ -3532,7 +3532,7 @@ GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
// iter is root, add nothing // iter is root, add nothing
if (!iter->user_data) if (!iter->user_data)
return retval; return retval;
// user_data is just the index +1 // user_data is just the index +1
int i = ( (wxUIntPtr) iter->user_data ) -1; int i = ( (wxUIntPtr) iter->user_data ) -1;
gtk_tree_path_append_index (retval, i); gtk_tree_path_append_index (retval, i);
@@ -3626,7 +3626,7 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *
return TRUE; return TRUE;
} }
wxDataViewItem item; wxDataViewItem item;
if (parent) if (parent)
item = wxDataViewItem( (void*) parent->user_data ); item = wxDataViewItem( (void*) parent->user_data );
@@ -3777,13 +3777,12 @@ gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *ch
} }
} }
// item can be deleted already in the model // item can be deleted already in the model
int wxDataViewCtrlInternal::GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item ) int wxDataViewCtrlInternal::GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item )
{ {
if (m_wx_model->IsVirtualListModel()) if (m_wx_model->IsVirtualListModel())
{ {
int index = ((int)(item.GetID())) - 1; return wxPtrToUInt(item.GetID()) - 1;
return index;
} }
else else
{ {