suppress an assert when a combobox receives WM_KILLFOCUS while it is being destroyed

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

diff --git a/wxPython/src/events.i b/wxPython/src/events.i
index b5b27ce5ed76cdc56f78000197b266c6e7e51803..cd34979002fbec314b4d1e55519fddf03562ff79 100644 (file)
--- a/wxPython/src/events.i
+++ b/wxPython/src/events.i
@@ -193,6 +193,30 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+class wxMouseCaptureChangedEvent : public wxEvent
+{
+public:
+    wxMouseCaptureChangedEvent(wxWindowID id = 0, wxWindow* gainedCapture = NULL);
+    wxWindow* GetCapturedWindow() const;
+};
+
+//---------------------------------------------------------------------------
+
+class wxSetCursorEvent : public wxEvent
+{
+public:
+    wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0);
+
+    wxCoord GetX() const;
+    wxCoord GetY() const;
+
+    void SetCursor(const wxCursor& cursor);
+    const wxCursor& GetCursor() const;
+    bool HasCursor() const;
+};
+
+//---------------------------------------------------------------------------
+

 class wxKeyEvent: public wxEvent {
 public:
     wxKeyEvent(int keyEventType);
 class wxKeyEvent: public wxEvent {
 public:
     wxKeyEvent(int keyEventType);


@@ -206,18 +230,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;

 
 };
 
 
 };
 


@@ -374,7 +406,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;
         }