#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"
class wxDataViewCtrl;
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
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
virtual bool RowDeleted( size_t row );
virtual bool RowChanged( size_t row );
virtual bool ValueChanged( size_t col, size_t row );
+ virtual bool RowsReordered( size_t *new_order );
virtual bool Cleared();
GtkWxListStore *m_gtk_store;
bool wxGtkDataViewListModelNotifier::ValueChanged( size_t model_col, size_t model_row )
{
- // This adds GTK+'s missing MVC logic for SetValue
+ // This adds GTK+'s missing MVC logic for ValueChanged
wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
while (node)
{
return true;
}
+bool wxGtkDataViewListModelNotifier::RowsReordered( size_t *new_order )
+{
+ // Assume sizeof(size_t)= == sizeof(gint)
+
+ GtkTreePath *path = gtk_tree_path_new ();
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (m_gtk_store), path, NULL, (gint*)new_order);
+ gtk_tree_path_free (path);
+
+ // This adds GTK+'s missing MVC logic for RowsReordered
+ wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
+ while (node)
+ {
+ wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
+ GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview);
+ // Doesn't work yet...
+ gtk_widget_queue_draw( GTK_WIDGET(widget) );
+
+ node = node->GetNext();
+ }
+
+ return true;
+}
+
bool wxGtkDataViewListModelNotifier::Cleared()
{
return false;
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(
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 );
}