prevent the parent window from losing activation when a popup is shown

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

include/wx/msw/popupwin.h

@@ -30,11 +30,26 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
+    // implementation only from now on
+    // -------------------------------
+
+    // override Show() to prevent wxPopupWindow from being activated
+    virtual bool Show(bool show = TRUE);
+
+    // find a shown popup window with the given window as parent, return NULL
+    // if none
+    static wxPopupWindow *FindPopupFor(wxWindow *win);
+
 protected:
+    // popups handle the position like wxTopLevelWindow, not wxWindow
     virtual void DoGetPosition(int *x, int *y) const;
 
+    // return the style to be used for the popup windows
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 
+    // the list of all currently shown popup windows used by FindPopupFor()
+    static wxWindowList ms_shownPopups;
+
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 

include/wx/msw/toplevel.h

@@ -89,10 +89,17 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
+    // prevent the window from being deactivated sometimes (see comments in the
+    // code)
+    long HandleNcActivate(bool activate);
+
     // translate wxWindows flags to Windows ones
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 
-    // is the frame currently iconized?
+    // we handle WM_NCACTIVATE specially here
+    virtual long MSWWindowProc(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
+
+    // is the window currently iconized?
     bool m_iconized;
 
     // should the frame be maximized when it will be shown? set by Maximize()

include/wx/popupwin.h

@@ -86,8 +86,10 @@ public:
 
     // hide the window
     virtual void Dismiss();
-    
 
+    // can the window be dismissed now?
+    //
+    // VZ: where is this used??
     virtual bool CanDismiss()
         { return TRUE; }