Fix bug with unloading wxPluginLibrary objects in "wrong" order.

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

diff --git a/include/wx/os2/popupwin.h b/include/wx/os2/popupwin.h
index 9341ecdd5c5cb0ec75d800601125ab73ac144dfe..4990a2a1307ff156a732aad9fb356d2cd914b832 100644 (file)
--- a/include/wx/os2/popupwin.h
+++ b/include/wx/os2/popupwin.h
@@ -16,12 +16,15 @@
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
+class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase

 {
 public:
     wxPopupWindow() { }
 
 {
 public:
     wxPopupWindow() { }
 

-    wxPopupWindow(wxWindow* pParent) { (void)Create(pParent); }
+    wxPopupWindow( wxWindow* pParent
+                  ,int       nFlags
+                 )
+    { (void)Create(pParent, nFlags); }

 
     bool Create( wxWindow* pParent
                 ,int       nFlags = wxBORDER_NONE
 
     bool Create( wxWindow* pParent
                 ,int       nFlags = wxBORDER_NONE


@@ -30,19 +33,8 @@ public:
     // Implementation only from now on
     // -------------------------------
     //
     // 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* pWin);
-

 protected:
 protected:

+

     virtual void DoGetPosition( int* pnX
                                ,int* pny
                               ) const;
     virtual void DoGetPosition( int* pnX
                                ,int* pny
                               ) const;


@@ -50,6 +42,11 @@ protected:
     virtual WXDWORD OS2GetStyle( long     lFlags
                                 ,WXDWORD* dwExstyle
                                ) const;
     virtual WXDWORD OS2GetStyle( long     lFlags
                                 ,WXDWORD* dwExstyle
                                ) const;

+    //
+    // Get the HWND to be used as parent of this window with CreateWindow()
+    //
+    virtual WXHWND OS2GetParent(void) const;
+

     //
     // The list of all currently shown popup windows used by FindPopupFor()
     //
     //
     // The list of all currently shown popup windows used by FindPopupFor()
     //