gdk/gdkwindow.c, gtk/gtkwidget.c: Include fallback-c89.c

[~andy/gtk] / gtk / gtkstyleprovider.c

diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c
index 2a9d2fc5e5ab3e4bf3c79cedeb05c2562f92d2ad..c1eb72ec144a99da42b027262e465f257c209a05 100644 (file)
--- a/gtk/gtkstyleprovider.c
+++ b/gtk/gtkstyleprovider.c
@@ -12,25 +12,25 @@
  * 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/>.
  */
 
 #include "config.h"
 
-#include "gtkprivate.h"
 #include "gtkstyleprovider.h"
+
 #include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkwidgetpath.h"
 
 /**
  * SECTION:gtkstyleprovider
- * @Short_description: Interface to provide style information to #GtkStyleContext
+ * @Short_description: Interface to provide style information to GtkStyleContext
  * @Title: GtkStyleProvider
  * @See_also: #GtkStyleContext, #GtkCssProvider
  *
- * #GtkStyleProvider is an interface used to provide style information to a #GtkStyleContext,
- * see gtk_style_context_add_provider() and gtk_style_context_add_provider_for_screen().
+ * GtkStyleProvider is an interface used to provide style information to a #GtkStyleContext.
+ * See gtk_style_context_add_provider() and gtk_style_context_add_provider_for_screen().
  */
 
 static void gtk_style_provider_iface_init (gpointer g_iface);
@@ -62,11 +62,15 @@ gtk_style_provider_iface_init (gpointer g_iface)
  * Returns the style settings affecting a widget defined by @path, or %NULL if
  * @provider doesn't contemplate styling @path.
  *
- * Returns: a #GtkStyleSet containing the style settings affecting @path
+ * Returns: (transfer full): a #GtkStyleProperties containing the
+ * style settings affecting @path
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.8: Will always return %NULL for all GTK-provided style providers
+ *     as the interface cannot correctly work the way CSS is specified.
  **/
-GtkStyleSet *
+GtkStyleProperties *
 gtk_style_provider_get_style (GtkStyleProvider *provider,
                               GtkWidgetPath    *path)
 {
@@ -86,25 +90,30 @@ gtk_style_provider_get_style (GtkStyleProvider *provider,
  * gtk_style_provider_get_style_property:
  * @provider: a #GtkStyleProvider
  * @path: #GtkWidgetPath to query
- * @property_name: the property name
+ * @state: state to query the style property for
+ * @pspec: The #GParamSpec to query
  * @value: (out): return location for the property value
  *
  * Looks up a widget style property as defined by @provider for
- * the widget represented by @widget_path.
+ * the widget represented by @path.
  *
  * Returns: %TRUE if the property was found and has a value, %FALSE otherwise
+ *
+ * Since: 3.0
  **/
 gboolean
 gtk_style_provider_get_style_property (GtkStyleProvider *provider,
                                        GtkWidgetPath    *path,
-                                       const gchar      *property_name,
+                                       GtkStateFlags     state,
+                                       GParamSpec       *pspec,
                                        GValue           *value)
 {
   GtkStyleProviderIface *iface;
 
   g_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), FALSE);
+  g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), FALSE);
   g_return_val_if_fail (path != NULL, FALSE);
-  g_return_val_if_fail (property_name != NULL, FALSE);
+  g_return_val_if_fail (g_type_is_a (gtk_widget_path_get_object_type (path), pspec->owner_type), FALSE);
   g_return_val_if_fail (value != NULL, FALSE);
 
   iface = GTK_STYLE_PROVIDER_GET_IFACE (provider);
@@ -112,7 +121,7 @@ gtk_style_provider_get_style_property (GtkStyleProvider *provider,
   if (!iface->get_style_property)
     return FALSE;
 
-  return iface->get_style_property (provider, path, property_name, value);
+  return iface->get_style_property (provider, path, state, pspec, value);
 }
 
 /**
@@ -123,9 +132,11 @@ gtk_style_provider_get_style_property (GtkStyleProvider *provider,
  * Returns the #GtkIconFactory defined to be in use for @path, or %NULL if none
  * is defined.
  *
- * Returns: The icon factory to use for @path, or %NULL
+ * Returns: (transfer none): The icon factory to use for @path, or %NULL
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.8: Will always return %NULL for all GTK-provided style providers.
  **/
 GtkIconFactory *
 gtk_style_provider_get_icon_factory (GtkStyleProvider *provider,