X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd9f7fea29e3f8bb61861f52984b7943512346ac..42f8298f6f42d5d63bb3caf65682b7d9d9f8b702:/wxPython/src/_dirctrl.i?ds=inline

diff --git a/wxPython/src/_dirctrl.i b/wxPython/src/_dirctrl.i
index 5703f1cff0..79a2d72a2a 100644
--- a/wxPython/src/_dirctrl.i
+++ b/wxPython/src/_dirctrl.i
@@ -15,9 +15,7 @@
 
 //---------------------------------------------------------------------------
 
-%{
-    DECLARE_DEF_STRING(DirDialogDefaultFolderStr);
-%}
+MAKE_CONST_WXSTRING(DirDialogDefaultFolderStr);
 
 //---------------------------------------------------------------------------
 %newgroup
@@ -56,11 +54,13 @@ public:
 
 
 
+MustHaveApp(wxGenericDirCtrl);
+
 class wxGenericDirCtrl: public wxControl
 {
 public:
-    %addtofunc wxGenericDirCtrl         "self._setOORInfo(self)"
-    %addtofunc wxGenericDirCtrl()       ""
+    %pythonAppend wxGenericDirCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxGenericDirCtrl()       ""
 
     wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1,
                      const wxString& dir = wxPyDirDialogDefaultFolderStr,
@@ -69,8 +69,8 @@ public:
                      long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
                      const wxString& filter = wxPyEmptyString,
                      int defaultFilter = 0,
-                     const wxString& name = wxPy_TreeCtrlNameStr);
-    %name(PreGenericDirCtrl)wxGenericDirCtrl();
+                     const wxString& name = wxPyTreeCtrlNameStr);
+    %RenameCtor(PreGenericDirCtrl, wxGenericDirCtrl());
 
 
     bool Create(wxWindow *parent, const wxWindowID id = -1,
@@ -80,7 +80,7 @@ public:
                 long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
                 const wxString& filter = wxPyEmptyString,
                 int defaultFilter = 0,
-                const wxString& name = wxPy_TreeCtrlNameStr);
+                const wxString& name = wxPyTreeCtrlNameStr);
 
 
     
@@ -110,18 +110,22 @@ public:
 
     virtual wxTreeItemId GetRootId();
 
-    virtual wxTreeCtrl* GetTreeCtrl() const;
+    virtual wxPyTreeCtrl* GetTreeCtrl() const;
     virtual wxDirFilterListCtrl* GetFilterListCtrl() const;
 
     
     // Parse the filter into an array of filters and an array of descriptions
 //     virtual int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions);
     
-    // Find the child that matches the first part of 'path'.
-    // E.g. if a child path is "/usr" and 'path' is "/usr/include"
-    // then the child for /usr is returned.
-    // If the path string has been used (we're at the leaf), done is set to True
-    virtual wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& OUTPUT);
+    DocDeclAStr(
+        virtual wxTreeItemId, FindChild(wxTreeItemId parentId, const wxString& path, bool& OUTPUT),
+        "FindChild(wxTreeItemId parentId, wxString path) -> (item, done)",
+        "Find the child that matches the first part of 'path'.  E.g. if a child
+path is \"/usr\" and 'path' is \"/usr/include\" then the child for
+/usr is returned.  If the path string has been used (we're at the
+leaf), done is set to True.
+", "");
+        
     
     // Resize the components of the control
     virtual void DoResize();
@@ -134,17 +138,19 @@ public:
 
 
 
+MustHaveApp(wxDirFilterListCtrl);
+
 class wxDirFilterListCtrl: public wxChoice
 {
 public:
-    %addtofunc wxDirFilterListCtrl         "self._setOORInfo(self)"
-    %addtofunc wxDirFilterListCtrl()       ""
+    %pythonAppend wxDirFilterListCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxDirFilterListCtrl()       ""
 
     wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = -1,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = 0);
-    %name(PreDirFilterListCtrl)wxDirFilterListCtrl();
+    %RenameCtor(PreDirFilterListCtrl, wxDirFilterListCtrl());
 
     bool Create(wxGenericDirCtrl* parent, const wxWindowID id = -1,
               const wxPoint& pos = wxDefaultPosition,