X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21f60945831a6edad0f2101b6053a2c8213d5296..4aae4a085cf105551590b2a999758e0762743352:/include/wx/filename.h diff --git a/include/wx/filename.h b/include/wx/filename.h index 774f65aaf0..cbd601e663 100644 --- a/include/wx/filename.h +++ b/include/wx/filename.h @@ -177,7 +177,11 @@ public: // file tests // is the filename valid at all? - bool IsOk() const { return m_dirs.size() != 0 || !m_name.IsEmpty(); } + bool IsOk() const + { + // we're fine if we have the path or the name or if we're a root dir + return m_dirs.size() != 0 || !m_name.IsEmpty() || !m_relative; + } // does the file with this name exists? bool FileExists() const; @@ -284,10 +288,12 @@ public: { return Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE | wxPATH_NORM_TILDE, cwd, format); } -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE // if the path is a shortcut, return the target and optionally, // the arguments - bool GetShortcutTarget(const wxString& shortcutPath, wxString& targetFilename, wxString* arguments = NULL); + bool GetShortcutTarget(const wxString& shortcutPath, + wxString& targetFilename, + wxString* arguments = NULL); #endif // Comparison