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

Correct bug with items without attributes in wxGTK wxDVC.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2009-10-12 22:43:57 +00:00
parent 47583ac103
commit b74399b982
2 changed files with 75 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/gtk/dataview.h
View File

@@ -42,10 +42,17 @@ public:
void GtkInitHandlers(); void GtkInitHandlers();
void GtkUpdateAlignment(); void GtkUpdateAlignment();
bool GtkIsUsingDefaultAttrs() const { return m_usingDefaultAttrs; }
void GtkSetUsingDefaultAttrs(bool def) { m_usingDefaultAttrs = def; }
protected: protected:
GtkCellRenderer *m_renderer; GtkCellRenderer *m_renderer;
int m_alignment; int m_alignment;
// true if we hadn't changed any visual attributes or restored them since
// doing this
bool m_usingDefaultAttrs;
protected: protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
}; };

118
src/gtk/dataview.cpp
View File

@@ -1553,6 +1553,9 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewC
{ {
m_renderer = NULL; 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, // NOTE: SetMode() and SetAlignment() needs to be called in the renderer's ctor,
// after the m_renderer pointer has been initialized // after the m_renderer pointer has been initialized
} }
@@ -2550,62 +2553,76 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
cell->SetValue( value ); cell->SetValue( value );
// deal with attributes
wxDataViewItemAttr attr; 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()) // no custom attributes specified and we're already using the default
{ // ones -- nothing to do
const GdkColor * const gcol = attr.GetColour().GetColor(); return;
}
GValue gvalue = { 0, }; bool usingDefaultAttrs = true;
g_value_init( &gvalue, GDK_TYPE_COLOR ); if (attr.HasColour())
g_value_set_boxed( &gvalue, gcol ); {
g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue ); const GdkColor * const gcol = attr.GetColour().GetColor();
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 );
}
if (attr.GetItalic()) GValue gvalue = { 0, };
{ g_value_init( &gvalue, GDK_TYPE_COLOR );
GValue gvalue = { 0, }; g_value_set_boxed( &gvalue, gcol );
g_value_init( &gvalue, PANGO_TYPE_STYLE ); g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue );
g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC ); g_value_unset( &gvalue );
g_object_set_property( G_OBJECT(renderer), "style", &gvalue );
g_value_unset( &gvalue ); usingDefaultAttrs = false;
} }
else else
{ {
GValue gvalue = { 0, }; GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_BOOLEAN ); g_value_init( &gvalue, G_TYPE_BOOLEAN );
g_value_set_boolean( &gvalue, FALSE ); g_value_set_boolean( &gvalue, FALSE );
g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue ); g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue );
g_value_unset( &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()) if (attr.GetBold())
{ {
GValue gvalue = { 0, }; GValue gvalue = { 0, };
g_value_init( &gvalue, PANGO_TYPE_WEIGHT ); g_value_init( &gvalue, PANGO_TYPE_WEIGHT );
g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD ); g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD );
g_object_set_property( G_OBJECT(renderer), "weight", &gvalue ); g_object_set_property( G_OBJECT(renderer), "weight", &gvalue );
g_value_unset( &gvalue ); g_value_unset( &gvalue );
}
else usingDefaultAttrs = false;
{ }
GValue gvalue = { 0, }; else
g_value_init( &gvalue, G_TYPE_BOOLEAN ); {
g_value_set_boolean( &gvalue, FALSE ); GValue gvalue = { 0, };
g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue ); g_value_init( &gvalue, G_TYPE_BOOLEAN );
g_value_unset( &gvalue ); g_value_set_boolean( &gvalue, FALSE );
} g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue );
g_value_unset( &gvalue );
} }
#if 0 #if 0
@@ -2630,6 +2647,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
} }
#endif #endif
cell->GtkSetUsingDefaultAttrs(usingDefaultAttrs);
} }
} // extern "C" } // extern "C"