Changes needed for wxUSE_UNICODE

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

diff --git a/wxPython/contrib/xrc/xrc.cpp b/wxPython/contrib/xrc/xrc.cpp
index 3dca1cc560cb2fd794ae52ce54daf673c3a899bc..175c7a154dc1958b3671dc66c946b098dd93ad31 100644 (file)
--- a/wxPython/contrib/xrc/xrc.cpp
+++ b/wxPython/contrib/xrc/xrc.cpp
@@ -874,19 +874,29 @@ static PyObject *_wrap_wxXmlResource_AttachUnknownControl(PyObject *self, PyObje
 static PyObject *_wrap_wxXmlResource_GetXRCID(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
 static PyObject *_wrap_wxXmlResource_GetXRCID(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;

-    char * _arg0;
+    wxString * _arg0;
+    PyObject * _obj0 = 0;

     char *_kwnames[] = { "str_id", NULL };
 
     self = self;
     char *_kwnames[] = { "str_id", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxXmlResource_GetXRCID",_kwnames,&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxXmlResource_GetXRCID",_kwnames,&_obj0)) 

         return NULL;
         return NULL;

+{
+    _arg0 = wxString_in_helper(_obj0);
+    if (_arg0 == NULL)
+        return NULL;
+}

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (int )wxXmlResource::GetXRCID(_arg0);
+    _result = (int )wxXmlResource::GetXRCID(*_arg0);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);

+{
+    if (_obj0)
+        delete _arg0;
+}

     return _resultobj;
 }
 
     return _resultobj;
 }
 

diff --git a/wxPython/contrib/xrc/xrc.i b/wxPython/contrib/xrc/xrc.i
index dbf81e43ec8502ea97f43093535e13bb685ed342..3e6869004f190013e3e1a8163d177995bfb34fb5 100644 (file)
--- a/wxPython/contrib/xrc/xrc.i
+++ b/wxPython/contrib/xrc/xrc.i
@@ -122,7 +122,7 @@ public:
     // Returns numeric ID that is equivalent to string id used in XML
     // resource. To be used in event tables
     // Macro XMLID is provided for convenience
     // Returns numeric ID that is equivalent to string id used in XML
     // resource. To be used in event tables
     // Macro XMLID is provided for convenience

-    static int GetXRCID(const char *str_id);
+    static int GetXRCID(const wxString& str_id);

 
     // Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a)
     long GetVersion() const;
 
     // Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a)
     long GetVersion() const;