X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d8729431c8c202bd57aadccf87e0a4777baa055..8d241dea5c18414ec92776044feda4c909ec5007:/include/wx/gtk/popupwin.h

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index 63c17d793d..4ae6a307b6 100644
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.h
+// Name:        wx/gtk/popupwin.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:
@@ -8,52 +8,44 @@
 // 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
-    
-    wxPopupWindow(wxWindow *parent) { (void)Create(parent); }
+    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);
+
+    virtual void SetFocus();
+
     // 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);
 
-private:
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+
+#ifdef __WXUNIVERSAL__
     DECLARE_EVENT_TABLE()
+#endif
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 
-#endif // __GTKPOPUPWINDOWH__
+#endif // _WX_GTK_POPUPWIN_H_