compilation fix for Borland C++

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

diff --git a/include/wx/gtk1/popupwin.h b/include/wx/gtk1/popupwin.h
index 4d161eafdebf5312e4c0d6aaac3d97c4fe29c744..fad5e8239f0f377cfc1d003e67ffa4a2d2240989 100644 (file)
--- a/include/wx/gtk1/popupwin.h
+++ b/include/wx/gtk1/popupwin.h
@@ -1,20 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Created:
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Created:
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Copyright:   (c) 2001 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 

-#ifdef __GNUG__
-#pragma interface
-#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,21 +19,23 @@
 // wxPopUpWindow
 //-----------------------------------------------------------------------------
 
 // wxPopUpWindow
 //-----------------------------------------------------------------------------
 

-class wxPopupWindow: public wxPopupWindowBase
+class WXDLLIMPEXP_CORE 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();