summaryrefslogtreecommitdiff
path: root/textscreen/txt_button.c
diff options
context:
space:
mode:
authorSimon Howard2006-05-22 11:59:11 +0000
committerSimon Howard2006-05-22 11:59:11 +0000
commit7c18ad6ccf1461696185013b333af3c056cc5630 (patch)
tree4dd7253ee816d30e7ee0bb2d4b1966d2662282a2 /textscreen/txt_button.c
parent11643c088751a2d3797467463bce4476d3b03292 (diff)
downloadchocolate-doom-7c18ad6ccf1461696185013b333af3c056cc5630.tar.gz
chocolate-doom-7c18ad6ccf1461696185013b333af3c056cc5630.tar.bz2
chocolate-doom-7c18ad6ccf1461696185013b333af3c056cc5630.zip
CAST -> TXT_CAST_ARG, UNCAST -> TXT_UNCAST_ARG.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 509
Diffstat (limited to 'textscreen/txt_button.c')
-rw-r--r--textscreen/txt_button.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/textscreen/txt_button.c b/textscreen/txt_button.c
index d7dbe143..6ff2bfe3 100644
--- a/textscreen/txt_button.c
+++ b/textscreen/txt_button.c
@@ -8,9 +8,9 @@
#include "txt_main.h"
#include "txt_window.h"
-static void TXT_ButtonSizeCalc(UNCAST(button), int *w, int *h)
+static void TXT_ButtonSizeCalc(TXT_UNCAST_ARG(button), int *w, int *h)
{
- CAST(txt_button_t, button);
+ TXT_CAST_ARG(txt_button_t, button);
// Minimum width is the string length + two spaces for padding
@@ -18,9 +18,9 @@ static void TXT_ButtonSizeCalc(UNCAST(button), int *w, int *h)
*h = 1;
}
-static void TXT_ButtonDrawer(UNCAST(button), int w, int selected)
+static void TXT_ButtonDrawer(TXT_UNCAST_ARG(button), int w, int selected)
{
- CAST(txt_button_t, button);
+ TXT_CAST_ARG(txt_button_t, button);
int i;
TXT_BGColor(TXT_COLOR_BLUE, 0);
@@ -40,16 +40,16 @@ static void TXT_ButtonDrawer(UNCAST(button), int w, int selected)
}
}
-static void TXT_ButtonDestructor(UNCAST(button))
+static void TXT_ButtonDestructor(TXT_UNCAST_ARG(button))
{
- CAST(txt_button_t, button);
+ TXT_CAST_ARG(txt_button_t, button);
free(button->label);
}
-static int TXT_ButtonKeyPress(UNCAST(button), int key)
+static int TXT_ButtonKeyPress(TXT_UNCAST_ARG(button), int key)
{
- CAST(txt_button_t, button);
+ TXT_CAST_ARG(txt_button_t, button);
if (key == KEY_ENTER)
{