Convert from GtkArg to GParam (originally based on patch from Lee

2001-03-05  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtklabel.[ch]:
	Convert from GtkArg to GParam (originally based on patch from Lee Mallabone).
	New function gtk_label_get_accel_keyval () to get the underline accelerator
	of the label. Setting the label pattern overrides other attributes.

ChangeLog

+2001-03-05  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtklabel.[ch]:
+	Convert from GtkArg to GParam (originally based on patch from Lee Mallabone).
+	New function gtk_label_get_accel_keyval () to get the underline accelerator
+	of the label. Setting the label pattern overrides other attributes.
+
 Mon Mar  5 14:51:10 MET 2001  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkrc.c: fixed compiler warnings by inserting some consts.

ChangeLog.pre-2-0

+2001-03-05  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtklabel.[ch]:
+	Convert from GtkArg to GParam (originally based on patch from Lee Mallabone).
+	New function gtk_label_get_accel_keyval () to get the underline accelerator
+	of the label. Setting the label pattern overrides other attributes.
+
 Mon Mar  5 14:51:10 MET 2001  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkrc.c: fixed compiler warnings by inserting some consts.

ChangeLog.pre-2-10

+2001-03-05  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtklabel.[ch]:
+	Convert from GtkArg to GParam (originally based on patch from Lee Mallabone).
+	New function gtk_label_get_accel_keyval () to get the underline accelerator
+	of the label. Setting the label pattern overrides other attributes.
+
 Mon Mar  5 14:51:10 MET 2001  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkrc.c: fixed compiler warnings by inserting some consts.

ChangeLog.pre-2-2

+2001-03-05  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtklabel.[ch]:
+	Convert from GtkArg to GParam (originally based on patch from Lee Mallabone).
+	New function gtk_label_get_accel_keyval () to get the underline accelerator
+	of the label. Setting the label pattern overrides other attributes.
+
 Mon Mar  5 14:51:10 MET 2001  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkrc.c: fixed compiler warnings by inserting some consts.

ChangeLog.pre-2-4

+2001-03-05  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtklabel.[ch]:
+	Convert from GtkArg to GParam (originally based on patch from Lee Mallabone).
+	New function gtk_label_get_accel_keyval () to get the underline accelerator
+	of the label. Setting the label pattern overrides other attributes.
+
 Mon Mar  5 14:51:10 MET 2001  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkrc.c: fixed compiler warnings by inserting some consts.

ChangeLog.pre-2-6

+2001-03-05  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtklabel.[ch]:
+	Convert from GtkArg to GParam (originally based on patch from Lee Mallabone).
+	New function gtk_label_get_accel_keyval () to get the underline accelerator
+	of the label. Setting the label pattern overrides other attributes.
+
 Mon Mar  5 14:51:10 MET 2001  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkrc.c: fixed compiler warnings by inserting some consts.

ChangeLog.pre-2-8

+2001-03-05  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtklabel.[ch]:
+	Convert from GtkArg to GParam (originally based on patch from Lee Mallabone).
+	New function gtk_label_get_accel_keyval () to get the underline accelerator
+	of the label. Setting the label pattern overrides other attributes.
+
 Mon Mar  5 14:51:10 MET 2001  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkrc.c: fixed compiler warnings by inserting some consts.

gtk/gtklabel.h

@@ -54,15 +54,18 @@ struct _GtkLabel
   GtkMisc misc;
 
   /*< private >*/
-  
-  gchar    *label;
-  gchar    *pattern;
-
+  gchar  *label;
   guint   jtype : 2;
   guint   wrap : 1;
+  guint   use_underline : 1;
+  guint   use_markup : 1;
+
+  guint   accel_keyval;
   
-  PangoLayout *layout;
+  gchar  *text; 
   PangoAttrList *attrs;
+  
+  PangoLayout *layout;
 
   GtkLabelSelectionInfo *select_info;
 };
@@ -87,6 +90,7 @@ void  gtk_label_set_markup            (GtkLabel    *label,
 guint gtk_label_set_markup_with_accel (GtkLabel    *label,
                                        const gchar *str);
                                             
+guint gtk_label_get_accel_keyval   (GtkLabel    *label);
 void       gtk_label_set_justify   (GtkLabel         *label,
 				    GtkJustification  jtype);
 void       gtk_label_set_pattern   (GtkLabel         *label,