Initial ShowWithoutActivating implementations for Mac and Windows, and attempt to improve IsActive behavior on Mac. Also adding ShowWithoutActivating() and Show/Hide tests, but until the mainloop issues are resolved, not adding them to tests.bkl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1040,12 +1040,15 @@ public :
|
||||
virtual bool IsFullScreen() const;
|
||||
|
||||
virtual bool ShowFullScreen(bool show, long style);
|
||||
|
||||
virtual void ShowWithoutActivating();
|
||||
|
||||
virtual void RequestUserAttention(int flags);
|
||||
|
||||
virtual void ScreenToWindow( int *x, int *y );
|
||||
|
||||
virtual void WindowToScreen( int *x, int *y );
|
||||
virtual bool IsActive();
|
||||
|
||||
|
||||
bool MacGetUnifiedAppearance() const ;
|
||||
|
@@ -233,6 +233,8 @@ public :
|
||||
virtual bool IsFullScreen() const;
|
||||
|
||||
virtual bool ShowFullScreen(bool show, long style);
|
||||
|
||||
virtual void ShowWithoutActivating();
|
||||
|
||||
virtual void RequestUserAttention(int flags);
|
||||
|
||||
@@ -240,6 +242,8 @@ public :
|
||||
|
||||
virtual void WindowToScreen( int *x, int *y );
|
||||
|
||||
virtual bool IsActive();
|
||||
|
||||
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
|
||||
protected :
|
||||
WX_wxNSWindow m_macWindow;
|
||||
|
@@ -717,6 +717,8 @@ public :
|
||||
|
||||
virtual bool IsFullScreen() const= 0;
|
||||
|
||||
virtual void ShowWithoutActivating() { Show(true); }
|
||||
|
||||
virtual bool ShowFullScreen(bool show, long style)= 0;
|
||||
|
||||
virtual void RequestUserAttention(int flags) = 0;
|
||||
@@ -725,6 +727,8 @@ public :
|
||||
|
||||
virtual void WindowToScreen( int *x, int *y ) = 0;
|
||||
|
||||
virtual bool IsActive() = 0;
|
||||
|
||||
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
|
||||
|
||||
// static creation methods, must be implemented by all toolkits
|
||||
|
@@ -169,6 +169,9 @@ public :
|
||||
|
||||
virtual void WindowToScreen( int *x, int *y );
|
||||
|
||||
// FIXME: Does iPhone have a concept of inactive windows?
|
||||
virtual bool IsActive() { return true; }
|
||||
|
||||
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
|
||||
protected :
|
||||
WX_UIWindow m_macWindow;
|
||||
|
@@ -62,7 +62,10 @@ public:
|
||||
virtual void Iconize(bool iconize = true);
|
||||
virtual bool IsIconized() const;
|
||||
virtual void Restore();
|
||||
|
||||
virtual bool IsActive();
|
||||
|
||||
virtual void ShowWithoutActivating();
|
||||
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ;
|
||||
virtual bool IsFullScreen() const ;
|
||||
|
||||
|
Reference in New Issue
Block a user