use generic timer in wxMGL and wxX11

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

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 5e4c8aff5866b74eebd2fda6b71304644087d00d..ebbb299a32c89a295ac7195c54a8b815f042fee0 100644 (file)
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -1308,11 +1308,11 @@ class wxGenericDirCtrl: public wxControl
 {
 public:
     wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1,
-                     const wxString &dir = wxDirDialogDefaultFolderStr,
+                     const char* dir = wxDirDialogDefaultFolderStr,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
-                     const wxString& filter = wxEmptyString,
+                     const char* filter = wxEmptyString,
                      int defaultFilter = 0,
                      const char* name = "dirCtrl" );
     %name(wxPreGenericDirCtrl)wxGenericDirCtrl();
@@ -1321,11 +1321,11 @@ public:
     %pragma(python) addtomethod = "wxPreGenericDirCtrl:val._setOORInfo(val)"
 
     bool Create(wxWindow *parent, const wxWindowID id = -1,
-                const wxString &dir = wxDirDialogDefaultFolderStr,
+                const char* dir = wxDirDialogDefaultFolderStr,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
-                const wxString& filter = wxEmptyString,
+                const char* filter = wxEmptyString,
                 int defaultFilter = 0,
                 const char* name = "dirCtrl" );