compilation fixes for wxUSE_LONGLONG==0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dir.h b/include/wx/dir.h
index 14ed2ab963d70ae9bef736b0036f085f410e9da5..e41495513d76d487f96f633442f833feab782abf 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -146,8 +146,10 @@ public:
                               const wxString& filespec,
                               int flags = wxDIR_DEFAULT);
 
                               const wxString& filespec,
                               int flags = wxDIR_DEFAULT);
 

+#if wxUSE_LONGLONG

     // returns the size of all directories recursively found in given path
     static wxULongLong GetTotalSize(const wxString &dir, wxArrayString *filesSkipped = NULL);
     // returns the size of all directories recursively found in given path
     static wxULongLong GetTotalSize(const wxString &dir, wxArrayString *filesSkipped = NULL);

+#endif // wxUSE_LONGLONG

 
 private:
     friend class wxDirData;
 
 private:
     friend class wxDirData;

diff --git a/include/wx/filename.h b/include/wx/filename.h
index dd44465684f537ac1d63e7d77528c23b94408253..6f3273257dca87af7c91c8b1e49dd9dd7028cc1d 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -84,8 +84,10 @@ enum
     wxPATH_MKDIR_FULL    = 0x0001   // create directories recursively
 };
 
     wxPATH_MKDIR_FULL    = 0x0001   // create directories recursively
 };
 

+#if wxUSE_LONGLONG

 // error code of wxFileName::GetSize()
 extern wxULongLong wxInvalidSize;
 // error code of wxFileName::GetSize()
 extern wxULongLong wxInvalidSize;

+#endif // wxUSE_LONGLONG

 
 
 
 
 
 


@@ -483,6 +485,7 @@ public:
 
     // Filesize
 
 
     // Filesize
 

+#if wxUSE_LONGLONG

         // returns the size of the given filename
     wxULongLong GetSize() const;
     static wxULongLong GetSize(const wxString &file);
         // returns the size of the given filename
     wxULongLong GetSize() const;
     static wxULongLong GetSize(const wxString &file);


@@ -493,6 +496,7 @@ public:
     static wxString GetHumanReadableSize(const wxULongLong &sz,
                                          const wxString &nullsize = wxGetTranslation(_T("Not available")),
                                          int precision = 1);
     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
 
 
     // deprecated methods, don't use any more

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index ac7b30fb30abc38dd56fe80420805d048f2388d7..30e47dd78284e7914c506581b74d3fa33be52965 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -291,6 +291,8 @@ wxString wxDir::FindFirst(const wxString& dirname,
 // wxDir::GetTotalSize()
 // ----------------------------------------------------------------------------
 
 // wxDir::GetTotalSize()
 // ----------------------------------------------------------------------------
 

+#if wxUSE_LONGLONG
+

 class wxDirTraverserSumSize : public wxDirTraverser
 {
 public:
 class wxDirTraverserSumSize : public wxDirTraverser
 {
 public:


@@ -355,3 +357,4 @@ wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSki
     return traverser.GetTotalSize();
 }
 
     return traverser.GetTotalSize();
 }
 

+#endif // wxUSE_LONGLONG

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 295725c32f5d181f5ec3ff2ab1f3026e36f99290..2d583d2719dc785e0d1bf0249aed4bdd6af3c48a 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -139,7 +139,9 @@
 #endif
 
 
 #endif
 
 

+#if wxUSE_LONGLONG

 wxULongLong wxInvalidSize = (unsigned)-1;
 wxULongLong wxInvalidSize = (unsigned)-1;

+#endif // wxUSE_LONGLONG

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -2317,6 +2319,8 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess,
 // file size functions
 // ----------------------------------------------------------------------------
 
 // file size functions
 // ----------------------------------------------------------------------------
 

+#if wxUSE_LONGLONG
+

 /* static */
 wxULongLong wxFileName::GetSize(const wxString &filename)
 {
 /* static */
 wxULongLong wxFileName::GetSize(const wxString &filename)
 {


@@ -2385,6 +2389,7 @@ wxString wxFileName::GetHumanReadableSize(const wxString &failmsg, int precision
     return GetHumanReadableSize(GetSize(), failmsg, precision);
 }
 
     return GetHumanReadableSize(GetSize(), failmsg, precision);
 }
 

+#endif // wxUSE_LONGLONG

 
 // ----------------------------------------------------------------------------
 // Mac-specific functions
 
 // ----------------------------------------------------------------------------
 // Mac-specific functions