Script updates

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

diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i
index f7c2901c959b269ee13076382cf4e1f13f63bf33..115650bc6d38dfb321f6510c0e7f126446760e9a 100644 (file)
--- 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_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)
 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)


@@ -450,7 +446,8 @@ public:
 
     // Get checkbox value
     bool IsChecked() const;
 
     // Get checkbox value
     bool IsChecked() const;

-
+    %pythoncode { Checked = IsChecked }
+    

     // True if the listbox event was a selection.
     bool IsSelection() const;
 
     // True if the listbox event was a selection.
     bool IsSelection() const;
 


@@ -699,11 +696,11 @@ public:
 
     %extend {
         int GetUniChar() {
 
     %extend {
         int GetUniChar() {

-        #if wxUSE_UNICODE
+        %#if wxUSE_UNICODE

             return self->m_uniChar;
             return self->m_uniChar;

-        #else
+        %#else

             return 0;
             return 0;

-        #endif
+        %#endif

         }
     }
     
         }
     }
     


@@ -963,11 +960,7 @@ public:
             }
 
             for (int i=0; i<count; i++) {
             }
 
             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;
         }
             }
             return list;
         }


@@ -994,6 +987,8 @@ enum wxUpdateUIMode
     wxUPDATE_UI_PROCESS_SPECIFIED
 };
 
     wxUPDATE_UI_PROCESS_SPECIFIED
 };
 

+
+

 class wxUpdateUIEvent : public wxCommandEvent
 {
 public:
 class wxUpdateUIEvent : public wxCommandEvent
 {
 public:


@@ -1033,7 +1028,6 @@ public:
     static wxUpdateUIMode GetMode();
 };
 
     static wxUpdateUIMode GetMode();
 };
 

-

 //---------------------------------------------------------------------------
 %newgroup;
 
 //---------------------------------------------------------------------------
 %newgroup;
 


@@ -1187,6 +1181,7 @@ enum wxIdleMode
     wxIDLE_PROCESS_SPECIFIED
 };
 
     wxIDLE_PROCESS_SPECIFIED
 };
 

+

 class wxIdleEvent : public wxEvent
 {
 public:
 class wxIdleEvent : public wxEvent
 {
 public:


@@ -1216,7 +1211,7 @@ public:
 
 class wxPyEvent : public wxEvent {
 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();
 
     wxPyEvent(int winid=0, wxEventType commandType = wxEVT_NULL );
     ~wxPyEvent();
 


@@ -1228,7 +1223,7 @@ public:
 
 class wxPyCommandEvent : public wxCommandEvent {
 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();
 
     wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);
     ~wxPyCommandEvent();