Remove some cruft

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

diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h
index 5d38c0c01a0c5b1acc0cf776b420a0c9fb089d93..6cb6d721e97474fe5d1c0e74bf3cfa61fde4f2d8 100644 (file)
--- a/include/wx/x11/popupwin.h
+++ b/include/wx/x11/popupwin.h
@@ -11,7 +11,7 @@
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 

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

     #pragma interface "popupwin.h"
 #endif
 
     #pragma interface "popupwin.h"
 #endif
 


@@ -27,23 +27,21 @@ class wxPopupWindow: public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
 {
 public:
     wxPopupWindow() { }

-    virtual ~wxPopupWindow() { }
+    virtual ~wxPopupWindow() ;

 
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
         { (void)Create(parent, flags); }
 
     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 );
 
     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);
 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)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)