fixing include type

[wxWidgets.git] / src / common / dircmn.cpp

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 1674029b6dc621f23f5bd57a400095af59855b7d..a3862feb9d516f8b029c35a6918ab1e0b6d7cdd2 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -55,16 +55,16 @@ wxDirTraverser::OnOpenError(const wxString& WXUNUSED(dirname))
 
 // dumb generic implementation
 
 
 // dumb generic implementation
 

-bool wxDir::HasFiles(const wxString& spec)
+bool wxDir::HasFiles(const wxString& spec) const

 {
     wxString s;
     return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN);
 }
 
 // we have a (much) faster version for Unix
 {
     wxString s;
     return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN);
 }
 
 // we have a (much) faster version for Unix

-#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) || defined(__WINE__)
+#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__EMX__) || defined(__WINE__)

 
 

-bool wxDir::HasSubDirs(const wxString& spec)
+bool wxDir::HasSubDirs(const wxString& spec) const

 {
     wxString s;
     return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN);
 {
     wxString s;
     return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN);


@@ -81,7 +81,7 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
                        int flags) const
 {
     wxCHECK_MSG( IsOpened(), (size_t)-1,
                        int flags) const
 {
     wxCHECK_MSG( IsOpened(), (size_t)-1,

-                 _T("dir must be opened before traversing it") );
+                 wxT("dir must be opened before traversing it") );

 
     // the total number of files found
     size_t nFiles = 0;
 
     // the total number of files found
     size_t nFiles = 0;


@@ -103,7 +103,7 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
             switch ( sink.OnDir(fulldirname) )
             {
                 default:
             switch ( sink.OnDir(fulldirname) )
             {
                 default:

-                    wxFAIL_MSG(_T("unexpected OnDir() return value") );
+                    wxFAIL_MSG(wxT("unexpected OnDir() return value") );

                     // fall through
 
                 case wxDIR_STOP:
                     // fall through
 
                 case wxDIR_STOP:


@@ -131,7 +131,7 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
                                 switch ( sink.OnOpenError(fulldirname) )
                                 {
                                     default:
                                 switch ( sink.OnOpenError(fulldirname) )
                                 {
                                     default:

-                                        wxFAIL_MSG(_T("unexpected OnOpenError() return value") );
+                                        wxFAIL_MSG(wxT("unexpected OnOpenError() return value") );

                                         // fall through
 
                                     case wxDIR_STOP:
                                         // fall through
 
                                     case wxDIR_STOP:


@@ -180,7 +180,7 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
                 break;
 
             wxASSERT_MSG( res == wxDIR_CONTINUE,
                 break;
 
             wxASSERT_MSG( res == wxDIR_CONTINUE,

-                          _T("unexpected OnFile() return value") );
+                          wxT("unexpected OnFile() return value") );

 
             nFiles++;
 
 
             nFiles++;
 


@@ -214,7 +214,7 @@ public:
 private:
     wxArrayString& m_files;
 
 private:
     wxArrayString& m_files;
 

-    DECLARE_NO_COPY_CLASS(wxDirTraverserSimple)
+    wxDECLARE_NO_COPY_CLASS(wxDirTraverserSimple);

 };
 
 /* static */
 };
 
 /* static */


@@ -223,7 +223,7 @@ size_t wxDir::GetAllFiles(const wxString& dirname,
                           const wxString& filespec,
                           int flags)
 {
                           const wxString& filespec,
                           int flags)
 {

-    wxCHECK_MSG( files, (size_t)-1, _T("NULL pointer in wxDir::GetAllFiles") );
+    wxCHECK_MSG( files, (size_t)-1, wxT("NULL pointer in wxDir::GetAllFiles") );

 
     size_t nFiles = 0;
 
 
     size_t nFiles = 0;
 


@@ -266,7 +266,7 @@ public:
 private:
     wxString m_file;
 
 private:
     wxString m_file;
 

-    DECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst)
+    wxDECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst);

 };
 
 /* static */
 };
 
 /* static */


@@ -291,10 +291,12 @@ wxString wxDir::FindFirst(const wxString& dirname,
 // wxDir::GetTotalSize()
 // ----------------------------------------------------------------------------
 
 // wxDir::GetTotalSize()
 // ----------------------------------------------------------------------------
 

+#if wxUSE_LONGLONG
+

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

-    wxDirTraverserSumSize() { m_skippedFiles=false; }
+    wxDirTraverserSumSize() { }

 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {
 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {


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

+#endif // wxUSE_LONGLONG