don't leak wxImageList if wxHF_CONTENTS is not used in wxHtmlHelpWindow

[wxWidgets.git] / include / wx / mac / carbon / popupwin.h

diff --git a/include/wx/mac/carbon/popupwin.h b/include/wx/mac/carbon/popupwin.h
index b3ec56577d8d78911fb5120a8024ff6333840ec0..c1590abc73619ee25e90086413072a2d790488f2 100644 (file)
--- a/include/wx/mac/carbon/popupwin.h
+++ b/include/wx/mac/carbon/popupwin.h
@@ -20,6 +20,7 @@ class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
 {
 public:
     wxPopupWindow() { }

+    ~wxPopupWindow();

 
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
         { (void)Create(parent, flags); }
 
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
         { (void)Create(parent, flags); }


@@ -28,9 +29,16 @@ public:
 
     virtual bool Show(bool show = true);
 
 
     virtual bool Show(bool show = true);
 

+    WXWindow MacGetPopupWindowRef() const ;
+

 protected:
     // popups handle the position like wxTopLevelWindow, not wxWindow
     virtual void DoGetPosition(int *x, int *y) const;
 protected:
     // popups handle the position like wxTopLevelWindow, not wxWindow
     virtual void DoGetPosition(int *x, int *y) const;

+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual void DoGetClientSize( int *width, int *height ) const;
+    
+    WXWindow m_popupWindowRef ;

 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };