From e1c324c3752b01c1c565a8600e9c0ff0c3760982 Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <lavaux@easynet.fr>
Date: Fri, 18 Feb 2000 18:36:00 +0000
Subject: [PATCH] * 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
---
 utils/wxMMedia2/board/mmbman.cpp   |   7 ++++---
 utils/wxMMedia2/board/mmboard.cpp  |   2 +-
 utils/wxMMedia2/board/mmboard.def  |   7 +++++++
 utils/wxMMedia2/board/mmboard.rc   |   6 ++++++
 utils/wxMMedia2/board/mondrian.ico | Bin 766 -> 0 bytes
 utils/wxMMedia2/board/mondros2.ico | Bin 0 -> 996 bytes
 6 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 utils/wxMMedia2/board/mmboard.def
 create mode 100644 utils/wxMMedia2/board/mmboard.rc
 delete mode 100644 utils/wxMMedia2/board/mondrian.ico
 create mode 100644 utils/wxMMedia2/board/mondros2.ico

diff --git a/utils/wxMMedia2/board/mmbman.cpp b/utils/wxMMedia2/board/mmbman.cpp
index 36c18d53af..9b8723a6d9 100644
--- a/utils/wxMMedia2/board/mmbman.cpp
+++ b/utils/wxMMedia2/board/mmbman.cpp
@@ -381,18 +381,19 @@ MMBoardTime MMBoardVideoFile::GetLength()
 {
   MMBoardTime btime;
 
-  btime.seconds = btime.minutes = btime.hours = 1;
+  btime.seconds = 1;
+  btime.minutes = btime.hours = 0;
   return btime;
 }
 
 bool MMBoardVideoFile::IsStopped()
 {
-  return FALSE;
+  return m_video_driver->IsStopped();
 }
 
 bool MMBoardVideoFile::IsPaused()
 {
-  return FALSE;
+  return m_video_driver->IsPaused();
 }
 
 wxString MMBoardVideoFile::GetStringType()
diff --git a/utils/wxMMedia2/board/mmboard.cpp b/utils/wxMMedia2/board/mmboard.cpp
index fae860cf55..f314449534 100644
--- 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_sizer->Prepend(m_video_window, 0, wxCENTRE, 0);
+  m_sizer->Prepend(m_video_window, 0, wxGROW | wxSHRINK | wxCENTRE, 0);
 
   m_sizer->Fit(this);
 }
diff --git a/utils/wxMMedia2/board/mmboard.def b/utils/wxMMedia2/board/mmboard.def
new file mode 100644
index 0000000000..59f0db711d
--- /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
index 0000000000..3bf71d6da0
--- /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
index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 766
zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Z<M**w4TKL=5})Lnt5#WHKB$
zaDbtqp#doIAB-6O{|B*v7zjZ^AOa2W|NsACHyAJ}De?dRKnp(HN~rljcR;{k;{zQE
i@;}UZ|9Q?Fpp*~yJCwmWbLIrN`9Qm9%}2L?p!oo$cZ4ed

diff --git a/utils/wxMMedia2/board/mondros2.ico b/utils/wxMMedia2/board/mondros2.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8b0e58c0d7ba2fc9e51c6fa8bd97f4e77a23c9ad
GIT binary patch
literal 996
zcmZ?v^kZOP5CFm_K-vL_6`(XD10#@y379a2P(=R!|IgrzFcoNs15jQ8iWwPLfGpBM
z14s*yXn-;rpqvJvz?m~=82*FgfdtTUFylXz19HtMKn(%@|NlR{0|TyAtN8zapf(@H
sHmLc)cz}SR#s_)^6h1KL|L2@JfmA+9cmO#(XU-gen+G(T+I)2T0H9%&e*gdg

literal 0
HcmV?d00001

-- 
2.47.2