GtkEntry: Sanity check the end_pos value in _get_display_text()

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

diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index 3bc638ae9fdcce37cecb391694b83fabb01c9f4c..a652a0140f73316a0459bf7c455dfaee5e9c0daa 100644 (file)
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -12,23 +12,24 @@
  * 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_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>
 
 
@@ -42,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 xalign;
-  gfloat yalign;
-  
-  guint16 xpad;
-  guint16 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);
 };
 
 
@@ -76,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