Applied patch [ 1393577 ] show volumename in dirctlg

Viktor P

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index d67468d8c1d0a74d1aa5a0f18f4ad3c69c727f07..11e112db2a54aabbfe82210c4c17c81aee846999 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -117,6 +117,14 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI
         path.Printf(wxT("%c:\\"), driveBuffer[i]);
         name.Printf(wxT("%c:"), driveBuffer[i]);
 
+#if !defined(__WXWINCE__)
+        wxChar pname[52];
+        if (GetVolumeInformation( path.c_str(), pname, 52, NULL, NULL, NULL, NULL, NULL ))
+        {
+            name.Printf(wxT("%s %s"), (const wxChar*) name, pname );
+        }
+#endif
+
         int imageId;
         int driveType = ::GetDriveType(path);
         switch (driveType)