fix aui crash related to SF bug 1531361

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

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index aa4f6579827afcf2039b659bb64d7c9c13d1ba62..18b7a743ccc09e135d28410ed94fd2c27249ce24 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -8,12 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKPOPUPWINH__
-#define __GTKPOPUPWINH__
-
-#include "wx/defs.h"
-#include "wx/panel.h"
-#include "wx/icon.h"
+#ifndef _WX_GTK_POPUPWIN_H_
+#define _WX_GTK_POPUPWIN_H_
 
 //-----------------------------------------------------------------------------
 // wxPopUpWindow
@@ -34,21 +30,24 @@ public:
     // 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 );
+    void GtkOnSize();
 
     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:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 
-#endif // __GTKPOPUPWINDOWH__
+#endif // _WX_GTK_POPUPWIN_H_