Merge branch 'mediaplayer_sample'

Add wxMC_NO_AUTORESIZE and use it in mediaplayer sample to fix it
layout.

See https://github.com/wxWidgets/wxWidgets/pull/2562
This commit is contained in:
Vadim Zeitlin
2021-11-20 21:41:58 +01:00
4 changed files with 28 additions and 6 deletions

View File

@@ -5,6 +5,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#define wxMC_NO_AUTORESIZE 0x0001
/**
Describes the current state of the media.
@@ -225,6 +227,18 @@ public:
wxActiveXContainer documentation.
@beginStyleTable
@style{wxMC_NO_AUTORESIZE}
By default, the control will automatically adjust its size to
exactly fit the size of a loaded video as soon as a video is loaded.
If this flag is given, the control will not change its size
automatically and it must be done manually (if desired) using Layout().
It is strongly recommended to use this flag and handle control
resizing manually (note that this style is only available in
wxWidgets 3.1.6, so it is only possible to do it when using this or
later version).
@endStyleTable
@library{wxmedia}
@category{media}
@@ -255,7 +269,8 @@ public:
@param size
Size to put the control at and to stretch movie to.
@param style
Optional styles.
Optional styles. It is recommended to use ::wxMC_NO_AUTORESIZE,
although it is not used by default for compatibility reasons.
@param szBackend
Name of backend you want to use, leave blank to make wxMediaCtrl figure it out.
@param validator
@@ -289,7 +304,8 @@ public:
@param size
Size to put the control at and to stretch movie to.
@param style
Optional styles.
Optional styles. It is recommended to use ::wxMC_NO_AUTORESIZE,
although it is not used by default for compatibility reasons.
@param szBackend
Name of backend you want to use, leave blank to make wxMediaCtrl figure it out.
@param validator