X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/973983be622fcfa9e4387d9eb96f5adf03f2fc7b..6041f69ca7bbb7c39e4ba64e407bc3ac39e3687f:/include/wx/msw/popupwin.h diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h index 297c0e7991..0a1f487b50 100644 --- a/include/wx/msw/popupwin.h +++ b/include/wx/msw/popupwin.h @@ -16,7 +16,7 @@ // wxPopupWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase +class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase { public: wxPopupWindow() { } @@ -24,24 +24,21 @@ public: wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) { (void)Create(parent, flags); } - 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 *parent, int flags = wxBORDER_NONE); + + virtual bool Show(bool show = true); + + // return the style to be used for the popup windows + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const; + + // get the HWND to be used as parent of this window with CreateWindow() + virtual WXHWND MSWGetParent() const; protected: - virtual void DoGetPosition(int *x, int *y) const - { - // the position of a "top level" window such as this should be in - // screen coordinates, not in the client ones which MSW gives us - // (because we are a child window) - wxPopupWindowBase::DoGetPosition(x, y); - - GetParent()->ClientToScreen(x, y); - } + // popups handle the position like wxTopLevelWindow, not wxWindow + virtual void DoGetPosition(int *x, int *y) const; + + DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow) }; #endif // _WX_MSW_POPUPWIN_H_