X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmisc.h;h=a652a0140f73316a0459bf7c455dfaee5e9c0daa;hb=ea043cab5718304d9b6170afa2d3f959fc99c718;hp=6e34f9ec350768e186341414b7d9cda67a4b03f5;hpb=36112dccd4faa4534e19cc286677b57b25dfdd64;p=~andy%2Fgtk
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index 6e34f9ec3..a652a0140 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -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 .
*/
/*
@@ -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 can be included directly."
-#endif
-
#ifndef __GTK_MISC_H__
#define __GTK_MISC_H__
-#include
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
@@ -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