1. more accurate conversion from 8-bit wx color to 16-bit GDK color

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

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index e40673b4e6465681a560660ce1cf37119f0fe93f..b32e4684b5c37f7c09576180de2da1e716e531de 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -11,10 +11,6 @@
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "popupwin.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/panel.h"
 #include "wx/icon.h"
@@ -23,7 +19,7 @@
 // wxPopUpWindow
 //-----------------------------------------------------------------------------
 
-class wxPopupWindow: public wxPopupWindowBase
+class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
@@ -38,9 +34,10 @@ 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:
@@ -50,6 +47,8 @@ protected:
                            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)