Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Incorporate Darin's suggestions

Browse Source
This commit is contained in:
Havoc Pennington
2000-06-29 03:53:19 +00:00
parent 7b8adae406
commit 03f0f06701
3 changed files with 93 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gtk/gtkdialog.c
View File

@@ -368,10 +368,8 @@ typedef struct {
} RunInfo;
static void
run_destroy_handler (GtkDialog *dialog, gpointer data)
shutdown_loop (RunInfo *ri)
{
RunInfo *ri = data;
if (ri->loop != NULL)
{
g_main_quit (ri->loop);
@@ -380,6 +378,14 @@ run_destroy_handler (GtkDialog *dialog, gpointer data)
}
}
static void
run_destroy_handler (GtkDialog *dialog, gpointer data)
{
RunInfo *ri = data;
shutdown_loop (ri);
}
static void
run_response_handler (GtkDialog *dialog,
gint response_id,
@@ -391,7 +397,7 @@ run_response_handler (GtkDialog *dialog,
ri->response_id = response_id;
run_destroy_handler (dialog, data);
shutdown_loop (ri);
}
static gint
@@ -399,8 +405,15 @@ run_delete_handler (GtkDialog *dialog,
GdkEventAny *event,
gpointer data)
{
run_destroy_handler (dialog, data);
RunInfo *ri;
ri = data;
shutdown_loop (ri);
/* emit response signal */
gtk_dialog_response (dialog, GTK_RESPONSE_NONE);
return TRUE; /* Do not destroy */
}
@@ -438,16 +451,16 @@ gtk_dialog_run (GtkDialog *dialog)
GTK_SIGNAL_FUNC (run_delete_handler),
&ri);
ri.loop = g_main_new(FALSE);
ri.loop = g_main_new (FALSE);
g_main_run(ri.loop);
g_main_run (ri.loop);
g_assert(ri.loop == NULL);
g_assert (ri.loop == NULL);
if (!GTK_OBJECT_DESTROYED (dialog))
{
if (!was_modal)
gtk_window_set_modal(GTK_WINDOW(dialog), FALSE);
gtk_window_set_modal (GTK_WINDOW(dialog), FALSE);
gtk_signal_disconnect (GTK_OBJECT (dialog), ri.destroy_handler);
gtk_signal_disconnect (GTK_OBJECT (dialog), ri.response_handler);
@@ -459,5 +472,3 @@ gtk_dialog_run (GtkDialog *dialog)
return ri.response_id;
}

91
gtk/gtkimage.c
View File

@@ -84,7 +84,7 @@ gtk_image_init (GtkImage *image)
{
GTK_WIDGET_SET_FLAGS (image, GTK_NO_WINDOW);
image->representation_type = GTK_IMAGE_EMPTY;
image->storage_type = GTK_IMAGE_EMPTY;
}
GtkWidget*
@@ -169,7 +169,11 @@ gtk_image_set_from_pixmap (GtkImage *image,
GdkBitmap *mask)
{
g_return_if_fail (GTK_IS_IMAGE (image));
g_return_if_fail (pixmap == NULL ||
GDK_IS_PIXMAP (pixmap));
g_return_if_fail (mask == NULL ||
GDK_IS_PIXMAP (mask));
if (pixmap)
g_object_ref (G_OBJECT (pixmap));
@@ -183,7 +187,7 @@ gtk_image_set_from_pixmap (GtkImage *image,
int width;
int height;
image->representation_type = GTK_IMAGE_PIXMAP;
image->storage_type = GTK_IMAGE_PIXMAP;
image->data.pixmap.pixmap = pixmap;
image->data.pixmap.mask = mask;
@@ -206,6 +210,11 @@ gtk_image_set_from_image (GtkImage *image,
GdkBitmap *mask)
{
g_return_if_fail (GTK_IS_IMAGE (image));
g_return_if_fail (gdk_image == NULL ||
GDK_IS_IMAGE (gdk_image));
g_return_if_fail (mask == NULL ||
GDK_IS_PIXMAP (mask));
if (gdk_image)
g_object_ref (G_OBJECT (gdk_image));
@@ -217,7 +226,7 @@ gtk_image_set_from_image (GtkImage *image,
if (gdk_image)
{
image->representation_type = GTK_IMAGE_IMAGE;
image->storage_type = GTK_IMAGE_IMAGE;
image->data.image.image = gdk_image;
image->data.image.mask = mask;
@@ -239,7 +248,8 @@ gtk_image_set_from_file (GtkImage *image,
GdkPixbuf *pixbuf;
g_return_if_fail (GTK_IS_IMAGE (image));
g_return_if_fail (filename != NULL);
gtk_image_clear (image);
if (filename == NULL)
@@ -260,7 +270,9 @@ gtk_image_set_from_pixbuf (GtkImage *image,
GdkPixbuf *pixbuf)
{
g_return_if_fail (GTK_IS_IMAGE (image));
g_return_if_fail (pixbuf == NULL ||
GDK_IS_PIXBUF (pixbuf));
if (pixbuf)
g_object_ref (G_OBJECT (pixbuf));
@@ -268,7 +280,7 @@ gtk_image_set_from_pixbuf (GtkImage *image,
if (pixbuf != NULL)
{
image->representation_type = GTK_IMAGE_PIXBUF;
image->storage_type = GTK_IMAGE_PIXBUF;
image->data.pixbuf.pixbuf = pixbuf;
@@ -284,12 +296,12 @@ gtk_image_set_from_stock (GtkImage *image,
GtkIconSizeType size)
{
g_return_if_fail (GTK_IS_IMAGE (image));
gtk_image_clear (image);
if (stock_id)
{
image->representation_type = GTK_IMAGE_STOCK;
image->storage_type = GTK_IMAGE_STOCK;
image->data.stock.stock_id = g_strdup (stock_id);
image->data.stock.size = size;
@@ -315,7 +327,7 @@ gtk_image_set_from_icon_set (GtkImage *image,
if (icon_set)
{
image->representation_type = GTK_IMAGE_ICON_SET;
image->storage_type = GTK_IMAGE_ICON_SET;
image->data.icon_set.icon_set = icon_set;
image->data.icon_set.size = size;
@@ -326,14 +338,29 @@ gtk_image_set_from_icon_set (GtkImage *image,
}
}
GtkImageType
gtk_image_get_storage_type (GtkImage *image)
{
g_return_val_if_fail (GTK_IS_IMAGE (image), GTK_IMAGE_EMPTY);
return image->storage_type;
}
void
gtk_image_get_pixmap (GtkImage *image,
GdkPixmap **pixmap,
GdkBitmap **mask)
{
g_return_if_fail (GTK_IS_IMAGE (image));
g_return_if_fail (image->representation_type == GTK_IMAGE_PIXMAP);
g_return_if_fail (image->storage_type == GTK_IMAGE_PIXMAP ||
image->storage_type == GTK_IMAGE_EMPTY);
if (image->storage_type == GTK_IMAGE_EMPTY)
{
image->data.pixmap.pixmap = NULL;
image->data.pixmap.mask = NULL;
}
if (pixmap)
*pixmap = image->data.pixmap.pixmap;
@@ -347,8 +374,15 @@ gtk_image_get_image (GtkImage *image,
GdkBitmap **mask)
{
g_return_if_fail (GTK_IS_IMAGE (image));
g_return_if_fail (image->representation_type == GTK_IMAGE_IMAGE);
g_return_if_fail (image->storage_type == GTK_IMAGE_IMAGE ||
image->storage_type == GTK_IMAGE_EMPTY);
if (image->storage_type == GTK_IMAGE_EMPTY)
{
image->data.image.image = NULL;
image->data.image.mask = NULL;
}
if (gdk_image)
*gdk_image = image->data.image.image;
@@ -360,8 +394,12 @@ GdkPixbuf*
gtk_image_get_pixbuf (GtkImage *image)
{
g_return_val_if_fail (GTK_IS_IMAGE (image), NULL);
g_return_val_if_fail (image->representation_type == GTK_IMAGE_PIXBUF, NULL);
g_return_val_if_fail (image->storage_type == GTK_IMAGE_PIXBUF ||
image->storage_type == GTK_IMAGE_EMPTY, NULL);
if (image->storage_type == GTK_IMAGE_EMPTY)
image->data.pixbuf.pixbuf = NULL;
return image->data.pixbuf.pixbuf;
}
@@ -371,9 +409,12 @@ gtk_image_get_stock (GtkImage *image,
GtkIconSizeType *size)
{
g_return_if_fail (GTK_IS_IMAGE (image));
g_return_if_fail (image->representation_type == GTK_IMAGE_STOCK);
g_return_if_fail (image->storage_type == GTK_IMAGE_STOCK ||
image->storage_type == GTK_IMAGE_EMPTY);
if (image->storage_type == GTK_IMAGE_EMPTY)
image->data.stock.stock_id = NULL;
if (stock_id)
*stock_id = g_strdup (image->data.stock.stock_id);
@@ -387,9 +428,13 @@ gtk_image_get_icon_set (GtkImage *image,
GtkIconSizeType *size)
{
g_return_if_fail (GTK_IS_IMAGE (image));
g_return_if_fail (image->representation_type == GTK_IMAGE_ICON_SET);
g_return_if_fail (image->storage_type == GTK_IMAGE_ICON_SET ||
image->storage_type == GTK_IMAGE_EMPTY);
if (icon_set)
if (image->storage_type == GTK_IMAGE_EMPTY)
image->data.icon_set.icon_set = NULL;
if (icon_set)
*icon_set = image->data.icon_set.icon_set;
if (size)
@@ -441,7 +486,7 @@ gtk_image_expose (GtkWidget *widget,
g_return_val_if_fail (event != NULL, FALSE);
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget) &&
GTK_IMAGE (widget)->representation_type != GTK_IMAGE_EMPTY)
GTK_IMAGE (widget)->storage_type != GTK_IMAGE_EMPTY)
{
GtkImage *image;
GtkMisc *misc;
@@ -465,7 +510,7 @@ gtk_image_expose (GtkWidget *widget,
image_bound.x = x;
image_bound.y = y;
switch (image->representation_type)
switch (image->storage_type)
{
case GTK_IMAGE_PIXMAP:
mask = image->data.pixmap.mask;
@@ -530,7 +575,7 @@ gtk_image_expose (GtkWidget *widget,
if (gdk_rectangle_intersect (&image_bound, &area, &intersection))
{
switch (image->representation_type)
switch (image->storage_type)
{
case GTK_IMAGE_PIXMAP:
gdk_draw_drawable (widget->window,
@@ -597,7 +642,7 @@ gtk_image_expose (GtkWidget *widget,
static void
gtk_image_clear (GtkImage *image)
{
switch (image->representation_type)
switch (image->storage_type)
{
case GTK_IMAGE_PIXMAP:
@@ -657,7 +702,7 @@ gtk_image_clear (GtkImage *image)
}
image->representation_type = GTK_IMAGE_EMPTY;
image->storage_type = GTK_IMAGE_EMPTY;
GTK_WIDGET (image)->requisition.width = 0;
GTK_WIDGET (image)->requisition.height = 0;
@@ -675,7 +720,7 @@ gtk_image_size_request (GtkWidget *widget,
image = GTK_IMAGE (widget);
switch (image->representation_type)
switch (image->storage_type)
{
case GTK_IMAGE_STOCK:
pixbuf = gtk_widget_get_icon (GTK_WIDGET (image),

4
gtk/gtkimage.h
View File

@@ -96,7 +96,7 @@ struct _GtkImage
{
GtkMisc misc;
GtkImageType representation_type;
GtkImageType storage_type;
union
{
@@ -144,6 +144,8 @@ void gtk_image_set_from_icon_set (GtkImage *image,
GtkIconSet *icon_set,
GtkIconSizeType size);
GtkImageType gtk_image_get_storage_type (GtkImage *image);
void gtk_image_get_pixmap (GtkImage *image,
GdkPixmap **pixmap,
GdkBitmap **mask);