changed make_int, make_exp .. to wxmake_int..
fixed small listbox thing fixed layout probs of wxFrame small DnD updates small DialogEd optical correction small ODBC updates added wxListBox DClick Text in controls sample updated wxGTK.spec git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1138,14 +1138,14 @@ bool wxExprIsFunctor(wxExpr *expr, const wxString& functor)
|
||||
*
|
||||
*/
|
||||
|
||||
char *make_integer(char *str)
|
||||
char *wxmake_integer(char *str)
|
||||
{
|
||||
wxExpr *x = new wxExpr(atol(str));
|
||||
|
||||
return (char *)x;
|
||||
}
|
||||
|
||||
char *make_real(char *str1, char *str2)
|
||||
char *wxmake_real(char *str1, char *str2)
|
||||
{
|
||||
char buf[50];
|
||||
|
||||
@@ -1158,7 +1158,7 @@ char *make_real(char *str1, char *str2)
|
||||
|
||||
// extern "C" double exp10(double);
|
||||
|
||||
char *make_exp(char *str1, char *str2)
|
||||
char *wxmake_exp(char *str1, char *str2)
|
||||
{
|
||||
double mantissa = (double)atoi(str1);
|
||||
double exponent = (double)atoi(str2);
|
||||
@@ -1170,7 +1170,7 @@ char *make_exp(char *str1, char *str2)
|
||||
return (char *)x;
|
||||
}
|
||||
|
||||
char *make_exp2(char *str1, char *str2, char *str3)
|
||||
char *wxmake_exp2(char *str1, char *str2, char *str3)
|
||||
{
|
||||
char buf[50];
|
||||
|
||||
@@ -1185,13 +1185,13 @@ char *make_exp2(char *str1, char *str2, char *str3)
|
||||
return (char *)x;
|
||||
}
|
||||
|
||||
char *make_word(char *str)
|
||||
char *wxmake_word(char *str)
|
||||
{
|
||||
wxExpr *x = new wxExpr(wxExprWord, str);
|
||||
return (char *)x;
|
||||
}
|
||||
|
||||
char *make_string(char *str)
|
||||
char *wxmake_string(char *str)
|
||||
{
|
||||
char *s, *t;
|
||||
int len, i;
|
||||
|
Reference in New Issue
Block a user