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 239ee042124292cb64e98da4f0a5f22944d7fbea..6cb6d721e97474fe5d1c0e74bf3cfa61fde4f2d8 100644 (file)
--- a/include/wx/x11/popupwin.h
+++ b/include/wx/x11/popupwin.h
@@ -1,50 +1,50 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/popupwin.h
-// Purpose:     wxPopupWindow class for wxMSW
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     06.01.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+/////////////////////////////////////////////////////////////////////////////
+// Name:        popupwin.h
+// Purpose:
+// Author:      Robert Roebling
+// Created:
+// Id:          $Id$
+// Copyright:   (c) 2001 Robert Roebling

 // Licence:     wxWindows licence
 // Licence:     wxWindows licence

-///////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////

 
 

-#ifndef _WX_MSW_POPUPWIN_H_
-#define _WX_MSW_POPUPWIN_H_
+#ifndef __GTKPOPUPWINH__
+#define __GTKPOPUPWINH__

 
 

-// ----------------------------------------------------------------------------
-// wxPopupWindow
-// ----------------------------------------------------------------------------
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "popupwin.h"
+#endif

 
 

-class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
+#include "wx/defs.h"
+#include "wx/panel.h"
+#include "wx/icon.h"
+
+//-----------------------------------------------------------------------------
+// wxPopUpWindow
+//-----------------------------------------------------------------------------
+
+class wxPopupWindow: public wxPopupWindowBase

 {
 public:
     wxPopupWindow() { }
 {
 public:
     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);

 
 

-    bool Create(wxWindow *parent, int flags = wxBORDER_NONE)
-    {
-        return wxPopupWindowBase::Create(parent) &&
-               wxWindow::Create(parent, -1,
-                                wxDefaultPosition, wxDefaultSize,
-                                (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
-    }
+    virtual bool Show( bool show = TRUE );

 
 protected:
 
 protected:

-    virtual void DoGetPosition(int *x, int *y) const
-    {
-        // the position of a "top level" window such as this should be in
-        // screen coordinates, not in the client ones which MSW gives us
-        // (because we are a child window)
-        wxPopupWindowBase::DoGetPosition(x, y);
-
-        GetParent()->ClientToScreen(x, y);
-    }
-
+    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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 

-#endif // _WX_MSW_POPUPWIN_H_
-
+#endif // __GTKPOPUPWINDOWH__