CAST -> TXT_CAST_ARG, UNCAST -> TXT_UNCAST_ARG.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 509

1 files changed, 14 insertions, 14 deletions

diff --git a/textscreen/txt_widget.h b/textscreen/txt_widget.h
index 1a256c64..10906304 100644
--- a/textscreen/txt_widget.h
+++ b/textscreen/txt_widget.h
@@ -27,18 +27,18 @@
 #ifndef TXT_WIDGET_H
 #define TXT_WIDGET_H
 
-#define UNCAST(name)   void *uncast_ ## name
-#define CAST(type, name)  type *name = (type *) uncast_ ## name
+#define TXT_UNCAST_ARG(name)   void *uncast_ ## name
+#define TXT_CAST_ARG(type, name)  type *name = (type *) uncast_ ## name
 
 typedef struct txt_widget_class_s txt_widget_class_t;
 typedef struct txt_widget_s txt_widget_t;
 typedef struct txt_callback_table_s txt_callback_table_t;
 
-typedef void (*TxtWidgetSizeCalc)(UNCAST(widget), int *w, int *h);
-typedef void (*TxtWidgetDrawer)(UNCAST(widget), int w, int selected);
-typedef void (*TxtWidgetDestroy)(UNCAST(widget));
-typedef int (*TxtWidgetKeyPress)(UNCAST(widget), int key);
-typedef void (*TxtWidgetSignalFunc)(UNCAST(widget), void *user_data);
+typedef void (*TxtWidgetSizeCalc)(TXT_UNCAST_ARG(widget), int *w, int *h);
+typedef void (*TxtWidgetDrawer)(TXT_UNCAST_ARG(widget), int w, int selected);
+typedef void (*TxtWidgetDestroy)(TXT_UNCAST_ARG(widget));
+typedef int (*TxtWidgetKeyPress)(TXT_UNCAST_ARG(widget), int key);
+typedef void (*TxtWidgetSignalFunc)(TXT_UNCAST_ARG(widget), void *user_data);
 
 struct txt_widget_class_s
 {
@@ -56,14 +56,14 @@ struct txt_widget_s
     int visible;
 };
 
-void TXT_InitWidget(UNCAST(widget), txt_widget_class_t *widget_class);
-void TXT_CalcWidgetSize(UNCAST(widget), int *w, int *h);
-void TXT_DrawWidget(UNCAST(widget), int w, int selected);
-void TXT_SignalConnect(UNCAST(widget), char *signal_name,
+void TXT_InitWidget(TXT_UNCAST_ARG(widget), txt_widget_class_t *widget_class);
+void TXT_CalcWidgetSize(TXT_UNCAST_ARG(widget), int *w, int *h);
+void TXT_DrawWidget(TXT_UNCAST_ARG(widget), int w, int selected);
+void TXT_SignalConnect(TXT_UNCAST_ARG(widget), char *signal_name,
                        TxtWidgetSignalFunc func, void *user_data);
-void TXT_EmitSignal(UNCAST(widget), char *signal_name);
-int TXT_WidgetKeyPress(UNCAST(widget), int key);
-void TXT_DestroyWidget(UNCAST(widget));
+void TXT_EmitSignal(TXT_UNCAST_ARG(widget), char *signal_name);
+int TXT_WidgetKeyPress(TXT_UNCAST_ARG(widget), int key);
+void TXT_DestroyWidget(TXT_UNCAST_ARG(widget));
 
 #endif /* #ifndef TXT_WIDGET_H */