X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2edb8f3c524f302b727386bb0a694c44fb57e7d..74b965198ce3a4257deac901b6f7517e6447ca0f:/src/common/filename.cpp diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 8fa76ef7bf..ee6fc1fe17 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -98,7 +98,7 @@ #include "wx/msw/gccpriv.h" #endif -#ifdef __WXWINCE__ +#ifdef __WXMSW__ #include "wx/msw/private.h" #endif @@ -2656,17 +2656,18 @@ wxString wxFileName::GetHumanReadableSize(const wxULongLong &bs, // depending on the convention used the multiplier may be either 1000 or // 1024 and the binary infix may be empty (for "KB") or "i" (for "KiB") - double multiplier; + double multiplier = 1024.; wxString biInfix; switch ( conv ) { + case wxSIZE_CONV_TRADITIONAL: + // nothing to do, this corresponds to the default values of both + // the multiplier and infix string + break; + case wxSIZE_CONV_IEC: biInfix = "i"; - // fall through - - case wxSIZE_CONV_TRADIONAL: - multiplier = 1024.; break; case wxSIZE_CONV_SI: