Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/gtk1/popupwin.h b/include/wx/gtk1/popupwin.h
index d01ecdff0123e151006119806d884e53e9becce0..fad5e8239f0f377cfc1d003e67ffa4a2d2240989 100644 (file)
--- a/include/wx/gtk1/popupwin.h
+++ b/include/wx/gtk1/popupwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        popupwin.h
+// Name:        wx/gtk1/popupwin.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:
 // Purpose:
 // Author:      Robert Roebling
 // Created:


@@ -11,10 +11,6 @@
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 

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

 #include "wx/defs.h"
 #include "wx/panel.h"
 #include "wx/icon.h"
 #include "wx/defs.h"
 #include "wx/panel.h"
 #include "wx/icon.h"


@@ -23,13 +19,11 @@
 // wxPopUpWindow
 //-----------------------------------------------------------------------------
 
 // wxPopUpWindow
 //-----------------------------------------------------------------------------
 

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

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

-#ifdef __DARWIN__
-    virtual ~wxPopupWindow() { }
-#endif
+    virtual ~wxPopupWindow();

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