removed wxUSE_MENU_CALLBACK references: the code inside the #if couldn't compile...

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

diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h
index 5d38c0c01a0c5b1acc0cf776b420a0c9fb089d93..60852edfd8773c9f5f5d55f83f393f088eda9d4e 100644 (file)
--- a/include/wx/x11/popupwin.h
+++ b/include/wx/x11/popupwin.h
@@ -11,7 +11,7 @@
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "popupwin.h"
 #endif
 
@@ -23,27 +23,25 @@
 // wxPopUpWindow
 //-----------------------------------------------------------------------------
 
-class wxPopupWindow: public wxPopupWindowBase
+class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
-    virtual ~wxPopupWindow() { }
+    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
-    // --------------
-
 protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
-
+                           
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)