Changes to match recent CVS updates, added demo for wxGenericDirCtrl.

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

wxPython/contrib/xrc/_xrcextras.py

@@ -0,0 +1,4 @@
+
+# The global was removed  in favor of static accessor functions.  This is for
+# backwards compatibility:
+wxTheXmlResource = wxXmlResource_Get()

wxPython/contrib/xrc/xrc.cpp

@@ -93,21 +93,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_wxTheXmlResource_set(PyObject *val) {
-
-    PyErr_SetString(PyExc_TypeError,"Variable wxTheXmlResource is read-only.");
-    return 1;
-}
-
-static PyObject *_wrap_wxTheXmlResource_get() {
-    PyObject * pyobj;
-    char ptemp[128];
-
-    SWIG_MakePtr(ptemp, (char *) wxTheXmlResource,"_wxXmlResource_p");
-    pyobj = PyString_FromString(ptemp);
-    return pyobj;
-}
-
 static void *SwigwxXmlResourceTowxObject(void *ptr) {
     wxXmlResource *src;
     wxObject *dest;
@@ -1140,7 +1125,68 @@ static PyObject *_wrap_wxXmlResource_CompareVersion(PyObject *self, PyObject *ar
     return _resultobj;
 }
 
+static PyObject *_wrap_wxXmlResource_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxXmlResource * _result;
+    char *_kwnames[] = {  NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxXmlResource_Get",_kwnames)) 
+        return NULL;
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+        _result = (wxXmlResource *)wxXmlResource::Get();
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxXmlResource_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
+static PyObject *_wrap_wxXmlResource_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxXmlResource * _result;
+    wxXmlResource * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "res", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxXmlResource_Set",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxXmlResource_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxXmlResource_Set. Expected _wxXmlResource_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+        _result = (wxXmlResource *)wxXmlResource::Set(_arg0);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxXmlResource_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
 static PyMethodDef xrccMethods[] = {
+	 { "wxXmlResource_Set", (PyCFunction) _wrap_wxXmlResource_Set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxXmlResource_Get", (PyCFunction) _wrap_wxXmlResource_Get, METH_VARARGS | METH_KEYWORDS },
 	 { "wxXmlResource_CompareVersion", (PyCFunction) _wrap_wxXmlResource_CompareVersion, METH_VARARGS | METH_KEYWORDS },
 	 { "wxXmlResource_GetVersion", (PyCFunction) _wrap_wxXmlResource_GetVersion, METH_VARARGS | METH_KEYWORDS },
 	 { "wxXmlResource_GetXMLID", (PyCFunction) _wrap_wxXmlResource_GetXMLID, METH_VARARGS | METH_KEYWORDS },
@@ -1285,8 +1331,6 @@ SWIGEXPORT(void) initxrcc() {
 	 d = PyModule_GetDict(m);
 	 PyDict_SetItemString(d,"wxXRC_USE_LOCALE", PyInt_FromLong((long) wxXRC_USE_LOCALE));
 	 PyDict_SetItemString(d,"wxXRC_NO_SUBCLASSING", PyInt_FromLong((long) wxXRC_NO_SUBCLASSING));
-	 PyDict_SetItemString(d,"cvar", SWIG_globals);
-	 SWIG_addvarlink(SWIG_globals,"wxTheXmlResource",_wrap_wxTheXmlResource_get, _wrap_wxTheXmlResource_set);
 
 
     wxClassInfo::CleanUpClasses();
@@ -1294,7 +1338,7 @@ SWIGEXPORT(void) initxrcc() {
 
     wxXmlInitXmlModule();
     wxXmlInitResourceModule();
-    wxTheXmlResource->InitAllHandlers();
+    wxXmlResource::Get()->InitAllHandlers();
 
 {
    int i;

wxPython/contrib/xrc/xrc.i

@@ -131,17 +131,16 @@ public:
     // is less than the argument, +1 if greater and 0 if they equal.
     int CompareVersion(int major, int minor, int release, int revision) const;
 
+
+    // Gets global resources object or create one if none exists
+    static wxXmlResource *Get();
+    // Sets global resources object and returns pointer to previous one (may be NULL).
+    static wxXmlResource *Set(wxXmlResource *res);
+
 };
 
 //----------------------------------------------------------------------
 
-%readonly
-// Global instance of resource class. For your convenience.
-wxXmlResource *wxTheXmlResource;
-%readwrite
-
-//----------------------------------------------------------------------
-
 %pragma(python) code = "
 def XMLID(str_id):
     return wxXmlResource_GetXMLID(str_id)
@@ -153,7 +152,7 @@ def XMLCTRL(window, str_id, *args):
 
 //----------------------------------------------------------------------
 
-// TODO:  Add wxXmlResourceHandler and etc.
+// TODO:  Add wxXmlResourceHandler and allow it to be derived from.
 
 //----------------------------------------------------------------------
 
@@ -164,8 +163,14 @@ def XMLCTRL(window, str_id, *args):
 
     wxXmlInitXmlModule();
     wxXmlInitResourceModule();
-    wxTheXmlResource->InitAllHandlers();
+    wxXmlResource::Get()->InitAllHandlers();
 
 %}
 
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------
+// This file gets appended to the shadow class file.
+//----------------------------------------------------------------------
+
+%pragma(python) include="_xrcextras.py";
+
+

wxPython/contrib/xrc/xrc.py

@@ -131,11 +131,27 @@ def wxXmlResource(*_args,**_kwargs):
 
 wxXmlResource_GetXMLID = xrcc.wxXmlResource_GetXMLID
 
+def wxXmlResource_Get(*_args, **_kwargs):
+    val = apply(xrcc.wxXmlResource_Get,_args,_kwargs)
+    if val: val = wxXmlResourcePtr(val)
+    return val
+
+def wxXmlResource_Set(*_args, **_kwargs):
+    val = apply(xrcc.wxXmlResource_Set,_args,_kwargs)
+    if val: val = wxXmlResourcePtr(val)
+    return val
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 wxXRC_USE_LOCALE = xrcc.wxXRC_USE_LOCALE
 wxXRC_NO_SUBCLASSING = xrcc.wxXRC_NO_SUBCLASSING
-cvar = xrcc.cvar
-wxTheXmlResource = wxXmlResourcePtr(xrcc.cvar.wxTheXmlResource)
+
+
+#-------------- USER INCLUDE -----------------------
+
+
+# The global was removed  in favor of static accessor functions.  This is for
+# backwards compatibility:
+wxTheXmlResource = wxXmlResource_Get()