Removed deprecation warnings in OGL and Gizmos

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

diff --git a/wxPython/src/events.i b/wxPython/src/events.i
index 598316933591f056df664ef5fbb6bb9da3573496..aba54b3e453167c92c7782efcc8b74a3d6ceab21 100644 (file)
--- a/wxPython/src/events.i
+++ b/wxPython/src/events.i
@@ -225,9 +225,9 @@ public:
     bool MetaDown();
     bool AltDown();
     bool ShiftDown();
     bool MetaDown();
     bool AltDown();
     bool ShiftDown();

-    long KeyCode();

 
     long GetKeyCode();
 
     long GetKeyCode();

+    %pragma(python) addtoclass = "KeyCode = GetKeyCode"

     bool HasModifiers();
 
     // get the raw key code (platform-dependent)
     bool HasModifiers();
 
     // get the raw key code (platform-dependent)


@@ -407,7 +407,7 @@ public:
 
             for (int i=0; i<count; i++) {
 #if wxUSE_UNICODE
 
             for (int i=0; i<count; i++) {
 #if wxUSE_UNICODE

-                PyList_SetItem(list, i, PyUnicode_FromUnicode(files[i], files[i].Len()));
+                PyList_SetItem(list, i, PyUnicode_FromWideChar(files[i], files[i].Len()));

 #else
                 PyList_SetItem(list, i, PyString_FromString((const char*)files[i]));
 #endif
 #else
                 PyList_SetItem(list, i, PyString_FromString((const char*)files[i]));
 #endif