# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1170987668 0
# Node ID d07c1e2e04962ae3707ce330f1ac6122164d8a30
# Parent  015463bdb09a7a92891785aa3a6410b9dbdf2e01# Parent  d059cfbb62ae72989c52f0cce506d23d67e52080
merge of 'efde7d02b602348f7af4ff6a3c8364f9aabea9df'
     and 'f59170f361556a597e522badf428349c3573bfe9'

diff -r 015463bdb09a -r d07c1e2e0496 console/libgnt/gntbox.c
--- a/console/libgnt/gntbox.c	Thu Feb 08 17:33:09 2007 +0000
+++ b/console/libgnt/gntbox.c	Fri Feb 09 02:21:08 2007 +0000
@@ -62,7 +62,7 @@
 		else
 			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TITLE_D));
 		mvwaddch(widget->window, 0, pos-1, ACS_RTEE | COLOR_PAIR(GNT_COLOR_NORMAL));
-		mvwprintw(widget->window, 0, pos, title);
+		mvwaddstr(widget->window, 0, pos, title);
 		mvwaddch(widget->window, 0, right, ACS_LTEE | COLOR_PAIR(GNT_COLOR_NORMAL));
 		g_free(title);
 	}
diff -r 015463bdb09a -r d07c1e2e0496 console/libgnt/gntbutton.c
--- a/console/libgnt/gntbutton.c	Thu Feb 08 17:33:09 2007 +0000
+++ b/console/libgnt/gntbutton.c	Fri Feb 09 02:21:08 2007 +0000
@@ -22,7 +22,7 @@
 		type = GNT_COLOR_NORMAL;
 	
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(type));
-	mvwprintw(widget->window, 1, 2, button->priv->text);
+	mvwaddstr(widget->window, 1, 2, button->priv->text);
 
 	GNTDEBUG;
 }
diff -r 015463bdb09a -r d07c1e2e0496 console/libgnt/gntcheckbox.c
--- a/console/libgnt/gntcheckbox.c	Thu Feb 08 17:33:09 2007 +0000
+++ b/console/libgnt/gntcheckbox.c	Fri Feb 09 02:21:08 2007 +0000
@@ -24,11 +24,11 @@
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(type));
 
 	text = g_strdup_printf("[%c]", cb->checked ? 'X' : ' ');
-	mvwprintw(widget->window, 0, 0, text);
+	mvwaddstr(widget->window, 0, 0, text);
 	g_free(text);
 
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
-	mvwprintw(widget->window, 0, 4, GNT_BUTTON(cb)->priv->text);
+	mvwaddstr(widget->window, 0, 4, GNT_BUTTON(cb)->priv->text);
 	
 	GNTDEBUG;
 }
diff -r 015463bdb09a -r d07c1e2e0496 console/libgnt/gntcombobox.c
--- a/console/libgnt/gntcombobox.c	Thu Feb 08 17:33:09 2007 +0000
+++ b/console/libgnt/gntcombobox.c	Fri Feb 09 02:21:08 2007 +0000
@@ -56,7 +56,7 @@
 	s = (char*)gnt_util_onscreen_width_to_pointer(text, widget->priv.width - 4, &len);
 	*s = '\0';
 
-	mvwprintw(widget->window, 1, 1, text);
+	mvwaddstr(widget->window, 1, 1, text);
 	whline(widget->window, ' ' | COLOR_PAIR(type), widget->priv.width - 4 - len);
 	mvwaddch(widget->window, 1, widget->priv.width - 3, ACS_VLINE | COLOR_PAIR(GNT_COLOR_NORMAL));
 	mvwaddch(widget->window, 1, widget->priv.width - 2, ACS_DARROW | COLOR_PAIR(GNT_COLOR_NORMAL));
diff -r 015463bdb09a -r d07c1e2e0496 console/libgnt/gntlabel.c
--- a/console/libgnt/gntlabel.c	Thu Feb 08 17:33:09 2007 +0000
+++ b/console/libgnt/gntlabel.c	Fri Feb 09 02:21:08 2007 +0000
@@ -24,7 +24,7 @@
 	chtype flag = gnt_text_format_flag_to_chtype(label->flags);
 
 	wbkgdset(widget->window, '\0' | flag);
-	mvwprintw(widget->window, 0, 0, label->text);
+	mvwaddstr(widget->window, 0, 0, label->text);
 
 	GNTDEBUG;
 }
diff -r 015463bdb09a -r d07c1e2e0496 console/libgnt/gnttree.c
--- a/console/libgnt/gnttree.c	Thu Feb 08 17:33:09 2007 +0000
+++ b/console/libgnt/gnttree.c	Fri Feb 09 02:21:08 2007 +0000
@@ -330,7 +330,7 @@
 		
 		for (i = 0; i < tree->ncol; i++)
 		{
-			mvwprintw(widget->window, pos, x + i, tree->columns[i].title);
+			mvwaddstr(widget->window, pos, x + i, tree->columns[i].title);
 			x += tree->columns[i].width;
 		}
 		if (pos)
@@ -409,7 +409,7 @@
 		}
 
 		wbkgdset(widget->window, '\0' | attr);
-		mvwprintw(widget->window, i, pos, str);
+		mvwaddstr(widget->window, i, pos, str);
 		whline(widget->window, ' ', scrcol - wr);
 		tree->bottom = row;
 		g_free(str);