fix for crash when using wxEXEC_NODISABLE

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

diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index 2b1a0fd77b65858d0f346ac3696b5721c92ee5a5..6d38693a0fce5c3c1c585f3b9211757c1b05edf8 100644 (file)
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -43,7 +43,7 @@
 //---------------------------------------------------------------------------
 extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
 #ifdef __WXWINCE__
-extern WXDLLIMPEXP_CORE      wxChar *wxCanvasClassName;
+extern WXDLLIMPEXP_CORE       wxChar *wxCanvasClassName;
 #else
 extern WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName;
 #endif
@@ -186,7 +186,7 @@ public:
     HWND m_hNotifyWnd;      //Window to use for MCI events
     bool m_bVideo;          //Whether or not we have video
 
-    DECLARE_DYNAMIC_CLASS(wxMCIMediaBackend);
+    DECLARE_DYNAMIC_CLASS(wxMCIMediaBackend)
 };
 
 //---------------------------------------------------------------------------
@@ -1080,7 +1080,13 @@ bool wxMCIMediaBackend::SetPosition(wxLongLong where)
 {
     MCI_SEEK_PARMS seekParms;
     seekParms.dwCallback = 0;
+#if wxUSE_LONGLONG_NATIVE && !wxUSE_LONGLONG_WX
     seekParms.dwTo = (DWORD)where.GetValue();
+#else /* wxUSE_LONGLONG_WX */
+    /* no way to return it in one piece */
+    wxASSERT( where.GetHi()==0 );
+    seekParms.dwTo = (DWORD)where.GetLo();
+#endif /* wxUSE_LONGLONG_* */
 
     //device was playing?
     bool bReplay = GetState() == wxMEDIASTATE_PLAYING;
@@ -1613,7 +1619,7 @@ bool wxQTMediaBackend::SetPosition(wxLongLong where)
 // wxQTMediaBackend::GetPosition
 //
 // 1) Calls GetMovieTime to get the position we are in in the movie
-// in milliseconds (we called 
+// in milliseconds (we called
 //---------------------------------------------------------------------------
 wxLongLong wxQTMediaBackend::GetPosition()
 {