Committing in .

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

diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index 11ed0f1e6f62aab5933201e77a10345cd7f9f166..836af80a10b3f17caa612d65163e70c669d04a9d 100644 (file)
--- a/wxPython/src/misc.i
+++ b/wxPython/src/misc.i
@@ -28,10 +28,6 @@
 %import _defs.i
 
 
 %import _defs.i
 
 

-%{
-    static wxString wxPyEmptyStr("");
-%}
-

 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 
 


@@ -315,13 +311,13 @@ public:
         dest = reg1.GetBox();
 
         if (dest != wxRect(0,0,0,0)) {
         dest = reg1.GetBox();
 
         if (dest != wxRect(0,0,0,0)) {

-            wxPyTState* state = wxPyBeginBlockThreads();
+            wxPyBeginBlockThreads();

             wxRect* newRect = new wxRect(dest);
             obj = wxPyConstructObject((void*)newRect, "wxRect");
             PyObject* one = PyInt_FromLong(1);
             PyObject_SetAttrString(obj, "thisown", one);
             Py_DECREF(one);
             wxRect* newRect = new wxRect(dest);
             obj = wxPyConstructObject((void*)newRect, "wxRect");
             PyObject* one = PyInt_FromLong(1);
             PyObject_SetAttrString(obj, "thisown", one);
             Py_DECREF(one);

-            wxPyEndBlockThreads(state);
+            wxPyEndBlockThreads();

             return obj;
         }
         Py_INCREF(Py_None);
             return obj;
         }
         Py_INCREF(Py_None);


@@ -349,7 +345,7 @@ long wxGetFreeMemory();
 void wxGetMousePosition(int* OUTPUT, int* OUTPUT);
 bool wxIsBusy();
 wxString wxNow();
 void wxGetMousePosition(int* OUTPUT, int* OUTPUT);
 bool wxIsBusy();
 wxString wxNow();

-bool wxShell(const wxString& command = wxPyEmptyStr);
+bool wxShell(const wxString& command = wxEmptyString);

 void wxStartTimer();
 int wxGetOsVersion(int *OUTPUT, int *OUTPUT);
 wxString wxGetOsDescription();
 void wxStartTimer();
 int wxGetOsVersion(int *OUTPUT, int *OUTPUT);
 wxString wxGetOsDescription();


@@ -377,7 +373,7 @@ wxString wxGetFullHostName();
 wxString wxGetUserId();
 wxString wxGetUserName();
 wxString wxGetHomeDir();
 wxString wxGetUserId();
 wxString wxGetUserName();
 wxString wxGetHomeDir();

-
+wxString wxGetUserHome(const char* user = "");

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------