Now uses proper wxUSE_xxx flags

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

diff --git a/utils/wxPython/src/events.i b/utils/wxPython/src/events.i
index 870807cf61444434e46697ab3f09ffa82e74b1bb..254b42e63c12b7e5400ae0db626d5d7e81276f5b 100644 (file)
--- a/utils/wxPython/src/events.i
+++ b/utils/wxPython/src/events.i
@@ -54,15 +54,12 @@ public:
 
 class wxCloseEvent : public wxEvent {
 public:
-    bool CanVeto();
-// ****    bool GetSessionEnding();
+    void SetLoggingOff(bool loggingOff);
     bool GetLoggingOff();
     void Veto(bool veto = TRUE);
+    bool CanVeto();
     bool GetVeto();
-    void SetForce(bool force);
     void SetCanVeto(bool canVeto);
-    void SetLoggingOff(bool loggingOff);
-    bool GetForce();
 };
 
 //---------------------------------------------------------------------------
@@ -73,9 +70,8 @@ public:
     long GetExtraLong();
     int GetInt();
     int GetSelection();
-    char* GetString();
+    wxString GetString();
     bool IsSelection();
-
 };
 
 
@@ -140,9 +136,7 @@ public:
     bool AltDown();
     bool ShiftDown();
     long KeyCode();
-    void Position(float *OUTPUT, float *OUTPUT);
-    float GetX();
-    float GetY();
+
 };
 
 //---------------------------------------------------------------------------
@@ -296,46 +290,25 @@ public:
 
 //---------------------------------------------------------------------------
 
+class wxPyEvent : public wxCommandEvent {
+public:
+    wxPyEvent(wxEventType commandType = wxEVT_NULL, PyObject* userData = Py_None);
+    ~wxPyEvent();
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// 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();
+};
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------