added fix for MSL under Win32 (by Steve Hartwell)

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

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index 63c17d793d944ea35a62de1b0a0ba34e12692323..e40673b4e6465681a560660ce1cf37119f0fe93f 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -11,7 +11,7 @@
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "popupwin.h"
 #endif
 
@@ -27,20 +27,19 @@ class wxPopupWindow: public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
-#ifdef __DARWIN__
-    virtual ~wxPopupWindow() { }
-#endif
-    
-    wxPopupWindow(wxWindow *parent) { (void)Create(parent); }
+    virtual ~wxPopupWindow();
+
+    wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
+        { (void)Create(parent, flags); }
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
     virtual bool Show( bool show = TRUE );
-    
+
     // implementation
     // --------------
 
     virtual void DoMoveWindow(int x, int y, int width, int height);
-    
+
     virtual void OnInternalIdle();