some setup.h changes for wxMovieCtrl

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 818687974b46d7dbc17dbdb2fb3daf2a2fd4f888..51474f66dd33cb924b73282af75907318e574646 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -428,6 +428,11 @@
 // wxSound class
 #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.
 //
 // Default is 1

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index f3bca4234a08886a6ca47a146b0d17b9a6150c98..233a7dc00b9bad5e2617abd0ef525f0c5a6228a5 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -459,6 +459,13 @@
 // wxSound class
 #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.
 //
 // Default is 1

diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h
index c3718f7d6e4120d3613eb87dabd7acbd2a1a4176..21b62558cd5732cd9fa07fde8066b27b036be9ef 100644 (file)
--- a/include/wx/msw/setup_microwin.h
+++ b/include/wx/msw/setup_microwin.h
@@ -392,6 +392,13 @@
 // wxSound class
 #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.
 //
 // Default is 1

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 058635fac5ecc7395d2a3acea99048c7aad95641..831742bd00dcd0f0cde148e04a7105c25be26b41 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -447,6 +447,13 @@
 // wxSound class
 #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.
 //
 // Default is 1

diff --git a/src/mac/carbon/moviectrl.cpp b/src/mac/carbon/moviectrl.cpp
index a1741e1cfe2af7123bbcf38972a004f9a118f214..ba21a9a1d4cc13d540421c829908d71393dd1d0a 100644 (file)
--- a/src/mac/carbon/moviectrl.cpp
+++ b/src/mac/carbon/moviectrl.cpp
@@ -20,8 +20,6 @@
 #pragma hdrstop
 #endif
 
-#define wxUSE_MOVIECTRL 1
-
 #if wxUSE_MOVIECTRL
 
 #include "wx/moviectrl.h"
@@ -327,8 +325,6 @@ void wxMovieCtrl::Cleanup()
 #ifndef __WXMAC__
     TerminateQTML();
 #endif
-
-    m_bLoaded = false;
 }
 
 wxMovieCtrl::~wxMovieCtrl()

diff --git a/src/msw/moviectrl.cpp b/src/msw/moviectrl.cpp
index 7917b6382bbc9de0ee5db290f52482e6d957363f..3b9c85c663f0b4d95c2bcc031e8c16c983f9ece4 100644 (file)
--- a/src/msw/moviectrl.cpp
+++ b/src/msw/moviectrl.cpp
@@ -20,8 +20,6 @@
 #pragma hdrstop
 #endif
 
-#define wxUSE_MOVIECTRL 1
-
 #if wxUSE_MOVIECTRL
 
 #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
     SetBackgroundColour(*wxBLACK);
 
+    wxControl::SetLabel(label);
+
     if(!fileName.empty())
     {
         if (!Load(fileName))
             return false;
 
-        SetLabel(label);
-
         if(!Play())
             return false;
     }
-    else
-        wxControl::SetLabel(label);
 
     return true;
 }
@@ -135,6 +131,9 @@ bool wxMovieCtrl::Load(const wxString& fileName)
     //set the time format
     wxDSVERIFY( pMS->SetTimeFormat(&TIME_FORMAT_MEDIA_TIME) );
 
+
+    SetLabel(GetLabel());
+
     m_bLoaded = true;
     return true;
 }