add virtual DoGetTextExtent() to allow calling the overloaded wxWindowBase::GetTextEx...

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

diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
index 75acd4f99e765b256cb8e4013818a37592a41b7d..3088d51ab9fbf952977f9704db52a083e182aac4 100644 (file)
--- a/src/msw/mediactrl_am.cpp
+++ b/src/msw/mediactrl_am.cpp
@@ -1478,11 +1478,12 @@ public:
 #endif
     wxSize m_bestSize;  // Cached size
 
 #endif
     wxSize m_bestSize;  // Cached size
 

-#ifdef __WXDEBUG__  // Stuff for getting useful debugging strings
+    // Stuff for getting useful debugging strings
+#if wxDEBUG_LEVEL

     wxDynamicLibrary m_dllQuartz;
     LPAMGETERRORTEXT m_lpAMGetErrorText;
     wxString GetErrorString(HRESULT hrdsv);
     wxDynamicLibrary m_dllQuartz;
     LPAMGETERRORTEXT m_lpAMGetErrorText;
     wxString GetErrorString(HRESULT hrdsv);

-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL

     wxEvtHandler* m_evthandler;
 
     friend class wxAMMediaEvtHandler;
     wxEvtHandler* m_evthandler;
 
     friend class wxAMMediaEvtHandler;


@@ -1509,7 +1510,7 @@ private:
     bool m_bLoadEventSent; // Whether or not FinishLoaded was already called
                            // prevents it being called multiple times
 
     bool m_bLoadEventSent; // Whether or not FinishLoaded was already called
                            // prevents it being called multiple times
 

-    DECLARE_NO_COPY_CLASS(wxAMMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxAMMediaEvtHandler);

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


@@ -1527,7 +1528,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend)
 //---------------------------------------------------------------------------
 // Usual debugging macros
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // Usual debugging macros
 //---------------------------------------------------------------------------

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

 #define MAX_ERROR_TEXT_LEN 160
 
 // Get the error string for Active Movie
 #define MAX_ERROR_TEXT_LEN 160
 
 // Get the error string for Active Movie


@@ -1614,13 +1615,13 @@ bool wxAMMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
 {
     // First get the AMGetErrorText procedure in debug
     // mode for more meaningful messages
 {
     // First get the AMGetErrorText procedure in debug
     // mode for more meaningful messages

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     if ( m_dllQuartz.Load(_T("quartz.dll"), wxDL_VERBATIM) )
     {
         m_lpAMGetErrorText = (LPAMGETERRORTEXT)
                                 m_dllQuartz.GetSymbolAorW(wxT("AMGetErrorText"));
     }
     if ( m_dllQuartz.Load(_T("quartz.dll"), wxDL_VERBATIM) )
     {
         m_lpAMGetErrorText = (LPAMGETERRORTEXT)
                                 m_dllQuartz.GetSymbolAorW(wxT("AMGetErrorText"));
     }

-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL

 
 
 
 
 
 


@@ -1983,7 +1984,7 @@ double wxAMMediaBackend::GetVolume()
 bool wxAMMediaBackend::SetVolume(double dVolume)
 {
     // inverse the transformation above
 bool wxAMMediaBackend::SetVolume(double dVolume)
 {
     // inverse the transformation above

-    long lVolume = 2000*log10(dVolume + (1 - dVolume)*0.00001);
+    long lVolume = static_cast<long>(2000*log10(dVolume + (1 - dVolume)*0.00001));

 
     HRESULT hr = GetAM()->put_Volume(lVolume);
     if(FAILED(hr))
 
     HRESULT hr = GetAM()->put_Volume(lVolume);
     if(FAILED(hr))