gui: replace deprecated printEx with printf

libtcod · Apr 13, 2020 · e7280c4 · e7280c4
1 parent 494a266
commit e7280c4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/libtcod/gui/button.cpp b/src/libtcod/gui/button.cpp
@@ -81,9 +81,9 @@ void Button::render() {
   if (w > 0 && h > 0) { con->rect(x, y, w, h, true, TCOD_BKGND_SET); }
   if (label) {
     if (pressed && mouseIn) {
-      con->printEx(x + w / 2, y, TCOD_BKGND_NONE, TCOD_CENTER, "-%s-", label);
+      con->printf(x + w / 2, y, TCOD_BKGND_NONE, TCOD_CENTER, "-%s-", label);
     } else {
-      con->printEx(x + w / 2, y, TCOD_BKGND_NONE, TCOD_CENTER, label);
+      con->printf(x + w / 2, y, TCOD_BKGND_NONE, TCOD_CENTER, "%s", label);
     }
   }
 }

diff --git a/src/libtcod/gui/label.cpp b/src/libtcod/gui/label.cpp
@@ -42,7 +42,7 @@ Label::Label(int x, int y, const char *label, const char *tip)
 void Label::render() {
   con->setDefaultBackground(back);
   con->setDefaultForeground(fore);
-  con->printEx(x, y, TCOD_BKGND_NONE, TCOD_LEFT, label);
+  con->printf(x, y, TCOD_BKGND_NONE, TCOD_LEFT, "%s", label);
 }
 void Label::computeSize() {
   w = label ? static_cast<int>(strlen(label)) : 0;

diff --git a/src/libtcod/gui/textbox.cpp b/src/libtcod/gui/textbox.cpp
@@ -67,14 +67,14 @@ void TextBox::render() {
 	con->setDefaultBackground(back);
 	con->setDefaultForeground(fore);
 	con->rect(x,y,w,h,true,TCOD_BKGND_SET);
-	if ( label ) con->printEx(x,y,TCOD_BKGND_NONE,TCOD_LEFT,label);
+	if ( label ) con->printf(x,y,TCOD_BKGND_NONE,TCOD_LEFT, "%s", label);
 
 	con->setDefaultBackground(keyboardFocus == this ? foreFocus : fore);
 	con->setDefaultForeground(keyboardFocus == this ? backFocus : back);
 	con->rect(x+boxx,y,boxw,h,false,TCOD_BKGND_SET);
 	int len = static_cast<int>(strlen(txt) - offset);
 	if (len > boxw) len = boxw;
-	if ( txt ) con->printEx(x+boxx,y,TCOD_BKGND_NONE,TCOD_LEFT,"%.*s",len,&txt[offset]);
+	if ( txt ) con->printf(x+boxx,y,TCOD_BKGND_NONE,TCOD_LEFT,"%.*s",len,&txt[offset]);
 	if (keyboardFocus == this && blink > 0.0f) {
 		if (insert) {
 			con->setCharBackground(x+boxx+pos-offset,y,fore);

diff --git a/src/libtcod/gui/togglebutton.cpp b/src/libtcod/gui/togglebutton.cpp
@@ -37,10 +37,11 @@ void ToggleButton::render() {
 	con->setDefaultBackground(mouseIn ? backFocus : back);
 	con->setDefaultForeground(mouseIn ? foreFocus : fore);
 	con->rect(x,y,w,h,true,TCOD_BKGND_SET);
+	const char  check = pressed ? TCOD_CHAR_CHECKBOX_SET : TCOD_CHAR_CHECKBOX_UNSET;
 	if ( label ) {
-		con->printEx(x,y,TCOD_BKGND_NONE,TCOD_LEFT,"%c %s",pressed ? TCOD_CHAR_CHECKBOX_SET : TCOD_CHAR_CHECKBOX_UNSET, label);
+		con->printf(x,y,TCOD_BKGND_NONE,TCOD_LEFT,"%c %s", check, label);
 	} else {
-		con->printEx(x,y,TCOD_BKGND_NONE,TCOD_LEFT,"%c",pressed ? TCOD_CHAR_CHECKBOX_SET : TCOD_CHAR_CHECKBOX_UNSET);
+		con->printf(x,y,TCOD_BKGND_NONE,TCOD_LEFT,"%c", check);
 	}
 }
 

diff --git a/src/libtcod/gui/toolbar.cpp b/src/libtcod/gui/toolbar.cpp
@@ -63,7 +63,7 @@ public :
 		con->setChar(x+w,y,TCOD_CHAR_TEEW);
 		con->setDefaultBackground(fore);
 		con->setDefaultForeground(back);
-		con->printEx(x+w/2,y,TCOD_BKGND_SET,TCOD_CENTER," %s ",txt);
+		con->printf(x+w/2,y,TCOD_BKGND_SET,TCOD_CENTER," %s ",txt);
 	}
 	char *txt;
 };