svn not cvs

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

diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index afa432cd220ddade679cc524a3475247d6ae9121..1578d45777e7053f58a93459e1a59777e29ac20b 100644 (file)
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -38,9 +38,9 @@
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/timer.h"
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/timer.h"

+    #include "wx/math.h"        // log10 & pow

 #endif
 
 #endif
 

-#include "wx/math.h"        // log10 & pow

 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/dynlib.h"
 
 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/dynlib.h"
 


@@ -1507,7 +1507,7 @@ class WXDLLIMPEXP_MEDIA wxMCIMediaBackend : public wxMediaBackendCommonBase
 {
 public:
     wxMCIMediaBackend();
 {
 public:
     wxMCIMediaBackend();

-    ~wxMCIMediaBackend();
+    virtual ~wxMCIMediaBackend();

 
     virtual bool CreateControl(wxControl* ctrl, wxWindow* parent,
                                      wxWindowID id,
 
     virtual bool CreateControl(wxControl* ctrl, wxWindow* parent,
                                      wxWindowID id,


@@ -1867,7 +1867,7 @@ class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackendCommonBase
 {
 public:
     wxQTMediaBackend();
 {
 public:
     wxQTMediaBackend();

-    ~wxQTMediaBackend();
+    virtual ~wxQTMediaBackend();

 
     virtual bool CreateControl(wxControl* ctrl, wxWindow* parent,
                                      wxWindowID id,
 
     virtual bool CreateControl(wxControl* ctrl, wxWindow* parent,
                                      wxWindowID id,


@@ -1979,14 +1979,14 @@ wxString wxAMMediaBackend::GetErrorString(HRESULT hrdsv)
     {
         return wxString::Format(wxT("DirectShow error \"%s\" \n")
                                      wxT("(numeric %X)\n")
     {
         return wxString::Format(wxT("DirectShow error \"%s\" \n")
                                      wxT("(numeric %X)\n")

-                                     wxT("occured"),
+                                     wxT("occurred"),

                                      szError, (int)hrdsv);
     }
     else
     {
         return wxString::Format(wxT("Unknown error \n")
                                      wxT("(numeric %X)\n")
                                      szError, (int)hrdsv);
     }
     else
     {
         return wxString::Format(wxT("Unknown error \n")
                                      wxT("(numeric %X)\n")

-                                     wxT("occured"),
+                                     wxT("occurred"),

                                      (int)hrdsv);
     }
 }
                                      (int)hrdsv);
     }
 }


@@ -1995,7 +1995,6 @@ wxString wxAMMediaBackend::GetErrorString(HRESULT hrdsv)
 #define wxVERIFY(x) wxASSERT((x))
 #define wxAMLOG(x) wxLogDebug(GetErrorString(x))
 #else
 #define wxVERIFY(x) wxASSERT((x))
 #define wxAMLOG(x) wxLogDebug(GetErrorString(x))
 #else

-#define wxAMVERIFY(x) (x)

 #define wxVERIFY(x) (x)
 #define wxAMLOG(x)
 #define wxAMFAIL(x)
 #define wxVERIFY(x) (x)
 #define wxAMLOG(x)
 #define wxAMFAIL(x)


@@ -2134,7 +2133,7 @@ public:
         pGB->Release();
     }
 
         pGB->Release();
     }
 

-    ~wxAMPlayTimer()
+    virtual ~wxAMPlayTimer()

     {
         SAFE_RELEASE(m_pME);
     }
     {
         SAFE_RELEASE(m_pME);
     }