typo fix

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

diff --git a/wxPython/src/_app.i b/wxPython/src/_app.i
index 3285fef3db12fb1590df3d361660b2f6cab3fcf4..5aa20a5d5577a73e861de8b9d1e5fb7d7bf1c0cf 100644 (file)
--- a/wxPython/src/_app.i
+++ b/wxPython/src/_app.i
@@ -48,8 +48,8 @@ class wxPyApp : public wxEvtHandler {
 public:
 
     %pythonAppend wxPyApp
 public:
 
     %pythonAppend wxPyApp

-       "self._setCallbackInfo(self, PyApp)
-        self._setOORInfo(self)";
+       "self._setCallbackInfo(self, PyApp, False)
+        self._setOORInfo(self, False)";

     %typemap(out) wxPyApp*;    // turn off this typemap
 
     DocStr(wxPyApp,
     %typemap(out) wxPyApp*;    // turn off this typemap
 
     DocStr(wxPyApp,


@@ -67,7 +67,7 @@ public:
     %typemap(out) wxPyApp* { $result = wxPyMake_wxObject($1, $owner); }
 
 
     %typemap(out) wxPyApp* { $result = wxPyMake_wxObject($1, $owner); }
 
 

-    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    void _setCallbackInfo(PyObject* self, PyObject* _class, bool incref);

 
 
     DocDeclStr(
 
 
     DocDeclStr(


@@ -361,7 +361,13 @@ DocDeclAStr(
     void , wxSetDefaultPyEncoding(const char* encoding),
     "SetDefaultPyEncoding(string encoding)",
     "Sets the encoding that wxPython will use when it needs to convert a
     void , wxSetDefaultPyEncoding(const char* encoding),
     "SetDefaultPyEncoding(string encoding)",
     "Sets the encoding that wxPython will use when it needs to convert a

-Python string or unicode object to or from a wxString.", "");
+Python string or unicode object to or from a wxString.
+
+The default encoding is the value of ``locale.getdefaultlocale()[1]``
+but please be aware that the default encoding within the same locale
+may be slightly different on different platforms.  For example, please
+see http://www.alanwood.net/demos/charsetdiffs.html for differences
+between the common latin/roman encodings.", "");

 
 DocDeclAStr(
     const char* , wxGetDefaultPyEncoding(),
 
 DocDeclAStr(
     const char* , wxGetDefaultPyEncoding(),