[gtk+] Don't export GtkModifierStyle symbols

[Matthias Clasen <matthiasc src gnome org>]

commit 49433673fcda54322feb11c710081b234bb481bc
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Feb 8 23:19:21 2011 -0500

    Don't export GtkModifierStyle symbols
    
    This is not public API, so don't export it.

 gtk/gtkmodifierstyle.c |   42 +++++++++++++++++++-------------------
 gtk/gtkmodifierstyle.h |   36 ++++++++++++++++----------------
 gtk/gtkwidget.c        |   52 ++++++++++++++++++++++++++++++-----------------
 3 files changed, 72 insertions(+), 58 deletions(-)
---
diff --git a/gtk/gtkmodifierstyle.c b/gtk/gtkmodifierstyle.c
index 6b2b9a7..8d4a18c 100644
--- a/gtk/gtkmodifierstyle.c
+++ b/gtk/gtkmodifierstyle.c
@@ -40,12 +40,12 @@ static guint signals [LAST_SIGNAL] = { 0 };
 static void gtk_modifier_style_provider_init (GtkStyleProviderIface *iface);
 static void gtk_modifier_style_finalize      (GObject      *object);
 
-G_DEFINE_TYPE_EXTENDED (GtkModifierStyle, gtk_modifier_style, G_TYPE_OBJECT, 0,
+G_DEFINE_TYPE_EXTENDED (GtkModifierStyle, _gtk_modifier_style, G_TYPE_OBJECT, 0,
                         G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER,
                                                gtk_modifier_style_provider_init));
 
 static void
-gtk_modifier_style_class_init (GtkModifierStyleClass *klass)
+_gtk_modifier_style_class_init (GtkModifierStyleClass *klass)
 {
   GObjectClass *object_class;
 
@@ -65,7 +65,7 @@ gtk_modifier_style_class_init (GtkModifierStyleClass *klass)
 }
 
 static void
-gtk_modifier_style_init (GtkModifierStyle *modifier_style)
+_gtk_modifier_style_init (GtkModifierStyle *modifier_style)
 {
   GtkModifierStylePrivate *priv;
 
@@ -141,11 +141,11 @@ gtk_modifier_style_finalize (GObject *object)
   g_hash_table_destroy (priv->color_properties);
   g_object_unref (priv->style);
 
-  G_OBJECT_CLASS (gtk_modifier_style_parent_class)->finalize (object);
+  G_OBJECT_CLASS (_gtk_modifier_style_parent_class)->finalize (object);
 }
 
 GtkModifierStyle *
-gtk_modifier_style_new (void)
+_gtk_modifier_style_new (void)
 {
   return g_object_new (GTK_TYPE_MODIFIER_STYLE, NULL);
 }
@@ -185,9 +185,9 @@ modifier_style_set_color (GtkModifierStyle *style,
 }
 
 void
-gtk_modifier_style_set_background_color (GtkModifierStyle *style,
-                                         GtkStateFlags     state,
-                                         const GdkRGBA    *color)
+_gtk_modifier_style_set_background_color (GtkModifierStyle *style,
+                                          GtkStateFlags     state,
+                                          const GdkRGBA    *color)
 {
   g_return_if_fail (GTK_IS_MODIFIER_STYLE (style));
 
@@ -195,9 +195,9 @@ gtk_modifier_style_set_background_color (GtkModifierStyle *style,
 }
 
 void
-gtk_modifier_style_set_color (GtkModifierStyle *style,
-                              GtkStateFlags     state,
-                              const GdkRGBA    *color)
+_gtk_modifier_style_set_color (GtkModifierStyle *style,
+                               GtkStateFlags     state,
+                               const GdkRGBA    *color)
 {
   g_return_if_fail (GTK_IS_MODIFIER_STYLE (style));
 
@@ -205,8 +205,8 @@ gtk_modifier_style_set_color (GtkModifierStyle *style,
 }
 
 void
-gtk_modifier_style_set_font (GtkModifierStyle           *style,
-                             const PangoFontDescription *font_desc)
+_gtk_modifier_style_set_font (GtkModifierStyle           *style,
+                              const PangoFontDescription *font_desc)
 {
   GtkModifierStylePrivate *priv;
   PangoFontDescription *old_font;
@@ -223,7 +223,7 @@ gtk_modifier_style_set_font (GtkModifierStyle           *style,
        pango_font_description_equal (old_font, font_desc)))
     {
       if (old_font)
-	pango_font_description_free (old_font);
+        pango_font_description_free (old_font);
 
       return;
     }
@@ -242,9 +242,9 @@ gtk_modifier_style_set_font (GtkModifierStyle           *style,
 }
 
 void
-gtk_modifier_style_map_color (GtkModifierStyle *style,
-                              const gchar      *name,
-                              const GdkRGBA    *color)
+_gtk_modifier_style_map_color (GtkModifierStyle *style,
+                               const gchar      *name,
+                               const GdkRGBA    *color)
 {
   GtkModifierStylePrivate *priv;
   GtkSymbolicColor *symbolic_color = NULL;
@@ -264,10 +264,10 @@ gtk_modifier_style_map_color (GtkModifierStyle *style,
 }
 
 void
-gtk_modifier_style_set_color_property (GtkModifierStyle *style,
-                                       GType             widget_type,
-                                       const gchar      *prop_name,
-                                       const GdkRGBA    *color)
+_gtk_modifier_style_set_color_property (GtkModifierStyle *style,
+                                        GType             widget_type,
+                                        const gchar      *prop_name,
+                                        const GdkRGBA    *color)
 {
   GtkModifierStylePrivate *priv;
   const GdkRGBA *old_color;
diff --git a/gtk/gtkmodifierstyle.h b/gtk/gtkmodifierstyle.h
index 59213ad..3413b72 100644
--- a/gtk/gtkmodifierstyle.h
+++ b/gtk/gtkmodifierstyle.h
@@ -26,7 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_MODIFIER_STYLE         (gtk_modifier_style_get_type ())
+#define GTK_TYPE_MODIFIER_STYLE         (_gtk_modifier_style_get_type ())
 #define GTK_MODIFIER_STYLE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_MODIFIER_STYLE, GtkModifierStyle))
 #define GTK_MODIFIER_STYLE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST    ((c), GTK_TYPE_MODIFIER_STYLE, GtkModifierStyleClass))
 #define GTK_IS_MODIFIER_STYLE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_MODIFIER_STYLE))
@@ -53,27 +53,27 @@ struct _GtkModifierStyleClass
   void (*_gtk_reserved4) (void);
 };
 
-GType gtk_modifier_style_get_type (void) G_GNUC_CONST;
+GType _gtk_modifier_style_get_type (void) G_GNUC_CONST;
 
-GtkModifierStyle * gtk_modifier_style_new (void);
+GtkModifierStyle * _gtk_modifier_style_new (void);
 
-void gtk_modifier_style_set_background_color (GtkModifierStyle *style,
-                                              GtkStateFlags     state,
-                                              const GdkRGBA    *color);
-void gtk_modifier_style_set_color            (GtkModifierStyle *style,
-                                              GtkStateFlags     state,
-                                              const GdkRGBA    *color);
-void gtk_modifier_style_set_font             (GtkModifierStyle           *style,
-                                              const PangoFontDescription *font_desc);
+void _gtk_modifier_style_set_background_color (GtkModifierStyle *style,
+                                               GtkStateFlags     state,
+                                               const GdkRGBA    *color);
+void _gtk_modifier_style_set_color            (GtkModifierStyle *style,
+                                               GtkStateFlags     state,
+                                               const GdkRGBA    *color);
+void _gtk_modifier_style_set_font             (GtkModifierStyle           *style,
+                                               const PangoFontDescription *font_desc);
 
-void gtk_modifier_style_map_color            (GtkModifierStyle *style,
-                                              const gchar      *name,
-                                              const GdkRGBA    *color);
+void _gtk_modifier_style_map_color            (GtkModifierStyle *style,
+                                               const gchar      *name,
+                                               const GdkRGBA    *color);
 
-void gtk_modifier_style_set_color_property  (GtkModifierStyle *style,
-                                             GType             widget_type,
-                                             const gchar      *prop_name,
-                                             const GdkRGBA    *color);
+void _gtk_modifier_style_set_color_property   (GtkModifierStyle *style,
+                                               GType             widget_type,
+                                               const gchar      *prop_name,
+                                               const GdkRGBA    *color);
 
 G_END_DECLS
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 3ac3050..b2e3572 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8058,7 +8058,7 @@ _gtk_widget_get_modifier_properties (GtkWidget *widget)
     {
       GtkStyleContext *context;
 
-      style = gtk_modifier_style_new ();
+      style = _gtk_modifier_style_new ();
       g_object_set_qdata_full (G_OBJECT (widget),
                                quark_modifier_style,
                                style,
@@ -8121,7 +8121,7 @@ gtk_widget_override_color (GtkWidget     *widget,
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   style = _gtk_widget_get_modifier_properties (widget);
-  gtk_modifier_style_set_color (style, state, color);
+  _gtk_modifier_style_set_color (style, state, color);
 }
 
 /**
@@ -8148,7 +8148,7 @@ gtk_widget_override_background_color (GtkWidget     *widget,
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   style = _gtk_widget_get_modifier_properties (widget);
-  gtk_modifier_style_set_background_color (style, state, color);
+  _gtk_modifier_style_set_background_color (style, state, color);
 }
 
 /**
@@ -8171,7 +8171,7 @@ gtk_widget_override_font (GtkWidget                  *widget,
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   style = _gtk_widget_get_modifier_properties (widget);
-  gtk_modifier_style_set_font (style, font_desc);
+  _gtk_modifier_style_set_font (style, font_desc);
 }
 
 /**
@@ -8200,7 +8200,7 @@ gtk_widget_override_symbolic_color (GtkWidget     *widget,
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   style = _gtk_widget_get_modifier_properties (widget);
-  gtk_modifier_style_map_color (style, name, color);
+  _gtk_modifier_style_map_color (style, name, color);
 }
 
 /**
@@ -8233,13 +8233,13 @@ gtk_widget_override_cursor (GtkWidget     *widget,
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   style = _gtk_widget_get_modifier_properties (widget);
-  gtk_modifier_style_set_color_property (style,
-                                         GTK_TYPE_WIDGET,
-                                         "cursor-color", cursor);
-  gtk_modifier_style_set_color_property (style,
-                                         GTK_TYPE_WIDGET,
-                                         "secondary-cursor-color",
-                                         secondary_cursor);
+  _gtk_modifier_style_set_color_property (style,
+                                          GTK_TYPE_WIDGET,
+                                          "cursor-color", cursor);
+  _gtk_modifier_style_set_color_property (style,
+                                          GTK_TYPE_WIDGET,
+                                          "secondary-cursor-color",
+                                          secondary_cursor);
 }
 
 /**
@@ -9895,18 +9895,20 @@ gtk_widget_set_device_events (GtkWidget    *widget,
 }
 
 /**
- * gtk_widget_enable_device:
+ * gtk_widget_set_device_enabled:
  * @widget: a #GtkWidget
  * @device: a #GdkDevice
+ * @enabled: whether to enable the device
  *
- * Enables a #GdkDevice to interact with @widget and
- * all its children, it does so by descending through
- * the #GdkWindow hierarchy and enabling the same mask
- * that is has for core events (i.e. the one that
- * gdk_window_get_events() returns).
+ * Enables or disables a #GdkDevice to interact with @widget
+ * and all its children.
+ *
+ * It does so by descending through the #GdkWindow hierarchy
+ * and enabling the same mask that is has for core events
+ * (i.e. the one that gdk_window_get_events() returns).
  *
  * Since: 3.0
- **/
+ */
 void
 gtk_widget_set_device_enabled (GtkWidget *widget,
                                GdkDevice *device,
@@ -9927,6 +9929,18 @@ gtk_widget_set_device_enabled (GtkWidget *widget,
     gtk_widget_set_device_enabled_internal (widget, device, TRUE, enabled);
 }
 
+/**
+ * gtk_widget_get_device_enabled:
+ * @widget: a #GtkWidget
+ * @device: a #GdkDevice
+ *
+ * Returns whether @device can interact with @widget and its
+ * children. See gtk_widget_set_device_enabled().
+ *
+ * Return value: %TRUE is @device is enabled for @widget
+ *
+ * Since: 3.0
+ */
 gboolean
 gtk_widget_get_device_enabled (GtkWidget *widget,
                                GdkDevice *device)