Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (harmless)m ingw32 warning; use anonymous namespace instead of a bunch of static functions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-15 14:25:04 +00:00
parent 2ad4f89f57
commit 145bbf1fdf
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/msw/dir.cpp
View File

@@ -40,56 +40,64 @@
// define the types and functions used for file searching // define the types and functions used for file searching
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
namespace
{
typedef WIN32_FIND_DATA FIND_STRUCT; typedef WIN32_FIND_DATA FIND_STRUCT;
typedef HANDLE FIND_DATA; typedef HANDLE FIND_DATA;
typedef DWORD FIND_ATTR; typedef DWORD FIND_ATTR;
static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; } inline FIND_DATA InitFindData()
{
return INVALID_HANDLE_VALUE;
}
static inline bool IsFindDataOk(FIND_DATA fd) inline bool IsFindDataOk(FIND_DATA fd)
{ {
return fd != INVALID_HANDLE_VALUE; return fd != INVALID_HANDLE_VALUE;
} }
static inline void FreeFindData(FIND_DATA fd) inline void FreeFindData(FIND_DATA fd)
{ {
if ( !::FindClose(fd) ) if ( !::FindClose(fd) )
{ {
wxLogLastError(_T("FindClose")); wxLogLastError(_T("FindClose"));
} }
} }
static inline FIND_DATA FindFirst(const wxString& spec, inline FIND_DATA FindFirst(const wxString& spec,
FIND_STRUCT *finddata) FIND_STRUCT *finddata)
{ {
return ::FindFirstFile(spec.fn_str(), finddata); return ::FindFirstFile(spec.fn_str(), finddata);
} }
static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata) inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
{ {
return ::FindNextFile(fd, finddata) != 0; return ::FindNextFile(fd, finddata) != 0;
} }
static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata) const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
{ {
return finddata->cFileName; return finddata->cFileName;
} }
static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata) inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
{ {
return finddata->dwFileAttributes; return finddata->dwFileAttributes;
} }
static inline bool IsDir(FIND_ATTR attr) inline bool IsDir(FIND_ATTR attr)
{ {
return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0; return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
} }
static inline bool IsHidden(FIND_ATTR attr) inline bool IsHidden(FIND_ATTR attr)
{ {
return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0; return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
} }
} // anonymous namespace
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------