X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5f6d6096f8eb42993cf3d5318a0277b8dac191c..1a4b6b97b1141a81a129baa34a50d2835d5ec003:/src/gtk/dataview.cpp

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 49f3dedb26..37a761a59f 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -251,6 +251,10 @@ wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
 
     if (wxtype == wxT("string"))
         gtype = G_TYPE_STRING;
+    else
+    {
+        wxFAIL_MSG( _T("non-string columns not supported yet") );
+    }
 
     return gtype;
 }
@@ -299,41 +303,23 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model,
     GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
     g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) );
 
-#if 0
     wxDataViewListModel *model = list_store->model;
     wxString mtype = model->GetColType( (unsigned int) column );
     if (mtype == wxT("string"))
     {
         wxVariant variant;
         g_value_init( value, G_TYPE_STRING );
-        model->GetValue( variant, (unsigned int) column, (unsigned int) iter->user_data );
-        g_value_set_string( value, wxGTK_CONV(variant.GetString()) );
+        model->GetValue( variant,
+                         (unsigned int) column,
+                         (unsigned int) iter->user_data );
+
+        // FIXME: we should support different encodings here
+        g_value_set_string( value, wxGTK_CONV_SYS(variant.GetString()) );
     }
     else
     {
+        wxFAIL_MSG( _T("non-string columns not supported yet") );
     }
-#endif
-
-#if 0
-  GtkTreeDataList *list;
-  gint tmp_column = column;
-
-  g_return_if_fail (column < GTK_LIST_STORE (tree_model)->n_columns);
-  g_return_if_fail (GTK_LIST_STORE (tree_model)->stamp == iter->stamp);
-
-  list = G_SLIST (iter->user_data)->data;
-
-  while (tmp_column-- > 0 && list)
-    list = list->next;
-
-  if (list == NULL)
-    g_value_init (value, GTK_LIST_STORE (tree_model)->column_headers[column]);
-  else
-    _gtk_tree_data_list_node_to_value (list,
-                                       GTK_LIST_STORE (tree_model)->column_headers[column],
-                                       value);
-#endif
-
 }
 
 static gboolean
@@ -948,11 +934,7 @@ bool wxDataViewTextRenderer::SetValue( const wxVariant &value )
 
     GValue gvalue = { 0, };
     g_value_init( &gvalue, G_TYPE_STRING );
-#if wxUSE_UNICODE
-    g_value_set_string( &gvalue, wxGTK_CONV( tmp ) );
-#else
     g_value_set_string( &gvalue, wxGTK_CONV_FONT( tmp, GetOwner()->GetOwner()->GetFont() ) );
-#endif
     g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
     g_value_unset( &gvalue );
 
@@ -1227,11 +1209,9 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
 
         GValue gvalue = { 0, };
         g_value_init( &gvalue, G_TYPE_STRING );
-#if wxUSE_UNICODE
-        g_value_set_string( &gvalue, wxGTK_CONV(m_label) );
-#else
+
+        // FIXME: font encoding support
         g_value_set_string( &gvalue, wxGTK_CONV_SYS(m_label) );
-#endif
         g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
         g_value_unset( &gvalue );
     }
@@ -1547,10 +1527,7 @@ void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner )
     
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
     
-#if wxUSE_UNICODE
-#else
     gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(GetTitle(), GetOwner()->GetFont() ) );
-#endif
 }
 
 void wxDataViewColumn::SetTitle( const wxString &title )
@@ -1568,14 +1545,10 @@ void wxDataViewColumn::SetTitle( const wxString &title )
         m_isConnected = false;
     }
 
-#if wxUSE_UNICODE
-    gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
-#else
-    if (GetOwner())
-        gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(title, GetOwner()->GetFont() ) );
-    else
-        gtk_tree_view_column_set_title( column, "" );
-#endif
+    // FIXME: can it really happen that we don't have the owner here??
+    wxDataViewCtrl *ctrl = GetOwner();
+    gtk_tree_view_column_set_title( column, ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont())
+                                                 : wxGTK_CONV_SYS(title) );
 
     gtk_tree_view_column_set_widget( column, NULL );
 }