Mercurial > dwindows

comparison gtk/dw.c @ 1562:9a8aa230a538

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ported a couple fixes from GTK3 to GTK2 that I had missed.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 17 Jan 2012 18:27:07 +0000
parents 46e34bd92336
children 035bc006afbe
comparison
equal deleted inserted replaced
1561:46e34bd92336 1562:9a8aa230a538
5527 if(GTK_IS_SCROLLED_WINDOW(handle)) 5527 if(GTK_IS_SCROLLED_WINDOW(handle))
5528 { 5528 {
5529 GtkWidget *tmp = (GtkWidget *)gtk_object_get_user_data(GTK_OBJECT(handle)); 5529 GtkWidget *tmp = (GtkWidget *)gtk_object_get_user_data(GTK_OBJECT(handle));
5530 5530
5531 if(tmp && GTK_IS_TEXT_VIEW(tmp)) 5531 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5532 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_WORD); 5532 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), state ? GTK_WRAP_WORD : GTK_WRAP_NONE);
5533 } 5533 }
5534 #else 5534 #else
5535 if(GTK_IS_BOX(handle)) 5535 if(GTK_IS_BOX(handle))
5536 { 5536 {
5537 GtkWidget *tmp = (GtkWidget *)gtk_object_get_user_data(GTK_OBJECT(handle)); 5537 GtkWidget *tmp = (GtkWidget *)gtk_object_get_user_data(GTK_OBJECT(handle));
10051 dw_mle_get_size(item, &bytes, NULL); 10051 dw_mle_get_size(item, &bytes, NULL);
10052 10052
10053 ptr = buf = alloca(bytes + 2); 10053 ptr = buf = alloca(bytes + 2);
10054 dw_mle_export(item, buf, 0, (int)bytes); 10054 dw_mle_export(item, buf, 0, (int)bytes);
10055 buf[bytes] = 0; 10055 buf[bytes] = 0;
10056 strcat(buf, "\n"); 10056 strcat(buf, "\r");
10057 10057
10058 /* MLE */ 10058 /* MLE */
10059 while((ptr = strstr(buf, "\n"))) 10059 while((ptr = strstr(buf, "\r")))
10060 { 10060 {
10061 ptr[0] = 0; 10061 ptr[0] = 0;
10062 width = 0; 10062 width = 0;
10063 if(strlen(buf)) 10063 if(strlen(buf))
10064 dw_font_text_extents_get(item, NULL, buf, &width, &height); 10064 dw_font_text_extents_get(item, NULL, buf, &width, &height);
10076 { 10076 {
10077 if(width > *thiswidth) 10077 if(width > *thiswidth)
10078 *thiswidth = width > _DW_SCROLLED_MAX_WIDTH ? _DW_SCROLLED_MAX_WIDTH : width; 10078 *thiswidth = width > _DW_SCROLLED_MAX_WIDTH ? _DW_SCROLLED_MAX_WIDTH : width;
10079 } 10079 }
10080 *thisheight += height; 10080 *thisheight += height;
10081 buf = &ptr[1]; 10081 if(ptr[1] == '\n')
10082 buf = &ptr[2];
10083 else
10084 buf = &ptr[1];
10082 } 10085 }
10083 } 10086 }
10084 } 10087 }
10085 else 10088 else
10086 { 10089 {