Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix typos introduced by error in r63870 (see #10673)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2010-04-06 22:51:11 +00:00
parent e32454eadc
commit 2febffbac7
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/filename.h
View File

@@ -65,15 +65,14 @@ enum wxPathFormat
wxPATH_MAX // Not a valid value for specifying path format wxPATH_MAX // Not a valid value for specifying path format
}; };
// different convention that may be used with GetHumanReadableSize() // different conventions that may be used with GetHumanReadableSize()
enum wxSizeConvention enum wxSizeConvention
{ {
wxSIZE_CONV_TRADIONAL, // 1024 bytes = 1 KB wxSIZE_CONV_TRADITIONAL, // 1024 bytes = 1 KB
wxSIZE_CONV_IEC, // 1024 bytes = 1 KiB wxSIZE_CONV_IEC, // 1024 bytes = 1 KiB
wxSIZE_CONV_SI // 1000 bytes = 1 KB wxSIZE_CONV_SI // 1000 bytes = 1 KB
}; };
// the kind of normalization to do with the file name: these values can be // the kind of normalization to do with the file name: these values can be
// or'd together to perform several operations at once // or'd together to perform several operations at once
enum wxPathNormalize enum wxPathNormalize
@@ -552,12 +551,12 @@ public:
wxString wxString
GetHumanReadableSize(const wxString& nullsize = _("Not available"), GetHumanReadableSize(const wxString& nullsize = _("Not available"),
int precision = 1, int precision = 1,
wxSizeConvention conv = wxSIZE_CONV_TRADIONAL) const; wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
static wxString static wxString
GetHumanReadableSize(const wxULongLong& sz, GetHumanReadableSize(const wxULongLong& sz,
const wxString& nullsize = _("Not available"), const wxString& nullsize = _("Not available"),
int precision = 1, int precision = 1,
wxSizeConvention conv = wxSIZE_CONV_TRADIONAL); wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
#endif // wxUSE_LONGLONG #endif // wxUSE_LONGLONG

10
interface/wx/filename.h
View File

@@ -38,13 +38,13 @@ enum wxPathFormat
enum wxSizeConvention enum wxSizeConvention
{ {
/// 1000 bytes = 1KiB. /// 1000 bytes = 1KiB.
wxSIZE_CONV_REAL_SI, wxSIZE_CONV_IEC,
/// 1000 bytes = 1KB. /// 1000 bytes = 1KB.
wxSIZE_CONV_TRAD_1000, wxSIZE_CONV_SI,
/// 1024 bytes = 1KB. /// 1024 bytes = 1KB.
wxSIZE_CONV_TRAD_1024 wxSIZE_CONV_TRADITIONAL
}; };
@@ -568,13 +568,13 @@ public:
wxString wxString
GetHumanReadableSize(const wxString& failmsg = _("Not available"), GetHumanReadableSize(const wxString& failmsg = _("Not available"),
int precision = 1, int precision = 1,
wxSizeConvention conv = wxSIZE_CONV_TRADIONAL) const; wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
static wxString static wxString
GetHumanReadableSize(const wxULongLong& bytes, GetHumanReadableSize(const wxULongLong& bytes,
const wxString& nullsize = _("Not available"), const wxString& nullsize = _("Not available"),
int precision = 1, int precision = 1,
wxSizeConvention conv = wxSIZE_CONV_REAL_SI); wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
//@} //@}
/** /**

2
src/common/filename.cpp
View File

@@ -2665,7 +2665,7 @@ wxString wxFileName::GetHumanReadableSize(const wxULongLong &bs,
biInfix = "i"; biInfix = "i";
// fall through // fall through
case wxSIZE_CONV_TRADIONAL: case wxSIZE_CONV_TRADITIONAL:
multiplier = 1024.; multiplier = 1024.;
break; break;