X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07b2e1cd389c16c05d74adedf92fda3ca785f2bd..e422162882bf4c5ae743fd618864e97206765fca:/wxPython/src/events.i diff --git a/wxPython/src/events.i b/wxPython/src/events.i index e197bebd72..cd34979002 100644 --- a/wxPython/src/events.i +++ b/wxPython/src/events.i @@ -35,7 +35,7 @@ int wxNewEventType(); class wxEvent : public wxObject { public: - wxEvent(int id = 0); + // wxEvent(int id = 0); // *** This class is now an ABC ~wxEvent(); wxObject* GetEventObject(); @@ -193,6 +193,30 @@ public: //--------------------------------------------------------------------------- +class wxMouseCaptureChangedEvent : public wxEvent +{ +public: + wxMouseCaptureChangedEvent(wxWindowID id = 0, wxWindow* gainedCapture = NULL); + wxWindow* GetCapturedWindow() const; +}; + +//--------------------------------------------------------------------------- + +class wxSetCursorEvent : public wxEvent +{ +public: + wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0); + + wxCoord GetX() const; + wxCoord GetY() const; + + void SetCursor(const wxCursor& cursor); + const wxCursor& GetCursor() const; + bool HasCursor() const; +}; + +//--------------------------------------------------------------------------- + class wxKeyEvent: public wxEvent { public: wxKeyEvent(int keyEventType); @@ -206,18 +230,26 @@ public: long GetKeyCode(); bool HasModifiers(); + // get the raw key code (platform-dependent) + long GetRawKeyCode() const; + + // get the raw key flags (platform-dependent) + long GetRawKeyFlags() const; + long GetX(); long GetY(); wxPoint GetPosition(); %name(GetPositionTuple) void GetPosition(long* OUTPUT, long* OUTPUT); - long m_x, m_y; - long m_keyCode; - bool m_controlDown; - bool m_shiftDown; - bool m_altDown; - bool m_metaDown; - bool m_scanCode; + long m_x, m_y; + long m_keyCode; + bool m_controlDown; + bool m_shiftDown; + bool m_altDown; + bool m_metaDown; + bool m_scanCode; + long m_rawCode; + long m_rawFlags; }; @@ -269,6 +301,18 @@ public: wxFocusEvent(WXTYPE eventType = 0, int id = 0); }; +//--------------------------------------------------------------------------- + +// wxChildFocusEvent notifies the parent that a child has got the focus: unlike +// wxFocusEvent it is propgated upwards the window chain +class wxChildFocusEvent : public wxCommandEvent +{ +public: + wxChildFocusEvent(wxWindow *win = NULL); + wxWindow *GetWindow() const; +}; + + //--------------------------------------------------------------------------- class wxActivateEvent: public wxEvent{ @@ -290,6 +334,7 @@ class wxMenuEvent: public wxEvent { public: wxMenuEvent(WXTYPE id = 0, int id = 0); int GetMenuId(); + bool IsPopup(); }; //--------------------------------------------------------------------------- @@ -361,7 +406,11 @@ public: } for (int i=0; i