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

Change wxVariant GetValue() to GetValue( wxVariant & ).

Browse Source 
More cool sorting code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-03-02 10:46:01 +00:00
parent 04e044c4d6
commit 3f3af7e7f8
4 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/dataview.cpp
View File

@@ -20,6 +20,7 @@
#include "wx/calctrl.h"
#include "wx/popupwin.h"
#include "wx/sizer.h"
#include "wx/log.h"
#include "wx/gtk/private.h"
#include "wx/gtk/win_gtk.h"
@@ -304,8 +305,9 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model,
wxString mtype = model->GetColType( (size_t) column );
if (mtype == wxT("string"))
{
wxVariant variant;
g_value_init( value, G_TYPE_STRING );
wxVariant variant = model->GetValue( (size_t) column, (size_t) iter->user_data );
model->GetValue( variant, (size_t) column, (size_t) iter->user_data );
g_value_set_string( value, wxGTK_CONV(variant.GetString()) );
}
else
@@ -855,7 +857,6 @@ bool wxGtkDataViewListModelNotifier::RowsReordered( size_t *new_order )
node = node->GetNext();
}
return true;
}
@@ -1295,7 +1296,8 @@ wxSize wxDataViewDateCell::GetSize()
bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row )
{
wxVariant variant = model->GetValue( col, row );
wxVariant variant;
model->GetValue( variant, col, row );
wxDateTime value = variant.GetDateTime();
wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient(
@@ -1334,11 +1336,11 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
size_t model_row = (size_t) iter->user_data;
wxVariant value = list_store->model->GetValue(
cell->GetOwner()->GetModelColumn(), model_row );
wxVariant value;
list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row );
if (value.GetType() != cell->GetVariantType())
wxPrintf( wxT("Wrong type\n") );
wxLogError( wxT("Wrong type\n") );
cell->SetValue( value );
}