Watcom C++ fixup in tbar95.cpp; removed WXWIN_COMPATIBILITY for 'old' menu

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

diff --git a/include/wx/event.h b/include/wx/event.h
index e8d25fd42523c829458661bed5c75078c327d848..0d90ca6b44cdf868aed8b67a569bccd574b706b4 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -605,8 +605,23 @@ public:
     bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); }
 
     // Find the position of the event
     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(wxCoord *xpos, wxCoord *ypos) const 
+    {
+        if (xpos)
+            *xpos = m_x; 
+        if (ypos)
+            *ypos = m_y;
+    }
+
+#ifndef __WIN16__
+    void GetPosition(long *xpos, long *ypos) const
+    {
+        if (xpos)
+            *xpos = (long)m_x; 
+        if (ypos)
+            *ypos = (long)m_y;
+    }
+#endif

 
     // Find the position of the event
     wxPoint GetPosition() const { return wxPoint(m_x, m_y); }
 
     // Find the position of the event
     wxPoint GetPosition() const { return wxPoint(m_x, m_y); }


@@ -616,6 +631,14 @@ public:
 
     // Compatibility
 #if WXWIN_COMPATIBILITY
 
     // Compatibility
 #if WXWIN_COMPATIBILITY

+    void Position(long *xpos, long *ypos) const 
+    {
+        if (xpos)
+            *xpos = (long)m_x; 
+        if (ypos)
+            *ypos = (long)m_y;
+    }
+

     void Position(float *xpos, float *ypos) const
     {
         *xpos = (float) m_x; *ypos = (float) m_y;
     void Position(float *xpos, float *ypos) const
     {
         *xpos = (float) m_x; *ypos = (float) m_y;


@@ -631,8 +654,8 @@ public:
     void CopyObject(wxObject& obj) const;
 
 public:
     void CopyObject(wxObject& obj) const;
 
 public:

-    long          m_x;
-    long          m_y;
+    wxCoord m_x, m_y;
+

     bool          m_leftDown;
     bool          m_middleDown;
     bool          m_rightDown;
     bool          m_leftDown;
     bool          m_middleDown;
     bool          m_rightDown;


@@ -667,24 +690,36 @@ public:
     long KeyCode() const { return m_keyCode; }
 
     // Find the position of the event
     long KeyCode() const { return m_keyCode; }
 
     // Find the position of the event

+    void GetPosition(wxCoord *xpos, wxCoord *ypos) const
+    {
+        if (xpos) *xpos = m_x; 
+        if (ypos) *ypos = m_y;
+    }
+
+#ifndef __WIN16__

     void GetPosition(long *xpos, long *ypos) const
     void GetPosition(long *xpos, long *ypos) const

-        { *xpos = m_x; *ypos = m_y; }
+    {
+        if (xpos) *xpos = (long)m_x; 
+        if (ypos) *ypos = (long)m_y;
+    }
+#endif

 
     wxPoint GetPosition() const
         { return wxPoint(m_x, m_y); }
 
     // Get X position
 
     wxPoint GetPosition() const
         { return wxPoint(m_x, m_y); }
 
     // Get X position

-    long GetX() const { return m_x; }
+    wxCoord GetX() const { return m_x; }

 
     // Get Y position
 
     // Get Y position

-    long GetY() const { return m_y; }
+    wxCoord GetY() const { return m_y; }

 
     void CopyObject(wxObject& obj) const;
 
 public:
 
     void CopyObject(wxObject& obj) const;
 
 public:

-    long          m_x;
-    long          m_y;
+    wxCoord       m_x, m_y;
+

     long          m_keyCode;
     long          m_keyCode;

+

     bool          m_controlDown;
     bool          m_shiftDown;
     bool          m_altDown;
     bool          m_controlDown;
     bool          m_shiftDown;
     bool          m_altDown;