* Make some more work on the video for Linux (Unix hopefully as I use XAnim)

* Added some datas for Windows

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

diff --git a/utils/wxMMedia2/board/mmbman.cpp b/utils/wxMMedia2/board/mmbman.cpp
index 36c18d53afc4754f471ed6c7580e722a98f65870..9b8723a6d98964bf03f0ac6af1a2475dc0f0a421 100644 (file)
--- a/utils/wxMMedia2/board/mmbman.cpp
+++ b/utils/wxMMedia2/board/mmbman.cpp
@@ -381,18 +381,19 @@ MMBoardTime MMBoardVideoFile::GetLength()
 {
   MMBoardTime btime;
 
 {
   MMBoardTime btime;
 

-  btime.seconds = btime.minutes = btime.hours = 1;
+  btime.seconds = 1;
+  btime.minutes = btime.hours = 0;

   return btime;
 }
 
 bool MMBoardVideoFile::IsStopped()
 {
   return btime;
 }
 
 bool MMBoardVideoFile::IsStopped()
 {

-  return FALSE;
+  return m_video_driver->IsStopped();

 }
 
 bool MMBoardVideoFile::IsPaused()
 {
 }
 
 bool MMBoardVideoFile::IsPaused()
 {

-  return FALSE;
+  return m_video_driver->IsPaused();

 }
 
 wxString MMBoardVideoFile::GetStringType()
 }
 
 wxString MMBoardVideoFile::GetStringType()

diff --git a/utils/wxMMedia2/board/mmboard.cpp b/utils/wxMMedia2/board/mmboard.cpp
index fae860cf5500183986f90d7196e6ad0035d6aae1..f31444953452c6e8278296cc4f173223319d907e 100644 (file)
--- a/utils/wxMMedia2/board/mmboard.cpp
+++ b/utils/wxMMedia2/board/mmboard.cpp
@@ -357,7 +357,7 @@ void MMBoardFrame::OpenVideoWindow()
 
   m_video_window = new wxWindow(m_panel, -1, wxDefaultPosition, wxSize(400, 400));
   m_video_window->SetBackgroundColour(*wxBLACK);
 
   m_video_window = new wxWindow(m_panel, -1, wxDefaultPosition, wxSize(400, 400));
   m_video_window->SetBackgroundColour(*wxBLACK);

-  m_sizer->Prepend(m_video_window, 0, wxCENTRE, 0);
+  m_sizer->Prepend(m_video_window, 0, wxGROW | wxSHRINK | wxCENTRE, 0);

 
   m_sizer->Fit(this);
 }
 
   m_sizer->Fit(this);
 }

diff --git a/utils/wxMMedia2/board/mmboard.def b/utils/wxMMedia2/board/mmboard.def
new file mode 100644 (file)
index 0000000..59f0db7
--- /dev/null
+++ b/utils/wxMMedia2/board/mmboard.def
@@ -0,0 +1,7 @@
+NAME         Minimal
+DESCRIPTION  'Minimal wxWindows application'
+EXETYPE      WINDOWS
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     4048
+STACKSIZE    16000

diff --git a/utils/wxMMedia2/board/mmboard.rc b/utils/wxMMedia2/board/mmboard.rc
new file mode 100644 (file)
index 0000000..3bf71d6
--- /dev/null
+++ b/utils/wxMMedia2/board/mmboard.rc
@@ -0,0 +1,6 @@
+mondrian ICON "mondrian.ico"
+#include "wx/msw/wx.rc"
+
+#define MINIMAL_QUIT   1
+#define MINIMAL_ABOUT  102
+

diff --git a/utils/wxMMedia2/board/mondrian.ico b/utils/wxMMedia2/board/mondrian.ico
deleted file mode 100644 (file)
index 2310c5d..0000000
Binary files a/utils/wxMMedia2/board/mondrian.ico and /dev/null differ

diff --git a/utils/wxMMedia2/board/mondros2.ico b/utils/wxMMedia2/board/mondros2.ico
new file mode 100644 (file)
index 0000000..8b0e58c
Binary files /dev/null and b/utils/wxMMedia2/board/mondros2.ico differ