Correct drawing of mnemonics in wxStaticBox label under wxMSW.

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

diff --git a/src/msw/sound.cpp b/src/msw/sound.cpp
index 788f3e63d367e12dc416753306fa57987ade423c..b87032146975dc6271332ac7e93a196fe1114b7f 100644 (file)
--- a/src/msw/sound.cpp
+++ b/src/msw/sound.cpp
@@ -70,7 +70,7 @@ private:
     GlobalPtr m_waveData;
     GlobalPtrLock m_waveDataPtr;
 
     GlobalPtr m_waveData;
     GlobalPtrLock m_waveDataPtr;
 

-    DECLARE_NO_COPY_CLASS(wxSoundDataMemory)
+    wxDECLARE_NO_COPY_CLASS(wxSoundDataMemory);

 };
 
 // class for sound files and resources
 };
 
 // class for sound files and resources


@@ -90,7 +90,7 @@ private:
     const wxString m_name;
     const bool m_isResource;
 
     const wxString m_name;
     const bool m_isResource;
 

-    DECLARE_NO_COPY_CLASS(wxSoundDataFile)
+    wxDECLARE_NO_COPY_CLASS(wxSoundDataFile);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -144,11 +144,7 @@ wxSound::~wxSound()
 
 void wxSound::Free()
 {
 
 void wxSound::Free()
 {

-    if ( m_data )
-    {
-        delete m_data;
-        m_data = NULL;
-    }
+    wxDELETE(m_data);

 }
 
 bool wxSound::CheckCreatedOk()
 }
 
 bool wxSound::CheckCreatedOk()