Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some setup.h changes for wxMovieCtrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-11-07 15:47:57 +00:00
parent 52f2f7b2c1
commit 16cfbafc6a
6 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/mac/setup0.h
View File

@@ -428,6 +428,11 @@
// wxSound class // wxSound class
#define wxUSE_SOUND 1 #define wxUSE_SOUND 1
// wxMovieCtrl class
//
// Recommended setting: 0 (Nice to have)
#define wxUSE_MOVIECTRL 0
// Use wxWidget's XRC XML-based resource system. Recommended. // Use wxWidget's XRC XML-based resource system. Recommended.
// //
// Default is 1 // Default is 1

7
include/wx/msw/setup0.h
View File

@@ -459,6 +459,13 @@
// wxSound class // wxSound class
#define wxUSE_SOUND 1 #define wxUSE_SOUND 1
// wxMovieCtrl class
//
// Requires DirectX 7 & DirectMedia or above (link with STRMIIDS.LIB)
//
// Recommended setting: 0 (Nice to have, but SDK doesn't exist by default)
#define wxUSE_MOVIECTRL 0
// Use wxWidget's XRC XML-based resource system. Recommended. // Use wxWidget's XRC XML-based resource system. Recommended.
// //
// Default is 1 // Default is 1

7
include/wx/msw/setup_microwin.h
View File

@@ -392,6 +392,13 @@
// wxSound class // wxSound class
#define wxUSE_SOUND 0 #define wxUSE_SOUND 0
// wxMovieCtrl class
//
// Requires DirectX 7 & DirectMedia or above (link with STRMIIDS.LIB)
//
// Recommended setting: 0 (Nice to have, but SDK doesn't exist by default)
#define wxUSE_MOVIECTRL 0
// Use wxWidget's XRC XML-based resource system. Recommended. // Use wxWidget's XRC XML-based resource system. Recommended.
// //
// Default is 1 // Default is 1

7
include/wx/msw/wince/setup.h
View File

@@ -447,6 +447,13 @@
// wxSound class // wxSound class
#define wxUSE_SOUND 1 #define wxUSE_SOUND 1
// wxMovieCtrl class
//
// Requires DirectX 7 & DirectMedia or above (link with STRMIIDS.LIB)
//
// Recommended setting: 0 (Nice to have, but SDK doesn't exist by default)
#define wxUSE_MOVIECTRL 0
// Use wxWidget's XRC XML-based resource system. Recommended. // Use wxWidget's XRC XML-based resource system. Recommended.
// //
// Default is 1 // Default is 1

4
src/mac/carbon/moviectrl.cpp
View File

@@ -20,8 +20,6 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#define wxUSE_MOVIECTRL 1
#if wxUSE_MOVIECTRL #if wxUSE_MOVIECTRL
#include "wx/moviectrl.h" #include "wx/moviectrl.h"
@@ -327,8 +325,6 @@ void wxMovieCtrl::Cleanup()
#ifndef __WXMAC__ #ifndef __WXMAC__
TerminateQTML(); TerminateQTML();
#endif #endif
m_bLoaded = false;
} }
wxMovieCtrl::~wxMovieCtrl() wxMovieCtrl::~wxMovieCtrl()

11
src/msw/moviectrl.cpp
View File

@@ -20,8 +20,6 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#define wxUSE_MOVIECTRL 1
#if wxUSE_MOVIECTRL #if wxUSE_MOVIECTRL
#include "wx/moviectrl.h" #include "wx/moviectrl.h"
@@ -59,18 +57,16 @@ bool wxMovieCtrl::Create(wxWindow* parent, wxWindowID id, const wxString& fileNa
//Set our background color to black by default //Set our background color to black by default
SetBackgroundColour(*wxBLACK); SetBackgroundColour(*wxBLACK);
wxControl::SetLabel(label);
if(!fileName.empty()) if(!fileName.empty())
{ {
if (!Load(fileName)) if (!Load(fileName))
return false; return false;
SetLabel(label);
if(!Play()) if(!Play())
return false; return false;
} }
else
wxControl::SetLabel(label);
return true; return true;
} }
@@ -135,6 +131,9 @@ bool wxMovieCtrl::Load(const wxString& fileName)
//set the time format //set the time format
wxDSVERIFY( pMS->SetTimeFormat(&TIME_FORMAT_MEDIA_TIME) ); wxDSVERIFY( pMS->SetTimeFormat(&TIME_FORMAT_MEDIA_TIME) );
SetLabel(GetLabel());
m_bLoaded = true; m_bLoaded = true;
return true; return true;
} }