Applied patch [ 778625 ] wxSVGFileDC and UNICODE build

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

diff --git a/include/wx/os2/popupwin.h b/include/wx/os2/popupwin.h
index 9dbaac6564577ebb1e5013327b42ca31ed60ab06..72ddbab4d789b4b542c612a594c886f5f31efedd 100644 (file)
--- a/include/wx/os2/popupwin.h
+++ b/include/wx/os2/popupwin.h
@@ -21,12 +21,20 @@ class WXDLLEXPORT 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
                );

+    //
+    // Implementation only from now on
+    // -------------------------------
+    //

 protected:
 protected:

+

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


@@ -34,6 +42,16 @@ 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()
+    //
+    static wxWindowList             m_svShownPopups;
+

     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 }; // end of CLASS wxPopupWindow
 
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 }; // end of CLASS wxPopupWindow