X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83b18bab391d242907d18b4b040720eae6202f76..704f9c00cdcfd153e351675845da115bf2c4c89b:/wxPython/src/events.i diff --git a/wxPython/src/events.i b/wxPython/src/events.i index d1454016dc..3c825cbaf5 100644 --- a/wxPython/src/events.i +++ b/wxPython/src/events.i @@ -30,24 +30,74 @@ //--------------------------------------------------------------------------- +enum Propagation_state +{ + // don't propagate it at all + wxEVENT_PROPAGATE_NONE = 0, + + // propagate it until it is processed + wxEVENT_PROPAGATE_MAX = INT_MAX +}; + int wxNewEventType(); -class wxEvent { + + +class wxEvent : public wxObject { public: - wxEvent(int id = 0); + // wxEvent(int id = 0); // *** This class is now an ABC ~wxEvent(); wxObject* GetEventObject(); wxEventType GetEventType(); int GetId(); - bool GetSkipped(); long GetTimestamp(); void SetEventObject(wxObject* object); void SetEventType(wxEventType typ); void SetId(int id); void SetTimestamp(long timeStamp); + + bool IsCommandEvent() const; + + // Can instruct event processor that we wish to ignore this event + // (treat as if the event table entry had not been found): this must be done + // to allow the event processing by the base classes (calling event.Skip() + // is the analog of calling the base class verstion of a virtual function) void Skip(bool skip = TRUE); + bool GetSkipped() const; + + // Determine if this event should be propagating to the parent window. + bool ShouldPropagate() const; + + // Stop an event from propagating to its parent window, returns the old + // propagation level value + int StopPropagation(); + + // Resume the event propagation by restoring the propagation level + // (returned by StopPropagation()) + void ResumePropagation(int propagationLevel); + + wxEvent *Clone(); +}; + +//--------------------------------------------------------------------------- + +// Helper class to temporarily change an event not to propagate. +class wxPropagationDisabler +{ +public: + wxPropagationDisabler(wxEvent& event); + ~wxPropagationDisabler(); +}; + + +// Another one to temporarily lower propagation level. +class wxPropagateOnce +{ +public: + wxPropagateOnce(wxEvent& event); + ~wxPropagateOnce(); }; //--------------------------------------------------------------------------- @@ -56,6 +106,8 @@ class wxSizeEvent : public wxEvent { public: wxSizeEvent(const wxSize& sz, int id = 0); wxSize GetSize(); + wxRect GetRect() const; + void SetRect(wxRect rect); }; //--------------------------------------------------------------------------- @@ -89,6 +141,18 @@ public: void SetExtraLong(long extraLong); void SetInt(int i); + %addmethods { + PyObject* GetClientData() { + wxPyClientData* data = (wxPyClientData*)self->GetClientObject(); + if (data) { + Py_INCREF(data->m_obj); + return data->m_obj; + } else { + Py_INCREF(Py_None); + return Py_None; + } + } + } }; @@ -160,6 +224,10 @@ public: long GetX(); long GetY(); + int GetWheelRotation() const { return m_wheelRotation; } + int GetWheelDelta() const { return m_wheelDelta; } + int GetLinesPerAction() const { return m_linesPerAction; } + long m_x, m_y; bool m_leftDown; bool m_middleDown; @@ -168,6 +236,33 @@ public: bool m_shiftDown; bool m_altDown; bool m_metaDown; + int m_wheelRotation; + int m_wheelDelta; + int m_linesPerAction; +}; + +//--------------------------------------------------------------------------- + +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; }; //--------------------------------------------------------------------------- @@ -180,23 +275,31 @@ public: bool MetaDown(); bool AltDown(); bool ShiftDown(); - long KeyCode(); long GetKeyCode(); + %pragma(python) addtoclass = "KeyCode = 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; }; @@ -220,8 +323,9 @@ public: class wxMoveEvent: public wxEvent { public: wxMoveEvent(const wxPoint& pt, int id = 0); - wxPoint GetPosition(); + wxRect GetRect() const; + void SetRect(wxRect rect); }; //--------------------------------------------------------------------------- @@ -245,14 +349,26 @@ public: class wxFocusEvent: public wxEvent { public: - wxFocusEvent(WXTYPE eventType = 0, int id = 0); + wxFocusEvent(int 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{ public: - wxActivateEvent(WXTYPE eventType = 0, int active = TRUE, int id = 0); + wxActivateEvent(int eventType = 0, int active = TRUE, int id = 0); bool GetActive(); }; @@ -267,8 +383,10 @@ public: class wxMenuEvent: public wxEvent { public: - wxMenuEvent(WXTYPE id = 0, int id = 0); + wxMenuEvent(int id = 0, int winid = 0, wxMenu* menu = NULL); int GetMenuId(); + bool IsPopup(); + wxMenu* GetMenu() const; }; //--------------------------------------------------------------------------- @@ -284,7 +402,8 @@ public: class wxIconizeEvent: public wxEvent { public: - wxIconizeEvent(int id = 0); + wxIconizeEvent(int id = 0, bool iconized = TRUE); + bool Iconized(); }; //--------------------------------------------------------------------------- @@ -339,7 +458,11 @@ public: } for (int i=0; i