From f2a5fd303bb0109b0b41b701dae9047ad224615d Mon Sep 17 00:00:00 2001 From: Lauri Nurmi Date: Tue, 21 Nov 2017 14:49:21 +0200 Subject: [PATCH] Declare wxInvalidSize also in wx/dir.h wxInvalidSize is a documented return value for wxDir::GetTotalSize(), yet it was not available by including just wx/dir.h as it was declared in wx/filename.h only. Fix this by declaring it in wx/dir.h too. Closes https://github.com/wxWidgets/wxWidgets/pull/609 --- include/wx/dir.h | 5 +++++ interface/wx/dir.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/include/wx/dir.h b/include/wx/dir.h index f23862e0a9..305411b749 100644 --- a/include/wx/dir.h +++ b/include/wx/dir.h @@ -45,6 +45,11 @@ enum wxDirTraverseResult wxDIR_CONTINUE // continue into this directory }; +#if wxUSE_LONGLONG +// error code of wxDir::GetTotalSize() +extern WXDLLIMPEXP_DATA_BASE(const wxULongLong) wxInvalidSize; +#endif // wxUSE_LONGLONG + // ---------------------------------------------------------------------------- // wxDirTraverser: helper class for wxDir::Traverse() // ---------------------------------------------------------------------------- diff --git a/interface/wx/dir.h b/interface/wx/dir.h index d9a9c0dae7..e5dbd92109 100644 --- a/interface/wx/dir.h +++ b/interface/wx/dir.h @@ -15,6 +15,11 @@ enum wxDirTraverseResult wxDIR_CONTINUE ///< Continue into this directory. }; +/** + The return value of wxDir::GetTotalSize() in case of error. +*/ +wxULongLong wxInvalidSize; + /** @class wxDirTraverser