Change FSF Address

[~andy/gtk] / gtk / gtkwidgetpath.h

diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h
index b069fe61e35efb5b310ed8b132a5e139daeec8b0..a8127e47fe1488b37cdc555d05f0da619980f66b 100644 (file)
--- a/gtk/gtkwidgetpath.h
+++ b/gtk/gtkwidgetpath.h
@@ -12,9 +12,7 @@
  * 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/>.
  */
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
@@ -25,34 +23,58 @@
 #define __GTK_WIDGET_PATH_H__
 
 #include <glib-object.h>
-#include "gtkenums.h"
+#include <gdk/gdk.h>
+#include <gtk/gtkenums.h>
 
 G_BEGIN_DECLS
 
 typedef struct _GtkWidgetPath GtkWidgetPath;
 
+/* We make this forward declaration here, since gtkwidget.h includes us.
+ */
+typedef struct _GtkWidget      GtkWidget;
+
 #define GTK_TYPE_WIDGET_PATH (gtk_widget_path_get_type ())
 
-GType           gtk_widget_path_get_type            (void) G_GNUC_CONST:
+GType           gtk_widget_path_get_type            (void) G_GNUC_CONST;
 GtkWidgetPath * gtk_widget_path_new                 (void);
 
 GtkWidgetPath * gtk_widget_path_copy                (const GtkWidgetPath *path);
+GDK_AVAILABLE_IN_3_2
+GtkWidgetPath * gtk_widget_path_ref                 (GtkWidgetPath       *path);
+GDK_AVAILABLE_IN_3_2
+void            gtk_widget_path_unref               (GtkWidgetPath       *path);
 void            gtk_widget_path_free                (GtkWidgetPath       *path);
 
+GDK_AVAILABLE_IN_3_2
+char *          gtk_widget_path_to_string           (const GtkWidgetPath *path);
 gint            gtk_widget_path_length              (const GtkWidgetPath *path);
 
 gint            gtk_widget_path_append_type         (GtkWidgetPath       *path,
                                                      GType                type);
 void            gtk_widget_path_prepend_type        (GtkWidgetPath       *path,
                                                      GType                type);
-
-GType               gtk_widget_path_iter_get_widget_type (const GtkWidgetPath *path,
-                                                          gint                 pos);
-void                gtk_widget_path_iter_set_widget_type (GtkWidgetPath       *path,
-                                                          gint                 pos,
-                                                          GType                type);
-
-G_CONST_RETURN gchar * gtk_widget_path_iter_get_name  (const GtkWidgetPath *path,
+GDK_AVAILABLE_IN_3_2
+gint            gtk_widget_path_append_with_siblings(GtkWidgetPath       *path,
+                                                     GtkWidgetPath       *siblings,
+                                                     guint                sibling_index);
+/* gtk_widget_path_append_for_widget() is declared in gtkwidget.c */
+GDK_AVAILABLE_IN_3_2
+gint            gtk_widget_path_append_for_widget   (GtkWidgetPath       *path,
+                                                     GtkWidget           *widget);
+
+GType               gtk_widget_path_iter_get_object_type  (const GtkWidgetPath *path,
+                                                           gint                 pos);
+void                gtk_widget_path_iter_set_object_type  (GtkWidgetPath       *path,
+                                                           gint                 pos,
+                                                           GType                type);
+const GtkWidgetPath *
+                    gtk_widget_path_iter_get_siblings     (const GtkWidgetPath *path,
+                                                           gint                 pos);
+guint               gtk_widget_path_iter_get_sibling_index(const GtkWidgetPath *path,
+                                                           gint                 pos);
+
+const gchar *          gtk_widget_path_iter_get_name  (const GtkWidgetPath *path,
                                                        gint                 pos);
 void                   gtk_widget_path_iter_set_name  (GtkWidgetPath       *path,
                                                        gint                 pos,
@@ -103,7 +125,7 @@ gboolean gtk_widget_path_iter_has_qregion   (const GtkWidgetPath *path,
                                              GQuark               qname,
                                              GtkRegionFlags      *flags);
 
-GType           gtk_widget_path_get_widget_type (const GtkWidgetPath *path);
+GType           gtk_widget_path_get_object_type (const GtkWidgetPath *path);
 
 gboolean        gtk_widget_path_is_type    (const GtkWidgetPath *path,
                                             GType                type);