diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-11-06 16:03:17 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-11-06 16:03:17 +0000 |
| commit | 093032a4c1940919ef403556d4912f371c3bfc24 (patch) | |
| tree | 78ec24e0d6ce2d84453f27ba496673f53206db8e /gtk/gtkpixmap.c | |
| parent | 4b0e615fc5e2ab8c996f08e5401ba459eca7f078 (diff) | |
| download | gtk+-themes-2.tar.gz | |
Queue a clear/redraw, not just a redraw, so the focus gets undrawnthemes-2
Thu Nov 5 12:06:16 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c (gtk_check_button_draw_focus): Queue
a clear/redraw, not just a redraw, so the focus
gets undrawn properly.
* gtk/gtktogglebutton.c (gtk_toggle_button_unrealize):
Chain to gtk_widget_unrealize() instead of duplicating
code.
Wed Nov 4 14:34:51 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c gdk/gdkprivate.h gdk/gdkwindow.c: Removed
last vestiges of old DND.
Tue Nov 3 12:27:52 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c: Restored inner border to entries,
erase cursors to background image.
Fri Oct 30 12:09:21 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkstyle.[ch]: removed paint_entry() -
it was identical to paint_flat_box().
* gtk/gtkstyle.c: Coding style fixups.
* gtk/gtkwindow.c (gtk_window_move_resize): removed useless
test.
* gtk/gtkframe.c gtkstyle.[ch] gtknotebook.c:
Change 'side' for paint_[box/shadow]_gap and paint_extension
to be GtkPositionType instead of a random int.
* gtk/gtkaspectframe.c (gtk_aspect_frame_paint): Use
"frame" as detail - an aspectframe should draw identical
to a frame.
Tue Oct 27 09:58:11 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_merge_child_shapes): renamed
from combine_child_shapes().
* gdk/gdkwindow.c: Merge propagate_shapes() and
propagate_combine_shapes() to remove code duplication.
Diffstat (limited to 'gtk/gtkpixmap.c')
| -rw-r--r-- | gtk/gtkpixmap.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c index 5f4006555e..9cc6ec0076 100644 --- a/gtk/gtkpixmap.c +++ b/gtk/gtkpixmap.c @@ -80,15 +80,15 @@ 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 ()); + GtkPixmap *pixmap; - gtk_pixmap_set (pixmap, val, mask); - - return GTK_WIDGET (pixmap); + g_return_val_if_fail (val != NULL, NULL); + + pixmap = gtk_type_new (gtk_pixmap_get_type ()); + + gtk_pixmap_set (pixmap, val, mask); + + return GTK_WIDGET (pixmap); } static void @@ -184,17 +184,6 @@ gtk_pixmap_expose (GtkWidget *widget, pixmap = GTK_PIXMAP (widget); misc = GTK_MISC (widget); -/* - x = widget->allocation.x + - (gint)((gfloat)((widget->allocation.width - - widget->requisition.width) - + (misc->xpad * 2)) * misc->xalign); - y = widget->allocation.y + - (gint)((gfloat)((widget->allocation.height - - widget->requisition.height) - + (misc->ypad * 2)) * misc->yalign); -*/ - x = (widget->allocation.x * (1.0 - misc->xalign) + (widget->allocation.x + widget->allocation.width - (widget->requisition.width - misc->xpad * 2)) * |