applied patch #931719: "ESC closes dialog instead of combobox dropdown" (closes patch...

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

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 3ec588a47680b7044c8991adb7e3d98de8e8b1d7..3a1f9f1732dd17adec7d35260b4fb7bed6995dbb 100644 (file)
--- 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_
 
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "popup.h"
 #endif
 
     #pragma interface "popup.h"
 #endif
 


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

+    virtual bool Show(bool show = TRUE);
+

 protected:
 protected:

+    // popups handle the position like wxTopLevelWindow, not wxWindow

     virtual void DoGetPosition(int *x, int *y) const;
 
     virtual void DoGetPosition(int *x, int *y) const;
 

+    // 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;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)

 };
 
 #endif // _WX_MSW_POPUPWIN_H_
 };
 
 #endif // _WX_MSW_POPUPWIN_H_