All wxScrolledWindows shoudl have wxHSCROLL|wxVSCROLL now.

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

diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i
index 60285dafded5201efdac6f77e55c68e6afa9deb6..02238b8ef58db3c5e1701d58574e1be67886a1e6 100644 (file)
--- a/wxPython/src/_functions.i
+++ b/wxPython/src/_functions.i
@@ -57,7 +57,7 @@ wxString wxGetOsDescription();
 // // The arrays will contain an equal number of items found before the error.
 // // wildCard is in the form:
 // // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png"
 // // The arrays will contain an equal number of items found before the error.
 // // wildCard is in the form:
 // // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png"

-// int wxParseWildcard(const wxString& wildCard, wxArrayString& descriptions, wxArrayString& filters);
+// int wxParseCommonDialogsFilter(const wxString& wildCard, wxArrayString& descriptions, wxArrayString& filters);

 
 #if defined(__WXMSW__) || defined(__WXMAC__)
 long wxGetFreeMemory();
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
 long wxGetFreeMemory();


@@ -80,7 +80,10 @@ bool wxShutdown(wxShutdownFlags wFlags);
 
 
 void wxSleep(int secs);
 
 
 void wxSleep(int secs);

-void wxUsleep(unsigned long milliseconds);
+void wxMilliSleep(unsigned long milliseconds);
+void wxMicroSleep(unsigned long microseconds);
+%pythoncode { Usleep = MilliSleep }
+

 void wxEnableTopLevelWindows(bool enable);
 
 wxString wxStripMenuCodes(const wxString& in);
 void wxEnableTopLevelWindows(bool enable);
 
 wxString wxStripMenuCodes(const wxString& in);