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

No changes, just add wxGtkList to ensure g_list_free() is always called.

Browse Source 
Add an extremely simple RAII wrapper around GList and use it.

Also add wxGtkTreePathList which also automatically frees its contents to
simplify working with the lists of GtkTreePaths.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-08-22 12:41:00 +00:00
parent 040050b8f4
commit 0eec47e4a2
3 changed files with 61 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gtk/dataview.cpp
View File

@@ -34,6 +34,7 @@
#include "wx/gtk/dcclient.h"
#include "wx/gtk/private/gdkconv.h"
#include "wx/gtk/private/list.h"
using namespace wxGTKImpl;
class wxGtkDataViewModelNotifier;
@@ -98,6 +99,26 @@ private:
wxDECLARE_NO_COPY_CLASS(wxGtkTreePath);
};
// ----------------------------------------------------------------------------
// wxGtkTreePathList: self-destroying list of GtkTreePath objects.
// ----------------------------------------------------------------------------
class wxGtkTreePathList : public wxGtkList
{
public:
// Ctor takes ownership of the list.
explicit wxGtkTreePathList(GList* list)
: wxGtkList(list)
{
}
~wxGtkTreePathList()
{
// Delete the list contents, wxGtkList will delete the list itself.
g_list_foreach(m_list, (GFunc)gtk_tree_path_free, NULL);
}
};
// ----------------------------------------------------------------------------
// wxGtkTreeSelectionLock: prevent selection from changing during the
// lifetime of this object
@@ -4811,13 +4832,9 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
{
GtkTreeViewColumn *gtk_column = GTK_TREE_VIEW_COLUMN(column->GetGtkHandle());
GList *list = gtk_tree_view_get_columns( GTK_TREE_VIEW(m_treeview) );
wxGtkList list(gtk_tree_view_get_columns(GTK_TREE_VIEW(m_treeview)));
gint pos = g_list_index( list, (gconstpointer) gtk_column );
g_list_free( list );
return pos;
return g_list_index( list, (gconstpointer) gtk_column );
}
wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
@@ -4956,23 +4973,17 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
if (HasFlag(wxDV_MULTIPLE))
{
GtkTreeModel *model;
GList *list = gtk_tree_selection_get_selected_rows( selection, &model );
wxGtkTreePathList list(gtk_tree_selection_get_selected_rows(selection, &model));
int count = 0;
while (list)
for ( GList* current = list; current; current = g_list_next(current) )
{
GtkTreePath *path = (GtkTreePath*) list->data;
sel.Add(GTKPathToItem(path));
list = g_list_next( list );
count++;
}
// delete list
g_list_foreach( list, (GFunc) gtk_tree_path_free, NULL );
g_list_free( list );
return count;
}
else