X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/758bce950ba9236d0a9edc4c880c3ec73b5173f3..700d08c1092bd08150d47b952c1e0d817a64d75f:/include/wx/gtk/popupwin.h

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index d01ecdff01..cb0f7f18dd 100644
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -8,53 +8,43 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKPOPUPWINH__
-#define __GTKPOPUPWINH__
-
-#ifdef __GNUG__
-    #pragma interface "popupwin.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/panel.h"
-#include "wx/icon.h"
+#ifndef _WX_GTK_POPUPWIN_H_
+#define _WX_GTK_POPUPWIN_H_
 
 //-----------------------------------------------------------------------------
 // wxPopUpWindow
 //-----------------------------------------------------------------------------
 
-class wxPopupWindow: public wxPopupWindowBase
+class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
-#ifdef __DARWIN__
-    virtual ~wxPopupWindow() { }
-#endif
+    virtual ~wxPopupWindow();
 
     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 );
+    virtual bool Show(bool show = true);
 
     // implementation
     // --------------
 
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
-    virtual void OnInternalIdle();
-
+    // GTK time when connecting to button_press signal
+    wxUint32  m_time;
 
 protected:
-    void GtkOnSize( int x, int y, int width, int height );
-
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+
 private:
+#ifdef __WXUNIVERSAL__
     DECLARE_EVENT_TABLE()
+#endif
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 
-#endif // __GTKPOPUPWINDOWH__
+#endif // _WX_GTK_POPUPWIN_H_