From 59022c25c19cd7eb56b2405a58010df5d0b73eb6 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 26 Mar 2008 11:16:14 +0000 Subject: [PATCH] popup activation scope and l&f git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/nonownedwnd.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/mac/carbon/nonownedwnd.cpp b/src/mac/carbon/nonownedwnd.cpp index 2489f1022c..c52ce38738 100644 --- a/src/mac/carbon/nonownedwnd.cpp +++ b/src/mac/carbon/nonownedwnd.cpp @@ -1000,17 +1000,19 @@ void wxNonOwnedWindow::DoMacCreateRealWindow( } else if ( HasFlag( wxPOPUP_WINDOW ) ) { - // TEMPORARY HACK! - // Until we've got a real wxPopupWindow class on wxMac make it a - // little easier for wxFrame to be used to emulate it and workaround - // the lack of wxPopupWindow. if ( HasFlag( wxBORDER_NONE ) ) + { wclass = kHelpWindowClass ; // has no border + attr |= kWindowNoShadowAttribute; + } else + { wclass = kPlainWindowClass ; // has a single line border, it will have to do for now - //attr |= kWindowNoShadowAttribute; // turn off the shadow Should we?? - group = GetWindowGroupOfClass( // float above other windows - kFloatingWindowClass) ; + } + group = GetWindowGroupOfClass(kFloatingWindowClass) ; + // make sure we don't deactivate something + activationScopeSet = true; + activationScope = kWindowActivationScopeNone; } else if ( HasFlag( wxCAPTION ) ) { -- 2.45.2