Fixed wxDataViewCtrl::Set{Foreground,Background}Colour() to work under GTK too.

Implement DoApplyWidgetStyle() in wxGTK version of wxDataViewCtrl to propagate
the main window style to the GtkTreeView which is what the user mostly sees.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index b7f057c3db2c0505ce14c16c420e5e3eb1826eb9..a4f77f279bfd2785d88fe436682c3515b8c1cacd 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -413,6 +413,7 @@ All (GUI):
 - wxHTML: add support for table borders width (Laurent Humbertclaude).
 - Added wxMouseEventsManager.
 - Building OpenGL library is now enabled by default.
 - wxHTML: add support for table borders width (Laurent Humbertclaude).
 - Added wxMouseEventsManager.
 - Building OpenGL library is now enabled by default.

+- Fixed wxDataViewCtrl::Set{Foreground,Background}Colour().

 - Improve wxTreeCtrl::ScrollTo() in generic version (Raanan Barzel).
 - Added wxFont::[Make]{Bold,Italic,Smaller,Larger} and Scale[d]() methods.
 - Added wxDC::CopyAttributes() and use it in wxBufferedDC.
 - Improve wxTreeCtrl::ScrollTo() in generic version (Raanan Barzel).
 - Added wxFont::[Make]{Bold,Italic,Smaller,Larger} and Scale[d]() methods.
 - Added wxDC::CopyAttributes() and use it in wxBufferedDC.

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index dacccb9f1897813bdb353dd9343271df49f03571..486da22cdc6dfbbd949fc43051c9dc775945942a 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -447,6 +447,8 @@ protected:
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
 
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
 

+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+

 private:
     friend class wxDataViewCtrlDCImpl;
     friend class wxDataViewColumn;
 private:
     friend class wxDataViewCtrlDCImpl;
     friend class wxDataViewColumn;

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 15855368b10e981f25e610aa7d518d86d63d8f9a..7f03b9f81343364fe45ec858df026fbee498c5e3 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -4643,6 +4643,10 @@ void wxDataViewCtrl::GtkEnableSelectionEvents()
                             G_CALLBACK (wxdataview_selection_changed_callback), this);
 }
 
                             G_CALLBACK (wxdataview_selection_changed_callback), this);
 }
 

+// ----------------------------------------------------------------------------
+// visual attributes stuff
+// ----------------------------------------------------------------------------
+

 // static
 wxVisualAttributes
 wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))


@@ -4650,9 +4654,12 @@ wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new);
 }
 
     return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new);
 }
 

+void wxDataViewCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    wxDataViewCtrlBase::DoApplyWidgetStyle(style);
+    gtk_widget_modify_style(m_treeview, style);
+}

 
 

-#endif
-    // !wxUSE_GENERICDATAVIEWCTRL
+#endif // !wxUSE_GENERICDATAVIEWCTRL

 
 

-#endif
-    // wxUSE_DATAVIEWCTRL
+#endif // wxUSE_DATAVIEWCTRL