Added
wxPoint ClientToScreen(const wxPoint& pt) wxPoint ScreenToClient(const wxPoint& pt) back into class wxWindow git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -88,6 +88,10 @@ public:
|
||||
|
||||
virtual void ClientToScreen( int *x, int *y ) const;
|
||||
virtual void ScreenToClient( int *x, int *y ) const;
|
||||
wxPoint ClientToScreen(const wxPoint& pt) const
|
||||
{ int x = pt.x; int y = pt.y; ClientToScreen(& x, & y); return wxPoint(x, y); }
|
||||
wxPoint ScreenToClient(const wxPoint& pt) const
|
||||
{ int x = pt.x; int y = pt.y; ScreenToClient(& x, & y); return wxPoint(x, y); }
|
||||
|
||||
virtual bool PopupMenu( wxMenu *menu, int x, int y );
|
||||
|
||||
|
@@ -88,6 +88,10 @@ public:
|
||||
|
||||
virtual void ClientToScreen( int *x, int *y ) const;
|
||||
virtual void ScreenToClient( int *x, int *y ) const;
|
||||
wxPoint ClientToScreen(const wxPoint& pt) const
|
||||
{ int x = pt.x; int y = pt.y; ClientToScreen(& x, & y); return wxPoint(x, y); }
|
||||
wxPoint ScreenToClient(const wxPoint& pt) const
|
||||
{ int x = pt.x; int y = pt.y; ScreenToClient(& x, & y); return wxPoint(x, y); }
|
||||
|
||||
virtual bool PopupMenu( wxMenu *menu, int x, int y );
|
||||
|
||||
|
@@ -116,6 +116,10 @@ public:
|
||||
|
||||
virtual void ClientToScreen( int *x, int *y ) const;
|
||||
virtual void ScreenToClient( int *x, int *y ) const;
|
||||
wxPoint ClientToScreen(const wxPoint& pt) const
|
||||
{ int x = pt.x; int y = pt.y; ClientToScreen(& x, & y); return wxPoint(x, y); }
|
||||
wxPoint ScreenToClient(const wxPoint& pt) const
|
||||
{ int x = pt.x; int y = pt.y; ScreenToClient(& x, & y); return wxPoint(x, y); }
|
||||
|
||||
virtual bool PopupMenu( wxMenu *menu, int x, int y );
|
||||
|
||||
|
@@ -763,8 +763,8 @@ inline wxWindow *wxWindowBase::GetGrandParent() const
|
||||
// global function
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
extern wxWindow* WXDLLEXPORT wxGetActiveWindow();
|
||||
inline int WXDLLEXPORT NewControlId() { return wxWindowBase::NewControlId(); }
|
||||
WXDLLEXPORT extern wxWindow* wxGetActiveWindow();
|
||||
inline WXDLLEXPORT int NewControlId() { return wxWindowBase::NewControlId(); }
|
||||
|
||||
#endif
|
||||
// _WX_WINDOW_H_BASE_
|
||||
|
Reference in New Issue
Block a user