[start of] a wxUniversal implementation of wxToolBar

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

diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index af6c141f006ebbd02132be347f1327c3010b2c5c..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("");
-%}
-

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


@@ -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 = "");

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