Mercurial > dwindows

comparison gtk3/dw.c @ 1355:dd252596227b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2f5e54b0c5c4
comparison
equal deleted inserted replaced
1354:1f22addc2722 1355:dd252596227b
1798 { 1798 {
1799 _resources.resource_max = res->resource_max; 1799 _resources.resource_max = res->resource_max;
1800 _resources.resource_id = res->resource_id; 1800 _resources.resource_id = res->resource_id;
1801 _resources.resource_data = res->resource_data; 1801 _resources.resource_data = res->resource_data;
1802 } 1802 }
1803 #if !GLIB_CHECK_VERSION(2,32,0)
1803 g_thread_init(NULL); 1804 g_thread_init(NULL);
1805 #endif
1804 gdk_threads_init(); 1806 gdk_threads_init();
1805 1807
1806 gtk_init(argc, argv); 1808 gtk_init(argc, argv);
1807 1809
1808 tmp = getenv("DW_BORDER_WIDTH"); 1810 tmp = getenv("DW_BORDER_WIDTH");
10127 * text: The default text to be in the entryfield widget. 10129 * text: The default text to be in the entryfield widget.
10128 * id: An ID to be used with dw_window_from_id() or 0L. 10130 * id: An ID to be used with dw_window_from_id() or 0L.
10129 */ 10131 */
10130 HWND dw_html_new(unsigned long id) 10132 HWND dw_html_new(unsigned long id)
10131 { 10133 {
10132 GtkWidget *widget = NULL,*stext; 10134 GtkWidget *widget = NULL;
10133 int _locked_by_me = FALSE; 10135 int _locked_by_me = FALSE;
10134 10136
10135 DW_MUTEX_LOCK; 10137 DW_MUTEX_LOCK;
10136 #ifdef USE_WEBKIT 10138 #ifdef USE_WEBKIT
10137 if (!_webkit_web_view_open) 10139 if (!_webkit_web_view_open)