# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1322338841 0 # Node ID 8fe15c1648c9cf1d07036e9740e8a5a9852f1621 # Parent db27c6e139a366b74f5c77123cc8215b976490e5 Fix windows on GTK that aren't supposed to have a close button.. having one. Function added in 2.10 can try to remove it. diff -r db27c6e139a3 -r 8fe15c1648c9 gtk/dw.c --- a/gtk/dw.c Sat Nov 26 00:09:07 2011 +0000 +++ b/gtk/dw.c Sat Nov 26 20:20:41 2011 +0000 @@ -3438,6 +3438,11 @@ gtk_window_iconify(GTK_WINDOW(tmp)); #endif } +#if GTK_CHECK_VERSION(2,10,0) + /* Either the CLOSEBUTTON or SYSMENU flags should make it deletable */ + if(!(flStyle & (DW_FCF_CLOSEBUTTON | DW_FCF_SYSMENU))) + gtk_window_set_deletable(GTK_WINDOW(tmp), FALSE); +#endif gdk_window_set_decorations(tmp->window, flags); diff -r db27c6e139a3 -r 8fe15c1648c9 gtk3/dw.c --- a/gtk3/dw.c Sat Nov 26 00:09:07 2011 +0000 +++ b/gtk3/dw.c Sat Nov 26 20:20:41 2011 +0000 @@ -2921,6 +2921,9 @@ flags &= ~DW_FCF_MINIMIZE; gtk_window_iconify(GTK_WINDOW(tmp)); } + /* Either the CLOSEBUTTON or SYSMENU flags should make it deletable */ + if(!(flStyle & (DW_FCF_CLOSEBUTTON | DW_FCF_SYSMENU))) + gtk_window_set_deletable(GTK_WINDOW(tmp), FALSE); gdk_window_set_decorations(gtk_widget_get_window(tmp), flags);