diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-05 00:36:37 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-05 00:36:37 +0900 |
| commit | 0d786985a368d88e8ab4e45fc3607efc5e773732 (patch) | |
| tree | 5dfc8ec0e27ac3c23b9dc2eb097018971c28fd6b /gtk/gtk.h | |
| parent | 1d3961b34258a7a8c97ca12993220554369fccb1 (diff) | |
| parent | cd76b057e9693b6919f4ccbe40ce205efc8d3caf (diff) | |
| download | gtk+-0d786985a368d88e8ab4e45fc3607efc5e773732.tar.gz | |
Merge branch 'master' into treeview-refactor
Conflicts:
gtk/gtkmarshalers.list
tests/Makefile.am
Diffstat (limited to 'gtk/gtk.h')
| -rw-r--r-- | gtk/gtk.h | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -51,6 +51,7 @@ #include <gtk/gtkbbox.h> #include <gtk/gtkbin.h> #include <gtk/gtkbindings.h> +#include <gtk/gtkborder.h> #include <gtk/gtkbox.h> #include <gtk/gtkbuildable.h> #include <gtk/gtkbuilder.h> @@ -80,6 +81,7 @@ #include <gtk/gtkcombobox.h> #include <gtk/gtkcomboboxtext.h> #include <gtk/gtkcontainer.h> +#include <gtk/gtkcssprovider.h> #include <gtk/gtkdebug.h> #include <gtk/gtkdialog.h> #include <gtk/gtkdnd.h> @@ -100,6 +102,7 @@ #include <gtk/gtkfontbutton.h> #include <gtk/gtkfontsel.h> #include <gtk/gtkframe.h> +#include <gtk/gtkgradient.h> #include <gtk/gtkgrid.h> #include <gtk/gtkhandlebox.h> #include <gtk/gtkhbbox.h> @@ -177,8 +180,12 @@ #include <gtk/gtkstatusbar.h> #include <gtk/gtkstatusicon.h> #include <gtk/gtkstock.h> +#include <gtk/gtkstylecontext.h> +#include <gtk/gtkstyleproperties.h> +#include <gtk/gtkstyleprovider.h> #include <gtk/gtkstyle.h> #include <gtk/gtkswitch.h> +#include <gtk/gtksymboliccolor.h> #include <gtk/gtktable.h> #include <gtk/gtktearoffmenuitem.h> #include <gtk/gtktextbuffer.h> @@ -189,6 +196,7 @@ #include <gtk/gtktexttag.h> #include <gtk/gtktexttagtable.h> #include <gtk/gtktextview.h> +#include <gtk/gtkthemingengine.h> #include <gtk/gtktoggleaction.h> #include <gtk/gtktogglebutton.h> #include <gtk/gtktoggletoolbutton.h> @@ -221,6 +229,7 @@ #include <gtk/gtkvscrollbar.h> #include <gtk/gtkvseparator.h> #include <gtk/gtkwidget.h> +#include <gtk/gtkwidgetpath.h> #include <gtk/gtkwindow.h> #undef __GTK_H_INSIDE__ |