merged wxRegConf rename fix from 2.2

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

diff --git a/wxPython/src/events.i b/wxPython/src/events.i
index d0c6713c0b7268cc2c3052b75886082e85539aa6..47a7825ade8a9183fa6971be02e15d160998f268 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();


@@ -156,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;

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


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

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


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