improved dialup manager, added wxALL_FILES define

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 66b6a3bf43248bc1219fba4705388a29393c9f7d..1e9f2df6298495ecc701689c5871947e0e1d151b 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -23,9 +23,7 @@
     #include "wx/gdicmn.h"
 #endif
 
-#if wxUSE_THREADS
-    #include "wx/thread.h"
-#endif
+#include "wx/thread.h"
 
 // ----------------------------------------------------------------------------
 // forward declarations
@@ -607,8 +605,15 @@ public:
     bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); }
 
     // Find the position of the event
-    void GetPosition(long *xpos, long *ypos) const { *xpos = m_x; *ypos = m_y; }
-    void Position(long *xpos, long *ypos) const { *xpos = m_x; *ypos = m_y; }
+    void GetPosition(long *xpos, long *ypos) const 
+      { if (xpos) *xpos = m_x; 
+        if (ypos) *ypos = m_y; }
+    void GetPosition(int *xpos, int *ypos) const
+      { if (xpos) *xpos = m_x; 
+        if (ypos) *ypos = m_y; }
+    void Position(long *xpos, long *ypos) const 
+      { if (xpos) *xpos = m_x; 
+        if (ypos) *ypos = m_y; }
 
     // Find the position of the event
     wxPoint GetPosition() const { return wxPoint(m_x, m_y); }
@@ -670,7 +675,11 @@ public:
 
     // Find the position of the event
     void GetPosition(long *xpos, long *ypos) const
-        { *xpos = m_x; *ypos = m_y; }
+      { if (xpos) *xpos = m_x; 
+        if (ypos) *ypos = m_y; }
+    void GetPosition(int *xpos, int *ypos) const
+      { if (xpos) *xpos = m_x; 
+        if (ypos) *ypos = m_y; }
 
     wxPoint GetPosition() const
         { return wxPoint(m_x, m_y); }