don't leave two conscutive separators after "moving" a standard menu item to the...

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

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index ef0b43b49ff7f7026bd265d36517ec971e1e7e84..e40673b4e6465681a560660ce1cf37119f0fe93f 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/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,17 +27,19 @@ class wxPopupWindow: public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
 {
 public:
     wxPopupWindow() { }

+    virtual ~wxPopupWindow();

 
 

-    wxPopupWindow(wxWindow *parent) { (void)Create(parent); }
+    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
     // --------------
 
     virtual void DoMoveWindow(int x, int y, int width, int height);
     // implementation
     // --------------
 
     virtual void DoMoveWindow(int x, int y, int width, int height);

-    
+

     virtual void OnInternalIdle();
 
 
     virtual void OnInternalIdle();