Compilation fix for !wxUSE_OWNER_DRAWN.

[wxWidgets.git] / src / msw / volume.cpp

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 24a774b35c23edb8a4ed28c23089702944d47129..2b38bc7310d4bebafc2c2010c42bd1fbbc97fc4d 100644 (file)
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -4,7 +4,6 @@
 // Author:      George Policello
 // Modified by:
 // Created:     28 Jan 02
 // Author:      George Policello
 // Modified by:
 // Created:     28 Jan 02

-// RCS-ID:      $Id$

 // Copyright:   (c) 2002 George Policello
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2002 George Policello
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -506,12 +505,13 @@ bool wxFSVolumeBase::Create(const wxString& name)
     if (!rc)
     {
         wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str());
     if (!rc)
     {
         wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str());

-        return m_isOk;
+        return false;

     }
     m_dispName = fi.szDisplayName;
 
     // all tests passed.
     }
     m_dispName = fi.szDisplayName;
 
     // all tests passed.

-    return m_isOk = true;
+    m_isOk = true;
+    return true;

 } // Create
 
 //=============================================================================
 } // Create
 
 //=============================================================================


@@ -584,6 +584,7 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
     wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(), wxNullIcon,
                  wxT("wxFSIconType::GetIcon(): invalid icon index") );
 
     wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(), wxNullIcon,
                  wxT("wxFSIconType::GetIcon(): invalid icon index") );
 

+#ifdef __WXMSW__

     // Load on demand.
     if (m_icons[type].IsNull())
     {
     // Load on demand.
     if (m_icons[type].IsNull())
     {


@@ -621,6 +622,10 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
     }
 
     return m_icons[type];
     }
 
     return m_icons[type];

+#else
+    wxFAIL_MSG(wxS("Can't convert HICON to wxIcon in this port."));
+    return wxNullIcon;
+#endif

 } // GetIcon
 
 #endif // wxUSE_GUI
 } // GetIcon
 
 #endif // wxUSE_GUI