define I_IMAGENONE now that we use it, at least VC6 doesn't have it (thanks buildbot)

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

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 3ec588a47680b7044c8991adb7e3d98de8e8b1d7..0a1f487b501c7a13d75e902c0a723febde432e48 100644 (file)
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -12,15 +12,11 @@
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 

-#ifdef __GNUG__
-    #pragma interface "popup.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 

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

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


@@ -30,12 +26,19 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 

-protected:
-    virtual void DoGetPosition(int *x, int *y) const;
+    virtual bool Show(bool show = true);

 
 

+    // return the style to be used for the popup windows

     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 

-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
+    // get the HWND to be used as parent of this window with CreateWindow()
+    virtual WXHWND MSWGetParent() const;
+
+protected:
+    // 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_
 };
 
 #endif // _WX_MSW_POPUPWIN_H_