# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1326824827 0
# Node ID 9a8aa230a5381202750db21f876dcb7d0eddcbfc
# Parent  46e34bd92336cab9d0848baed2e57b39748aab29
Ported a couple fixes from GTK3 to GTK2 that I had missed.

diff -r 46e34bd92336 -r 9a8aa230a538 gtk/dw.c
--- a/gtk/dw.c	Tue Jan 17 18:18:00 2012 +0000
+++ b/gtk/dw.c	Tue Jan 17 18:27:07 2012 +0000
@@ -5529,7 +5529,7 @@
       GtkWidget *tmp = (GtkWidget *)gtk_object_get_user_data(GTK_OBJECT(handle));
 
       if(tmp && GTK_IS_TEXT_VIEW(tmp))
-         gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_WORD);
+         gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), state ? GTK_WRAP_WORD : GTK_WRAP_NONE);
    }
 #else
    if(GTK_IS_BOX(handle))
@@ -10053,10 +10053,10 @@
          ptr = buf = alloca(bytes + 2);
          dw_mle_export(item, buf, 0, (int)bytes);
          buf[bytes] = 0;
-         strcat(buf, "\n");
+         strcat(buf, "\r");
          
          /* MLE */
-         while((ptr = strstr(buf, "\n")))
+         while((ptr = strstr(buf, "\r")))
          {
             ptr[0] = 0;
             width = 0;
@@ -10078,7 +10078,10 @@
                   *thiswidth = width > _DW_SCROLLED_MAX_WIDTH ? _DW_SCROLLED_MAX_WIDTH : width;
             }
             *thisheight += height;
-            buf = &ptr[1];
+           if(ptr[1] == '\n')
+               buf = &ptr[2];
+            else
+               buf = &ptr[1];
          }
       }
    }
diff -r 46e34bd92336 -r 9a8aa230a538 gtk3/dw.c
--- a/gtk3/dw.c	Tue Jan 17 18:18:00 2012 +0000
+++ b/gtk3/dw.c	Tue Jan 17 18:27:07 2012 +0000
@@ -8367,7 +8367,7 @@
          ptr = buf = alloca(bytes + 2);
          dw_mle_export(item, buf, 0, (int)bytes);
          buf[bytes] = 0;
-         strcat(buf, "\n");
+         strcat(buf, "\r");
          
          /* MLE */
          while((ptr = strstr(buf, "\r")))