Large changes to the Win32 backend, partially made necessary by the

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

diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index eb419625cdce5648f660625a95629b544e5d39df..0eb98669814063b8e58f43970d7d5bb3ea46b09f 100644 (file)
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -8,14 +8,21 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-1999.  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/. 
+ */
+
 #ifndef __GTK_LABEL_H__
 #define __GTK_LABEL_H__
 
@@ -28,27 +35,33 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define GTK_TYPE_LABEL                 (gtk_label_get_type ())
-#define GTK_LABEL(obj)                 (GTK_CHECK_CAST ((obj), GTK_TYPE_LABEL, GtkLabel))
-#define GTK_LABEL_CLASS(klass)         (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL, GtkLabelClass))
-#define GTK_IS_LABEL(obj)              (GTK_CHECK_TYPE ((obj), GTK_TYPE_LABEL))
-#define GTK_IS_LABEL_CLASS(klass)      (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL))
 
+#define GTK_TYPE_LABEL           (gtk_label_get_type ())
+#define GTK_LABEL(obj)           (GTK_CHECK_CAST ((obj), GTK_TYPE_LABEL, GtkLabel))
+#define GTK_LABEL_CLASS(klass)   (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL, GtkLabelClass))
+#define GTK_IS_LABEL(obj)        (GTK_CHECK_TYPE ((obj), GTK_TYPE_LABEL))
+#define GTK_IS_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL))
+#define GTK_LABEL_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LABEL, GtkLabelClass))
+       
 
 typedef struct _GtkLabel       GtkLabel;
 typedef struct _GtkLabelClass  GtkLabelClass;
 
+typedef struct _GtkLabelWord   GtkLabelWord;
+
 struct _GtkLabel
 {
   GtkMisc misc;
-  
-  gchar  *label;
+
+  gchar    *label;
+  GdkWChar *label_wc;
   gchar  *pattern;
 
-  GSList *row;
+  GtkLabelWord *words;
+
   guint          max_width : 16;
   guint   jtype : 2;
-  guint          needs_clear : 1;
+  gboolean wrap;
 };
 
 struct _GtkLabelClass
@@ -56,18 +69,17 @@ struct _GtkLabelClass
   GtkMiscClass parent_class;
 };
 
-
-GtkType           gtk_label_get_type    (void);
-GtkWidget* gtk_label_new        (const gchar       *string);
-void      gtk_label_set         (GtkLabel          *label,
-                                 const gchar       *string);
-void      gtk_label_set_pattern (GtkLabel          *label,
-                                 const gchar       *pattern);
-void      gtk_label_set_justify (GtkLabel          *label,
-                                 GtkJustification   jtype);
-void      gtk_label_get         (GtkLabel          *label,
-                                 gchar            **string);
-
+GtkType    gtk_label_get_type      (void);
+GtkWidget *gtk_label_new           (const char       *str);
+void       gtk_label_set_text      (GtkLabel         *label,
+                                    const char       *str);
+void       gtk_label_set_justify   (GtkLabel         *label,
+                                    GtkJustification  jtype);
+void       gtk_label_set_pattern   (GtkLabel         *label,
+                                    const gchar      *pattern);
+void       gtk_label_set_line_wrap (GtkLabel         *label,
+                                    gboolean          wrap);
+gchar *    gtk_label_get_text      (GtkLabel         *label);
 
 /* Convenience function to set the name and pattern by parsing
  * a string with embedded underscores, and return the appropriate
@@ -77,6 +89,14 @@ void    gtk_label_get         (GtkLabel          *label,
 guint      gtk_label_parse_uline    (GtkLabel         *label,
                                     const gchar      *string);
 
+#ifndef        GTK_DISABLE_COMPAT_H
+#  define gtk_label_set                                gtk_label_set_text
+#endif /* GTK_DISABLE_COMPAT_H */
+
+/* Deprecated */
+void       gtk_label_get           (GtkLabel          *label,
+                                    char             **str);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */