Added wxSHOW_EFFECT_NONE.
Calling Show/HideWithEffect() with this effect is the same as calling just the normal Show/Hide(). This is convenient as it allows to use the same API, whether with effects or without them. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2e61f76aac
commit
ffa50e7361
4 changed files with 13 additions and 1 deletions
|
|
@ -118,6 +118,7 @@ enum wxWindowVariant
|
|||
// valid values for Show/HideWithEffect()
|
||||
enum wxShowEffect
|
||||
{
|
||||
wxSHOW_EFFECT_NONE,
|
||||
wxSHOW_EFFECT_ROLL_TO_LEFT,
|
||||
wxSHOW_EFFECT_ROLL_TO_RIGHT,
|
||||
wxSHOW_EFFECT_ROLL_TO_TOP,
|
||||
|
|
|
|||
|
|
@ -12,6 +12,13 @@
|
|||
*/
|
||||
enum wxShowEffect
|
||||
{
|
||||
/**
|
||||
No effect, equivalent to normal wxWindow::Show() or Hide() call.
|
||||
|
||||
@since 2.9.1
|
||||
*/
|
||||
wxSHOW_EFFECT_NONE,
|
||||
|
||||
/// Roll window to the left
|
||||
wxSHOW_EFFECT_ROLL_TO_LEFT,
|
||||
|
||||
|
|
|
|||
|
|
@ -181,6 +181,7 @@ private:
|
|||
{
|
||||
static const char *names[] =
|
||||
{
|
||||
"none",
|
||||
"roll to left",
|
||||
"roll to right",
|
||||
"roll to top",
|
||||
|
|
@ -346,7 +347,7 @@ void MainFrame::OnShowEffect(wxCommandEvent& event)
|
|||
return;
|
||||
}
|
||||
|
||||
new EffectFrame(this, eff,1000);
|
||||
new EffectFrame(this, eff, 1000);
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -724,6 +724,9 @@ wxWindowMSW::MSWShowWithEffect(bool show,
|
|||
wxShowEffect effect,
|
||||
unsigned timeout)
|
||||
{
|
||||
if ( effect == wxSHOW_EFFECT_NONE )
|
||||
return Show(show);
|
||||
|
||||
if ( !wxWindowBase::Show(show) )
|
||||
return false;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue