X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmisc.h;h=a652a0140f73316a0459bf7c455dfaee5e9c0daa;hb=b5ee44b419a5daa01605af8cd419b03d9e21926c;hp=ebab8d40324469249da4be4943a211613ab94e4a;hpb=fce9c8b7d45145c4556650843218e0b76c065c18;p=~andy%2Fgtk

diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index ebab8d403..a652a0140 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -1,4 +1,4 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -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/>.
  */
 
 /*
@@ -24,15 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_MISC_H__
 #define __GTK_MISC_H__
 
 
-#include <gdk/gdk.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 
 
@@ -46,23 +43,27 @@ G_BEGIN_DECLS
 #define GTK_MISC_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MISC, GtkMiscClass))
 
 
-typedef struct _GtkMisc	      GtkMisc;
-typedef struct _GtkMiscClass  GtkMiscClass;
+typedef struct _GtkMisc              GtkMisc;
+typedef struct _GtkMiscPrivate       GtkMiscPrivate;
+typedef struct _GtkMiscClass         GtkMiscClass;
 
 struct _GtkMisc
 {
   GtkWidget widget;
-  
-  gfloat GSEAL (xalign);
-  gfloat GSEAL (yalign);
-  
-  guint16 GSEAL (xpad);
-  guint16 GSEAL (ypad);
+
+  /*< private >*/
+  GtkMiscPrivate *priv;
 };
 
 struct _GtkMiscClass
 {
   GtkWidgetClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
@@ -80,6 +81,8 @@ void    gtk_misc_get_padding   (GtkMisc *misc,
 				gint    *xpad,
 				gint    *ypad);
 
+void   _gtk_misc_get_padding_and_border	(GtkMisc   *misc,
+					 GtkBorder *border);
 
 G_END_DECLS