X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkthemingengine.h;h=be458bbb76812f340a5c3c68d15d72a0c5587e64;hb=2cfc56ced81d801669deb3a429a00e25769e5a70;hp=78842c6f165695d211cf53650468503c119a367b;hpb=ebf5bd390f9c8fb13379afb12eaecea66262b020;p=~andy%2Fgtk

diff --git a/gtk/gtkthemingengine.h b/gtk/gtkthemingengine.h
index 78842c6f1..be458bbb7 100644
--- a/gtk/gtkthemingengine.h
+++ b/gtk/gtkthemingengine.h
@@ -12,20 +12,23 @@
  * 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_THEMING_ENGINE_H__
 #define __GTK_THEMING_ENGINE_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <cairo.h>
 
-#include <gtk/gtkstylecontext.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtkborder.h>
 #include <gtk/gtkenums.h>
+#include <gtk/gtkstyleproperties.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
@@ -37,16 +40,17 @@ G_BEGIN_DECLS
 #define GTK_THEMING_ENGINE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_THEMING_ENGINE, GtkThemingEngineClass))
 
 typedef struct _GtkThemingEngine GtkThemingEngine;
+typedef struct GtkThemingEnginePrivate GtkThemingEnginePrivate;
 typedef struct _GtkThemingEngineClass GtkThemingEngineClass;
 
 struct _GtkThemingEngine
 {
   GObject parent_object;
-  gpointer priv;
+  GtkThemingEnginePrivate *priv;
 };
 
 /**
- * GtkThemingEngineClass
+ * GtkThemingEngineClass:
  * @parent_class: The parent class.
  * @render_line: Renders a line between two points.
  * @render_background: Renders the background area of a widget region.
@@ -62,6 +66,10 @@ struct _GtkThemingEngine
  * @render_layout: Renders a #PangoLayout
  * @render_slider: Renders a slider control, as in #GtkScale.
  * @render_handle: Renders a handle to drag UI elements, as in #GtkPaned.
+ * @render_activity: Renders an area displaying activity, such as in #GtkSpinner,
+ *                   or #GtkProgressBar.
+ * @render_icon_pixbuf: Renders an icon as a #GdkPixbuf.
+ * @render_icon: Renders an icon given as a #GdkPixbuf.
  *
  * Base class for theming engines.
  */
@@ -157,18 +165,27 @@ struct _GtkThemingEngineClass
                             gdouble           y,
                             gdouble           width,
                             gdouble           height);
+
+  GdkPixbuf * (* render_icon_pixbuf) (GtkThemingEngine    *engine,
+                                      const GtkIconSource *source,
+                                      GtkIconSize          size);
+  void (* render_icon) (GtkThemingEngine *engine,
+                        cairo_t          *cr,
+			GdkPixbuf        *pixbuf,
+                        gdouble           x,
+                        gdouble           y);
+
+  /*< private >*/
+  gpointer padding[15];
 };
 
 GType gtk_theming_engine_get_type (void) G_GNUC_CONST;
 
-void _gtk_theming_engine_set_context (GtkThemingEngine *engine,
-                                      GtkStyleContext  *context);
-
-void gtk_theming_engine_register_property (GtkThemingEngine       *engine,
-                                           const gchar            *property_name,
-                                           GType                   type,
-                                           const GValue           *default_value,
-                                           GtkStylePropertyParser  parse_func);
+/* function implemented in gtkcsscustomproperty.c */
+GDK_DEPRECATED_IN_3_8
+void gtk_theming_engine_register_property (const gchar            *name_space,
+                                           GtkStylePropertyParser  parse_func,
+                                           GParamSpec             *pspec);
 
 void gtk_theming_engine_get_property (GtkThemingEngine *engine,
                                       const gchar      *property,
@@ -189,29 +206,58 @@ void gtk_theming_engine_get_style_valist   (GtkThemingEngine *engine,
 void gtk_theming_engine_get_style          (GtkThemingEngine *engine,
                                             ...);
 
+gboolean gtk_theming_engine_lookup_color (GtkThemingEngine *engine,
+                                          const gchar      *color_name,
+                                          GdkRGBA          *color);
 
-G_CONST_RETURN GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine);
+const GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine);
 
 gboolean gtk_theming_engine_has_class  (GtkThemingEngine *engine,
                                         const gchar      *style_class);
 gboolean gtk_theming_engine_has_region (GtkThemingEngine *engine,
-                                        const gchar      *style_class,
+                                        const gchar      *style_region,
                                         GtkRegionFlags   *flags);
 
 GtkStateFlags gtk_theming_engine_get_state        (GtkThemingEngine *engine);
+GDK_DEPRECATED_IN_3_6
 gboolean      gtk_theming_engine_state_is_running (GtkThemingEngine *engine,
                                                    GtkStateType      state,
                                                    gdouble          *progress);
 
+GDK_DEPRECATED_IN_3_8_FOR(gtk_theming_engine_get_state)
 GtkTextDirection gtk_theming_engine_get_direction (GtkThemingEngine *engine);
 
 GtkJunctionSides gtk_theming_engine_get_junction_sides (GtkThemingEngine *engine);
 
+/* Helper functions */
+void gtk_theming_engine_get_color            (GtkThemingEngine *engine,
+                                              GtkStateFlags     state,
+                                              GdkRGBA          *color);
+void gtk_theming_engine_get_background_color (GtkThemingEngine *engine,
+                                              GtkStateFlags     state,
+                                              GdkRGBA          *color);
+void gtk_theming_engine_get_border_color     (GtkThemingEngine *engine,
+                                              GtkStateFlags     state,
+                                              GdkRGBA          *color);
+
+void gtk_theming_engine_get_border  (GtkThemingEngine *engine,
+                                     GtkStateFlags     state,
+                                     GtkBorder        *border);
+void gtk_theming_engine_get_padding (GtkThemingEngine *engine,
+                                     GtkStateFlags     state,
+                                     GtkBorder        *padding);
+void gtk_theming_engine_get_margin  (GtkThemingEngine *engine,
+                                     GtkStateFlags     state,
+                                     GtkBorder        *margin);
+
+GDK_DEPRECATED_IN_3_8_FOR(gtk_theming_engine_get)
+const PangoFontDescription * gtk_theming_engine_get_font (GtkThemingEngine *engine,
+                                                          GtkStateFlags     state);
+
 GtkThemingEngine * gtk_theming_engine_load (const gchar *name);
 
 GdkScreen * gtk_theming_engine_get_screen (GtkThemingEngine *engine);
 
-
 G_END_DECLS
 
 #endif /* __GTK_THEMING_ENGINE_H__ */