add a critical section protecting ms_prev variables (replaces patch 1819224)

[wxWidgets.git] / include / wx / msw / popupwin.h

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 9147f5bac1c64c836b36a062fae15e3154d5a169..69f5ef964106a15a23db7b19e99be9b3ee932008 100644 (file)
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 
-#ifdef __GNUG__
-    #pragma interface "popup.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxPopupWindow
 // ----------------------------------------------------------------------------
@@ -30,27 +26,19 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
-    // implementation only from now on
-    // -------------------------------
+    virtual bool Show(bool show = true);
 
-    // override Show() to prevent wxPopupWindow from being activated
-    virtual bool Show(bool show = TRUE);
+    // return the style to be used for the popup windows
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 
-    // find a shown popup window with the given window as parent, return NULL
-    // if none
-    static wxPopupWindow *FindPopupFor(wxWindow *win);
+    // get the HWND to be used as parent of this window with CreateWindow()
+    virtual WXHWND MSWGetParent() const;
 
 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)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };
 
 #endif // _WX_MSW_POPUPWIN_H_