X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af309447ff8413abd2fa5e9cc780fcef1c891f87..1afc06c2d8c945535175bf32e427aac0bbb704de:/utils/wxPython/src/events.i

diff --git a/utils/wxPython/src/events.i b/utils/wxPython/src/events.i
index da2653c594..254b42e63c 100644
--- a/utils/wxPython/src/events.i
+++ b/utils/wxPython/src/events.i
@@ -70,9 +70,8 @@ public:
     long GetExtraLong();
     int GetInt();
     int GetSelection();
-    char* GetString();
+    wxString GetString();
     bool IsSelection();
-
 };
 
 
@@ -291,62 +290,25 @@ public:
 
 //---------------------------------------------------------------------------
 
+class wxPyEvent : public wxCommandEvent {
+public:
+    wxPyEvent(wxEventType commandType = wxEVT_NULL, PyObject* userData = Py_None);
+    ~wxPyEvent();
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.7  1999/02/20 09:02:57  RD
-// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
-// window handle.  If you can get the window handle into the python code,
-// it should just work...  More news on this later.
-//
-// Added wxImageList, wxToolTip.
-//
-// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
-// wxRegConfig class.
-//
-// As usual, some bug fixes, tweaks, etc.
-//
-// Revision 1.6  1999/02/06 22:55:00  RD
-//
-// Follow up for changes in wxWindows to various event classes
-//
-// Revision 1.5  1998/12/15 20:41:17  RD
-// Changed the import semantics from "from wxPython import *" to "from
-// wxPython.wx import *"  This is for people who are worried about
-// namespace pollution, they can use "from wxPython import wx" and then
-// prefix all the wxPython identifiers with "wx."
-//
-// Added wxTaskbarIcon for wxMSW.
-//
-// Made the events work for wxGrid.
-//
-// Added wxConfig.
-//
-// Added wxMiniFrame for wxGTK, (untested.)
-//
-// Changed many of the args and return values that were pointers to gdi
-// objects to references to reflect changes in the wxWindows API.
-//
-// Other assorted fixes and additions.
-//
-// Revision 1.4  1998/11/16 00:00:55  RD
-// Generic treectrl for wxPython/GTK compiles...
-//
-// Revision 1.3  1998/10/20 06:43:56  RD
-// New wxTreeCtrl wrappers (untested)
-// some changes in helpers
-// etc.
-//
-// Revision 1.2  1998/08/15 07:36:33  RD
-// - Moved the header in the .i files out of the code that gets put into
-// the .cpp files.  It caused CVS conflicts because of the RCS ID being
-// different each time.
-//
-// - A few minor fixes.
-//
-// Revision 1.1  1998/08/09 08:25:50  RD
-// Initial version
-//
-//
+    void SetUserData(PyObject* userData);
+    PyObject* GetUserData();
+};
+
+
+
+//---------------------------------------------------------------------------
+
+class wxNotifyEvent : public wxCommandEvent {
+public:
+    bool IsAllowed();
+    void Veto();
+};
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------