mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-26 05:31:07 +00:00
Remove GtkPixmap completely
This commit is contained in:
Javier Jardón
parent
e031c4f54a
commit
1e8fa9354a
@ -2847,25 +2847,6 @@ GTK_PANED_GET_CLASS
|
||||
gtk_paned_get_type
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
<FILE>gtkpixmap</FILE>
|
||||
<TITLE>GtkPixmap</TITLE>
|
||||
GtkPixmap
|
||||
gtk_pixmap_new
|
||||
gtk_pixmap_set
|
||||
gtk_pixmap_get
|
||||
gtk_pixmap_set_build_insensitive
|
||||
<SUBSECTION Standard>
|
||||
GTK_PIXMAP
|
||||
GTK_IS_PIXMAP
|
||||
GTK_TYPE_PIXMAP
|
||||
GTK_PIXMAP_CLASS
|
||||
GTK_IS_PIXMAP_CLASS
|
||||
GTK_PIXMAP_GET_CLASS
|
||||
<SUBSECTION Private>
|
||||
gtk_pixmap_get_type
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
<FILE>gtkplug</FILE>
|
||||
<TITLE>GtkPlug</TITLE>
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
<!-- ##### SECTION Title ##### -->
|
||||
GtkPixmap
|
||||
|
||||
<!-- ##### SECTION Short_Description ##### -->
|
||||
A widget displaying a graphical image or icon
|
||||
|
||||
<!-- ##### SECTION Long_Description ##### -->
|
||||
<para>
|
||||
The #GtkPixmap widget displays a graphical image or icon.
|
||||
The icon is typically created using gdk_pixmap_colormap_create_from_xpm()
|
||||
or gdk_pixmap_colormap_create_from_xpm_d().
|
||||
</para>
|
||||
<para>
|
||||
The pixels in a #GtkPixmap cannot be manipulated by the application after
|
||||
creation, since under the X Window system the pixel data is stored on the
|
||||
X server and so is not available to the client application.
|
||||
If you want to create graphical images which can be manipulated by the
|
||||
application, look at #GtkImage and #GdkRGB.
|
||||
</para>
|
||||
<para>
|
||||
GtkPixmap has been deprecated since GTK+ 2.0 and should not be used
|
||||
in newly written code. Use #GtkImage instead.
|
||||
</para>
|
||||
|
||||
<!-- ##### SECTION See_Also ##### -->
|
||||
<para>
|
||||
|
||||
</para>
|
||||
|
||||
<!-- ##### SECTION Stability_Level ##### -->
|
||||
|
||||
|
||||
<!-- ##### STRUCT GtkPixmap ##### -->
|
||||
<para>
|
||||
The #GtkPixmap-struct struct contains private data only, and
|
||||
should be accessed using the functions below.
|
||||
</para>
|
||||
|
||||
|
||||
<!-- ##### FUNCTION gtk_pixmap_new ##### -->
|
||||
<para>
|
||||
Creates a new #GtkPixmap, using the given GDK pixmap and mask.
|
||||
</para>
|
||||
|
||||
@pixmap: a #GDKPixmap.
|
||||
@mask: a #GDKBitmap which indicates which parts of the @pixmap should be
|
||||
transparent.
|
||||
@Returns: a new #GtkPixmap.
|
||||
|
||||
|
||||
<!-- ##### FUNCTION gtk_pixmap_set ##### -->
|
||||
<para>
|
||||
Sets the #GdkPixmap and #GdkBitmap mask.
|
||||
</para>
|
||||
|
||||
@pixmap: a #GtkPixmap.
|
||||
@val: a #GdkPixmap.
|
||||
@mask: a #GdkBitmap, which indicates which parts of the @pixmap should be
|
||||
transparent. This can be NULL, in which case none of the @pixmap is
|
||||
transparent.
|
||||
|
||||
|
||||
<!-- ##### FUNCTION gtk_pixmap_get ##### -->
|
||||
<para>
|
||||
Gets the current #GdkPixmap and #GdkBitmap mask.
|
||||
</para>
|
||||
|
||||
@pixmap: a #GtkPixmap.
|
||||
@val: returns the current #GdkPixmap.
|
||||
@mask: returns the current #GdkBitmap mask.
|
||||
|
||||
|
||||
<!-- ##### FUNCTION gtk_pixmap_set_build_insensitive ##### -->
|
||||
<para>
|
||||
Sets wether an extra pixmap should be automatically created and used
|
||||
when the pixmap is insensitive. The default value is %TRUE.
|
||||
</para>
|
||||
|
||||
@pixmap: a #GtkPixmap.
|
||||
@build: set to %TRUE if an extra pixmap should be automatically created to use
|
||||
when the pixmap is insensitive.
|
||||
|
||||
|
||||
@ -635,11 +635,9 @@ gtk_base_c_sources = \
|
||||
|
||||
# Deprecated
|
||||
gtk_public_h_sources += \
|
||||
gtkpixmap.h \
|
||||
gtkprogress.h \
|
||||
gtktooltips.h
|
||||
gtk_base_c_sources += \
|
||||
gtkpixmap.c \
|
||||
gtkprogress.c \
|
||||
gtktooltips.c
|
||||
|
||||
|
||||
@ -2452,18 +2452,6 @@ gtk_path_bar_get_type G_GNUC_CONST
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if IN_HEADER(__GTK_PIXMAP_H__)
|
||||
#if IN_FILE(__GTK_PIXMAP_C__)
|
||||
#ifndef GTK_DISABLE_DEPRECATED
|
||||
gtk_pixmap_get
|
||||
gtk_pixmap_get_type G_GNUC_CONST
|
||||
gtk_pixmap_new
|
||||
gtk_pixmap_set
|
||||
gtk_pixmap_set_build_insensitive
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if IN_HEADER(__GTK_PLUG_H__)
|
||||
#if IN_FILE(__GTK_PLUG_C__)
|
||||
gtk_plug_construct
|
||||
|
||||
286
gtk/gtkpixmap.c
286
gtk/gtkpixmap.c
@ -1,286 +0,0 @@
|
||||
/* GTK - The GIMP Toolkit
|
||||
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
||||
*
|
||||
* Insensitive pixmap building code by Eckehard Berns from GNOME Stock
|
||||
* Copyright (C) 1997, 1998 Free Software Foundation
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* 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/.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <math.h>
|
||||
|
||||
#undef GTK_DISABLE_DEPRECATED
|
||||
#define __GTK_PIXMAP_C__
|
||||
|
||||
#include "gtkcontainer.h"
|
||||
#include "gtkpixmap.h"
|
||||
#include "gtkintl.h"
|
||||
|
||||
#include "gtkalias.h"
|
||||
|
||||
|
||||
static gint gtk_pixmap_expose (GtkWidget *widget,
|
||||
GdkEventExpose *event);
|
||||
static void gtk_pixmap_finalize (GObject *object);
|
||||
static void build_insensitive_pixmap (GtkPixmap *gtkpixmap);
|
||||
|
||||
G_DEFINE_TYPE (GtkPixmap, gtk_pixmap, GTK_TYPE_MISC)
|
||||
|
||||
static void
|
||||
gtk_pixmap_class_init (GtkPixmapClass *class)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
|
||||
GtkWidgetClass *widget_class;
|
||||
|
||||
widget_class = (GtkWidgetClass*) class;
|
||||
|
||||
gobject_class->finalize = gtk_pixmap_finalize;
|
||||
|
||||
widget_class->expose_event = gtk_pixmap_expose;
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_pixmap_init (GtkPixmap *pixmap)
|
||||
{
|
||||
gtk_widget_set_has_window (GTK_WIDGET (pixmap), FALSE);
|
||||
|
||||
pixmap->pixmap = NULL;
|
||||
pixmap->mask = NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* gtk_pixmap_new:
|
||||
* @mask: (allow-none):
|
||||
*/
|
||||
GtkWidget*
|
||||
gtk_pixmap_new (GdkPixmap *val,
|
||||
GdkBitmap *mask)
|
||||
{
|
||||
GtkPixmap *pixmap;
|
||||
|
||||
g_return_val_if_fail (val != NULL, NULL);
|
||||
|
||||
pixmap = gtk_type_new (gtk_pixmap_get_type ());
|
||||
|
||||
pixmap->build_insensitive = TRUE;
|
||||
gtk_pixmap_set (pixmap, val, mask);
|
||||
|
||||
return GTK_WIDGET (pixmap);
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_pixmap_finalize (GObject *object)
|
||||
{
|
||||
gtk_pixmap_set (GTK_PIXMAP (object), NULL, NULL);
|
||||
|
||||
G_OBJECT_CLASS (gtk_pixmap_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
void
|
||||
gtk_pixmap_set (GtkPixmap *pixmap,
|
||||
GdkPixmap *val,
|
||||
GdkBitmap *mask)
|
||||
{
|
||||
gint width;
|
||||
gint height;
|
||||
gint oldwidth;
|
||||
gint oldheight;
|
||||
|
||||
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
|
||||
if(GDK_IS_DRAWABLE(val))
|
||||
g_return_if_fail (gdk_colormap_get_visual (gtk_widget_get_colormap (GTK_WIDGET (pixmap)))->depth == gdk_drawable_get_depth (GDK_DRAWABLE (val)));
|
||||
|
||||
if (pixmap->pixmap != val)
|
||||
{
|
||||
oldwidth = GTK_WIDGET (pixmap)->requisition.width;
|
||||
oldheight = GTK_WIDGET (pixmap)->requisition.height;
|
||||
if (pixmap->pixmap)
|
||||
g_object_unref (pixmap->pixmap);
|
||||
if (pixmap->pixmap_insensitive)
|
||||
g_object_unref (pixmap->pixmap_insensitive);
|
||||
pixmap->pixmap = val;
|
||||
pixmap->pixmap_insensitive = NULL;
|
||||
if (pixmap->pixmap)
|
||||
{
|
||||
g_object_ref (pixmap->pixmap);
|
||||
gdk_drawable_get_size (pixmap->pixmap, &width, &height);
|
||||
GTK_WIDGET (pixmap)->requisition.width =
|
||||
width + GTK_MISC (pixmap)->xpad * 2;
|
||||
GTK_WIDGET (pixmap)->requisition.height =
|
||||
height + GTK_MISC (pixmap)->ypad * 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
GTK_WIDGET (pixmap)->requisition.width = 0;
|
||||
GTK_WIDGET (pixmap)->requisition.height = 0;
|
||||
}
|
||||
if (gtk_widget_get_visible (GTK_WIDGET (pixmap)))
|
||||
{
|
||||
if ((GTK_WIDGET (pixmap)->requisition.width != oldwidth) ||
|
||||
(GTK_WIDGET (pixmap)->requisition.height != oldheight))
|
||||
gtk_widget_queue_resize (GTK_WIDGET (pixmap));
|
||||
else
|
||||
gtk_widget_queue_draw (GTK_WIDGET (pixmap));
|
||||
}
|
||||
}
|
||||
|
||||
if (pixmap->mask != mask)
|
||||
{
|
||||
if (pixmap->mask)
|
||||
g_object_unref (pixmap->mask);
|
||||
pixmap->mask = mask;
|
||||
if (pixmap->mask)
|
||||
g_object_ref (pixmap->mask);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
gtk_pixmap_get (GtkPixmap *pixmap,
|
||||
GdkPixmap **val,
|
||||
GdkBitmap **mask)
|
||||
{
|
||||
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
|
||||
|
||||
if (val)
|
||||
*val = pixmap->pixmap;
|
||||
if (mask)
|
||||
*mask = pixmap->mask;
|
||||
}
|
||||
|
||||
static gint
|
||||
gtk_pixmap_expose (GtkWidget *widget,
|
||||
GdkEventExpose *event)
|
||||
{
|
||||
GtkPixmap *pixmap;
|
||||
GtkMisc *misc;
|
||||
gint x, y;
|
||||
gfloat xalign;
|
||||
|
||||
g_return_val_if_fail (GTK_IS_PIXMAP (widget), FALSE);
|
||||
g_return_val_if_fail (event != NULL, FALSE);
|
||||
|
||||
if (GTK_WIDGET_DRAWABLE (widget))
|
||||
{
|
||||
pixmap = GTK_PIXMAP (widget);
|
||||
misc = GTK_MISC (widget);
|
||||
|
||||
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
|
||||
xalign = misc->xalign;
|
||||
else
|
||||
xalign = 1.0 - misc->xalign;
|
||||
|
||||
x = floor (widget->allocation.x + misc->xpad
|
||||
+ ((widget->allocation.width - widget->requisition.width) * xalign));
|
||||
y = floor (widget->allocation.y + misc->ypad
|
||||
+ ((widget->allocation.height - widget->requisition.height) * misc->yalign));
|
||||
|
||||
if (pixmap->mask)
|
||||
{
|
||||
gdk_gc_set_clip_mask (widget->style->black_gc, pixmap->mask);
|
||||
gdk_gc_set_clip_origin (widget->style->black_gc, x, y);
|
||||
}
|
||||
|
||||
if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE
|
||||
&& pixmap->build_insensitive)
|
||||
{
|
||||
if (!pixmap->pixmap_insensitive)
|
||||
build_insensitive_pixmap (pixmap);
|
||||
gdk_draw_drawable (widget->window,
|
||||
widget->style->black_gc,
|
||||
pixmap->pixmap_insensitive,
|
||||
0, 0, x, y, -1, -1);
|
||||
}
|
||||
else
|
||||
{
|
||||
gdk_draw_drawable (widget->window,
|
||||
widget->style->black_gc,
|
||||
pixmap->pixmap,
|
||||
0, 0, x, y, -1, -1);
|
||||
}
|
||||
|
||||
if (pixmap->mask)
|
||||
{
|
||||
gdk_gc_set_clip_mask (widget->style->black_gc, NULL);
|
||||
gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0);
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void
|
||||
gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap, gboolean build)
|
||||
{
|
||||
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
|
||||
|
||||
pixmap->build_insensitive = build;
|
||||
|
||||
if (gtk_widget_get_visible (GTK_WIDGET (pixmap)))
|
||||
{
|
||||
gtk_widget_queue_draw (GTK_WIDGET (pixmap));
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
build_insensitive_pixmap (GtkPixmap *gtkpixmap)
|
||||
{
|
||||
GdkPixmap *pixmap = gtkpixmap->pixmap;
|
||||
GdkPixmap *insensitive;
|
||||
gint w, h;
|
||||
GdkPixbuf *pixbuf;
|
||||
GdkPixbuf *stated;
|
||||
|
||||
gdk_drawable_get_size (pixmap, &w, &h);
|
||||
|
||||
pixbuf = gdk_pixbuf_get_from_drawable (NULL,
|
||||
pixmap,
|
||||
gtk_widget_get_colormap (GTK_WIDGET (gtkpixmap)),
|
||||
0, 0,
|
||||
0, 0,
|
||||
w, h);
|
||||
|
||||
stated = gdk_pixbuf_copy (pixbuf);
|
||||
|
||||
gdk_pixbuf_saturate_and_pixelate (pixbuf, stated,
|
||||
0.8, TRUE);
|
||||
|
||||
g_object_unref (pixbuf);
|
||||
pixbuf = NULL;
|
||||
|
||||
insensitive = gdk_pixmap_new (GTK_WIDGET (gtkpixmap)->window, w, h, -1);
|
||||
|
||||
gdk_draw_pixbuf (insensitive,
|
||||
GTK_WIDGET (gtkpixmap)->style->white_gc,
|
||||
stated,
|
||||
0, 0,
|
||||
0, 0,
|
||||
w, h,
|
||||
GDK_RGB_DITHER_NORMAL,
|
||||
0, 0);
|
||||
|
||||
gtkpixmap->pixmap_insensitive = insensitive;
|
||||
|
||||
g_object_unref (stated);
|
||||
}
|
||||
|
||||
#include "gtkaliasdef.c"
|
||||
@ -1,83 +0,0 @@
|
||||
/* GTK - The GIMP Toolkit
|
||||
* 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 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* 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/.
|
||||
*/
|
||||
|
||||
#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_PIXMAP_C__)
|
||||
|
||||
#ifndef __GTK_PIXMAP_H__
|
||||
#define __GTK_PIXMAP_H__
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define GTK_TYPE_PIXMAP (gtk_pixmap_get_type ())
|
||||
#define GTK_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PIXMAP, GtkPixmap))
|
||||
#define GTK_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP, GtkPixmapClass))
|
||||
#define GTK_IS_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PIXMAP))
|
||||
#define GTK_IS_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP))
|
||||
#define GTK_PIXMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PIXMAP, GtkPixmapClass))
|
||||
|
||||
|
||||
typedef struct _GtkPixmap GtkPixmap;
|
||||
typedef struct _GtkPixmapClass GtkPixmapClass;
|
||||
|
||||
struct _GtkPixmap
|
||||
{
|
||||
GtkMisc misc;
|
||||
|
||||
GdkPixmap *pixmap;
|
||||
GdkBitmap *mask;
|
||||
|
||||
GdkPixmap *pixmap_insensitive;
|
||||
guint build_insensitive : 1;
|
||||
};
|
||||
|
||||
struct _GtkPixmapClass
|
||||
{
|
||||
GtkMiscClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
GType gtk_pixmap_get_type (void) G_GNUC_CONST;
|
||||
GtkWidget* gtk_pixmap_new (GdkPixmap *pixmap,
|
||||
GdkBitmap *mask);
|
||||
void gtk_pixmap_set (GtkPixmap *pixmap,
|
||||
GdkPixmap *val,
|
||||
GdkBitmap *mask);
|
||||
void gtk_pixmap_get (GtkPixmap *pixmap,
|
||||
GdkPixmap **val,
|
||||
GdkBitmap **mask);
|
||||
|
||||
void gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap,
|
||||
gboolean build);
|
||||
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GTK_PIXMAP_H__ */
|
||||
|
||||
#endif /* GTK_DISABLE_DEPRECATED */
|
||||
@ -41,15 +41,9 @@
|
||||
#include <gtk/gtktooltips.h>
|
||||
#include <gtk/gtktoolitem.h>
|
||||
|
||||
#ifndef GTK_DISABLE_DEPRECATED
|
||||
|
||||
/* Not needed, retained for compatibility -Yosh */
|
||||
#include <gtk/gtkpixmap.h>
|
||||
|
||||
#endif /* GTK_DISABLE_DEPRECATED */
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
||||
#define GTK_TYPE_TOOLBAR (gtk_toolbar_get_type ())
|
||||
#define GTK_TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLBAR, GtkToolbar))
|
||||
#define GTK_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOLBAR, GtkToolbarClass))
|
||||
|
||||
@ -114,7 +114,6 @@ gtk_OBJECTS_deprecated = \
|
||||
gtkprogress.obj \
|
||||
gtktipsquery.obj \
|
||||
gtkshow.obj \
|
||||
gtkpixmap.obj \
|
||||
gtkpreview.obj \
|
||||
gtkseparatortoolitem.obj \
|
||||
gtktypeutils.obj \
|
||||
@ -468,7 +467,6 @@ gtk_public_h_sources = \
|
||||
gtkpagesetup.h \
|
||||
gtkpaned.h \
|
||||
gtkpapersize.h \
|
||||
gtkpixmap.h \
|
||||
gtkplug.h \
|
||||
gtkpreview.h \
|
||||
gtkprintcontext.h \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user