# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1613440630 0 # Node ID c6ea79c74c034cd82e78bb99ce6c9086536356ce # Parent ada8f7610df02dd5f8815ce29bdb4a4e2cd59cb3 GTK4: Remove some lingering eventbox code from GTK3. diff -r ada8f7610df0 -r c6ea79c74c03 gtk4/dw.c --- a/gtk4/dw.c Tue Feb 16 01:26:50 2021 +0000 +++ b/gtk4/dw.c Tue Feb 16 01:57:10 2021 +0000 @@ -1762,11 +1762,6 @@ else if(GTK_IS_WIDGET(handle)) { GtkWidget *box, *handle2 = handle; - GtkWidget *eventbox = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_eventbox"); - - /* Handle the invisible event box if it exists */ - if(eventbox && GTK_IS_WIDGET(eventbox)) - handle2 = eventbox; /* Check if we are removing a widget from a box */ if((box = gtk_widget_get_parent(handle2)) && GTK_IS_GRID(box)) @@ -2226,15 +2221,6 @@ if(tmp) handle2 = tmp; } - else if(GTK_IS_GRID(handle)) - { - GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_eventbox"); - if(tmp) - { - handle2 = tmp; - fore = DW_CLR_DEFAULT; - } - } _dw_set_color(handle2, fore, back); @@ -8134,11 +8120,6 @@ if(GTK_IS_WIDGET(handle)) { GtkWidget *box, *handle2 = handle; - GtkWidget *eventbox = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_eventbox"); - - /* Handle the invisible event box if it exists */ - if(eventbox && GTK_IS_WIDGET(eventbox)) - handle2 = eventbox; /* Check if we are removing a widget from a box */ if((box = gtk_widget_get_parent(handle2)) && GTK_IS_GRID(box)) @@ -10826,3 +10807,4 @@ } } +