SWIGged files updates for wxMac

[wxWidgets.git] / wxPython / src / events.i

diff --git a/wxPython/src/events.i b/wxPython/src/events.i
index 2a9e392b701a6e8c06fe21cd3599e9fc485b84e0..e6933f8e25bd8e8a07e550378f536dc707d8335c 100644 (file)
--- a/wxPython/src/events.i
+++ b/wxPython/src/events.i
@@ -30,7 +30,10 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxEvent {
+
+int wxNewEventType();
+
+class wxEvent : public wxObject {

 public:
     wxEvent(int id = 0);
     ~wxEvent();
 public:
     wxEvent(int id = 0);
     ~wxEvent();


@@ -86,6 +89,18 @@ public:
     void SetExtraLong(long extraLong);
     void SetInt(int i);
 
     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;
+            }
+        }
+    }

 };
 
 
 };
 
 


@@ -157,6 +172,10 @@ public:
     long GetX();
     long GetY();
 
     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;
     long          m_x, m_y;
     bool          m_leftDown;
     bool          m_middleDown;


@@ -165,6 +184,9 @@ public:
     bool          m_shiftDown;
     bool          m_altDown;
     bool          m_metaDown;
     bool          m_shiftDown;
     bool          m_altDown;
     bool          m_metaDown;

+    int           m_wheelRotation;
+    int           m_wheelDelta;
+    int           m_linesPerAction;

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -281,7 +303,8 @@ public:
 
 class wxIconizeEvent: public wxEvent {
 public:
 
 class wxIconizeEvent: public wxEvent {
 public:

-    wxIconizeEvent(int id = 0);
+    wxIconizeEvent(int id = 0, bool iconized = TRUE);
+    bool Iconized();

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -435,6 +458,17 @@ public:
     int GetInterval();
 };
 
     int GetInterval();
 };
 

+//---------------------------------------------------------------------------
+
+class wxTextUrlEvent : public wxCommandEvent
+{
+public:
+    wxTextUrlEvent(int id, const wxMouseEvent& evtMouse,
+                   long start, long end);
+    const wxMouseEvent& GetMouseEvent();
+    long GetURLStart();
+    long GetURLEnd();
+};

 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------