and the compilation fix for the warning fixes

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

diff --git a/utils/wxPython/src/events.i b/utils/wxPython/src/events.i
index b14b98beaeb3fda64e678d9b59c5d942d8b62200..fdc2a8ccfed1f049a985bea6955ed8f4b20bfa74 100644 (file)
--- a/utils/wxPython/src/events.i
+++ b/utils/wxPython/src/events.i
@@ -31,6 +31,9 @@
 
 class wxEvent {
 public:
 
 class wxEvent {
 public:

+    wxEvent(int id = 0);
+    ~wxEvent();
+

     wxObject* GetEventObject();
     wxEventType GetEventType();
     int GetId();
     wxObject* GetEventObject();
     wxEventType GetEventType();
     int GetId();


@@ -47,6 +50,7 @@ public:
 
 class wxSizeEvent : public wxEvent {
 public:
 
 class wxSizeEvent : public wxEvent {
 public:

+    wxSizeEvent(const wxSize& sz, int id = 0);

     wxSize GetSize();
 };
 
     wxSize GetSize();
 };
 


@@ -54,6 +58,8 @@ public:
 
 class wxCloseEvent : public wxEvent {
 public:
 
 class wxCloseEvent : public wxEvent {
 public:

+    wxCloseEvent(int commandEventType = 0, int id = 0);
+

     void SetLoggingOff(bool loggingOff);
     bool GetLoggingOff();
     void Veto(bool veto = TRUE);
     void SetLoggingOff(bool loggingOff);
     bool GetLoggingOff();
     void Veto(bool veto = TRUE);


@@ -66,6 +72,8 @@ public:
 
 class wxCommandEvent : public wxEvent {
 public:
 
 class wxCommandEvent : public wxEvent {
 public:

+    wxCommandEvent(int commandEventType = 0, int id = 0);
+

     bool Checked();
     long GetExtraLong();
     int GetInt();
     bool Checked();
     long GetExtraLong();
     int GetInt();


@@ -79,6 +87,9 @@ public:
 
 class wxScrollEvent: public wxCommandEvent {
 public:
 
 class wxScrollEvent: public wxCommandEvent {
 public:

+    wxScrollEvent(int commandType = 0, int id = 0, int pos = 0,
+                  int orientation = 0);
+

     int GetOrientation();
     int GetPosition();
 };
     int GetOrientation();
     int GetPosition();
 };


@@ -87,6 +98,9 @@ public:
 
 class wxScrollWinEvent: public wxEvent {
 public:
 
 class wxScrollWinEvent: public wxEvent {
 public:

+    wxScrollWinEvent(int commandType = 0, int pos = 0,
+                     int orientation = 0);
+

     int GetOrientation();
     int GetPosition();
 };
     int GetOrientation();
     int GetPosition();
 };


@@ -95,6 +109,7 @@ public:
 
 class wxSpinEvent : public wxScrollEvent {
 public:
 
 class wxSpinEvent : public wxScrollEvent {
 public:

+    wxSpinEvent(int commandType = 0, int id = 0);

 
 };
 
 
 };
 


@@ -102,6 +117,8 @@ public:
 
 class wxMouseEvent: public wxEvent {
 public:
 
 class wxMouseEvent: public wxEvent {
 public:

+    wxMouseEvent(int mouseEventType = 0);
+

     bool IsButton();
     bool ButtonDown(int but = -1);
     bool ButtonDClick(int but = -1);
     bool IsButton();
     bool ButtonDown(int but = -1);
     bool ButtonDClick(int but = -1);


@@ -139,18 +156,41 @@ public:
 
 class wxKeyEvent: public wxEvent {
 public:
 
 class wxKeyEvent: public wxEvent {
 public:

+    wxKeyEvent(int keyEventType);
+

     bool ControlDown();
     bool MetaDown();
     bool AltDown();
     bool ShiftDown();
     long KeyCode();
 
     bool ControlDown();
     bool MetaDown();
     bool AltDown();
     bool ShiftDown();
     long KeyCode();
 

+    long GetX();
+    long GetY();
+    wxPoint GetPosition();
+    %name(GetPositionTuple) void GetPosition(long* OUTPUT, long* OUTPUT);

 };
 
 };
 

+//---------------------------------------------------------------------------
+
+class wxNavigationKeyEvent : public wxCommandEvent {
+public:
+    wxNavigationKeyEvent();
+
+    bool GetDirection();
+    void SetDirection(bool bForward);
+    bool IsWindowChange();
+    void SetWindowChange(bool bIs);
+    wxWindow* GetCurrentFocus();
+    void SetCurrentFocus(wxWindow *win);
+};
+
+

 //---------------------------------------------------------------------------
 
 class wxMoveEvent: public wxEvent {
 public:
 //---------------------------------------------------------------------------
 
 class wxMoveEvent: public wxEvent {
 public:

+    wxMoveEvent(const wxPoint& pt, int id = 0);
+

     wxPoint GetPosition();
 };
 
     wxPoint GetPosition();
 };
 


@@ -158,6 +198,7 @@ public:
 
 class wxPaintEvent: public wxEvent {
 public:
 
 class wxPaintEvent: public wxEvent {
 public:

+    wxPaintEvent(int id = 0);

 
 };
 
 
 };
 


@@ -165,6 +206,8 @@ public:
 
 class wxEraseEvent: public wxEvent {
 public:
 
 class wxEraseEvent: public wxEvent {
 public:

+    wxEraseEvent(int id = 0, wxDC* dc = NULL);
+

     wxDC *GetDC();
 };
 
     wxDC *GetDC();
 };
 


@@ -172,13 +215,14 @@ public:
 
 class wxFocusEvent: public wxEvent {
 public:
 
 class wxFocusEvent: public wxEvent {
 public:

-
+    wxFocusEvent(WXTYPE eventType = 0, int id = 0);

 };
 
 //---------------------------------------------------------------------------
 
 class wxActivateEvent: public wxEvent{
 public:
 };
 
 //---------------------------------------------------------------------------
 
 class wxActivateEvent: public wxEvent{
 public:

+    wxActivateEvent(WXTYPE eventType = 0, int active = TRUE, int id = 0);

     bool GetActive();
 };
 
     bool GetActive();
 };
 


@@ -186,13 +230,14 @@ public:
 
 class wxInitDialogEvent: public wxEvent {
 public:
 
 class wxInitDialogEvent: public wxEvent {
 public:

-
+    wxInitDialogEvent(int id = 0);

 };
 
 //---------------------------------------------------------------------------
 
 class wxMenuEvent: public wxEvent {
 public:
 };
 
 //---------------------------------------------------------------------------
 
 class wxMenuEvent: public wxEvent {
 public:

+    wxMenuEvent(WXTYPE id = 0, int id = 0);

     int GetMenuId();
 };
 
     int GetMenuId();
 };
 


@@ -200,6 +245,7 @@ public:
 
 class wxShowEvent: public wxEvent {
 public:
 
 class wxShowEvent: public wxEvent {
 public:

+    wxShowEvent(int id = 0, int show = FALSE);

     void SetShow(bool show);
     bool GetShow();
 };
     void SetShow(bool show);
     bool GetShow();
 };


@@ -208,19 +254,24 @@ public:
 
 class wxIconizeEvent: public wxEvent {
 public:
 
 class wxIconizeEvent: public wxEvent {
 public:

+    wxIconizeEvent(int id = 0);

 };
 
 //---------------------------------------------------------------------------
 
 class wxMaximizeEvent: public wxEvent {
 public:
 };
 
 //---------------------------------------------------------------------------
 
 class wxMaximizeEvent: public wxEvent {
 public:

-
+    wxMaximizeEvent(int id = 0);

 };
 
 //---------------------------------------------------------------------------
 
 class wxJoystickEvent: public wxEvent {
 public:
 };
 
 //---------------------------------------------------------------------------
 
 class wxJoystickEvent: public wxEvent {
 public:

+    wxJoystickEvent(int type = wxEVT_NULL,
+                    int state = 0,
+                    int joystick = wxJOYSTICK1,
+                    int change = 0);

     wxPoint GetPosition();
     int GetZPosition();
     int GetButtonState();
     wxPoint GetPosition();
     int GetZPosition();
     int GetButtonState();


@@ -269,6 +320,7 @@ public:
 
 class wxIdleEvent: public wxEvent {
 public:
 
 class wxIdleEvent: public wxEvent {
 public:

+    wxIdleEvent();

     void RequestMore(bool needMore = TRUE);
     bool MoreRequested();
 };
     void RequestMore(bool needMore = TRUE);
     bool MoreRequested();
 };


@@ -277,6 +329,7 @@ public:
 
 class wxUpdateUIEvent: public wxEvent {
 public:
 
 class wxUpdateUIEvent: public wxEvent {
 public:

+    wxUpdateUIEvent(wxWindowID commandId = 0);

     bool GetChecked();
     bool GetEnabled();
     wxString GetText();
     bool GetChecked();
     bool GetEnabled();
     wxString GetText();


@@ -293,30 +346,177 @@ public:
 
 class wxSysColourChangedEvent: public wxEvent {
 public:
 
 class wxSysColourChangedEvent: public wxEvent {
 public:

+    wxSysColourChangedEvent();
+};
+
+//---------------------------------------------------------------------------
+

 
 

+class wxNotifyEvent : public wxCommandEvent {
+public:
+    wxNotifyEvent(int commandType = wxEVT_NULL, int id = 0);
+    bool IsAllowed();
+    void Veto();

 };
 
 };
 

+

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

-class wxPyEvent : public wxCommandEvent {
+class  wxPaletteChangedEvent : public wxEvent {

 public:
 public:

-    wxPyEvent(wxEventType commandType = wxEVT_NULL, PyObject* userData = Py_None);
-    ~wxPyEvent();
+    wxPaletteChangedEvent(wxWindowID id = 0);
+
+    void SetChangedWindow(wxWindow* win);
+    wxWindow* GetChangedWindow();

 
 

-    void SetUserData(PyObject* userData);
-    PyObject* GetUserData();

 };
 
 };
 

+//---------------------------------------------------------------------------
+
+class  wxQueryNewPaletteEvent : public wxEvent {
+public:
+    wxQueryNewPaletteEvent(wxWindowID id = 0);
+
+    void SetPaletteRealized(bool realized);
+    bool GetPaletteRealized();
+};

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

-class wxNotifyEvent : public wxCommandEvent {
+class wxWindowCreateEvent : public wxEvent {

 public:
 public:

-    bool IsAllowed();
-    void Veto();
+    wxWindowCreateEvent(wxWindow *win = NULL);
+
+    wxWindow *GetWindow();
+};
+
+class wxWindowDestroyEvent : public wxEvent {
+public:
+    wxWindowDestroyEvent(wxWindow *win = NULL);
+
+    wxWindow *GetWindow();
+};
+
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+// This one can be derived from in Python and passed through the event
+// system without loosing anything so long as the Python data is saved with
+// SetPyData...
+
+%{
+class wxPyEvent : public wxEvent {
+    DECLARE_DYNAMIC_CLASS(wxPyEvent)
+public:
+    wxPyEvent(int id=0, PyObject* userData = Py_None)
+        : wxEvent(id) {
+        m_userData = userData;
+        Py_INCREF(m_userData);
+    }
+
+    ~wxPyEvent() {
+        bool doSave = wxPyRestoreThread();
+        Py_DECREF(m_userData);
+        wxPySaveThread(doSave);
+    }
+
+    void SetPyData(PyObject* userData) {
+        bool doSave = wxPyRestoreThread();
+        Py_DECREF(m_userData);
+        m_userData = userData;
+        Py_INCREF(m_userData);
+        wxPySaveThread(doSave);
+    }
+
+    PyObject* GetPyData() const {
+        Py_INCREF(m_userData);
+        return m_userData;
+    }
+
+    // This one is so the event object can be Cloned...
+    void CopyObject(wxObject& dest) const {
+        wxEvent::CopyObject(dest);
+        ((wxPyEvent*)&dest)->SetPyData(m_userData);
+    }
+
+private:
+    PyObject* m_userData;
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxPyEvent, wxEvent)
+
+%}
+
+
+class wxPyEvent : public wxEvent {
+public:
+    wxPyEvent(int id=0, PyObject* userData = Py_None);
+    ~wxPyEvent();
+
+    void SetPyData(PyObject* userData);
+    PyObject* GetPyData();

 };
 
 };
 

+//---------------------------------------------------------------------------
+// Same for this one except it is a wxCommandEvent and so will get passed up the
+// containment heirarchy.
+
+%{
+class wxPyCommandEvent : public wxCommandEvent {
+    DECLARE_DYNAMIC_CLASS(wxPyCommandEvent)
+public:
+    wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0, PyObject* userData = Py_None)
+        : wxCommandEvent(commandType, id) {
+        m_userData = userData;
+        Py_INCREF(m_userData);
+    }
+
+    ~wxPyCommandEvent() {
+        bool doSave = wxPyRestoreThread();
+        Py_DECREF(m_userData);
+        wxPySaveThread(doSave);
+    }
+
+    void SetPyData(PyObject* userData) {
+        bool doSave = wxPyRestoreThread();
+        Py_DECREF(m_userData);
+        m_userData = userData;
+        Py_INCREF(m_userData);
+        wxPySaveThread(doSave);
+    }
+
+    PyObject* GetPyData() const {
+        Py_INCREF(m_userData);
+        return m_userData;
+    }
+
+    // This one is so the event object can be Cloned...
+    void CopyObject(wxObject& dest) const {
+        wxCommandEvent::CopyObject(dest);
+        ((wxPyCommandEvent*)&dest)->SetPyData(m_userData);
+    }
+
+private:
+    PyObject* m_userData;
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxPyCommandEvent, wxCommandEvent)
+
+%}
+
+
+class wxPyCommandEvent : public wxCommandEvent {
+public:
+    wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0, PyObject* userData = Py_None);
+    ~wxPyCommandEvent();
+
+    void SetPyData(PyObject* userData);
+    PyObject* GetPyData();
+};
+
+

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