Use the correct screen for getting the height. (Fix from Stephen Browne,

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

diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h
index f49dcf58055bcbbadcb9f8bd4fd79dc5ec2147a1..07010ba071d469a5535d94a856d9d0f1ca988e80 100644 (file)
--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@@ -3,23 +3,23 @@
  * Copyright (C) 1998 Elliot Lee
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * 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/. 
@@ -44,10 +44,11 @@ extern "C" {
 
 
 #define GTK_TYPE_HANDLE_BOX            (gtk_handle_box_get_type ())
-#define GTK_HANDLE_BOX(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBox))
-#define GTK_HANDLE_BOX_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
-#define GTK_IS_HANDLE_BOX(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_HANDLE_BOX))
-#define GTK_IS_HANDLE_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HANDLE_BOX))
+#define GTK_HANDLE_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBox))
+#define GTK_HANDLE_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
+#define GTK_IS_HANDLE_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HANDLE_BOX))
+#define GTK_IS_HANDLE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HANDLE_BOX))
+#define GTK_HANDLE_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
 
 
 typedef struct _GtkHandleBox       GtkHandleBox;
@@ -66,7 +67,7 @@ struct _GtkHandleBox
   guint                  in_drag : 1;
   guint                  shrink_on_detach : 1;
 
-  gint            snap_edge : 3; /* -1 == unset */
+  signed int      snap_edge : 3; /* -1 == unset */
   
   /* Variables used during a drag
    */
@@ -84,17 +85,26 @@ struct _GtkHandleBoxClass
                                 GtkWidget      *child);
   void (*child_detached)       (GtkHandleBox   *handle_box,
                                 GtkWidget      *child);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType     gtk_handle_box_get_type        (void);
-GtkWidget*  gtk_handle_box_new             (void);
-void        gtk_handle_box_set_shadow_type      (GtkHandleBox    *handle_box,
-                                                 GtkShadowType    type);
-void        gtk_handle_box_set_handle_position  (GtkHandleBox    *handle_box,
-                                                GtkPositionType  position);
-void        gtk_handle_box_set_snap_edge        (GtkHandleBox    *handle_box,
-                                                GtkPositionType  edge);
+GType         gtk_handle_box_get_type             (void) G_GNUC_CONST;
+GtkWidget*    gtk_handle_box_new                  (void);
+void          gtk_handle_box_set_shadow_type      (GtkHandleBox    *handle_box,
+                                                   GtkShadowType    type);
+GtkShadowType gtk_handle_box_get_shadow_type      (GtkHandleBox    *handle_box);
+void          gtk_handle_box_set_handle_position  (GtkHandleBox    *handle_box,
+                                                  GtkPositionType  position);
+GtkPositionType gtk_handle_box_get_handle_position(GtkHandleBox    *handle_box);
+void          gtk_handle_box_set_snap_edge        (GtkHandleBox    *handle_box,
+                                                  GtkPositionType  edge);
+GtkPositionType gtk_handle_box_get_snap_edge      (GtkHandleBox    *handle_box);