removed duplicate entries for UTF-16/32 (which are aliases for either LE or BE varian...

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 2915205ed8fb3b6b4c2886e6a86922598dab5506..dabd5c80638b6548579b1eec4d24bfc562cd2e54 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -12,10 +12,6 @@
 #ifndef _WX_POPUPWIN_H_BASE_
 #define _WX_POPUPWIN_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "popupwinbase.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_POPUPWIN
@@ -56,17 +52,19 @@ public:
 
 
 // include the real class declaration
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
     #include "wx/msw/popupwin.h"
-#elif __WXPM__
+#elif defined(__WXPM__)
     #include "wx/os2/popupwin.h"
-#elif __WXGTK__
+#elif defined(__WXGTK20__)
     #include "wx/gtk/popupwin.h"
-#elif __WXX11__
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/popupwin.h"
+#elif defined(__WXX11__)
     #include "wx/x11/popupwin.h"
-#elif __WXMOTIF__
+#elif defined(__WXMOTIF__)
     #include "wx/motif/popupwin.h"
-#elif __WXMGL__
+#elif defined(__WXMGL__)
     #include "wx/mgl/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
@@ -127,12 +125,11 @@ protected:
     // get alerted when child gets deleted from under us
     void OnDestroy(wxWindowDestroyEvent& event);
 
-    void OnEnter(wxMouseEvent& event);
-    void OnLeave(wxMouseEvent& event);
-    void OnLeftDown(wxMouseEvent& event);
-    void OnChildEnter(wxMouseEvent& event);
-    void OnChildLeave(wxMouseEvent& event);
-    
+#ifdef __WXMSW__
+    // check if the mouse needs captured or released
+    void OnIdle(wxIdleEvent& event);
+#endif
+
     // the child of this popup if any
     wxWindow *m_child;
 
@@ -191,4 +188,3 @@ protected:
 #endif // wxUSE_POPUPWIN
 
 #endif // _WX_POPUPWIN_H_BASE_
-