projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SetSelection() for generic wxSpinCtrl (forgot to commit before)
[wxWidgets.git]
/
include
/
wx
/
wxexpr.h
diff --git
a/include/wx/wxexpr.h
b/include/wx/wxexpr.h
index adaaa4c7f5a5c3b5cbf888ec4d3fdeb0c2e70cc0..8730ce773b54431a28db4b0f2cb71eb6a5bea3f6 100644
(file)
--- a/
include/wx/wxexpr.h
+++ b/
include/wx/wxexpr.h
@@
-12,7
+12,7
@@
#ifndef _WX_WXEXPRH__
#define _WX_WXEXPRH__
#ifndef _WX_WXEXPRH__
#define _WX_WXEXPRH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "wxexpr.h"
#endif
#pragma interface "wxexpr.h"
#endif
@@
-50,9
+50,6
@@
typedef bool (*wxExprErrorHandler) (int errorType, char *msg);
WXDLLEXPORT_DATA(extern wxExprErrorHandler) currentwxExprErrorHandler;
WXDLLEXPORT_DATA(extern wxExprErrorHandler) currentwxExprErrorHandler;
-extern "C" WXDLLEXPORT_DATA(FILE*) yyin;
-
-extern "C" WXDLLEXPORT int yyparse(void);
typedef enum {
wxExprNull,
typedef enum {
wxExprNull,
@@
-112,7
+109,7
@@
class WXDLLEXPORT wxExpr
return value.word;
else if (type == wxExprString)
return wxString(value.string);
return value.word;
else if (type == wxExprString)
return wxString(value.string);
- else return wxString(
_
T(""));
+ else return wxString(
wx
T(""));
}
inline wxString StringValue(void) const {
}
inline wxString StringValue(void) const {
@@
-120,7
+117,7
@@
class WXDLLEXPORT wxExpr
return wxString(value.string);
else if (type == wxExprWord)
return wxString(value.word);
return wxString(value.string);
else if (type == wxExprWord)
return wxString(value.word);
- else return wxString(
_
T(""));
+ else return wxString(
wx
T(""));
}
// Get nth arg of clause (starting from 1)
}
// Get nth arg of clause (starting from 1)