From 2febffbac706bd984d1c8e96bbc8f27b2343f07d Mon Sep 17 00:00:00 2001
From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Tue, 6 Apr 2010 22:51:11 +0000
Subject: [PATCH] fix typos introduced by error in r63870 (see #10673)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/filename.h   | 13 ++++++-------
 interface/wx/filename.h | 10 +++++-----
 src/common/filename.cpp |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/wx/filename.h b/include/wx/filename.h
index cc8806b275..8f9de3bb3a 100644
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -65,15 +65,14 @@ enum wxPathFormat
     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
 {
-    wxSIZE_CONV_TRADIONAL,  // 1024 bytes = 1 KB
-    wxSIZE_CONV_IEC,        // 1024 bytes = 1 KiB
-    wxSIZE_CONV_SI          // 1000 bytes = 1 KB
+    wxSIZE_CONV_TRADITIONAL,  // 1024 bytes = 1 KB
+    wxSIZE_CONV_IEC,          // 1024 bytes = 1 KiB
+    wxSIZE_CONV_SI            // 1000 bytes = 1 KB
 };
 
-
 // the kind of normalization to do with the file name: these values can be
 // or'd together to perform several operations at once
 enum wxPathNormalize
@@ -552,12 +551,12 @@ public:
     wxString
     GetHumanReadableSize(const wxString& nullsize = _("Not available"),
                          int precision = 1,
-                         wxSizeConvention conv = wxSIZE_CONV_TRADIONAL) const;
+                         wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
     static wxString
     GetHumanReadableSize(const wxULongLong& sz,
                          const wxString& nullsize = _("Not available"),
                          int precision = 1,
-                         wxSizeConvention conv = wxSIZE_CONV_TRADIONAL);
+                         wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
 #endif // wxUSE_LONGLONG
 
 
diff --git a/interface/wx/filename.h b/interface/wx/filename.h
index 17c783f03c..1b098a6acb 100644
--- a/interface/wx/filename.h
+++ b/interface/wx/filename.h
@@ -38,13 +38,13 @@ enum wxPathFormat
 enum wxSizeConvention
 {
     /// 1000 bytes = 1KiB.
-    wxSIZE_CONV_REAL_SI,
+    wxSIZE_CONV_IEC,
 
     /// 1000 bytes = 1KB.
-    wxSIZE_CONV_TRAD_1000,
+    wxSIZE_CONV_SI,
 
     /// 1024 bytes = 1KB.
-    wxSIZE_CONV_TRAD_1024
+    wxSIZE_CONV_TRADITIONAL
 };
 
 
@@ -568,13 +568,13 @@ public:
     wxString
     GetHumanReadableSize(const wxString& failmsg = _("Not available"),
                          int precision = 1,
-                         wxSizeConvention conv = wxSIZE_CONV_TRADIONAL) const;
+                         wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
 
     static wxString
     GetHumanReadableSize(const wxULongLong& bytes,
                          const wxString& nullsize = _("Not available"),
                          int precision = 1,
-                         wxSizeConvention conv = wxSIZE_CONV_REAL_SI);
+                         wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
     //@}
 
     /**
diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 8fa76ef7bf..5c457be39c 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -2665,7 +2665,7 @@ wxString wxFileName::GetHumanReadableSize(const wxULongLong &bs,
             biInfix = "i";
             // fall through
 
-        case wxSIZE_CONV_TRADIONAL:
+        case wxSIZE_CONV_TRADITIONAL:
             multiplier = 1024.;
             break;
 
-- 
2.47.2