Bug 131920 – gtkNotebook sends incorrect switch_page value

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

diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 3bbaade26dd2c9b7b424898352c4eb50ba00f7c1..d684b48544fdb37f4dacf9a7c4a19ce2f0611417 100644 (file)
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -20,9 +20,13 @@
  * 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/.
  */
 
+#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_LABEL_H__
 #define __GTK_LABEL_H__
 
@@ -40,7 +44,7 @@ G_BEGIN_DECLS
 #define GTK_IS_LABEL(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LABEL))
 #define GTK_IS_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL))
 #define GTK_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LABEL, GtkLabelClass))
-       
+
 
 typedef struct _GtkLabel       GtkLabel;
 typedef struct _GtkLabelClass  GtkLabelClass;
@@ -53,23 +57,28 @@ struct _GtkLabel
 
   /*< private >*/
   gchar  *label;
-  guint   jtype : 2;
-  guint   wrap : 1;
-  guint   use_underline : 1;
-  guint   use_markup : 1;
-  guint   ellipsize : 3;
+  guint   jtype            : 2;
+  guint   wrap             : 1;
+  guint   use_underline    : 1;
+  guint   use_markup       : 1;
+  guint   ellipsize        : 3;
+  guint   single_line_mode : 1;
+  guint   have_transform   : 1;
+  guint   in_click         : 1;
+  guint   wrap_mode        : 3;
+  guint   pattern_set      : 1;
 
   guint   mnemonic_keyval;
-  
-  gchar  *text; 
+
+  gchar  *text;
   PangoAttrList *attrs;
   PangoAttrList *effective_attrs;
-  
+
   PangoLayout *layout;
 
   GtkWidget *mnemonic_widget;
   GtkWindow *mnemonic_window;
-  
+
   GtkLabelSelectionInfo *select_info;
 };
 
@@ -82,7 +91,7 @@ struct _GtkLabelClass
                            gint            count,
                            gboolean        extend_selection);
   void (* copy_clipboard)  (GtkLabel       *label);
-  
+
   /* Hook to customize right-click popup for selectable labels */
   void (* populate_popup)   (GtkLabel       *label,
                              GtkMenu        *menu);
@@ -140,6 +149,9 @@ void     gtk_label_set_pattern                    (GtkLabel         *label,
 void     gtk_label_set_line_wrap                  (GtkLabel         *label,
                                                   gboolean          wrap);
 gboolean gtk_label_get_line_wrap                  (GtkLabel         *label);
+void     gtk_label_set_line_wrap_mode             (GtkLabel         *label,
+                                                  PangoWrapMode     wrap_mode);
+PangoWrapMode gtk_label_get_line_wrap_mode        (GtkLabel         *label);
 void     gtk_label_set_selectable                 (GtkLabel         *label,
                                                   gboolean          setting);
 gboolean gtk_label_get_selectable                 (GtkLabel         *label);