ensure style of GtkText widget is used, also sync with GtkText of GTK 1.2.10

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d2ebd7e0cc4282d9737620814f4ddd216161b10a..c6a7987ecf811dddb9c6963f3adad407e89f0c93 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2001-10-25 [alfons]    0.6.4claws6
+
+       * src/gtkstext.c
+       
+               make GtkSText follow style of GtkText (closes bug 
+               #469211 "text selection while writing message");
+               
+               do sync with GTK 1.2.10
+
 2001-10-25 [paul]      0.6.4claws5
 
        * src/html.c
@@ -66,6 +75,7 @@
 
        * correct Alfons' last ChangeLog.claws entry
 
+>>>>>>> 1.398
 2001-10-19 [alfons]
 
        * src/pgptext.[ch]

diff --git a/configure.in b/configure.in
index bce3197d0768a94b93f07792729d8bbc2515cf7b..5a203b996e0bcf0b06168497c2df6eb2cfc8e5c3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws5
+EXTRA_VERSION=claws6
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/gtkstext.c b/src/gtkstext.c
index 4450a22ab0941f8f02236bb2eca5b115f634ceec..1128d9378f753fd7c6e56ed00373e9b137fdf476 100644 (file)
--- a/src/gtkstext.c
+++ b/src/gtkstext.c
@@ -27,7 +27,7 @@
 /*
  * Modified by the Sylpheed Team and others 2001. Interesting 
  * parts are marked using comment block following this one.
- * This modification is based on the GtkSText of GTK 1.2.8
+ * This modification is based on the GtkText of GTK 1.2.10
  */
 
 /* SYLPHEED: 
@@ -815,6 +815,13 @@ gtk_stext_new (GtkAdjustment *hadj,
                         "vadjustment", vadj,
                         NULL);
 
+  /* SYLPHEED:
+   * force widget name to be GtkText so it silently adapts
+   * the GtkText widget's style... 
+   */
+  gtk_widget_set_name(text, "GtkText");                        
+  gtk_widget_ensure_style(text);
+
   return text;
 }
 
@@ -5654,12 +5661,23 @@ undraw_cursor (GtkSText* text, gint absolute)
 
          gdk_gc_set_foreground (text->gc, MARK_CURRENT_FORE (text, &text->cursor_mark));
 
-         gdk_draw_text_wc (text->text_area, font,
-                        text->gc,
-                        text->cursor_pos_x,
-                        text->cursor_pos_y - text->cursor_char_offset,
-                        &text->cursor_char,
-                        1);
+          if (text->use_wchar)
+           gdk_draw_text_wc (text->text_area, font,
+                             text->gc,
+                             text->cursor_pos_x,
+                             text->cursor_pos_y - text->cursor_char_offset,
+                             &text->cursor_char,
+                             1);
+         else
+           {
+             guchar ch = text->cursor_char;
+             gdk_draw_text (text->text_area, font,
+                            text->gc,
+                            text->cursor_pos_x,
+                            text->cursor_pos_y - text->cursor_char_offset,
+                            (gchar *)&ch,
+                            1);         
+           }
        }
 
        gdk_gc_copy(text->gc, gc);