Don't use *DISABLE_DEPRECATED guards

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

diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 9c8cffacfd9c5b0b8f70bbaf1e8712b7f7103ad1..38d4052d720936b64987ef2e99d099ffe638814a 100644 (file)
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -46,8 +46,9 @@ G_BEGIN_DECLS
 #define GTK_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LABEL, GtkLabelClass))
 
 
-typedef struct _GtkLabel       GtkLabel;
-typedef struct _GtkLabelClass  GtkLabelClass;
+typedef struct _GtkLabel              GtkLabel;
+typedef struct _GtkLabelPrivate       GtkLabelPrivate;
+typedef struct _GtkLabelClass         GtkLabelClass;
 
 typedef struct _GtkLabelSelectionInfo GtkLabelSelectionInfo;
 
@@ -56,31 +57,7 @@ struct _GtkLabel
   GtkMisc misc;
 
   /*< private >*/
-  gchar  *GSEAL (label);
-  guint   GSEAL (jtype)            : 2;
-  guint   GSEAL (wrap)             : 1;
-  guint   GSEAL (use_underline)    : 1;
-  guint   GSEAL (use_markup)       : 1;
-  guint   GSEAL (ellipsize)        : 3;
-  guint   GSEAL (single_line_mode) : 1;
-  guint   GSEAL (have_transform)   : 1;
-  guint   GSEAL (in_click)         : 1;
-  guint   GSEAL (wrap_mode)        : 3;
-  guint   GSEAL (pattern_set)      : 1;
-  guint   GSEAL (track_links)      : 1;
-
-  guint   GSEAL (mnemonic_keyval);
-
-  gchar  *GSEAL (text);
-  PangoAttrList *GSEAL (attrs);
-  PangoAttrList *GSEAL (effective_attrs);
-
-  PangoLayout *GSEAL (layout);
-
-  GtkWidget *GSEAL (mnemonic_widget);
-  GtkWindow *GSEAL (mnemonic_window);
-
-  GtkLabelSelectionInfo *GSEAL (select_info);
+  GtkLabelPrivate *priv;
 };
 
 struct _GtkLabelClass
@@ -104,6 +81,11 @@ struct _GtkLabelClass
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 GType                 gtk_label_get_type          (void) G_GNUC_CONST;
@@ -111,13 +93,13 @@ GtkWidget*            gtk_label_new               (const gchar   *str);
 GtkWidget*            gtk_label_new_with_mnemonic (const gchar   *str);
 void                  gtk_label_set_text          (GtkLabel      *label,
                                                   const gchar   *str);
-G_CONST_RETURN gchar* gtk_label_get_text          (GtkLabel      *label);
+const gchar*          gtk_label_get_text          (GtkLabel      *label);
 void                  gtk_label_set_attributes    (GtkLabel      *label,
                                                   PangoAttrList *attrs);
 PangoAttrList        *gtk_label_get_attributes    (GtkLabel      *label);
 void                  gtk_label_set_label         (GtkLabel      *label,
                                                   const gchar   *str);
-G_CONST_RETURN gchar *gtk_label_get_label         (GtkLabel      *label);
+const gchar *         gtk_label_get_label         (GtkLabel      *label);
 void                  gtk_label_set_markup        (GtkLabel      *label,
                                                   const gchar   *str);
 void                  gtk_label_set_use_markup    (GtkLabel      *label,
@@ -177,7 +159,7 @@ void         gtk_label_set_single_line_mode  (GtkLabel *label,
                                               gboolean single_line_mode);
 gboolean     gtk_label_get_single_line_mode  (GtkLabel *label);
 
-G_CONST_RETURN gchar *gtk_label_get_current_uri (GtkLabel *label);
+const gchar *gtk_label_get_current_uri (GtkLabel *label);
 void         gtk_label_set_track_visited_links  (GtkLabel *label,
                                                  gboolean  track_links);
 gboolean     gtk_label_get_track_visited_links  (GtkLabel *label);
@@ -187,6 +169,8 @@ gboolean     gtk_label_get_track_visited_links  (GtkLabel *label);
 
 void _gtk_label_mnemonics_visible_apply_recursively (GtkWidget *widget,
                                                      gboolean   mnemonics_visible);
+gint _gtk_label_get_cursor_position (GtkLabel *label);
+gint _gtk_label_get_selection_bound (GtkLabel *label);
 
 G_END_DECLS