reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/gizmos/gtk/gizmos.py b/wxPython/contrib/gizmos/gtk/gizmos.py
index 5130ce72c3dbf2b7079f5db7d5e1386ee84173ed..0cb05be0d311337d4a1545d1b5fc480e21576afb 100644 (file)
--- a/wxPython/contrib/gizmos/gtk/gizmos.py
+++ b/wxPython/contrib/gizmos/gtk/gizmos.py
@@ -11,8 +11,8 @@ import _gizmos
 import _windows
 import _core
 import _controls
-wx = _core 
-__docfilter__ = wx.__DocFilter(globals()) 
+import wx 
+__docfilter__ = wx._core.__DocFilter(globals()) 
 wxEVT_DYNAMIC_SASH_SPLIT = _gizmos.wxEVT_DYNAMIC_SASH_SPLIT
 wxEVT_DYNAMIC_SASH_UNIFY = _gizmos.wxEVT_DYNAMIC_SASH_UNIFY
 DS_MANAGE_SCROLLBARS = _gizmos.DS_MANAGE_SCROLLBARS
@@ -359,6 +359,8 @@ TL_SEARCH_LEVEL = _gizmos.TL_SEARCH_LEVEL
 TL_SEARCH_FULL = _gizmos.TL_SEARCH_FULL
 TL_SEARCH_PARTIAL = _gizmos.TL_SEARCH_PARTIAL
 TL_SEARCH_NOCASE = _gizmos.TL_SEARCH_NOCASE
+TR_DONT_ADJUST_MAC = _gizmos.TR_DONT_ADJUST_MAC
+wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC 
 class TreeListColumnInfo(_core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTreeListColumnInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

diff --git a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp
index d7be90b8455ee96c9830d065049248cb231459c1..c1ffa237783e1c1aa183eac25fdf977a078e06f1 100644 (file)
--- a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp
+++ b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp
@@ -8323,6 +8323,7 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d,"TL_SEARCH_FULL", SWIG_FromInt((int)wxTL_SEARCH_FULL));
     PyDict_SetItemString(d,"TL_SEARCH_PARTIAL", SWIG_FromInt((int)wxTL_SEARCH_PARTIAL));
     PyDict_SetItemString(d,"TL_SEARCH_NOCASE", SWIG_FromInt((int)wxTL_SEARCH_NOCASE));
+    PyDict_SetItemString(d,"TR_DONT_ADJUST_MAC", SWIG_FromInt((int)wxTR_DONT_ADJUST_MAC));
     
     
     wxPyPtrTypeMap_Add("wxTreeCompanionWindow", "wxPyTreeCompanionWindow");

diff --git a/wxPython/contrib/gizmos/mac/gizmos.py b/wxPython/contrib/gizmos/mac/gizmos.py
index 5130ce72c3dbf2b7079f5db7d5e1386ee84173ed..0cb05be0d311337d4a1545d1b5fc480e21576afb 100644 (file)
--- a/wxPython/contrib/gizmos/mac/gizmos.py
+++ b/wxPython/contrib/gizmos/mac/gizmos.py
@@ -11,8 +11,8 @@ import _gizmos
 import _windows
 import _core
 import _controls
-wx = _core 
-__docfilter__ = wx.__DocFilter(globals()) 
+import wx 
+__docfilter__ = wx._core.__DocFilter(globals()) 
 wxEVT_DYNAMIC_SASH_SPLIT = _gizmos.wxEVT_DYNAMIC_SASH_SPLIT
 wxEVT_DYNAMIC_SASH_UNIFY = _gizmos.wxEVT_DYNAMIC_SASH_UNIFY
 DS_MANAGE_SCROLLBARS = _gizmos.DS_MANAGE_SCROLLBARS
@@ -359,6 +359,8 @@ TL_SEARCH_LEVEL = _gizmos.TL_SEARCH_LEVEL
 TL_SEARCH_FULL = _gizmos.TL_SEARCH_FULL
 TL_SEARCH_PARTIAL = _gizmos.TL_SEARCH_PARTIAL
 TL_SEARCH_NOCASE = _gizmos.TL_SEARCH_NOCASE
+TR_DONT_ADJUST_MAC = _gizmos.TR_DONT_ADJUST_MAC
+wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC 
 class TreeListColumnInfo(_core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTreeListColumnInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
index 552aa342d3c712edc7f0face9c23073f1b2dbf13..31d51da41e6f559634162458bcdb130cd0b2c935 100644 (file)
--- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
+++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
@@ -8323,6 +8323,7 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d,"TL_SEARCH_FULL", SWIG_FromInt((int)wxTL_SEARCH_FULL));
     PyDict_SetItemString(d,"TL_SEARCH_PARTIAL", SWIG_FromInt((int)wxTL_SEARCH_PARTIAL));
     PyDict_SetItemString(d,"TL_SEARCH_NOCASE", SWIG_FromInt((int)wxTL_SEARCH_NOCASE));
+    PyDict_SetItemString(d,"TR_DONT_ADJUST_MAC", SWIG_FromInt((int)wxTR_DONT_ADJUST_MAC));
     
     
     wxPyPtrTypeMap_Add("wxTreeCompanionWindow", "wxPyTreeCompanionWindow");

diff --git a/wxPython/contrib/gizmos/msw/gizmos.py b/wxPython/contrib/gizmos/msw/gizmos.py
index 5130ce72c3dbf2b7079f5db7d5e1386ee84173ed..0cb05be0d311337d4a1545d1b5fc480e21576afb 100644 (file)
--- a/wxPython/contrib/gizmos/msw/gizmos.py
+++ b/wxPython/contrib/gizmos/msw/gizmos.py
@@ -11,8 +11,8 @@ import _gizmos
 import _windows
 import _core
 import _controls
-wx = _core 
-__docfilter__ = wx.__DocFilter(globals()) 
+import wx 
+__docfilter__ = wx._core.__DocFilter(globals()) 
 wxEVT_DYNAMIC_SASH_SPLIT = _gizmos.wxEVT_DYNAMIC_SASH_SPLIT
 wxEVT_DYNAMIC_SASH_UNIFY = _gizmos.wxEVT_DYNAMIC_SASH_UNIFY
 DS_MANAGE_SCROLLBARS = _gizmos.DS_MANAGE_SCROLLBARS
@@ -359,6 +359,8 @@ TL_SEARCH_LEVEL = _gizmos.TL_SEARCH_LEVEL
 TL_SEARCH_FULL = _gizmos.TL_SEARCH_FULL
 TL_SEARCH_PARTIAL = _gizmos.TL_SEARCH_PARTIAL
 TL_SEARCH_NOCASE = _gizmos.TL_SEARCH_NOCASE
+TR_DONT_ADJUST_MAC = _gizmos.TR_DONT_ADJUST_MAC
+wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC 
 class TreeListColumnInfo(_core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTreeListColumnInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
index 433c02b8345df6e919d59b004e2fd743e66d00a0..62a20e5f4bea31bd0e13cd3bfe407c63b4d7a6ba 100644 (file)
--- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
+++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
@@ -8323,6 +8323,7 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d,"TL_SEARCH_FULL", SWIG_FromInt((int)wxTL_SEARCH_FULL));
     PyDict_SetItemString(d,"TL_SEARCH_PARTIAL", SWIG_FromInt((int)wxTL_SEARCH_PARTIAL));
     PyDict_SetItemString(d,"TL_SEARCH_NOCASE", SWIG_FromInt((int)wxTL_SEARCH_NOCASE));
+    PyDict_SetItemString(d,"TR_DONT_ADJUST_MAC", SWIG_FromInt((int)wxTR_DONT_ADJUST_MAC));
     
     
     wxPyPtrTypeMap_Add("wxTreeCompanionWindow", "wxPyTreeCompanionWindow");

diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index 56a325a7018f0788f43b0714600fb5a974a10b17..1e5110cb1213ee91c3ca591bcce7a8946cdf362f 100644 (file)
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -3581,10 +3581,11 @@ class KeyEvent(Event):
         return _core_.KeyEvent_GetKeyCode(*args, **kwargs)
 
     KeyCode = GetKeyCode 
-    def GetUniChar(*args, **kwargs):
-        """GetUniChar(self) -> int"""
-        return _core_.KeyEvent_GetUniChar(*args, **kwargs)
+    def GetUnicodeKey(*args, **kwargs):
+        """GetUnicodeKey(self) -> int"""
+        return _core_.KeyEvent_GetUnicodeKey(*args, **kwargs)
 
+    GetUniChar = GetUnicodeKey 
     def GetRawKeyCode(*args, **kwargs):
         """GetRawKeyCode(self) -> unsigned int"""
         return _core_.KeyEvent_GetRawKeyCode(*args, **kwargs)
@@ -5051,6 +5052,10 @@ class PyOnDemandOutputWindow:
             wx.CallAfter(self.frame.Close)
 
 
+    def flush(self):
+        pass
+    
+
 
 #----------------------------------------------------------------------
 

diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp
index 7a731c68879946a4eccc4149ddd1d4c0db3132d4..d071af026ca7ad01c38e070bb37482decb7f0c67 100644 (file)
--- a/wxPython/src/mac/_core_wrap.cpp
+++ b/wxPython/src/mac/_core_wrap.cpp
@@ -1270,9 +1270,9 @@ void wxEvtHandler__setOORInfo(wxEvtHandler *self,PyObject *_self){
                 }
             }
         }
-int wxKeyEvent_GetUniChar(wxKeyEvent *self){
+int wxKeyEvent_GetUnicodeKey(wxKeyEvent *self){
         #if wxUSE_UNICODE
-            return self->m_uniChar;
+            return self->GetUnicodeKey();
         #else
             return 0;
         #endif
@@ -15567,7 +15567,7 @@ static PyObject *_wrap_KeyEvent_GetKeyCode(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_KeyEvent_GetUniChar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetUnicodeKey(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -15576,12 +15576,12 @@ static PyObject *_wrap_KeyEvent_GetUniChar(PyObject *self, PyObject *args, PyObj
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetUniChar",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetUnicodeKey",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)wxKeyEvent_GetUniChar(arg1);
+        result = (int)wxKeyEvent_GetUnicodeKey(arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -40441,7 +40441,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"KeyEvent_ShiftDown", (PyCFunction) _wrap_KeyEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
         { (char *)"KeyEvent_HasModifiers", (PyCFunction) _wrap_KeyEvent_HasModifiers, METH_VARARGS | METH_KEYWORDS },
         { (char *)"KeyEvent_GetKeyCode", (PyCFunction) _wrap_KeyEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_GetUniChar", (PyCFunction) _wrap_KeyEvent_GetUniChar, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"KeyEvent_GetUnicodeKey", (PyCFunction) _wrap_KeyEvent_GetUnicodeKey, METH_VARARGS | METH_KEYWORDS },
         { (char *)"KeyEvent_GetRawKeyCode", (PyCFunction) _wrap_KeyEvent_GetRawKeyCode, METH_VARARGS | METH_KEYWORDS },
         { (char *)"KeyEvent_GetRawKeyFlags", (PyCFunction) _wrap_KeyEvent_GetRawKeyFlags, METH_VARARGS | METH_KEYWORDS },
         { (char *)"KeyEvent_GetPosition", (PyCFunction) _wrap_KeyEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },