suppress an assert when a combobox receives WM_KILLFOCUS while it is being destroyed

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

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 9ace925b79b8752f7ed60d024d6e32be31dbf898..aa63f8a257b7a6e7f6bbd0aee3a8b632c3dc06d6 100644 (file)
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -20,6 +20,7 @@
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>

+#include <wx/dirctrl.h>

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -39,6 +40,23 @@
 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------

+%{
+    // Put some wx default wxChar* values into wxStrings.
+    const wxChar* wxListCtrlNameStr = _T("wxListCtrl");
+    DECLARE_DEF_STRING(ListCtrlNameStr);
+
+    const wxChar* wx_TreeCtrlNameStr = _T("wxTreeCtrl");
+    DECLARE_DEF_STRING(_TreeCtrlNameStr);
+    DECLARE_DEF_STRING(DirDialogDefaultFolderStr);
+
+    static const wxString wxPyEmptyString(wxT(""));
+%}
+
+
+%{
+    static const long longzero = 0;
+%}
+

 //----------------------------------------------------------------------
 
 enum {
 //----------------------------------------------------------------------
 
 enum {


@@ -64,7 +82,7 @@ enum {
     wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
     wxEVT_COMMAND_LIST_COL_DRAGGING,
     wxEVT_COMMAND_LIST_COL_END_DRAG,
     wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
     wxEVT_COMMAND_LIST_COL_DRAGGING,
     wxEVT_COMMAND_LIST_COL_END_DRAG,

-
+    wxEVT_COMMAND_LIST_ITEM_FOCUSED,

 };
 
 
 };
 
 


@@ -131,6 +149,9 @@ def EVT_LIST_ITEM_ACTIVATED(win, id, func):
 
 def EVT_LIST_CACHE_HINT(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_LIST_CACHE_HINT, func)
 
 def EVT_LIST_CACHE_HINT(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_LIST_CACHE_HINT, func)

+
+def EVT_LIST_ITEM_FOCUSED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_FOCUSED, func)

 "
 
 
 "
 
 


@@ -256,9 +277,9 @@ public:
     bool HasBackgroundColour();
     bool HasFont();
 
     bool HasBackgroundColour();
     bool HasFont();
 

-    const wxColour& GetTextColour();
-    const wxColour& GetBackgroundColour();
-    const wxFont& GetFont();
+    wxColour GetTextColour();
+    wxColour GetBackgroundColour();
+    wxFont GetFont();

 };
 
 
 };
 
 


@@ -328,20 +349,18 @@ class wxListEvent: public wxNotifyEvent {
 public:
     wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 
 public:
     wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 

+%readonly

     int           m_code;
     int           m_code;

-    long          m_itemIndex;

     long          m_oldItemIndex;
     long          m_oldItemIndex;

+    long          m_itemIndex;

     int           m_col;
     int           m_col;

-    bool          m_cancelled;

     wxPoint       m_pointDrag;
     wxListItem    m_item;
     wxPoint       m_pointDrag;
     wxListItem    m_item;

+%readwrite

 
     int GetCode();
     long GetIndex();
 
     int GetCode();
     long GetIndex();

-    long GetOldIndex();
-    long GetOldItem();

     int GetColumn();
     int GetColumn();

-    bool Cancelled();

     wxPoint GetPoint();
     const wxString& GetLabel();
     const wxString& GetText();
     wxPoint GetPoint();
     const wxString& GetLabel();
     const wxString& GetText();


@@ -365,7 +384,7 @@ public:
                  const wxSize& size,
                  long style,
                  const wxValidator& validator,
                  const wxSize& size,
                  long style,
                  const wxValidator& validator,

-                 char* name) :
+                 const wxString& name) :

         wxListCtrl(parent, id, pos, size, style, validator, name) {}
 
     bool Create(wxWindow* parent, wxWindowID id,
         wxListCtrl(parent, id, pos, size, style, validator, name) {}
 
     bool Create(wxWindow* parent, wxWindowID id,


@@ -373,7 +392,7 @@ public:
                 const wxSize& size,
                 long style,
                 const wxValidator& validator,
                 const wxSize& size,
                 long style,
                 const wxValidator& validator,

-                char* name) {
+                const wxString& name) {

         return wxListCtrl::Create(parent, id, pos, size, style, validator, name);
     }
 
         return wxListCtrl::Create(parent, id, pos, size, style, validator, name);
     }
 


@@ -400,7 +419,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = wxLC_ICON,
                  const wxValidator& validator = wxDefaultValidator,
                  const wxSize& size = wxDefaultSize,
                  long style = wxLC_ICON,
                  const wxValidator& validator = wxDefaultValidator,

-                 char* name = "listCtrl");
+                 const wxString& name = wxPyListCtrlNameStr);

     %name(wxPreListCtrl)wxPyListCtrl();
 
     bool Create(wxWindow* parent, wxWindowID id = -1,
     %name(wxPreListCtrl)wxPyListCtrl();
 
     bool Create(wxWindow* parent, wxWindowID id = -1,


@@ -408,7 +427,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = wxLC_ICON,
                  const wxValidator& validator = wxDefaultValidator,
                  const wxSize& size = wxDefaultSize,
                  long style = wxLC_ICON,
                  const wxValidator& validator = wxDefaultValidator,

-                 char* name = "listCtrl");
+                 const wxString& name = wxPyListCtrlNameStr);

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxListCtrl)"
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxListCtrl)"


@@ -421,7 +440,22 @@ public:
     bool SetBackgroundColour(const wxColour& col);
 
     // Gets information about this column
     bool SetBackgroundColour(const wxColour& col);
 
     // Gets information about this column

-    bool GetColumn(int col, wxListItem& item) const;
+    // bool GetColumn(int col, wxListItem& item) const;
+    %addmethods {
+        %new wxListItem* GetColumn(int col) {
+            wxListItem item;
+            if (self->GetColumn(col, item))
+                return new wxListItem(item);
+            else
+                return NULL;
+        }
+    }  // The OOR typemaps don't know what to do with the %new, so fix it up.
+    %pragma(python) addtoclass = "
+    def GetItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs)
+        if val is not None: val.thisown = 1
+        return val
+    "

 
     // Sets information about this column
     bool SetColumn(int col, wxListItem& item) ;
 
     // Sets information about this column
     bool SetColumn(int col, wxListItem& item) ;


@@ -640,21 +674,11 @@ public:
     // to scroll. If in report view mode, y specifies the number of lines to scroll.
     bool ScrollList(int dx, int dy);
 
     // to scroll. If in report view mode, y specifies the number of lines to scroll.
     bool ScrollList(int dx, int dy);
 

-    // bool SortItems(wxListCtrlCompare fn, long data);
-    %addmethods {
-        // Sort items.
-        // func is a function which takes 2 long arguments: item1, item2.
-        // item1 is the long data associated with a first item (NOT the index).
-        // item2 is the long data associated with a second item (NOT the index).
-        // The return value is a negative number if the first item should precede the second
-        // item, a positive number of the second item should precede the first,
-        // or zero if the two items are equivalent.
-        bool SortItems(PyObject* func) {
-            if (!PyCallable_Check(func))
-                return FALSE;
-            return self->SortItems(wxPyListCtrl_SortItems, (long)func);
-        }
-    }
+    void SetItemTextColour( long item, const wxColour& col);
+    wxColour GetItemTextColour( long item ) const;
+    void SetItemBackgroundColour( long item, const wxColour &col);
+    wxColour GetItemBackgroundColour( long item ) const;
+

 
     %pragma(python) addtoclass = "
     # Some helpers...
 
     %pragma(python) addtoclass = "
     # Some helpers...


@@ -686,7 +710,34 @@ public:
 
     def ClearColumnImage(self, col):
         self.SetColumnImage(col, -1)
 
     def ClearColumnImage(self, col):
         self.SetColumnImage(col, -1)

+
+    def Append(self, entry):
+        '''Append an item to the list control.  The entry parameter should be a
+           sequence with an item for each column'''
+        if len(entry):
+            pos = self.GetItemCount()
+            self.InsertStringItem(pos, str(entry[0]))
+            for i in range(1, len(entry)):
+                self.SetStringItem(pos, i, str(entry[i]))
+            return pos

     "
     "

+
+
+    // bool SortItems(wxListCtrlCompare fn, long data);
+    %addmethods {
+        // Sort items.
+        // func is a function which takes 2 long arguments: item1, item2.
+        // item1 is the long data associated with a first item (NOT the index).
+        // item2 is the long data associated with a second item (NOT the index).
+        // The return value is a negative number if the first item should precede the second
+        // item, a positive number of the second item should precede the first,
+        // or zero if the two items are equivalent.
+        bool SortItems(PyObject* func) {
+            if (!PyCallable_Check(func))
+                return FALSE;
+            return self->SortItems(wxPyListCtrl_SortItems, (long)func);
+        }
+    }

 };
 
 
 };
 
 


@@ -695,7 +746,7 @@ public:
     int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
         int retval = 0;
         PyObject* func = (PyObject*)funcPtr;
     int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
         int retval = 0;
         PyObject* func = (PyObject*)funcPtr;

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

 
         PyObject* args = Py_BuildValue("(ii)", item1, item2);
         PyObject* result = PyEval_CallObject(func, args);
 
         PyObject* args = Py_BuildValue("(ii)", item1, item2);
         PyObject* result = PyEval_CallObject(func, args);


@@ -705,7 +756,7 @@ public:
             Py_DECREF(result);
         }
 
             Py_DECREF(result);
         }
 

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         return retval;
     }
 
         return retval;
     }
 


@@ -722,7 +773,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_REPORT,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_REPORT,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString &name = "listctrl" );
+                const wxString& name = wxPyListCtrlNameStr);

     %name(wxPreListView)wxListView();
 
     bool Create( wxWindow *parent,
     %name(wxPreListView)wxListView();
 
     bool Create( wxWindow *parent,


@@ -731,7 +782,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_REPORT,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_REPORT,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString &name = "listctrl" );
+                const wxString& name = wxPyListCtrlNameStr);

 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreListView:val._setOORInfo(val)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreListView:val._setOORInfo(val)"


@@ -766,10 +817,12 @@ enum {
     wxTR_TWIST_BUTTONS,
     wxTR_NO_LINES,
     wxTR_MAC_BUTTONS,
     wxTR_TWIST_BUTTONS,
     wxTR_NO_LINES,
     wxTR_MAC_BUTTONS,

+    wxTR_AQUA_BUTTONS,

 
     wxTR_SINGLE,
     wxTR_MULTIPLE,
     wxTR_EXTENDED,
 
     wxTR_SINGLE,
     wxTR_MULTIPLE,
     wxTR_EXTENDED,

+    wxTR_FULL_ROW_HIGHLIGHT,

 
     wxTR_EDIT_LABELS,
     wxTR_LINES_AT_ROOT,
 
     wxTR_EDIT_LABELS,
     wxTR_LINES_AT_ROOT,


@@ -909,9 +962,9 @@ public:
     bool HasBackgroundColour();
     bool HasFont();
 
     bool HasBackgroundColour();
     bool HasFont();
 

-    const wxColour& GetTextColour();
-    const wxColour& GetBackgroundColour();
-    const wxFont& GetFont();
+    wxColour GetTextColour();
+    wxColour GetBackgroundColour();
+    wxFont GetFont();

 };
 
 
 };
 
 


@@ -920,6 +973,7 @@ public:
     wxTreeItemId();
     ~wxTreeItemId();
     bool IsOk();
     wxTreeItemId();
     ~wxTreeItemId();
     bool IsOk();

+    %pragma(python) addtoclass = "Ok = IsOk"

 
     %addmethods {
         int __cmp__(wxTreeItemId* other) {
 
     %addmethods {
         int __cmp__(wxTreeItemId* other) {


@@ -942,9 +996,9 @@ public:
     }
 
     ~wxPyTreeItemData() {
     }
 
     ~wxPyTreeItemData() {

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

         Py_DECREF(m_obj);
         Py_DECREF(m_obj);

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

     }
 
     PyObject* GetData() {
     }
 
     PyObject* GetData() {


@@ -953,9 +1007,9 @@ public:
     }
 
     void SetData(PyObject* obj) {
     }
 
     void SetData(PyObject* obj) {

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

         Py_DECREF(m_obj);
         Py_DECREF(m_obj);

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         m_obj = obj;
         Py_INCREF(obj);
     }
         m_obj = obj;
         Py_INCREF(obj);
     }


@@ -1003,7 +1057,7 @@ public:
                  const wxSize& size,
                  long style,
                  const wxValidator& validator,
                  const wxSize& size,
                  long style,
                  const wxValidator& validator,

-                 char* name) :
+                 const wxString& name) :

         wxTreeCtrl(parent, id, pos, size, style, validator, name) {}
 
     bool Create(wxWindow *parent, wxWindowID id,
         wxTreeCtrl(parent, id, pos, size, style, validator, name) {}
 
     bool Create(wxWindow *parent, wxWindowID id,


@@ -1011,7 +1065,7 @@ public:
                 const wxSize& size,
                 long style,
                 const wxValidator& validator,
                 const wxSize& size,
                 long style,
                 const wxValidator& validator,

-                char* name) {
+                const wxString& name) {

         return wxTreeCtrl::Create(parent, id, pos, size, style, validator, name);
     }
 
         return wxTreeCtrl::Create(parent, id, pos, size, style, validator, name);
     }
 


@@ -1020,13 +1074,13 @@ public:
                        const wxTreeItemId& item2) {
         int rval = 0;
         bool found;
                        const wxTreeItemId& item2) {
         int rval = 0;
         bool found;

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

         if ((found = m_myInst.findCallback("OnCompareItems")))
             rval = m_myInst.callCallback(Py_BuildValue(
                 "(OO)",
                 wxPyConstructObject((void*)&item1, "wxTreeItemId"),
                 wxPyConstructObject((void*)&item2, "wxTreeItemId")));
         if ((found = m_myInst.findCallback("OnCompareItems")))
             rval = m_myInst.callCallback(Py_BuildValue(
                 "(OO)",
                 wxPyConstructObject((void*)&item1, "wxTreeItemId"),
                 wxPyConstructObject((void*)&item2, "wxTreeItemId")));

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         if (! found)
             rval = wxTreeCtrl::OnCompareItems(item1, item2);
         return rval;
         if (! found)
             rval = wxTreeCtrl::OnCompareItems(item1, item2);
         return rval;


@@ -1050,7 +1104,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                const wxValidator& validator = wxDefaultValidator,
                const wxSize& size = wxDefaultSize,
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                const wxValidator& validator = wxDefaultValidator,

-               char* name = "wxTreeCtrl");
+               const wxString& name = wxPy_TreeCtrlNameStr);

     %name(wxPreTreeCtrl)wxPyTreeCtrl();
 
     bool Create(wxWindow *parent, wxWindowID id = -1,
     %name(wxPreTreeCtrl)wxPyTreeCtrl();
 
     bool Create(wxWindow *parent, wxWindowID id = -1,


@@ -1058,7 +1112,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                const wxValidator& validator = wxDefaultValidator,
                const wxSize& size = wxDefaultSize,
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                const wxValidator& validator = wxDefaultValidator,

-               char* name = "wxTreeCtrl");
+               const wxString& name = wxPy_TreeCtrlNameStr);

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)"
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)"


@@ -1145,7 +1199,7 @@ public:
     //size_t GetSelections(wxArrayTreeItemIds& selection);
     %addmethods {
         PyObject* GetSelections() {
     //size_t GetSelections(wxArrayTreeItemIds& selection);
     %addmethods {
         PyObject* GetSelections() {

-            wxPyTState* state = wxPyBeginBlockThreads();
+            wxPyBeginBlockThreads();

             PyObject*           rval = PyList_New(0);
             wxArrayTreeItemIds  array;
             size_t              num, x;
             PyObject*           rval = PyList_New(0);
             wxArrayTreeItemIds  array;
             size_t              num, x;


@@ -1155,7 +1209,7 @@ public:
                 PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE);
                 PyList_Append(rval, item);
             }
                 PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE);
                 PyList_Append(rval, item);
             }

-            wxPyEndBlockThreads(state);
+            wxPyEndBlockThreads();

             return rval;
         }
     }
             return rval;
         }
     }


@@ -1164,7 +1218,7 @@ public:
 
     size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE);
 
 
     size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE);
 

-    wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& INOUT);
+    wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& INOUT = longzero);

     wxTreeItemId GetNextChild(const wxTreeItemId& item, long& INOUT);
     wxTreeItemId GetNextSibling(const wxTreeItemId& item);
     wxTreeItemId GetPrevSibling(const wxTreeItemId& item);
     wxTreeItemId GetNextChild(const wxTreeItemId& item, long& INOUT);
     wxTreeItemId GetNextSibling(const wxTreeItemId& item);
     wxTreeItemId GetPrevSibling(const wxTreeItemId& item);


@@ -1192,7 +1246,7 @@ public:
                                 size_t before,
                                 const wxString& text,
                                 int image = -1, int selectedImage = -1,
                                 size_t before,
                                 const wxString& text,
                                 int image = -1, int selectedImage = -1,

-                                wxTreeItemData *data = NULL);
+                                wxPyTreeItemData *data = NULL);

     wxTreeItemId AppendItem(const wxTreeItemId& parent,
                             const wxString& text,
                             int image = -1, int selectedImage = -1,
     wxTreeItemId AppendItem(const wxTreeItemId& parent,
                             const wxString& text,
                             int image = -1, int selectedImage = -1,


@@ -1234,16 +1288,17 @@ public:
 
 #ifdef __WXMSW__
     void SetItemDropHighlight(const wxTreeItemId& item, int highlight = TRUE);
 
 #ifdef __WXMSW__
     void SetItemDropHighlight(const wxTreeItemId& item, int highlight = TRUE);

+#endif

 
     //bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, int textOnly = FALSE)
     %addmethods {
         PyObject* GetBoundingRect(const wxTreeItemId& item, int textOnly = FALSE) {
             wxRect rect;
             if (self->GetBoundingRect(item, rect, textOnly)) {
 
     //bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, int textOnly = FALSE)
     %addmethods {
         PyObject* GetBoundingRect(const wxTreeItemId& item, int textOnly = FALSE) {
             wxRect rect;
             if (self->GetBoundingRect(item, rect, textOnly)) {

-                wxPyTState* state = wxPyBeginBlockThreads();
+                wxPyBeginBlockThreads();

                 wxRect* r = new wxRect(rect);
                 PyObject* val = wxPyConstructObject((void*)r, "wxRect");
                 wxRect* r = new wxRect(rect);
                 PyObject* val = wxPyConstructObject((void*)r, "wxRect");

-                wxPyEndBlockThreads(state);
+                wxPyEndBlockThreads();

                 return val;
             }
             else {
                 return val;
             }
             else {


@@ -1252,7 +1307,7 @@ public:
             }
         }
     }
             }
         }
     }

-#endif
+

 
 %pragma(python) addtoclass = "
     # Redefine some methods that SWIG gets a bit confused on...
 
 %pragma(python) addtoclass = "
     # Redefine some methods that SWIG gets a bit confused on...


@@ -1272,9 +1327,129 @@ public:
         val1.thisown = 1
         return (val1,val2)
 "
         val1.thisown = 1
         return (val1,val2)
 "

+
+};
+
+
+//----------------------------------------------------------------------
+
+
+enum {
+    wxDIRCTRL_DIR_ONLY,
+    wxDIRCTRL_SELECT_FIRST,
+    wxDIRCTRL_SHOW_FILTERS,
+    wxDIRCTRL_3D_INTERNAL,
+    wxDIRCTRL_EDIT_LABELS,
+
+    wxID_TREECTRL,
+    wxID_FILTERLISTCTRL,

 };
 
 
 };
 
 

+class wxDirItemData : public wxObject // wxTreeItemData
+{
+public:
+  wxDirItemData(const wxString& path, const wxString& name, bool isDir);
+//  ~wxDirItemDataEx();
+  void SetNewDirName( wxString path );
+  wxString m_path, m_name;
+  bool m_isHidden;
+  bool m_isExpanded;
+  bool m_isDir;
+};
+
+
+class wxGenericDirCtrl: public wxControl
+{
+public:
+    wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1,
+                     const wxString& dir = wxPyDirDialogDefaultFolderStr,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
+                     const wxString& filter = wxPyEmptyString,
+                     int defaultFilter = 0,
+                     const wxString& name = wxPy_TreeCtrlNameStr);
+    %name(wxPreGenericDirCtrl)wxGenericDirCtrl();
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreGenericDirCtrl:val._setOORInfo(val)"
+
+    bool Create(wxWindow *parent, const wxWindowID id = -1,
+                const wxString& dir = wxPyDirDialogDefaultFolderStr,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
+                const wxString& filter = wxPyEmptyString,
+                int defaultFilter = 0,
+                const wxString& name = wxPy_TreeCtrlNameStr);
+
+
+    // Try to expand as much of the given path as possible.
+    bool ExpandPath(const wxString& path);
+
+    // Accessors
+
+    inline wxString GetDefaultPath() const;
+    void SetDefaultPath(const wxString& path);
+
+    // Get dir or filename
+    wxString GetPath() const ;
+
+    // Get selected filename path only (else empty string).
+    // I.e. don't count a directory as a selection
+    wxString GetFilePath() const ;
+    void SetPath(const wxString& path) ;
+
+    void ShowHidden( bool show );
+    bool GetShowHidden();
+
+    wxString GetFilter() const;
+    void SetFilter(const wxString& filter);
+
+    int GetFilterIndex() const;
+    void SetFilterIndex(int n) ;
+
+    wxTreeItemId GetRootId();
+
+    wxTreeCtrl* GetTreeCtrl() const;
+    wxDirFilterListCtrl* GetFilterListCtrl() const;
+
+//  //// Helpers
+//      void SetupSections();
+//      // Parse the filter into an array of filters and an array of descriptions
+//      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
+//      wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done);
+};
+
+
+class wxDirFilterListCtrl: public wxChoice
+{
+public:
+    wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = -1,
+                        const wxPoint& pos = wxDefaultPosition,
+                        const wxSize& size = wxDefaultSize,
+                        long style = 0);
+    %name(wxPreDirFilterListCtrl)wxDirFilterListCtrl();
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreDirFilterListCtrl:val._setOORInfo(val)"
+
+    bool Create(wxGenericDirCtrl* parent, const wxWindowID id = -1,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = 0);
+
+//// Operations
+    void FillFilterList(const wxString& filter, int defaultFilter);
+};
+
+
+//----------------------------------------------------------------------

 //----------------------------------------------------------------------
 
 %init %{
 //----------------------------------------------------------------------
 
 %init %{