Added ability to switch off more components of the size page UI

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

diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp
index a840d3c0ad95733167c7af4e011507b137fe6978..d84fa5f44b80de313fa58ef162a1b764f5e13d3d 100644 (file)
--- a/src/msw/mediactrl_qt.cpp
+++ b/src/msw/mediactrl_qt.cpp
@@ -44,11 +44,7 @@
 // Externals (somewhere in src/msw/app.cpp and src/msw/window.cpp)
 //---------------------------------------------------------------------------
 extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
 // 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;
 extern WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName;

-#endif

 
 LRESULT WXDLLIMPEXP_CORE APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
                                    WPARAM wParam, LPARAM lParam);
 
 LRESULT WXDLLIMPEXP_CORE APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
                                    WPARAM wParam, LPARAM lParam);


@@ -436,7 +432,7 @@ private:
     wxQTMediaBackend *m_qtb;
     WXHWND m_hwnd;
 
     wxQTMediaBackend *m_qtb;
     WXHWND m_hwnd;
 

-    DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler);

 };
 
 
 };
 
 


@@ -695,15 +691,13 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
     if (m_movie)
         Cleanup();
 
     if (m_movie)
         Cleanup();
 

-    bool result = true;
-    OSErr err = noErr;

     short movieResFile = 0; //= 0 because of annoying VC6 warning
     FSSpec sfFile;
 
     short movieResFile = 0; //= 0 because of annoying VC6 warning
     FSSpec sfFile;
 

-    err = m_lib.NativePathNameToFSSpec(
+    OSErr err = m_lib.NativePathNameToFSSpec(

         (char*) (const char*) fileName.mb_str(),
         &sfFile, 0);
         (char*) (const char*) fileName.mb_str(),
         &sfFile, 0);

-    result = (err == noErr);
+    bool result = (err == noErr);

 
     if (result)
     {
 
     if (result)
     {


@@ -1074,11 +1068,7 @@ void wxQTMediaBackend::Cleanup()
 {
     m_bPlaying = false;
 
 {
     m_bPlaying = false;
 

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

 
     m_lib.StopMovie(m_movie);
 
 
     m_lib.StopMovie(m_movie);
 


@@ -1172,7 +1162,7 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::MCFilterProc (static)
 //
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::MCFilterProc (static)
 //

-// Callback for when the movie controller recieves a message
+// Callback for when the movie controller receives a message

 //---------------------------------------------------------------------------
 Boolean wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController),
                                short action,
 //---------------------------------------------------------------------------
 Boolean wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController),
                                short action,


@@ -1291,8 +1281,9 @@ void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
 //  End QT Backend
 //---------------------------------------------------------------------------
 
 //  End QT Backend
 //---------------------------------------------------------------------------
 

-// in source file that contains stuff you don't directly use
-#include "wx/html/forcelnk.h"
-FORCE_LINK_ME(wxmediabackend_qt)
+// Allow the user code to use wxFORCE_LINK_MODULE() to ensure that this object
+// file is not discarded by the linker.
+#include "wx/link.h"
+wxFORCE_LINK_THIS_MODULE(wxmediabackend_qt)

 
 #endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX
 
 #endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX