Some code renaming to avoid confusion. Test editable column in sample.

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

diff --git a/include/wx/filename.h b/include/wx/filename.h
index d56d2a2d90008bb6d227358f87ec475bee80b0d7..7eff2e878376bbe4e6bd201abc59ce40b010c304 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -27,13 +27,14 @@
 #include "wx/filefn.h"
 #include "wx/datetime.h"
 #include "wx/intl.h"
+#include "wx/longlong.h"
 
 #if wxUSE_FILE
-class WXDLLIMPEXP_BASE wxFile;
+class WXDLLIMPEXP_FWD_BASE wxFile;
 #endif
 
 #if wxUSE_FFILE
-class WXDLLIMPEXP_BASE wxFFile;
+class WXDLLIMPEXP_FWD_BASE wxFFile;
 #endif
 
 // ----------------------------------------------------------------------------
@@ -84,8 +85,10 @@ enum
     wxPATH_MKDIR_FULL    = 0x0001   // create directories recursively
 };
 
+#if wxUSE_LONGLONG
 // error code of wxFileName::GetSize()
 extern wxULongLong wxInvalidSize;
+#endif // wxUSE_LONGLONG
 
 
 
@@ -483,6 +486,7 @@ public:
 
     // Filesize
 
+#if wxUSE_LONGLONG
         // returns the size of the given filename
     wxULongLong GetSize() const;
     static wxULongLong GetSize(const wxString &file);
@@ -493,6 +497,7 @@ public:
     static wxString GetHumanReadableSize(const wxULongLong &sz,
                                          const wxString &nullsize = wxGetTranslation(_T("Not available")),
                                          int precision = 1);
+#endif // wxUSE_LONGLONG
 
 
     // deprecated methods, don't use any more