cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxKeyEvent::GetPosition() after the changes of r72207.

Browse Source 
Now that the position of wxKeyEvent is initialized on demand, don't use m_x
and m_y fields directly but always use GetX() and GetY().

Also improve GetPosition() documentation slightly and mention only the new
version, taking wxCoord, in it as the old one, taking long, is provided for
compatiblity only.

Closes #14987.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-01-20 12:45:52 +00:00
parent feabb2ebeb
commit e0e6f3dc80
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/event.h
View File

@ -1862,18 +1862,23 @@ public:
// Find the position of the event
void GetPosition(wxCoord *xpos, wxCoord *ypos) const
{
if (xpos) *xpos = m_x;
if (ypos) *ypos = m_y;
if (xpos)
*xpos = GetX();
if (ypos)
*ypos = GetY();
}
// This version if provided only for backwards compatiblity, don't use.
void GetPosition(long *xpos, long *ypos) const
{
if (xpos) *xpos = (long)m_x;
if (ypos) *ypos = (long)m_y;
if (xpos)
*xpos = GetX();
if (ypos)
*ypos = GetY();
}
wxPoint GetPosition() const
{ return wxPoint(m_x, m_y); }
{ return wxPoint(GetX(), GetY()); }
// Get X position
wxCoord GetX() const;
@ -1911,6 +1916,8 @@ public:
}
public:
// Do not use these fields directly, they are initialized on demand, so
// call GetX() and GetY() or GetPosition() instead.
wxCoord m_x, m_y;
long m_keyCode;

10
interface/wx/event.h
View File

@ -1543,11 +1543,15 @@ public:
/**
Obtains the position (in client coordinates) at which the key was pressed.
Notice that this position is simply the current mouse pointer position
and has no special relationship to the key event itself.
Notice that under most platforms this position is simply the current
mouse pointer position and has no special relationship to the key event
itself.
@a x and @a y may be @NULL if the corresponding coordinate is not
needed.
*/
wxPoint GetPosition() const;
void GetPosition(long* x, long* y) const;
void GetPosition(wxCoord* x, wxCoord* y) const;
//@}
/**