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

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2009-09-26 16:43:30 +00:00
parent bb58fa37cd
commit ddb44248a6
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -413,6 +413,7 @@ All (GUI):
- wxHTML: add support for table borders width (Laurent Humbertclaude). - wxHTML: add support for table borders width (Laurent Humbertclaude).
- Added wxMouseEventsManager. - Added wxMouseEventsManager.
- Building OpenGL library is now enabled by default. - Building OpenGL library is now enabled by default.
- Fixed wxDataViewCtrl::Set{Foreground,Background}Colour().
- Improve wxTreeCtrl::ScrollTo() in generic version (Raanan Barzel). - Improve wxTreeCtrl::ScrollTo() in generic version (Raanan Barzel).
- Added wxFont::[Make]{Bold,Italic,Smaller,Larger} and Scale[d]() methods. - Added wxFont::[Make]{Bold,Italic,Smaller,Larger} and Scale[d]() methods.
- Added wxDC::CopyAttributes() and use it in wxBufferedDC. - Added wxDC::CopyAttributes() and use it in wxBufferedDC.

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

@@ -447,6 +447,8 @@ protected:
virtual void DoSetExpanderColumn(); virtual void DoSetExpanderColumn();
virtual void DoSetIndent(); virtual void DoSetIndent();
virtual void DoApplyWidgetStyle(GtkRcStyle *style);
private: private:
friend class wxDataViewCtrlDCImpl; friend class wxDataViewCtrlDCImpl;
friend class wxDataViewColumn; friend class wxDataViewColumn;

15
src/gtk/dataview.cpp
View File

@@ -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 // static
wxVisualAttributes wxVisualAttributes
wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) 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 #endif // !wxUSE_GENERICDATAVIEWCTRL
// !wxUSE_GENERICDATAVIEWCTRL
#endif #endif // wxUSE_DATAVIEWCTRL
// wxUSE_DATAVIEWCTRL