Bitmap and menu updates

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

diff --git a/wxPython/src/events.i b/wxPython/src/events.i
index b534f076b7f2d4d43e8bc91545a52cba533b1b14..5d2bd07da5272c9765b9f43fd9078791b0889350 100644 (file)
--- a/wxPython/src/events.i
+++ b/wxPython/src/events.i
@@ -30,9 +30,12 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

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

 public:
 public:

-    wxEvent(int id = 0);
+    // wxEvent(int id = 0);     // *** This class is now an ABC

     ~wxEvent();
 
     wxObject* GetEventObject();
     ~wxEvent();
 
     wxObject* GetEventObject();


@@ -45,6 +48,8 @@ public:
     void SetId(int id);
     void SetTimestamp(long timeStamp);
     void Skip(bool skip = TRUE);
     void SetId(int id);
     void SetTimestamp(long timeStamp);
     void Skip(bool skip = TRUE);

+
+    wxEvent *Clone();

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


@@ -86,6 +91,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 +174,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 +186,18 @@ 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;
+};
+
+//---------------------------------------------------------------------------
+
+class wxMouseCaptureChangedEvent : public wxEvent
+{
+public:
+    wxMouseCaptureChangedEvent(wxWindowID id = 0, wxWindow* gainedCapture = NULL);
+    wxWindow* GetCapturedWindow() const;

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


@@ -182,18 +215,26 @@ public:
     long GetKeyCode();
     bool HasModifiers();
 
     long GetKeyCode();
     bool HasModifiers();
 

+    // get the raw key code (platform-dependent)
+    long GetRawKeyCode() const;
+
+    // get the raw key flags (platform-dependent)
+    long GetRawKeyFlags() const;
+

     long GetX();
     long GetY();
     wxPoint GetPosition();
     %name(GetPositionTuple) void GetPosition(long* OUTPUT, long* OUTPUT);
 
     long GetX();
     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;
+    long        m_x, m_y;
+    long        m_keyCode;
+    bool        m_controlDown;
+    bool        m_shiftDown;
+    bool        m_altDown;
+    bool        m_metaDown;
+    bool        m_scanCode;
+    long        m_rawCode;
+    long        m_rawFlags;

 
 };
 
 
 };
 


@@ -245,6 +286,18 @@ public:
     wxFocusEvent(WXTYPE eventType = 0, int id = 0);
 };
 
     wxFocusEvent(WXTYPE eventType = 0, int id = 0);
 };
 

+//---------------------------------------------------------------------------
+
+// wxChildFocusEvent notifies the parent that a child has got the focus: unlike
+// wxFocusEvent it is propgated upwards the window chain
+class  wxChildFocusEvent : public wxCommandEvent
+{
+public:
+    wxChildFocusEvent(wxWindow *win = NULL);
+    wxWindow *GetWindow() const;
+};
+
+

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


@@ -266,6 +319,7 @@ class wxMenuEvent: public wxEvent {
 public:
     wxMenuEvent(WXTYPE id = 0, int id = 0);
     int GetMenuId();
 public:
     wxMenuEvent(WXTYPE id = 0, int id = 0);
     int GetMenuId();

+    bool IsPopup();

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


@@ -281,7 +335,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();

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


@@ -336,7 +391,11 @@ public:
             }
 
             for (int i=0; i<count; i++) {
             }
 
             for (int i=0; i<count; i++) {

+#if wxUSE_UNICODE
+                PyList_SetItem(list, i, PyUnicode_FromUnicode(files[i], files[i].Len()));
+#else

                 PyList_SetItem(list, i, PyString_FromString((const char*)files[i]));
                 PyList_SetItem(list, i, PyString_FromString((const char*)files[i]));

+#endif

             }
             return list;
         }
             }
             return list;
         }


@@ -383,10 +442,20 @@ 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();
 };
 
 

+//---------------------------------------------------------------------------
+
+class wxDisplayChangedEvent : public wxEvent
+{
+public:
+    wxDisplayChangedEvent();
+};
+
+

 //---------------------------------------------------------------------------
 
 class  wxPaletteChangedEvent : public wxEvent {
 //---------------------------------------------------------------------------
 
 class  wxPaletteChangedEvent : public wxEvent {


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

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