X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a0e4ead1ecaba0eda898b0d80a7002654ec4baa..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/toplevel.h?ds=inline diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index 93e0bc9fe2..9f0c365d40 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -224,7 +224,9 @@ public: virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); // Is this the active frame (highlighted in the taskbar)? - virtual bool IsActive() { return wxGetTopLevelParent(FindFocus()) == this; } + // + // A TLW is active only if it contains the currently focused window. + virtual bool IsActive() { return IsDescendant(FindFocus()); } // this function may be overridden to return false to allow closing the // application even when this top level window is still open @@ -355,10 +357,7 @@ protected: // include the real class declaration -#if defined(__WXPALMOS__) - #include "wx/palmos/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowPalm -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowMSW #elif defined(__WXGTK20__) @@ -370,9 +369,6 @@ protected: #elif defined(__WXX11__) #include "wx/x11/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowX11 -#elif defined(__WXMGL__) - #include "wx/mgl/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowMGL #elif defined(__WXDFB__) #include "wx/dfb/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowDFB