SetIcon added

[wxWidgets.git] / include / wx / expr.h

diff --git a/include/wx/expr.h b/include/wx/expr.h
index 418ed1b64b95700fe28b3b63d34cefd260e6f057..777676fdddd4c856e99571037d1a09a487e0447d 100644 (file)
--- a/include/wx/expr.h
+++ b/include/wx/expr.h
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+/* //////////////////////////////////////////////////////////////////////////

 // Name:        expr.h
 // Purpose:     C helper defines and functions for wxExpr class
 // Author:      Julian Smart
 // Name:        expr.h
 // Purpose:     C helper defines and functions for wxExpr class
 // Author:      Julian Smart


@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:    wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:    wxWindows licence

-/////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////// */

 
 #ifndef _WX_EXPRH__
 #define _WX_EXPRH__
 
 #ifndef _WX_EXPRH__
 #define _WX_EXPRH__


@@ -29,9 +29,6 @@
 #define yyoutput PROIO_yyoutput
 #define yylex PROIO_yylex
 #define yyerror PROIO_yyerror
 #define yyoutput PROIO_yyoutput
 #define yylex PROIO_yylex
 #define yyerror PROIO_yyerror

-#define input PROIO_input
-#define unput PROIO_unput
-

 #define yyleng PROIO_yyleng
 #define yytext PROIO_yytext
 #define yymorfg PROIO_yymorfg
 #define yyleng PROIO_yyleng
 #define yytext PROIO_yytext
 #define yymorfg PROIO_yymorfg


@@ -88,12 +85,12 @@
 #ifdef __cplusplus
 extern "C" {
 char *proio_cons(char *, char *);
 #ifdef __cplusplus
 extern "C" {
 char *proio_cons(char *, char *);

-char * make_integer(char *);
-char * make_word(char *);
-char * make_string(char *);
-char * make_real(char *, char *);
-char * make_exp(char *, char *);
-char * make_exp2(char *, char *, char*);
+char * wxmake_integer(char *);
+char * wxmake_word(char *);
+char * wxmake_string(char *);
+char * wxmake_real(char *, char *);
+char * wxmake_exp(char *, char *);
+char * wxmake_exp2(char *, char *, char*);

 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);
 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);


@@ -101,23 +98,23 @@ void syntax_error(char *);
 #else
 #if __BORLANDC__
 char *proio_cons(char *, char *);
 #else
 #if __BORLANDC__
 char *proio_cons(char *, char *);

-char * make_integer(char *);
-char * make_word(char *);
-char * make_string(char *);
-char * make_real(char *, char *);
-char * make_exp(char *, char *);
-char * make_exp2(char *, char *, char*);
+char * wxmake_integer(char *);
+char * wxmake_word(char *);
+char * wxmake_string(char *);
+char * wxmake_real(char *, char *);
+char * wxmake_exp(char *, char *);
+char * wxmake_exp2(char *, char *, char*);

 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);
 #else
 char *proio_cons();
 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);
 #else
 char *proio_cons();

-char * make_integer();
-char * make_word();
-char * make_string();
-char * make_real();
-char * make_exp();
-char * make_exp2();
+char * wxmake_integer();
+char * wxmake_word();
+char * wxmake_string();
+char * wxmake_real();
+char * wxmake_exp();
+char * wxmake_exp2();

 
 void add_expr();
 void process_command();
 
 void add_expr();
 void process_command();


@@ -126,4 +123,4 @@ void syntax_error();
 #endif
 
 #endif
 #endif
 
 #endif

-       // _WX_EXPRH__
+       /* _WX_EXPRH__ */