Destroy widgets _after_ propagating unrealize signals through the widget

Mon Dec  7 10:27:09 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c: Destroy widgets _after_ propagating unrealize
	signals through the widget heirarchy. This is unpleasant, as it
	causes more X traffic, but is necessary, because we have to clean
	up our Input Contexts before destroying the X windows.
	(from matsu-981109-0.patch)

Mon Dec  7 10:18:18 1998  Owen Taylor  <otaylor@redhat.com>

	Applied gtk-a-higuti-981202-0 :
	[ a-higuti@math.sci.hokudai.ac.jp (Akira Higuchi) ]

	* gdk/gdk.h gdk/gdk.c
		(gdk_mbstowcs): New function. Nearly equals to mbstowcs, but
			implemented by a combination of Xlib functions, so
			it works even with X_LOCALE.
		(gdk_wcstombs): New function.
		(g_mbtowc): Removed. No longer needed.

	* gdk/gdk.h gdk/gdkfont.c gdk/gdkdraw.c:
	        Added _wc() variants to gdk_text_width(),
		gdk_char_width(), gdk_draw_text(),

	* gdk/gdki18n.h
		(mblen, mbtowc, wctomb, mbstowcs, wcstombs,
		 wcslen, wcscpy, wcsncpy):
			Removed. No longer needed.
		(iswalnum): Removed.
		(gdk_iswalnum): New macro.
		(gdk_iswspace): New macro.
	* gdk/gdktype.h
		(GdkWChar): New typedef.

	* gtk/gtkentry.h, gtk/gtkentry.c
		There are many changes according to the change of the
		internal representation of text, from multibyte string
		to wide characters.
	* gtk/gtkprivate.h, gtk/gtkmain.c
		Removed the variable gtk_use_mb and related codes.
	* gtk/gtkspinbutton.c
		Some changes according to the change of type of entry->text.
	* gtk/gtktext.h, gtk/gtktext.c
		Changed the internal representation of text. We use GdkWchar
		if a fontset is supplied. If not, we use guchar to save
		memory.

1 files changed, 17 insertions, 7 deletions

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index eb4e6ccba3..4a24d8e033 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -5750,19 +5750,29 @@ create_text (void)
       
       if (infile)
 	{
-	  char buffer[1024];
-	  int nchars;
+	  char *buffer;
+	  int nbytes_read, nbytes_alloc;
 	  
+	  nbytes_read = 0;
+	  nbytes_alloc = 1024;
+	  buffer = g_new (char, nbytes_alloc);
 	  while (1)
 	    {
-	      nchars = fread(buffer, 1, 1024, infile);
-	      gtk_text_insert (GTK_TEXT (text), NULL, NULL,
-			       NULL, buffer, nchars);
-	      
-	      if (nchars < 1024)
+	      int len;
+	      if (nbytes_alloc < nbytes_read + 1024)
+		{
+		  nbytes_alloc *= 2;
+		  buffer = g_realloc (buffer, nbytes_alloc);
+		}
+	      len = fread (buffer + nbytes_read, 1, 1024, infile);
+	      nbytes_read += len;
+	      if (len < 1024)
 		break;
 	    }
 	  
+	  gtk_text_insert (GTK_TEXT (text), NULL, NULL,
+			   NULL, buffer, nbytes_read);
+	  g_free(buffer);
 	  fclose (infile);
 	}