Simplify and correct MSW selection of background brush for children painting.

[wxWidgets.git] / interface / wx / filename.h

diff --git a/interface/wx/filename.h b/interface/wx/filename.h
index 17c783f03c88cf4fcdea3928bc302f70e4ff0bfb..0e78b2d38fa7933ff004c1ce0e0b8061afbb0311 100644 (file)
--- a/interface/wx/filename.h
+++ b/interface/wx/filename.h
@@ -37,14 +37,14 @@ enum wxPathFormat
 */
 enum wxSizeConvention
 {
 */
 enum wxSizeConvention
 {

-    /// 1000 bytes = 1KiB.
-    wxSIZE_CONV_REAL_SI,
+    /// 1024 bytes = 1KB.
+    wxSIZE_CONV_TRADITIONAL,

 
 

-    /// 1000 bytes = 1KB.
-    wxSIZE_CONV_TRAD_1000,
+    /// 1024 bytes = 1KiB.
+    wxSIZE_CONV_IEC,

 
 

-    /// 1024 bytes = 1KB.
-    wxSIZE_CONV_TRAD_1024
+    /// 1000 bytes = 1KB.
+    wxSIZE_CONV_SI

 };
 
 
 };
 
 


@@ -568,13 +568,13 @@ public:
     wxString
     GetHumanReadableSize(const wxString& failmsg = _("Not available"),
                          int precision = 1,
     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,
 
     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);

     //@}
 
     /**
     //@}
 
     /**