Mercurial > dwindows
changeset 1355:dd252596227b
Removed a now unused variable on GTK in dw_html_new().
Also glib 2.32 deprecated g_thread_init() so conditionally call that.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 18 Nov 2011 13:49:11 +0000 |
parents | 1f22addc2722 |
children | 88a3cfa800a4 |
files | gtk/dw.c gtk3/dw.c |
diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/gtk/dw.c Fri Nov 18 13:34:36 2011 +0000 +++ b/gtk/dw.c Fri Nov 18 13:49:11 2011 +0000 @@ -12271,7 +12271,7 @@ */ HWND dw_html_new(unsigned long id) { - GtkWidget *widget = NULL,*stext; + GtkWidget *widget = NULL; int _locked_by_me = FALSE; DW_MUTEX_LOCK;
--- a/gtk3/dw.c Fri Nov 18 13:34:36 2011 +0000 +++ b/gtk3/dw.c Fri Nov 18 13:49:11 2011 +0000 @@ -1800,7 +1800,9 @@ _resources.resource_id = res->resource_id; _resources.resource_data = res->resource_data; } +#if !GLIB_CHECK_VERSION(2,32,0) g_thread_init(NULL); +#endif gdk_threads_init(); gtk_init(argc, argv); @@ -10129,7 +10131,7 @@ */ HWND dw_html_new(unsigned long id) { - GtkWidget *widget = NULL,*stext; + GtkWidget *widget = NULL; int _locked_by_me = FALSE; DW_MUTEX_LOCK;