adding standard menu items for cocoa, adding translation macro to menulabels, fixes...

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

diff --git a/include/wx/os2/popupwin.h b/include/wx/os2/popupwin.h
index 08ebecbf7f99836b4fd6a7fc66cc6550e200e5d0..4990a2a1307ff156a732aad9fb356d2cd914b832 100644 (file)
--- a/include/wx/os2/popupwin.h
+++ b/include/wx/os2/popupwin.h
@@ -16,20 +16,43 @@
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
+class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
 
-    wxPopupWindow(wxWindow *parent) { (void)Create(parent); }
+    wxPopupWindow( wxWindow* pParent
+                  ,int       nFlags
+                 )
+    { (void)Create(pParent, nFlags); }
 
-    bool Create(wxWindow *parent, int flags = wxBORDER_NONE)
-    {
-        return wxPopupWindowBase::Create(parent) &&
-               wxWindow::Create(parent, -1,
-                                wxDefaultPosition, wxDefaultSize,
-                                (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
-    }
-};
+    bool Create( wxWindow* pParent
+                ,int       nFlags = wxBORDER_NONE
+               );
+    //
+    // Implementation only from now on
+    // -------------------------------
+    //
+protected:
+
+    virtual void DoGetPosition( int* pnX
+                               ,int* pny
+                              ) 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
 
 #endif // _WX_PM_POPUPWIN_H_