Fix typos

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

diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index 7214ecf553b113d32a99018297b019a41e8d0459..ad0ad4c230074fe881a4cfbef3a8a53b16945f70 100644 (file)
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -27,22 +27,16 @@
 #ifndef __GTK_INVISIBLE_H__
 #define __GTK_INVISIBLE_H__
 
+#include <gtk/gtkwidget.h>
 
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_INVISIBLE             (gtk_invisible_get_type ())
-#define GTK_INVISIBLE(obj)             (GTK_CHECK_CAST ((obj), GTK_TYPE_INVISIBLE, GtkInvisible))
-#define GTK_INVISIBLE_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
-#define GTK_IS_INVISIBLE(obj)          (GTK_CHECK_TYPE ((obj), GTK_TYPE_INVISIBLE))
-#define GTK_IS_INVISIBLE_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_INVISIBLE))
-#define GTK_INVISIBLE_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
+#define GTK_INVISIBLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_INVISIBLE, GtkInvisible))
+#define GTK_INVISIBLE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
+#define GTK_IS_INVISIBLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_INVISIBLE))
+#define GTK_IS_INVISIBLE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_INVISIBLE))
+#define GTK_INVISIBLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
 
 
 typedef struct _GtkInvisible      GtkInvisible;
@@ -52,19 +46,28 @@ struct _GtkInvisible
 {
   GtkWidget widget;
   gboolean has_user_ref_count;
+  GdkScreen *screen;
 };
 
 struct _GtkInvisibleClass
 {
   GtkWidgetClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-GtkType               gtk_invisible_get_type        (void) G_GNUC_CONST;
-GtkWidget*     gtk_invisible_new            (void);
+GType gtk_invisible_get_type (void) G_GNUC_CONST;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GtkWidget* gtk_invisible_new            (void);
+GtkWidget* gtk_invisible_new_for_screen (GdkScreen *screen);
+void      gtk_invisible_set_screen     (GtkInvisible *invisible,
+                                        GdkScreen    *screen);
+GdkScreen* gtk_invisible_get_screen    (GtkInvisible *invisible);
 
+G_END_DECLS
 
 #endif /* __GTK_INVISIBLE_H__ */