X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstyleprovider.h;h=81bf5d6a6007abc2d693b5f1c3c17cf1a2a44f0a;hb=d97861bd8b338c3d25d7ffb5496edee9eee9bfbb;hp=9e67a3286dbb84863b04580f086cd111b4871cc2;hpb=4acc20abc142356c581dc58328fff408aed7a6b8;p=~andy%2Fgtk

diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
index 9e67a3286..81bf5d6a6 100644
--- a/gtk/gtkstyleprovider.h
+++ b/gtk/gtkstyleprovider.h
@@ -12,19 +12,21 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_STYLE_PROVIDER_H__
 #define __GTK_STYLE_PROVIDER_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <glib-object.h>
-#include "gtkwidgetpath.h"
-#include "gtkiconfactory.h"
-#include "gtkstyleproperties.h"
-#include "gtkenums.h"
+#include <gtk/gtkenums.h>
+#include <gtk/gtkiconfactory.h>
+#include <gtk/gtkstyleproperties.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
@@ -33,17 +35,57 @@ G_BEGIN_DECLS
 #define GTK_IS_STYLE_PROVIDER(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_STYLE_PROVIDER))
 #define GTK_STYLE_PROVIDER_GET_IFACE(o)  (G_TYPE_INSTANCE_GET_INTERFACE ((o), GTK_TYPE_STYLE_PROVIDER, GtkStyleProviderIface))
 
+/**
+ * GTK_STYLE_PROVIDER_PRIORITY_FALLBACK:
+ *
+ * The priority used for default style information
+ * that is used in the absence of themes.
+ */
 #define GTK_STYLE_PROVIDER_PRIORITY_FALLBACK      1
-#define GTK_STYLE_PROVIDER_PRIORITY_DEFAULT     200
+
+/**
+ * GTK_STYLE_PROVIDER_PRIORITY_THEME:
+ *
+ * The priority used for style information provided
+ * by themes.
+ */
+#define GTK_STYLE_PROVIDER_PRIORITY_THEME     200
+
+/**
+ * GTK_STYLE_PROVIDER_PRIORITY_SETTINGS:
+ *
+ * The priority used for style information provided
+ * via #GtkSettings.
+ *
+ * This priority is higher than #GTK_STYLE_PROVIDER_PRIORITY_THEME
+ * to let settings override themes.
+ */
 #define GTK_STYLE_PROVIDER_PRIORITY_SETTINGS    400
+
+/**
+ * GTK_STYLE_PROVIDER_PRIORITY_APPLICATION:
+ *
+ * A priority that can be used when adding a #GtkStyleProvider
+ * for application-specific style information.
+ */
 #define GTK_STYLE_PROVIDER_PRIORITY_APPLICATION 600
+
+/**
+ * GTK_STYLE_PROVIDER_PRIORITY_USER:
+ *
+ * The priority used for the style information from
+ * <filename>~/.gtk-3.0.css</filename>.
+ *
+ * You should not use priorities higher than this, to
+ * give the user the last word.
+ */
 #define GTK_STYLE_PROVIDER_PRIORITY_USER        800
 
 typedef struct _GtkStyleProviderIface GtkStyleProviderIface;
 typedef struct _GtkStyleProvider GtkStyleProvider; /* dummy typedef */
 
 /**
- * GtkStyleProviderIface
+ * GtkStyleProviderIface:
  * @get_style: Gets a set of style information that applies to a widget path.
  * @get_style_property: Gets the value of a widget style property that applies to a widget path.
  * @get_icon_factory: Gets the icon factory that applies to a widget path.
@@ -57,7 +99,8 @@ struct _GtkStyleProviderIface
 
   gboolean (* get_style_property) (GtkStyleProvider *provider,
                                    GtkWidgetPath    *path,
-                                   const gchar      *property_name,
+                                   GtkStateFlags     state,
+                                   GParamSpec       *pspec,
                                    GValue           *value);
 
   GtkIconFactory * (* get_icon_factory) (GtkStyleProvider *provider,
@@ -66,14 +109,17 @@ struct _GtkStyleProviderIface
 
 GType gtk_style_provider_get_type (void) G_GNUC_CONST;
 
+GDK_DEPRECATED_IN_3_8
 GtkStyleProperties *gtk_style_provider_get_style (GtkStyleProvider *provider,
                                                   GtkWidgetPath    *path);
 
 gboolean gtk_style_provider_get_style_property (GtkStyleProvider *provider,
                                                 GtkWidgetPath    *path,
-                                                const gchar      *property_name,
+                                                GtkStateFlags     state,
+                                                GParamSpec       *pspec,
                                                 GValue           *value);
 
+GDK_DEPRECATED_IN_3_8_FOR(NULL)
 GtkIconFactory * gtk_style_provider_get_icon_factory (GtkStyleProvider *provider,
 						      GtkWidgetPath    *path);