popup activation scope and l&f

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/nonownedwnd.cpp b/src/mac/carbon/nonownedwnd.cpp
index 2489f1022c2414782177ffc1ad11d8603f2c6b7f..c52ce3873858d0245bafab15de0a5547431f6035 100644 (file)
--- a/src/mac/carbon/nonownedwnd.cpp
+++ b/src/mac/carbon/nonownedwnd.cpp
@@ -1000,17 +1000,19 @@ void  wxNonOwnedWindow::DoMacCreateRealWindow(
     }
     else if ( HasFlag( wxPOPUP_WINDOW ) )
     {
     }
     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 ) )
         if ( HasFlag( wxBORDER_NONE ) )

+        {

             wclass = kHelpWindowClass ;   // has no border
             wclass = kHelpWindowClass ;   // has no border

+            attr |= kWindowNoShadowAttribute;
+        }

         else
         else

+        {

             wclass = kPlainWindowClass ;  // has a single line border, it will have to do for now
             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 ) )
     {
     }
     else if ( HasFlag( wxCAPTION ) )
     {