Move unused values into 2.4 compatibility. Source cleaning.

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

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 9147f5bac1c64c836b36a062fae15e3154d5a169..53d6e0e37df51b7ab9e9078250cd74dff9fc9950 100644 (file)
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "popup.h"
 #endif
 
@@ -30,15 +30,7 @@ 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);
+    virtual bool Show(bool show = true);
 
 protected:
     // popups handle the position like wxTopLevelWindow, not wxWindow
@@ -47,10 +39,10 @@ protected:
     // 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;
+    // get the HWND to be used as parent of this window with CreateWindow()
+    virtual WXHWND MSWGetParent() const;
 
-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };
 
 #endif // _WX_MSW_POPUPWIN_H_