diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-07-02 17:03:21 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-02 17:03:21 +0000 |
| commit | 4f1ccca5940937ca184c331e035c71ef84675193 (patch) | |
| tree | 686f66036477376e3d6038eb75bd8b4943ec1459 /gtk/gtkcolorsel.c | |
| parent | 7164c0acb138778fb973b0b48a70ff53d4a6e9b9 (diff) | |
| download | gdk-pixbuf-4f1ccca5940937ca184c331e035c71ef84675193.tar.gz | |
Add gdk_rgb_find_color() to get a pixel value using GdkRGB functionality
Sun Jul 2 12:45:50 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.[ch]: Add gdk_rgb_find_color() to get a pixel
value using GdkRGB functionality given GdkColormap and GdkColor.
(name not final, waiting for inspiration.)
* gdk/gdkgc.[ch] (gdk_gc_set_rgb_fg/bg_color): New functions to
set the foreground/background of a GC using the GC's colormap
and GdkRGB. (name not final, waiting for inspiration.)
* gdk/gdkcompat.h gdk/gdkrgb.c (gdk_rgb_get_colormap): Rename from
gdk_rgb_get_cmap(), put #define in gdkcompat.h.
* gtk/gtkwidget.[ch] gtkcompat.h: Make visuals for
gtk_widget_get_visual(), gtk_widget_get_default_visual, etc,
purely a function of the corresponding colormap. Make
gtk_widget_set_visual(), etc, noop macros in gtkcompat.h.
* gdk/gdkpixmap.c gdk/x11/gdkpixmap-c11.c: Rewrite
gdk_pixbuf_*create_from_xpm_* in terms of
gdk_pixbuf_new_from_xpm_data(), move into platform independent
code.
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): Take
advantage of the new draw_rgb_32_image_dithalign.
* gdk/gdkrgb.c (gdk_draw_rgb_32_image_dithalign): Added.
* gtk/gtkgc.c (gtk_gc_new): Set the appropriate colormap
on each created GC.
* gdk/gdkgc.[ch]: Add gdk_gc_get/set_colormap.
* gdk/gdkgc.[ch]: Add a colormap field to the GdkGC structure
which we initialize from the drawable when the GC is created,
if the drawable has a colormap.
* gdk/x11/gdkgc-x11.c: include string.h for memset.
* gdk/x11/gdkinput-x11.c: include string.h for strlen, etc.
* gtk/gtklayout.[ch]: Remove unsed configure serial member.
Diffstat (limited to 'gtk/gtkcolorsel.c')
| -rw-r--r-- | gtk/gtkcolorsel.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 26d34078e..61f28f8e9 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -488,9 +488,6 @@ color_sample_new (GtkColorSelection *colorsel) priv = colorsel->private_data; - gtk_widget_push_visual(gdk_rgb_get_visual()); - gtk_widget_push_colormap(gdk_rgb_get_cmap()); - priv->sample_area = gtk_hbox_new (FALSE, 0); priv->old_sample = gtk_drawing_area_new (); priv->cur_sample = gtk_drawing_area_new (); @@ -499,8 +496,6 @@ color_sample_new (GtkColorSelection *colorsel) TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (priv->sample_area), priv->cur_sample, TRUE, TRUE, 0); - gtk_widget_pop_visual(); - gtk_widget_pop_colormap(); gtk_signal_connect(GTK_OBJECT (priv->old_sample), "expose_event", GTK_SIGNAL_FUNC (color_old_sample_expose), |