Don't overwrite status message when restoring it if it changed.

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

diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index 8a89ce20638db39fa600afafa599564826572f33..e161a5a03db1b32405215df4f4fcca9c57466aee 100644 (file)
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -48,11 +48,7 @@
 // Externals (somewhere in src/msw/app.cpp and src/msw/window.cpp)
 //---------------------------------------------------------------------------
 extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
-#ifdef __WXWINCE__
-extern WXDLLIMPEXP_CORE       wxChar *wxCanvasClassName;
-#else
 extern WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName;
-#endif
 
 LRESULT WXDLLIMPEXP_CORE APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
                                    WPARAM wParam, LPARAM lParam);
@@ -1484,7 +1480,7 @@ public:
     wxTimer* m_pTimer;
     wxSize m_bestSize;
 
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
     wxDynamicLibrary m_dllQuartz;
     LPAMGETERRORTEXT m_lpAMGetErrorText;
     wxString GetErrorString(HRESULT hrdsv);
@@ -1929,7 +1925,7 @@ private:
     wxQTMediaBackend *m_qtb;
     WXHWND m_hwnd;
 
-    DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler);
 };
 
 
@@ -1946,7 +1942,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend)
 //---------------------------------------------------------------------------
 // Usual debugging macros
 //---------------------------------------------------------------------------
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
 #define MAX_ERROR_TEXT_LEN 160
 
 // Get the error string for Active Movie
@@ -2217,8 +2213,8 @@ bool wxAMMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
 {
     // First get the AMGetErrorText procedure in
     // debug mode for more meaningful messages
-#ifdef __WXDEBUG__
-    if ( m_dllQuartz.Load(_T("quartz.dll"), wxDL_VERBATIM) )
+#if wxDEBUG_LEVEL
+    if ( m_dllQuartz.Load(wxT("quartz.dll"), wxDL_VERBATIM) )
     {
         m_lpAMGetErrorText = (LPAMGETERRORTEXT)
                                 m_dllQuartz.GetSymbolAorW(wxT("AMGetErrorText"));
@@ -2782,7 +2778,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMCIMediaBackend, wxMediaBackend)
 // Usual debugging macros for MCI returns
 //---------------------------------------------------------------------------
 
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
 #define wxMCIVERIFY(arg) \
 { \
     DWORD nRet; \
@@ -2790,7 +2786,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMCIMediaBackend, wxMediaBackend)
     { \
         TCHAR sz[5000]; \
         mciGetErrorString(nRet, sz, 5000); \
-        wxFAIL_MSG(wxString::Format(_T("MCI Error:%s"), sz)); \
+        wxFAIL_MSG(wxString::Format(wxT("MCI Error:%s"), sz)); \
     } \
 }
 #else
@@ -2928,7 +2924,7 @@ bool wxMCIMediaBackend::Load(const wxString& fileName)
     // omit this it tells MCI to select the device instead. This is good
     // because we have no reliable way of "enumerating" the devices in MCI
     MCI_OPEN_PARMS openParms;
-    openParms.lpstrElementName = (wxChar*) fileName.c_str();
+    openParms.lpstrElementName = fileName.wx_str();
 
     if (mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT,
                         (DWORD)(LPVOID)&openParms) != 0)