diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 16:46:15 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 16:46:15 +0200 |
commit | f0ae67919454f572f39541b11ddd74b4fda0d12e (patch) | |
tree | 5c9ea9601db75eb849e86fc30fe67810f3679bdc /library | |
parent | 1.2 (diff) | |
download | FreeFileSync-f0ae67919454f572f39541b11ddd74b4fda0d12e.tar.gz FreeFileSync-f0ae67919454f572f39541b11ddd74b4fda0d12e.tar.bz2 FreeFileSync-f0ae67919454f572f39541b11ddd74b4fda0d12e.zip |
1.3
Diffstat (limited to 'library')
-rw-r--r-- | library/CustomGrid.cpp | 2 | ||||
-rw-r--r-- | library/CustomGrid.h | 2 | ||||
-rw-r--r-- | library/globalFunctions.cpp | 14 | ||||
-rw-r--r-- | library/globalFunctions.h | 4 |
4 files changed, 18 insertions, 4 deletions
diff --git a/library/CustomGrid.cpp b/library/CustomGrid.cpp index 76e22441..876ad8f9 100644 --- a/library/CustomGrid.cpp +++ b/library/CustomGrid.cpp @@ -1,4 +1,4 @@ -#include "CustomGrid.h" +#include "customGrid.h" const unsigned int MinimumRows = 15; diff --git a/library/CustomGrid.h b/library/CustomGrid.h index 93a378b4..951aadc3 100644 --- a/library/CustomGrid.h +++ b/library/CustomGrid.h @@ -1,7 +1,7 @@ #ifndef CUSTOMGRID_H_INCLUDED #define CUSTOMGRID_H_INCLUDED -#include "../ui/MainDialog.h" +#include "../ui/mainDialog.h" #include <vector> #include <wx/grid.h> diff --git a/library/globalFunctions.cpp b/library/globalFunctions.cpp index d8a3a67b..70a5abaf 100644 --- a/library/globalFunctions.cpp +++ b/library/globalFunctions.cpp @@ -1,6 +1,18 @@ #include "globalFunctions.h" #include <wx/intl.h> +#ifdef FFS_WIN +const wxChar FileNameSeparator = '\\'; +#endif // FFS_WIN + +#ifdef FFS_LINUX +const wxChar FileNameSeparator = '/'; +#endif // FFS_LINUX + +const wxChar* FloatingPointSeparator = _("."); +const wxChar* NumberSeparator = _(","); + + inline int GlobalFunctions::round(const double d) { @@ -101,8 +113,6 @@ double GlobalFunctions::wxStringToDouble(const wxString& number) wxString& GlobalFunctions::includeNumberSeparator(wxString& number) { - const wxChar* NumberSeparator = _(","); - for (int i = number.size() - 3; i > 0; i-= 3) number.insert(i, NumberSeparator); return number; diff --git a/library/globalFunctions.h b/library/globalFunctions.h index 90c4aa99..b766a097 100644 --- a/library/globalFunctions.h +++ b/library/globalFunctions.h @@ -8,6 +8,10 @@ using namespace std; +extern const wxChar FileNameSeparator; +extern const wxChar* FloatingPointSeparator; +extern const wxChar* NumberSeparator; + namespace GlobalFunctions { int round(double d); //little rounding function |