diff options
| author | Owen Taylor <owt1@cornell.edu> | 1998-03-29 02:44:43 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-03-29 02:44:43 +0000 |
| commit | 93e1585614b72c684b4fa302f6ae2e6d5605e02e (patch) | |
| tree | f0040246098ac7e056fc75c824759d81027d9a37 /gtk/gtklabel.c | |
| parent | 5b3cc69b4314a5206c0da6b16d34724ae0bba9ba (diff) | |
| download | gtk+-93e1585614b72c684b4fa302f6ae2e6d5605e02e.tar.gz | |
Disconnect from combo->entry, not combo. (From: Daniel Skarda
Sat Mar 28 21:18:42 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombo.c (gtk_combo_disable_activate):
Disconnect from combo->entry, not combo.
(From: Daniel Skarda <0rfelyus@atrey.karlin.mff.cuni.cz>)
* gdk/gdkpixmap.c (gdk_pixmap_colormap_create_from_xpm): Deal
better with xpm's with bad colors in them.
Plus, 3rd attempt to commit gtklabel changes
Diffstat (limited to 'gtk/gtklabel.c')
| -rw-r--r-- | gtk/gtklabel.c | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 694f9620a8..0f30935ce7 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -38,6 +38,11 @@ static void gtk_label_size_request (GtkWidget *widget, GtkRequisition *requisition); static gint gtk_label_expose (GtkWidget *widget, GdkEventExpose *event); +static void gtk_label_state_changed (GtkWidget *widget, + guint previous_state); +static void gtk_label_style_set (GtkWidget *widget, + GtkStyle *previous_style); + static GtkMiscClass *parent_class = NULL; @@ -85,6 +90,8 @@ gtk_label_class_init (GtkLabelClass *class) widget_class->size_request = gtk_label_size_request; widget_class->expose_event = gtk_label_expose; + widget_class->style_set = gtk_label_style_set; + widget_class->state_changed = gtk_label_state_changed; } static void @@ -365,7 +372,28 @@ gtk_label_expose (GtkWidget *widget, return TRUE; } +static void +gtk_label_state_changed (GtkWidget *widget, + guint previous_state) +{ + if (GTK_WIDGET_NO_WINDOW (widget) && + GTK_WIDGET_DRAWABLE (widget)) + gdk_window_clear_area (widget->window, + widget->allocation.x, + widget->allocation.y, + widget->allocation.width, + widget->allocation.height); +} - - - +static void +gtk_label_style_set (GtkWidget *widget, + GtkStyle *previous_style) +{ + if (GTK_WIDGET_NO_WINDOW (widget) && + GTK_WIDGET_DRAWABLE (widget)) + gdk_window_clear_area (widget->window, + widget->allocation.x, + widget->allocation.y, + widget->allocation.width, + widget->allocation.height); +} |