X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..015fd9ef4833ec3d8b0043a1c7e448c8be4f734a:/wxPython/src/_event.i?ds=sidebyside

diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i
index f009c9d50c..dfeebbde88 100644
--- a/wxPython/src/_event.i
+++ b/wxPython/src/_event.i
@@ -314,10 +314,6 @@ EVT_COMMAND_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1)
 EVT_COMMAND_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE, 1)
 EVT_COMMAND_SCROLL_ENDSCROLL = wx.PyEventBinder( wxEVT_SCROLL_ENDSCROLL, 1)
 
-EVT_SPIN_UP   = wx.PyEventBinder( wxEVT_SCROLL_LINEUP, 1)
-EVT_SPIN_DOWN = wx.PyEventBinder( wxEVT_SCROLL_LINEDOWN, 1)
-EVT_SPIN      = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1)
-
 EVT_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_BUTTON_CLICKED, 1)
 EVT_CHECKBOX = wx.PyEventBinder( wxEVT_COMMAND_CHECKBOX_CLICKED, 1)
 EVT_CHOICE = wx.PyEventBinder( wxEVT_COMMAND_CHOICE_SELECTED, 1)
@@ -382,7 +378,7 @@ public:
     // (treat as if the event table entry had not been found): this must be done
     // to allow the event processing by the base classes (calling event.Skip()
     // is the analog of calling the base class verstion of a virtual function)
-    void Skip(bool skip = TRUE);
+    void Skip(bool skip = True);
     bool GetSkipped() const;
 
     // Determine if this event should be propagating to the parent window.
@@ -450,8 +446,9 @@ public:
 
     // Get checkbox value
     bool IsChecked() const;
-
-    // TRUE if the listbox event was a selection.
+    %pythoncode { Checked = IsChecked }
+    
+    // True if the listbox event was a selection.
     bool IsSelection() const;
 
     void SetExtraLong(long extraLong);
@@ -598,10 +595,17 @@ public:
     // True if the mouse is just leaving the window
     bool Leaving() const;
 
-    // Find the position of the event
+
+    DocStr(GetPosition,   // sets the docstring for both
+           "Returns the position of the mouse in window coordinates when the event
+happened.", "");
     wxPoint GetPosition();
-    %name(GetPositionTuple)void GetPosition(long *OUTPUT, long *OUTPUT);
 
+    DocDeclAName(
+        void, GetPosition(long *OUTPUT, long *OUTPUT),
+        "GetPositionTuple() -> (x,y)",
+        GetPositionTuple);
+    
     // Find the logical position of the event given the DC
     wxPoint GetLogicalPosition(const wxDC& dc) const;
 
@@ -692,14 +696,16 @@ public:
     %pythoncode { KeyCode = GetKeyCode }
 
     %extend {
-        int GetUniChar() {
-        #if wxUSE_UNICODE
-            return self->m_uniChar;
-        #else
+        int GetUnicodeKey() {
+        %#if wxUSE_UNICODE
+            return self->GetUnicodeKey();
+        %#else
             return 0;
-        #endif
+        %#endif
         }
     }
+    %pythoncode { GetUniChar = GetUnicodeKey }
+    
     
     // get the raw key code (platform-dependent)
     wxUint32 GetRawKeyCode() const;
@@ -707,9 +713,15 @@ public:
     // get the raw key flags (platform-dependent)
     wxUint32 GetRawKeyFlags() const;
 
-    // Find the position of the event
+    
+    DocStr(GetPosition,   // sets the docstring for both
+           "Find the position of the event.", "");
     wxPoint GetPosition();
-    %name(GetPositionTuple) void GetPosition(long* OUTPUT, long* OUTPUT);
+
+    DocDeclAName(
+        void, GetPosition(long *OUTPUT, long *OUTPUT),
+        "GetPositionTuple() -> (x,y)",
+        GetPositionTuple);
 
     // Get X position
     wxCoord GetX() const;
@@ -843,7 +855,7 @@ public:
 class wxActivateEvent : public wxEvent
 {
 public:
-    wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = TRUE, int Id = 0);
+    wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = True, int Id = 0);
     bool GetActive() const;
 };
 
@@ -888,7 +900,7 @@ public:
     void SetLoggingOff(bool logOff);
     bool GetLoggingOff() const;
 
-    void Veto(bool veto = TRUE);
+    void Veto(bool veto = True);
     void SetCanVeto(bool canVeto);
     
     bool CanVeto() const;
@@ -902,7 +914,7 @@ public:
 class wxShowEvent : public wxEvent
 {
 public:
-    wxShowEvent(int winid = 0, bool show = FALSE);
+    wxShowEvent(int winid = 0, bool show = False);
     
     void SetShow(bool show);
     bool GetShow() const;
@@ -916,7 +928,7 @@ public:
 class wxIconizeEvent: public wxEvent
 {
 public:
-    wxIconizeEvent(int id = 0, bool iconized = TRUE);
+    wxIconizeEvent(int id = 0, bool iconized = True);
     bool Iconized();
 };
 
@@ -951,11 +963,7 @@ public:
             }
 
             for (int i=0; i<count; i++) {
-#if wxUSE_UNICODE
-                PyList_SetItem(list, i, PyUnicode_FromWideChar(files[i], files[i].Len()));
-#else
-                PyList_SetItem(list, i, PyString_FromString((const char*)files[i]));
-#endif
+                PyList_SetItem(list, i, wx2PyString(files[i]));
             }
             return list;
         }
@@ -982,6 +990,8 @@ enum wxUpdateUIMode
     wxUPDATE_UI_PROCESS_SPECIFIED
 };
 
+
+
 class wxUpdateUIEvent : public wxCommandEvent
 {
 public:
@@ -1021,7 +1031,6 @@ public:
     static wxUpdateUIMode GetMode();
 };
 
-
 //---------------------------------------------------------------------------
 %newgroup;
 
@@ -1095,19 +1104,26 @@ class wxNavigationKeyEvent : public wxEvent
 public:
     wxNavigationKeyEvent();
     
-    // direction: forward (true) or backward (false)
+    // direction: forward (True) or backward (False)
     bool GetDirection() const;
-    void SetDirection(bool bForward);
+    void SetDirection(bool forward);
 
     // it may be a window change event (MDI, notebook pages...) or a control
     // change event
     bool IsWindowChange() const;
-    void SetWindowChange(bool bIs);
+    void SetWindowChange(bool ischange);
 
+    void SetFlags(long flags);
+    
     // the child which has the focus currently (may be NULL - use
     // wxWindow::FindFocus then)
     wxWindow* GetCurrentFocus() const;
     void SetCurrentFocus(wxWindow *win);
+
+    enum {
+        IsForward,
+        WinChange
+    };
 };
 
 
@@ -1175,12 +1191,13 @@ enum wxIdleMode
     wxIDLE_PROCESS_SPECIFIED
 };
 
+
 class wxIdleEvent : public wxEvent
 {
 public:
     wxIdleEvent();
     
-    void RequestMore(bool needMore = TRUE);
+    void RequestMore(bool needMore = True);
     bool MoreRequested() const;
 
     // Specify how wxWindows will send idle events: to
@@ -1204,7 +1221,7 @@ public:
 
 class wxPyEvent : public wxEvent {
 public:
-    %addtofunc wxPyEvent     "self.SetSelf(self)"
+    %pythonAppend wxPyEvent     "self.SetSelf(self)"
     wxPyEvent(int winid=0, wxEventType commandType = wxEVT_NULL );
     ~wxPyEvent();
 
@@ -1216,7 +1233,7 @@ public:
 
 class wxPyCommandEvent : public wxCommandEvent {
 public:
-    %addtofunc wxPyCommandEvent     "self.SetSelf(self)"
+    %pythonAppend wxPyCommandEvent     "self.SetSelf(self)"
     wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);
     ~wxPyCommandEvent();