reswigged

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

diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index 77de443ed3c48d57c94e79c0a3b8420f786208ee..795fff7b49993d1205b5c5aeefc1811895b4ebcc 100644 (file)
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -4688,14 +4688,15 @@ class DataFormat(object):
         """
         return _misc_.DataFormat_GetType(*args, **kwargs)
 
-    def GetId(*args, **kwargs):
-        """
-        GetId(self) -> String
+    def _GetId(*args, **kwargs):
+        """_GetId(self) -> String"""
+        return _misc_.DataFormat__GetId(*args, **kwargs)
 
-        Returns the name of a custom format (this function will fail for a
-        standard format).
-        """
-        return _misc_.DataFormat_GetId(*args, **kwargs)
+    def GetId(self):
+        """Returns the name of a custom format (this function will fail for a
+     format)."""
+        nolog = wx.LogNull()
+        return self._GetId()
 
     def SetId(*args, **kwargs):
         """
@@ -5678,7 +5679,6 @@ class Clipboard(_core.Object):
         return _misc_.Clipboard_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
-    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
 _misc_.Clipboard_swigregister(Clipboard)
 
 def Clipboard_Get(*args):

diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp
index 2f7206ba2bc0d4d69c5c05fdf18e5cefd0447916..f6f5cd0ef3569b4e5fa51c801eb67b2190530582 100644 (file)
--- a/wxPython/src/gtk/_misc_wrap.cpp
+++ b/wxPython/src/gtk/_misc_wrap.cpp
@@ -31951,7 +31951,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DataFormat_GetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DataFormat__GetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxDataFormat *arg1 = (wxDataFormat *) 0 ;
   wxString result;
@@ -31963,7 +31963,7 @@ SWIGINTERN PyObject *_wrap_DataFormat_GetId(PyObject *SWIGUNUSEDPARM(self), PyOb
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDataFormat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataFormat_GetId" "', expected argument " "1"" of type '" "wxDataFormat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataFormat__GetId" "', expected argument " "1"" of type '" "wxDataFormat const *""'"); 
   }
   arg1 = reinterpret_cast< wxDataFormat * >(argp1);
   {
@@ -39942,7 +39942,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DataFormat___ne__", _wrap_DataFormat___ne__, METH_VARARGS, NULL},
         { (char *)"DataFormat_SetType", (PyCFunction) _wrap_DataFormat_SetType, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DataFormat_GetType", (PyCFunction)_wrap_DataFormat_GetType, METH_O, NULL},
-        { (char *)"DataFormat_GetId", (PyCFunction)_wrap_DataFormat_GetId, METH_O, NULL},
+        { (char *)"DataFormat__GetId", (PyCFunction)_wrap_DataFormat__GetId, METH_O, NULL},
         { (char *)"DataFormat_SetId", (PyCFunction) _wrap_DataFormat_SetId, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DataFormat_swigregister", DataFormat_swigregister, METH_VARARGS, NULL},
         { (char *)"DataFormat_swiginit", DataFormat_swiginit, METH_VARARGS, NULL},

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index 09eaac9f35953977d180cea959e21e4c53771130..898eb10064d7b7377bba6953623de8d27986c3ae 100644 (file)
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -7274,7 +7274,7 @@ class SearchCtrl(TextCtrl):
         """
         GetDescriptiveText(self) -> String
 
-        Set the text to be displayed when the user has not yet typed anything
+        Get the text to be displayed when the user has not yet typed anything
         in the control.
         """
         return _controls_.SearchCtrl_GetDescriptiveText(*args, **kwargs)

diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index d457792a99b90222bd8fdb419a5fdfca5327c35c..6ac360873b78f25c4e74cb6c35b46f48caf5aae5 100644 (file)
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -4688,14 +4688,15 @@ class DataFormat(object):
         """
         return _misc_.DataFormat_GetType(*args, **kwargs)
 
-    def GetId(*args, **kwargs):
-        """
-        GetId(self) -> String
+    def _GetId(*args, **kwargs):
+        """_GetId(self) -> String"""
+        return _misc_.DataFormat__GetId(*args, **kwargs)
 
-        Returns the name of a custom format (this function will fail for a
-        standard format).
-        """
-        return _misc_.DataFormat_GetId(*args, **kwargs)
+    def GetId(self):
+        """Returns the name of a custom format (this function will fail for a
+     format)."""
+        nolog = wx.LogNull()
+        return self._GetId()
 
     def SetId(*args, **kwargs):
         """
@@ -5686,7 +5687,6 @@ class Clipboard(_core.Object):
         return _misc_.Clipboard_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
-    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
 _misc_.Clipboard_swigregister(Clipboard)
 
 def Clipboard_Get(*args):

diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp
index 0d2a5693f0430f7c565ecc0347881c487321df60..7c87ef54e25f9d321690b1583ee188f9e3fa6186 100644 (file)
--- a/wxPython/src/mac/_misc_wrap.cpp
+++ b/wxPython/src/mac/_misc_wrap.cpp
@@ -31943,7 +31943,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DataFormat_GetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DataFormat__GetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxDataFormat *arg1 = (wxDataFormat *) 0 ;
   wxString result;
@@ -31955,7 +31955,7 @@ SWIGINTERN PyObject *_wrap_DataFormat_GetId(PyObject *SWIGUNUSEDPARM(self), PyOb
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDataFormat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataFormat_GetId" "', expected argument " "1"" of type '" "wxDataFormat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataFormat__GetId" "', expected argument " "1"" of type '" "wxDataFormat const *""'"); 
   }
   arg1 = reinterpret_cast< wxDataFormat * >(argp1);
   {
@@ -40003,7 +40003,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DataFormat___ne__", _wrap_DataFormat___ne__, METH_VARARGS, NULL},
         { (char *)"DataFormat_SetType", (PyCFunction) _wrap_DataFormat_SetType, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DataFormat_GetType", (PyCFunction)_wrap_DataFormat_GetType, METH_O, NULL},
-        { (char *)"DataFormat_GetId", (PyCFunction)_wrap_DataFormat_GetId, METH_O, NULL},
+        { (char *)"DataFormat__GetId", (PyCFunction)_wrap_DataFormat__GetId, METH_O, NULL},
         { (char *)"DataFormat_SetId", (PyCFunction) _wrap_DataFormat_SetId, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DataFormat_swigregister", DataFormat_swigregister, METH_VARARGS, NULL},
         { (char *)"DataFormat_swiginit", DataFormat_swiginit, METH_VARARGS, NULL},

diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py
index d457792a99b90222bd8fdb419a5fdfca5327c35c..6ac360873b78f25c4e74cb6c35b46f48caf5aae5 100644 (file)
--- a/wxPython/src/msw/_misc.py
+++ b/wxPython/src/msw/_misc.py
@@ -4688,14 +4688,15 @@ class DataFormat(object):
         """
         return _misc_.DataFormat_GetType(*args, **kwargs)
 
-    def GetId(*args, **kwargs):
-        """
-        GetId(self) -> String
+    def _GetId(*args, **kwargs):
+        """_GetId(self) -> String"""
+        return _misc_.DataFormat__GetId(*args, **kwargs)
 
-        Returns the name of a custom format (this function will fail for a
-        standard format).
-        """
-        return _misc_.DataFormat_GetId(*args, **kwargs)
+    def GetId(self):
+        """Returns the name of a custom format (this function will fail for a
+     format)."""
+        nolog = wx.LogNull()
+        return self._GetId()
 
     def SetId(*args, **kwargs):
         """
@@ -5686,7 +5687,6 @@ class Clipboard(_core.Object):
         return _misc_.Clipboard_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
-    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
 _misc_.Clipboard_swigregister(Clipboard)
 
 def Clipboard_Get(*args):

diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp
index e9733818ff1388df68ee7aa84ce4beac6d6b300b..7198689d170a518670416dff1f417ca9d19d3cb9 100644 (file)
--- a/wxPython/src/msw/_misc_wrap.cpp
+++ b/wxPython/src/msw/_misc_wrap.cpp
@@ -31943,7 +31943,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DataFormat_GetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DataFormat__GetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxDataFormat *arg1 = (wxDataFormat *) 0 ;
   wxString result;
@@ -31955,7 +31955,7 @@ SWIGINTERN PyObject *_wrap_DataFormat_GetId(PyObject *SWIGUNUSEDPARM(self), PyOb
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDataFormat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataFormat_GetId" "', expected argument " "1"" of type '" "wxDataFormat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataFormat__GetId" "', expected argument " "1"" of type '" "wxDataFormat const *""'"); 
   }
   arg1 = reinterpret_cast< wxDataFormat * >(argp1);
   {
@@ -40003,7 +40003,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DataFormat___ne__", _wrap_DataFormat___ne__, METH_VARARGS, NULL},
         { (char *)"DataFormat_SetType", (PyCFunction) _wrap_DataFormat_SetType, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DataFormat_GetType", (PyCFunction)_wrap_DataFormat_GetType, METH_O, NULL},
-        { (char *)"DataFormat_GetId", (PyCFunction)_wrap_DataFormat_GetId, METH_O, NULL},
+        { (char *)"DataFormat__GetId", (PyCFunction)_wrap_DataFormat__GetId, METH_O, NULL},
         { (char *)"DataFormat_SetId", (PyCFunction) _wrap_DataFormat_SetId, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DataFormat_swigregister", DataFormat_swigregister, METH_VARARGS, NULL},
         { (char *)"DataFormat_swiginit", DataFormat_swiginit, METH_VARARGS, NULL},