Make gtk_combo_box_get_active_text do the right thing for GtkComboBoxEntry

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

diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h
index 71da9b4f16cccea898e63b898802425e17dd72b4..515e6d8a2b25ac3e44a68aa596284231d1635bcf 100644 (file)
--- a/gtk/gtkpreview.h
+++ b/gtk/gtkpreview.h
@@ -2,20 +2,30 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
  */
+
+/*
+ * 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/. 
+ */
+
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_PREVIEW_H__
 #define __GTK_PREVIEW_H__
 
@@ -23,14 +33,14 @@
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
-
-#define GTK_PREVIEW(obj)          GTK_CHECK_CAST (obj, gtk_preview_get_type (), GtkPreview)
-#define GTK_PREVIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_preview_get_type (), GtkPreviewClass)
-#define GTK_IS_PREVIEW(obj)       GTK_CHECK_TYPE (obj, gtk_preview_get_type ())
+#define GTK_TYPE_PREVIEW            (gtk_preview_get_type ())
+#define GTK_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_PREVIEW, GtkPreview))
+#define GTK_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PREVIEW, GtkPreviewClass))
+#define GTK_IS_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_PREVIEW))
+#define GTK_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PREVIEW))
+#define GTK_PREVIEW_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PREVIEW, GtkPreviewClass))
 
 
 typedef struct _GtkPreview       GtkPreview;
@@ -46,37 +56,19 @@ struct _GtkPreview
   guint16 buffer_width;
   guint16 buffer_height;
 
+  guint16 bpp;
+  guint16 rowstride;
+
+  GdkRgbDither dither;
+
   guint type : 1;
   guint expand : 1;
 };
 
 struct _GtkPreviewInfo
 {
-  GdkVisual *visual;
-  GdkColormap *cmap;
-
-  gulong *color_pixels;
-  gulong *gray_pixels;
-  gulong *reserved_pixels;
-
-  gulong *lookup_red;
-  gulong *lookup_green;
-  gulong *lookup_blue;
-
-  GtkDitherInfo *dither_red;
-  GtkDitherInfo *dither_green;
-  GtkDitherInfo *dither_blue;
-  GtkDitherInfo *dither_gray;
-  guchar ***dither_matrix;
-
-  guint nred_shades;
-  guint ngreen_shades;
-  guint nblue_shades;
-  guint ngray_shades;
-  guint nreserved;
-
-  guint bpp;
-  gint cmap_alloced;
+  guchar *lookup;
+
   gdouble gamma;
 };
 
@@ -92,11 +84,10 @@ struct _GtkPreviewClass
 
   GtkPreviewInfo info;
 
-  GdkImage *image;
 };
 
 
-guint           gtk_preview_get_type           (void);
+GtkType         gtk_preview_get_type           (void) G_GNUC_CONST;
 void            gtk_preview_uninit             (void);
 GtkWidget*      gtk_preview_new                (GtkPreviewType   type);
 void            gtk_preview_size               (GtkPreview      *preview,
@@ -111,29 +102,27 @@ void            gtk_preview_put                (GtkPreview      *preview,
                                                gint             desty,
                                                gint             width,
                                                gint             height);
-void            gtk_preview_put_row            (GtkPreview      *preview,
-                                               guchar          *src,
-                                               guchar          *dest,
-                                               gint             x,
-                                               gint             y,
-                                               gint             w);
 void            gtk_preview_draw_row           (GtkPreview      *preview,
                                                guchar          *data,
                                                gint             x,
                                                gint             y,
                                                gint             w);
 void            gtk_preview_set_expand         (GtkPreview      *preview,
-                                               gint             expand);
+                                               gboolean         expand);
 
-void            gtk_preview_set_gamma          (double           gamma);
+void            gtk_preview_set_gamma          (double           gamma_);
 void            gtk_preview_set_color_cube     (guint            nred_shades,
                                                guint            ngreen_shades,
                                                guint            nblue_shades,
                                                guint            ngray_shades);
 void            gtk_preview_set_install_cmap   (gint             install_cmap);
 void            gtk_preview_set_reserved       (gint             nreserved);
+void            gtk_preview_set_dither         (GtkPreview      *preview,
+                                               GdkRgbDither     dither);
+#ifndef GTK_DISABLE_DEPRECATED
 GdkVisual*      gtk_preview_get_visual         (void);
 GdkColormap*    gtk_preview_get_cmap           (void);
+#endif
 GtkPreviewInfo* gtk_preview_get_info           (void);
 
 /* This function reinitializes the preview colormap and visual from
@@ -144,9 +133,8 @@ GtkPreviewInfo* gtk_preview_get_info           (void);
 void            gtk_preview_reset              (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_PREVIEW_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */