From 0026e0f231f78002ce2e77fd477a7ba45a5a63bf Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 17 Jan 2006 16:20:20 +0000 Subject: [PATCH] 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 --- src/generic/dirctrlg.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index d67468d8c1..11e112db2a 100644 --- 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)