Updated layout test

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

diff --git a/wxPython/src/_dirctrl.i b/wxPython/src/_dirctrl.i
index 5703f1cff055ab10aec404ba3c254cccc25c3785..b9b7699ba48ad8818704204a681c45426852db67 100644 (file)
--- a/wxPython/src/_dirctrl.i
+++ b/wxPython/src/_dirctrl.i
@@ -15,9 +15,7 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    DECLARE_DEF_STRING(DirDialogDefaultFolderStr);
-%}
+MAKE_CONST_WXSTRING(DirDialogDefaultFolderStr);

 
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup


@@ -59,8 +57,8 @@ public:
 class wxGenericDirCtrl: public wxControl
 {
 public:
 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,
 
     wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1,
                      const wxString& dir = wxPyDirDialogDefaultFolderStr,


@@ -69,7 +67,7 @@ public:
                      long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
                      const wxString& filter = wxPyEmptyString,
                      int defaultFilter = 0,
                      long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
                      const wxString& filter = wxPyEmptyString,
                      int defaultFilter = 0,

-                     const wxString& name = wxPy_TreeCtrlNameStr);
+                     const wxString& name = wxPyTreeCtrlNameStr);

     %name(PreGenericDirCtrl)wxGenericDirCtrl();
 
 
     %name(PreGenericDirCtrl)wxGenericDirCtrl();
 
 


@@ -80,7 +78,7 @@ public:
                 long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
                 const wxString& filter = wxPyEmptyString,
                 int defaultFilter = 0,
                 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 +108,20 @@ public:
 
     virtual wxTreeItemId GetRootId();
 
 
     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);
     
     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\n"
+        "\"/usr\" and 'path' is \"/usr/include\" then the child for /usr is returned.\n"
+        "If the path string has been used (we're at the leaf), done is set to True\n");
+        

     
     // Resize the components of the control
     virtual void DoResize();
     
     // Resize the components of the control
     virtual void DoResize();


@@ -137,8 +137,8 @@ public:
 class wxDirFilterListCtrl: public wxChoice
 {
 public:
 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,
 
     wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = -1,
                         const wxPoint& pos = wxDefaultPosition,