diff --git a/ChangeLog b/ChangeLog index ff8ade769ea2abdceda40e0f71b1b310f99dee1d..b8d06336e63d2b24906ad37fed6b5d4167c1a401 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-08-07 Matthias Clasen + + * gtk/gtkhsv.c (gtk_hsv_map, gtk_hsv_unmap): Reinstate these + functions in order to make mouse operation work again in the + color wheel. (#58604) + 2001-08-07 James Henstridge * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ff8ade769ea2abdceda40e0f71b1b310f99dee1d..b8d06336e63d2b24906ad37fed6b5d4167c1a401 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-08-07 Matthias Clasen + + * gtk/gtkhsv.c (gtk_hsv_map, gtk_hsv_unmap): Reinstate these + functions in order to make mouse operation work again in the + color wheel. (#58604) + 2001-08-07 James Henstridge * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ff8ade769ea2abdceda40e0f71b1b310f99dee1d..b8d06336e63d2b24906ad37fed6b5d4167c1a401 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-08-07 Matthias Clasen + + * gtk/gtkhsv.c (gtk_hsv_map, gtk_hsv_unmap): Reinstate these + functions in order to make mouse operation work again in the + color wheel. (#58604) + 2001-08-07 James Henstridge * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ff8ade769ea2abdceda40e0f71b1b310f99dee1d..b8d06336e63d2b24906ad37fed6b5d4167c1a401 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-08-07 Matthias Clasen + + * gtk/gtkhsv.c (gtk_hsv_map, gtk_hsv_unmap): Reinstate these + functions in order to make mouse operation work again in the + color wheel. (#58604) + 2001-08-07 James Henstridge * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ff8ade769ea2abdceda40e0f71b1b310f99dee1d..b8d06336e63d2b24906ad37fed6b5d4167c1a401 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-08-07 Matthias Clasen + + * gtk/gtkhsv.c (gtk_hsv_map, gtk_hsv_unmap): Reinstate these + functions in order to make mouse operation work again in the + color wheel. (#58604) + 2001-08-07 James Henstridge * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ff8ade769ea2abdceda40e0f71b1b310f99dee1d..b8d06336e63d2b24906ad37fed6b5d4167c1a401 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-08-07 Matthias Clasen + + * gtk/gtkhsv.c (gtk_hsv_map, gtk_hsv_unmap): Reinstate these + functions in order to make mouse operation work again in the + color wheel. (#58604) + 2001-08-07 James Henstridge * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ff8ade769ea2abdceda40e0f71b1b310f99dee1d..b8d06336e63d2b24906ad37fed6b5d4167c1a401 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-08-07 Matthias Clasen + + * gtk/gtkhsv.c (gtk_hsv_map, gtk_hsv_unmap): Reinstate these + functions in order to make mouse operation work again in the + color wheel. (#58604) + 2001-08-07 James Henstridge * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c index a7e5ae6fd7d094c77114fa421687fc9e28453f8d..a30d9fa068e58480a0f8d4e321e06bb8524998cb 100644 --- a/gtk/gtkhsv.c +++ b/gtk/gtkhsv.c @@ -87,6 +87,8 @@ enum { static void gtk_hsv_class_init (GtkHSVClass *class); static void gtk_hsv_init (GtkHSV *hsv); static void gtk_hsv_destroy (GtkObject *object); +static void gtk_hsv_map (GtkWidget *widget); +static void gtk_hsv_unmap (GtkWidget *widget); static void gtk_hsv_realize (GtkWidget *widget); static void gtk_hsv_unrealize (GtkWidget *widget); static void gtk_hsv_size_request (GtkWidget *widget, @@ -160,6 +162,8 @@ gtk_hsv_class_init (GtkHSVClass *class) object_class->destroy = gtk_hsv_destroy; + widget_class->map = gtk_hsv_map; + widget_class->unmap = gtk_hsv_unmap; widget_class->realize = gtk_hsv_realize; widget_class->unrealize = gtk_hsv_unrealize; widget_class->size_request = gtk_hsv_size_request; @@ -261,6 +265,39 @@ gtk_hsv_destroy (GtkObject *object) /* Default signal handlers */ + +/* Map handler for the HSV color selector */ + +static void +gtk_hsv_map (GtkWidget *widget) +{ + GtkHSV *hsv; + HSVPrivate *priv; + + hsv = GTK_HSV (widget); + priv = hsv->priv; + + GTK_WIDGET_CLASS (parent_class)->map (widget); + + gdk_window_show (priv->window); +} + +/* Unmap handler for the HSV color selector */ + +static void +gtk_hsv_unmap (GtkWidget *widget) +{ + GtkHSV *hsv; + HSVPrivate *priv; + + hsv = GTK_HSV (widget); + priv = hsv->priv; + + gdk_window_hide (priv->window); + + GTK_WIDGET_CLASS (parent_class)->unmap (widget); +} + /* Realize handler for the HSV color selector */ static void gtk_hsv_realize (GtkWidget *widget)