delete children in ~wxWindow dtor and not in the base class ~wxWindowNative as it...

[wxWidgets.git] / include / wx / filename.h

diff --git a/include/wx/filename.h b/include/wx/filename.h
index 774f65aaf0b9ae3ce272a19d6b47acb2dd2a6486..954f4f349f216e7f168bf09006c42fb903f7c2fd 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -149,11 +149,7 @@ public:
     void Assign(const wxString& path,
                 const wxString& name,
                 const wxString& ext,
     void Assign(const wxString& path,
                 const wxString& name,
                 const wxString& ext,

-                wxPathFormat format = wxPATH_NATIVE)
-    {
-        // empty volume
-        Assign(wxEmptyString, path, name, ext, format);
-    }
+                wxPathFormat format = wxPATH_NATIVE);

 
     void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE);
 
 
     void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE);
 


@@ -177,7 +173,11 @@ public:
     // file tests
 
         // is the filename valid at all?
     // 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;
 
         // does the file with this name exists?
     bool FileExists() const;


@@ -284,10 +284,12 @@ public:
         { return Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE |
                            wxPATH_NORM_TILDE, cwd, format); }
 
         { 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
         // 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
 #endif
 
     // Comparison


@@ -332,6 +334,10 @@ public:
     // get the string of path separators for this format
     static wxString GetPathSeparators(wxPathFormat format = wxPATH_NATIVE);
 
     // get the string of path separators for this format
     static wxString GetPathSeparators(wxPathFormat format = wxPATH_NATIVE);
 

+    // get the string of path terminators, i.e. characters which terminate the
+    // path
+    static wxString GetPathTerminators(wxPathFormat format = wxPATH_NATIVE);
+

     // get the canonical path separator for this format
     static wxChar GetPathSeparator(wxPathFormat format = wxPATH_NATIVE)
         { return GetPathSeparators(format)[0u]; }
     // get the canonical path separator for this format
     static wxChar GetPathSeparator(wxPathFormat format = wxPATH_NATIVE)
         { return GetPathSeparators(format)[0u]; }


@@ -405,6 +411,11 @@ public:
                           wxString *ext,
                           wxPathFormat format = wxPATH_NATIVE);
 
                           wxString *ext,
                           wxPathFormat format = wxPATH_NATIVE);
 

+        // split a path into volume and pure path part
+    static void SplitVolume(const wxString& fullpathWithVolume,
+                            wxString *volume,
+                            wxString *path,
+                            wxPathFormat format = wxPATH_NATIVE);

 
     // deprecated methods, don't use any more
     // --------------------------------------
 
     // deprecated methods, don't use any more
     // --------------------------------------