Correct bug with items without attributes in wxGTK wxDVC.

After the change to the sample in r62390 it turned out that wxGTK version
didn't handle items without attributes in a column where other items did have
attributes neither -- they inherited the last used attribute.

Fix this by remembering whether we are using any non-default attributes or not
and resetting them if we do.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index f59d27ee7356146f2cc899c2ed1c0708f9cf8ca1..ee1bdb3ccbfb0251b62c87048119b978a65a2f42 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -42,10 +42,17 @@ public:
     void GtkInitHandlers();
     void GtkUpdateAlignment();
 
+    bool GtkIsUsingDefaultAttrs() const { return m_usingDefaultAttrs; }
+    void GtkSetUsingDefaultAttrs(bool def) { m_usingDefaultAttrs = def; }
+
 protected:
     GtkCellRenderer   *m_renderer;
     int                m_alignment;
 
+    // true if we hadn't changed any visual attributes or restored them since
+    // doing this
+    bool m_usingDefaultAttrs;
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
 };

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index fead2fd22fe47b0c8c582331e261eb22d9bb7ed5..064708d6d3a9c4086e22f55561bc09e83ec566c6 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1553,6 +1553,9 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewC
 {
     m_renderer = NULL;
 
+    // we haven't changed them yet
+    m_usingDefaultAttrs = true;
+
     // NOTE: SetMode() and SetAlignment() needs to be called in the renderer's ctor,
     //       after the m_renderer pointer has been initialized
 }
@@ -2550,62 +2553,76 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
 
     cell->SetValue( value );
 
+
+    // deal with attributes
     wxDataViewItemAttr attr;
-    if (wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr ))
+    if ( !wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr )
+            && cell->GtkIsUsingDefaultAttrs() )
     {
-        if (attr.HasColour())
-        {
-            const GdkColor * const gcol = attr.GetColour().GetColor();
+        // no custom attributes specified and we're already using the default
+        // ones -- nothing to do
+        return;
+    }
 
-            GValue gvalue = { 0, };
-            g_value_init( &gvalue, GDK_TYPE_COLOR );
-            g_value_set_boxed( &gvalue, gcol );
-            g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue );
-            g_value_unset( &gvalue );
-        }
-        else
-        {
-            GValue gvalue = { 0, };
-            g_value_init( &gvalue, G_TYPE_BOOLEAN );
-            g_value_set_boolean( &gvalue, FALSE );
-            g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue );
-            g_value_unset( &gvalue );
-        }
+    bool usingDefaultAttrs = true;
+    if (attr.HasColour())
+    {
+        const GdkColor * const gcol = attr.GetColour().GetColor();
 
-        if (attr.GetItalic())
-        {
-            GValue gvalue = { 0, };
-            g_value_init( &gvalue, PANGO_TYPE_STYLE );
-            g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC );
-            g_object_set_property( G_OBJECT(renderer), "style", &gvalue );
-            g_value_unset( &gvalue );
-        }
-        else
-        {
-            GValue gvalue = { 0, };
-            g_value_init( &gvalue, G_TYPE_BOOLEAN );
-            g_value_set_boolean( &gvalue, FALSE );
-            g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue );
-            g_value_unset( &gvalue );
-        }
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, GDK_TYPE_COLOR );
+        g_value_set_boxed( &gvalue, gcol );
+        g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue );
+        g_value_unset( &gvalue );
 
+        usingDefaultAttrs = false;
+    }
+    else
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, FALSE );
+        g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue );
+        g_value_unset( &gvalue );
+    }
 
-        if (attr.GetBold())
-        {
-            GValue gvalue = { 0, };
-            g_value_init( &gvalue, PANGO_TYPE_WEIGHT );
-            g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD );
-            g_object_set_property( G_OBJECT(renderer), "weight", &gvalue );
-            g_value_unset( &gvalue );
-        }
-        else
-        {
-            GValue gvalue = { 0, };
-            g_value_init( &gvalue, G_TYPE_BOOLEAN );
-            g_value_set_boolean( &gvalue, FALSE );
-            g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue );
-            g_value_unset( &gvalue );
-        }
+    if (attr.GetItalic())
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, PANGO_TYPE_STYLE );
+        g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC );
+        g_object_set_property( G_OBJECT(renderer), "style", &gvalue );
+        g_value_unset( &gvalue );
+
+        usingDefaultAttrs = false;
+    }
+    else
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, FALSE );
+        g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue );
+        g_value_unset( &gvalue );
+    }
+
+
+    if (attr.GetBold())
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, PANGO_TYPE_WEIGHT );
+        g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD );
+        g_object_set_property( G_OBJECT(renderer), "weight", &gvalue );
+        g_value_unset( &gvalue );
+
+        usingDefaultAttrs = false;
+    }
+    else
+    {
+        GValue gvalue = { 0, };
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, FALSE );
+        g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue );
+        g_value_unset( &gvalue );
     }
 
 #if 0
@@ -2630,6 +2647,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
     }
 #endif
 
+    cell->GtkSetUsingDefaultAttrs(usingDefaultAttrs);
 }
 
 } // extern "C"