X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkinvisible.h;h=9806da76c8ffb0d277bf31f091d48c6ab0fcf7af;hb=d2c6a6bdfec768629633ffe0e1957793234d5065;hp=bc65391651769b0910352348bba8d018f6b74825;hpb=afee2c67c5091539cbe6270b14e7e74b2a7b60a7;p=~andy%2Fgtk

diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index bc6539165..9806da76c 100644
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -12,59 +12,66 @@
  * 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/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GTK_INVISIBLE_H__
 #define __GTK_INVISIBLE_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <gtk/gtkwidget.h>
 
+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;
-typedef struct _GtkInvisibleClass  GtkInvisibleClass;
+typedef struct _GtkInvisible              GtkInvisible;
+typedef struct _GtkInvisiblePrivate       GtkInvisiblePrivate;
+typedef struct _GtkInvisibleClass         GtkInvisibleClass;
 
 struct _GtkInvisible
 {
   GtkWidget widget;
-  gboolean has_user_ref_count;
+
+  /*< private >*/
+  GtkInvisiblePrivate *priv;
 };
 
 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);
-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__ */