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 2310c5d275..0000000000 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 index 0000000000..8b0e58c0d7 Binary files /dev/null and b/utils/wxMMedia2/board/mondros2.ico differ