X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkaccessible.h;h=3f171088fb1ca22c172b9df741a1881ffeacf396;hb=d0895d6c0feb6c6ca14bfc05910926051b2bf63b;hp=8b1ece6d42d18c8f0aee218d5017ab9cf4f4c896;hpb=44047a30e2af81a012d4145815b00f60f8f8331f;p=~andy%2Fgtk

diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index 8b1ece6d4..3f171088f 100644
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -12,61 +12,63 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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_ACCESSIBLE_H__
 #define __GTK_ACCESSIBLE_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <atk/atk.h>
 #include <gtk/gtkwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ACCESSIBLE                  (gtk_accessible_get_type ())
-#define GTK_ACCESSIBLE(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessible))
-#define GTK_ACCESSIBLE_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
-#define GTK_IS_ACCESSIBLE(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_ACCESSIBLE))
-#define GTK_IS_ACCESSIBLE_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCESSIBLE))
-#define GTK_ACCESSIBLE_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
-
-typedef struct _GtkAccessible                GtkAccessible;
-typedef struct _GtkAccessibleClass           GtkAccessibleClass;
+#define GTK_ACCESSIBLE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessible))
+#define GTK_ACCESSIBLE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
+#define GTK_IS_ACCESSIBLE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACCESSIBLE))
+#define GTK_IS_ACCESSIBLE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCESSIBLE))
+#define GTK_ACCESSIBLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
 
-  /**
-   * This object is a thin wrapper, in the GTK+ namespace, for AtkObject
-   */
+typedef struct _GtkAccessible        GtkAccessible;
+typedef struct _GtkAccessiblePrivate GtkAccessiblePrivate;
+typedef struct _GtkAccessibleClass   GtkAccessibleClass;
 
 struct _GtkAccessible
 {
   AtkObject parent;
 
-  /*
-   * The GtkWidget whose properties and features are exported via this 
-   * accessible instance.
-   */
-  GtkWidget *widget;
-
+  /*< private >*/
+  GtkAccessiblePrivate *priv;
 };
 
-GtkType gtk_accessible_get_type (void);
-
 struct _GtkAccessibleClass
 {
   AtkObjectClass parent_class;
 
-  void (*connect_widget_destroyed)              (GtkAccessible     *accessible);
+  void (*connect_widget_destroyed) (GtkAccessible *accessible);
+
+  void (*widget_set)               (GtkAccessible *accessible);
+  void (*widget_unset)             (GtkAccessible *accessible);
+  /* Padding for future expansion */
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-void gtk_accessible_connect_widget_destroyed    (GtkAccessible     *accessible);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GType      gtk_accessible_get_type                 (void) G_GNUC_CONST;
+
+void       gtk_accessible_set_widget               (GtkAccessible *accessible,
+                                                    GtkWidget     *widget);
+GtkWidget *gtk_accessible_get_widget               (GtkAccessible *accessible);
+
+GDK_DEPRECATED_IN_3_4_FOR(gtk_accessible_set_widget)
+void       gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible);
 
+G_END_DECLS
 
 #endif /* __GTK_ACCESSIBLE_H__ */