X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc797d8e1b4ef10be4f5c9cd73151406f459706d..d9359369af901bf2146b5ad6575f7aae13389a15:/include/wx/msw/window.h diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index cfab751f41..dd35d7fd88 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -59,7 +59,19 @@ public: virtual void Raise(); virtual void Lower(); - virtual bool Show( bool show = true ); + virtual bool Show(bool show = true); + virtual bool ShowWithEffect(wxShowEffect effect, + unsigned timeout = 0, + wxDirection dir = wxBOTTOM) + { + return MSWShowWithEffect(true, effect, timeout, dir); + } + virtual bool HideWithEffect(wxShowEffect effect, + unsigned timeout = 0, + wxDirection dir = wxBOTTOM) + { + return MSWShowWithEffect(false, effect, timeout, dir); + } virtual void SetFocus(); virtual void SetFocusFromKbd(); @@ -419,6 +431,11 @@ public: return true; } + // common part of Show/HideWithEffect() + bool MSWShowWithEffect(bool show, + wxShowEffect effect, + unsigned timeout, + wxDirection dir); // Responds to colour changes: passes event on to children. void OnSysColourChanged(wxSysColourChangedEvent& event); @@ -538,8 +555,7 @@ private: bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - // number of calls to Freeze() minus number of calls to Thaw() - unsigned int m_frozenness; + // current defer window position operation handle (may be NULL) WXHANDLE m_hDWP; @@ -551,6 +567,10 @@ protected: wxPoint m_pendingPosition; wxSize m_pendingSize; + // number of calls to Freeze() minus number of calls to Thaw() + // protected so that wxTopLevelWindowMSW can access it + unsigned int m_frozenness; + private: #ifdef __POCKETPC__ bool m_contextMenuEnabled;