Make wxString::WorstEncodingCase take a const wxMBConv&

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index e0dcb78f9bace1f72fce3613c72dc9ee2330a304..32a2a463063db5901dcddb0339b6cb8959072303 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -16,7 +16,7 @@
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "fsvolume.h"
 #endif
 
@@ -139,12 +139,7 @@ private:
 #else // !wxUSE_GUI
 
 // wxFSVolume is the same thing as wxFSVolume in wxBase
-class wxFSVolume : public wxFSVolumeBase
-{
-public:
-    wxFSVolume() : wxFSVolumeBase() { }
-    wxFSVolume(const wxString& name) : wxFSVolumeBase(name) { }
-};
+typedef wxFSVolumeBase wxFSVolume;
 
 #endif // wxUSE_GUI/!wxUSE_GUI