Fixed compilation error

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

diff --git a/wxPython/src/events.i b/wxPython/src/events.i
index 6ca6f66c18db79187b85f5c2d91184060687cdc2..029e29bdd6d4c02866f4f8bcf003a7ebfff5c16c 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();


@@ -75,7 +78,8 @@ class wxCommandEvent : public wxEvent {
 public:
     wxCommandEvent(int commandEventType = 0, int id = 0);
 
 public:
     wxCommandEvent(int commandEventType = 0, int id = 0);
 

-    bool Checked();
+    bool IsChecked();
+    %name(Checked)bool IsChecked();

     long GetExtraLong();
     int GetInt();
     int GetSelection();
     long GetExtraLong();
     int GetInt();
     int GetSelection();


@@ -155,6 +159,22 @@ public:
     wxPoint GetLogicalPosition(const wxDC& dc);
     long GetX();
     long GetY();
     wxPoint GetLogicalPosition(const wxDC& dc);
     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;
+    bool          m_rightDown;
+    bool          m_controlDown;
+    bool          m_shiftDown;
+    bool          m_altDown;
+    bool          m_metaDown;
+    int           m_wheelRotation;
+    int           m_wheelDelta;
+    int           m_linesPerAction;

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


@@ -176,6 +196,15 @@ public:
     long GetY();
     wxPoint GetPosition();
     %name(GetPositionTuple) void GetPosition(long* OUTPUT, long* OUTPUT);
     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;
+

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


@@ -262,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();

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


@@ -364,6 +394,7 @@ class wxNotifyEvent : public wxCommandEvent {
 public:
     wxNotifyEvent(int commandType = wxEVT_NULL, int id = 0);
     bool IsAllowed();
 public:
     wxNotifyEvent(int commandType = wxEVT_NULL, int id = 0);
     bool IsAllowed();

+    void Allow();

     void Veto();
 };
 
     void Veto();
 };
 


@@ -415,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();
+};

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