X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e25f59e48c3ee93fcb54aa7fca1fd51628c2fac..401e3b6e5f50f15571b86297b5d1e3f55c473f6f:/include/wx/msw/popupwin.h diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h index 9147f5bac1..3a1f9f1732 100644 --- 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,16 +30,8 @@ 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); - protected: // popups handle the position like wxTopLevelWindow, not wxWindow virtual void DoGetPosition(int *x, int *y) const; @@ -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_