added carbonaccessors.o

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

diff --git a/wxPython/src/events.i b/wxPython/src/events.i
index d1454016dccc7fd65fa8165d752a45abdf57ffd6..029e29bdd6d4c02866f4f8bcf003a7ebfff5c16c 100644 (file)
--- a/wxPython/src/events.i
+++ b/wxPython/src/events.i
@@ -33,7 +33,7 @@
 
 int wxNewEventType();
 
 
 int wxNewEventType();
 

-class wxEvent {
+class wxEvent : public wxObject {

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


@@ -160,6 +160,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;


@@ -168,6 +172,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;

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


@@ -284,7 +291,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();

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


@@ -438,6 +446,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();
+};

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