soutade/KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

Clean header includes

Browse Source
This commit is contained in:
Grégory Soutadé
2011-08-20 11:43:12 +02:00
parent fc3093d176
commit ad29793f8c
39 changed files with 123 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/view/grid/GridAccount.h
View File

@@ -31,6 +31,7 @@
#include "wxGridCellFastBoolEditor.h"
#include "wxGridCellTreeButtonRenderer.h"
#include "wxGridCellTreeButtonEditor.h"
#include "wxGridCellBitmapRenderer.h"
#include "wxGridCellFormulaEditor.h"
#include "wxGridCellTabStringRenderer.h"

6
src/view/grid/wxGridCellFormulaEditor.cpp
View File

@@ -48,7 +48,7 @@ bool wxGridCellFormulaEditor::EndEdit (int row, int col, wxGrid *grid/*, const w
wxString res = GetValue();
Operation op;
char* str, *str2;
struct parse_opt opt, *r;
struct ParseExp::parse_opt opt, *r;
bool ret;
res = res.Trim();
@@ -62,7 +62,7 @@ bool wxGridCellFormulaEditor::EndEdit (int row, int col, wxGrid *grid/*, const w
r = &opt;
str = str2;
try {
ParseExp(&str2, r, false);
ParseExp::ParseExp(&str2, r, false);
}
catch(...)
{
@@ -76,7 +76,7 @@ bool wxGridCellFormulaEditor::EndEdit (int row, int col, wxGrid *grid/*, const w
ret = wxGridCellTextEditor::EndEdit(row, col, grid);
grid->SetCellValue(row, col, wxString::Format(wxT("%.2lf"), EvaluateExpr(&opt, true)));
grid->SetCellValue(row, col, wxString::Format(wxT("%.2lf"), ParseExp::EvaluateExpr(&opt, true)));
}
else
{