Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h
index 60852edfd8773c9f5f5d55f83f393f088eda9d4e..28a423dd41bc57e429264d56a661d7ce19a9c020 100644 (file)
--- a/include/wx/x11/popupwin.h
+++ b/include/wx/x11/popupwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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"


@@ -31,7 +27,7 @@ public:
 
     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 );


@@ -41,7 +37,7 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     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)