]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/controls2.i
changed charset to iso8859-2
[wxWidgets.git] / wxPython / src / controls2.i
index dbb653bda4f3d684af439020791fbf4fc26e65bd..5f0077a7bfa6166eb12f1ab41af006b05f8792bf 100644 (file)
@@ -20,6 +20,7 @@
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
+#include <wx/dirctrl.h>
 %}
 
 //----------------------------------------------------------------------
@@ -60,6 +61,11 @@ enum {
     wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK,
     wxEVT_COMMAND_LIST_ITEM_ACTIVATED,
     wxEVT_COMMAND_LIST_CACHE_HINT,
+    wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,
+    wxEVT_COMMAND_LIST_COL_BEGIN_DRAG,
+    wxEVT_COMMAND_LIST_COL_DRAGGING,
+    wxEVT_COMMAND_LIST_COL_END_DRAG,
+    wxEVT_COMMAND_LIST_ITEM_FOCUSED,
 };
 
 
@@ -103,6 +109,18 @@ def EVT_LIST_INSERT_ITEM(win, id, func):
 def EVT_LIST_COL_CLICK(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_CLICK, func)
 
+def EVT_LIST_COL_RIGHT_CLICK(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, func)
+
+def EVT_LIST_COL_BEGIN_DRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, func)
+
+def EVT_LIST_COL_DRAGGING(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_DRAGGING, func)
+
+def EVT_LIST_COL_END_DRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_END_DRAG, func)
+
 def EVT_LIST_ITEM_RIGHT_CLICK(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, func)
 
@@ -114,6 +132,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_ITEM_FOCUSED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_FOCUSED, func)
 "
 
 
@@ -142,6 +163,7 @@ enum {
     wxLC_MASK_ALIGN,
     wxLC_MASK_SORT,
 
+    wxLC_USER_TEXT,
 };
 
 
@@ -238,9 +260,9 @@ public:
     bool HasBackgroundColour();
     bool HasFont();
 
-    const wxColour& GetTextColour();
-    const wxColour& GetBackgroundColour();
-    const wxFont& GetFont();
+    wxColour GetTextColour();
+    wxColour GetBackgroundColour();
+    wxFont GetFont();
 };
 
 
@@ -308,20 +330,18 @@ public:
 
 class wxListEvent: public wxNotifyEvent {
 public:
+    wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
+
     int           m_code;
-    long          m_itemIndex;
     long          m_oldItemIndex;
+    long          m_itemIndex;
     int           m_col;
-    bool          m_cancelled;
     wxPoint       m_pointDrag;
     wxListItem    m_item;
 
     int GetCode();
     long GetIndex();
-    long GetOldIndex();
-    long GetOldItem();
     int GetColumn();
-    bool Cancelled();
     wxPoint GetPoint();
     const wxString& GetLabel();
     const wxString& GetText();
@@ -329,13 +349,17 @@ public:
     long GetData();
     long GetMask();
     const wxListItem& GetItem();
+
+    long GetCacheFrom();
+    long GetCacheTo();
 };
 
 
-%{
+%{  // C++ Version of a Python aware class
 class wxPyListCtrl : public wxListCtrl {
     DECLARE_ABSTRACT_CLASS(wxPyListCtrl);
 public:
+    wxPyListCtrl() : wxListCtrl() {}
     wxPyListCtrl(wxWindow* parent, wxWindowID id,
                  const wxPoint& pos,
                  const wxSize& size,
@@ -344,6 +368,15 @@ public:
                  char* name) :
         wxListCtrl(parent, id, pos, size, style, validator, name) {}
 
+    bool Create(wxWindow* parent, wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                const wxValidator& validator,
+                char* name) {
+        return wxListCtrl::Create(parent, id, pos, size, style, validator, name);
+    }
+
     DEC_PYCALLBACK_STRING_LONGLONG(OnGetItemText);
     DEC_PYCALLBACK_INT_LONG(OnGetItemImage);
     DEC_PYCALLBACK_LISTATTR_LONG(OnGetItemAttr);
@@ -359,6 +392,7 @@ IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr);
 %}
 
 
+
 %name(wxListCtrl)class wxPyListCtrl : public wxControl {
 public:
     wxPyListCtrl(wxWindow* parent, wxWindowID id = -1,
@@ -367,18 +401,42 @@ public:
                  long style = wxLC_ICON,
                  const wxValidator& validator = wxDefaultValidator,
                  char* name = "listCtrl");
+    %name(wxPreListCtrl)wxPyListCtrl();
+
+    bool Create(wxWindow* parent, wxWindowID id = -1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxLC_ICON,
+                 const wxValidator& validator = wxDefaultValidator,
+                 char* name = "listCtrl");
 
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxListCtrl)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxListCtrl)"
 
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreListCtrl:val._setOORInfo(val)"
 
     // Set the control colours
     bool SetForegroundColour(const wxColour& col);
     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) ;
@@ -395,9 +453,10 @@ public:
     // or small icon view)
     int GetCountPerPage() const;
 
+#ifdef __WXMSW__
     // Gets the edit control for editing labels.
     wxTextCtrl* GetEditControl() const;
-
+#endif
 
     //bool GetItem(wxListItem& info) const ;
     %addmethods {
@@ -449,8 +508,9 @@ public:
 
     //bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
     //bool GetItemPosition(long item, wxPoint& pos) const ;
+
+    // Gets the item position
     %addmethods {
-        // Gets the item position
         %new wxPoint* GetItemPosition(long item) {
             wxPoint* pos = new wxPoint;
             self->GetItemPosition(item, *pos);
@@ -472,7 +532,7 @@ public:
     int GetItemCount() const;
 
     // Gets the number of columns in the list control
-    int GetColumnCount() const { return m_colCount; }
+    int GetColumnCount() const;
 
     // Retrieves the spacing between icons in pixels.
     // If small is TRUE, gets the spacing for the small icon
@@ -519,9 +579,6 @@ public:
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
 
-
-
-
     // Arranges the items
     bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
 
@@ -540,11 +597,13 @@ public:
     // Clears items, and columns if there are any.
     void ClearAll();
 
+#ifdef __WXMSW__
     // Edit the label
     wxTextCtrl* EditLabel(long item /*, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl)*/);
 
     // End label editing, optionally cancelling the edit
     bool EndEditLabel(bool cancel);
+#endif
 
     // Ensures this item is visible
     bool EnsureVisible(long item) ;
@@ -612,15 +671,46 @@ public:
         }
     }
 
+    %pragma(python) addtoclass = "
+    # Some helpers...
+
+    def Select(self, idx, on=1):
+        '''[de]select an item'''
+        if on: state = wxLIST_STATE_SELECTED
+        else: state = 0
+        self.SetItemState(idx, state, wxLIST_STATE_SELECTED)
+
+    def Focus(self, idx):
+        '''Focus and show the given item'''
+        self.SetItemState(idx, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED)
+        self.EnsureVisible(idx)
+
+    def GetFocusedItem(self):
+        '''get the currently focused item or -1 if none'''
+        return self.GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED)
+
+    def IsSelected(self, idx):
+        '''return TRUE if the item is selected'''
+        return self.GetItemState(idx, wxLIST_STATE_SELECTED) != 0
+
+    def SetColumnImage(self, col, image):
+        item = wxListItem()
+        item.SetMask(wxLIST_MASK_IMAGE)
+        item.SetImage(image)
+        self.SetColumn(col, item)
+
+    def ClearColumnImage(self, col):
+        self.SetColumnImage(col, -1)
+    "
 };
 
 
 
-%{
+%{ // Python aware sorting function for wxPyListCtrl
     int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
         int retval = 0;
         PyObject* func = (PyObject*)funcPtr;
-        bool doSave = wxPyRestoreThread();
+        wxPyBeginBlockThreads();
 
         PyObject* args = Py_BuildValue("(ii)", item1, item2);
         PyObject* result = PyEval_CallObject(func, args);
@@ -630,7 +720,7 @@ public:
             Py_DECREF(result);
         }
 
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
         return retval;
     }
 
@@ -638,6 +728,75 @@ public:
 
 //----------------------------------------------------------------------
 
+class wxListView : public wxPyListCtrl
+{
+public:
+    wxListView( wxWindow *parent,
+                wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxLC_REPORT,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString &name = "listctrl" );
+    %name(wxPreListView)wxListView();
+
+    bool Create( wxWindow *parent,
+                wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxLC_REPORT,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString &name = "listctrl" );
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreListView:val._setOORInfo(val)"
+
+    // [de]select an item
+    void Select(long n, bool on = TRUE);
+
+    // focus and show the given item
+    void Focus(long index);
+
+    // get the currently focused item or -1 if none
+    long GetFocusedItem() const;
+
+    // get first and subsequent selected items, return -1 when no more
+    long GetNextSelected(long item) const;
+    long GetFirstSelected() const;
+
+    // return TRUE if the item is selected
+    bool IsSelected(long index);
+
+    void SetColumnImage(int col, int image);
+    void ClearColumnImage(int col);
+};
+
+
+//----------------------------------------------------------------------
+
+// wxTreeCtrl flags
+enum {
+    wxTR_NO_BUTTONS,
+    wxTR_HAS_BUTTONS,
+    wxTR_TWIST_BUTTONS,
+    wxTR_NO_LINES,
+    wxTR_MAC_BUTTONS,
+    wxTR_AQUA_BUTTONS,
+
+    wxTR_SINGLE,
+    wxTR_MULTIPLE,
+    wxTR_EXTENDED,
+    wxTR_FULL_ROW_HIGHLIGHT,
+
+    wxTR_EDIT_LABELS,
+    wxTR_LINES_AT_ROOT,
+    wxTR_HIDE_ROOT,
+    wxTR_ROW_LINES,
+    wxTR_HAS_VARIABLE_ROW_HEIGHT,
+
+    wxTR_DEFAULT_STYLE,
+};
+
 enum wxTreeItemIcon
 {
     wxTreeItemIcon_Normal,              // not selected, not expanded
@@ -690,11 +849,95 @@ enum {
 };
 
 
+%pragma(python) code = "
+# wxTreeCtrl events
+def EVT_TREE_BEGIN_DRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_DRAG, func)
+
+def EVT_TREE_BEGIN_RDRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_RDRAG, func)
+
+def EVT_TREE_END_DRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func)
+
+def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func)
+
+def EVT_TREE_END_LABEL_EDIT(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_END_LABEL_EDIT, func)
+
+def EVT_TREE_GET_INFO(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_GET_INFO, func)
+
+def EVT_TREE_SET_INFO(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_SET_INFO, func)
+
+def EVT_TREE_ITEM_EXPANDED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_EXPANDED, func)
+
+def EVT_TREE_ITEM_EXPANDING(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_EXPANDING, func)
+
+def EVT_TREE_ITEM_COLLAPSED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_COLLAPSED, func)
+
+def EVT_TREE_ITEM_COLLAPSING(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_COLLAPSING, func)
+
+def EVT_TREE_SEL_CHANGED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_SEL_CHANGED, func)
+
+def EVT_TREE_SEL_CHANGING(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_SEL_CHANGING, func)
+
+def EVT_TREE_KEY_DOWN(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_KEY_DOWN, func)
+
+def EVT_TREE_DELETE_ITEM(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_DELETE_ITEM, func)
+
+def EVT_TREE_ITEM_ACTIVATED(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_ACTIVATED, func)
+
+def EVT_TREE_ITEM_RIGHT_CLICK(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, func)
+
+def EVT_TREE_ITEM_MIDDLE_CLICK(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, func)
+"
+
+
+class wxTreeItemAttr
+{
+public:
+    // ctors
+    //wxTreeItemAttr() { }
+    wxTreeItemAttr(const wxColour& colText = wxNullColour,
+                   const wxColour& colBack = wxNullColour,
+                   const wxFont& font = wxNullFont);
+
+    // setters
+    void SetTextColour(const wxColour& colText);
+    void SetBackgroundColour(const wxColour& colBack);
+    void SetFont(const wxFont& font);
+
+    // accessors
+    bool HasTextColour();
+    bool HasBackgroundColour();
+    bool HasFont();
+
+    wxColour GetTextColour();
+    wxColour GetBackgroundColour();
+    wxFont GetFont();
+};
+
+
 class wxTreeItemId {
 public:
     wxTreeItemId();
     ~wxTreeItemId();
     bool IsOk();
+    %pragma(python) addtoclass = "Ok = IsOk"
 
     %addmethods {
         int __cmp__(wxTreeItemId* other) {
@@ -717,9 +960,9 @@ public:
     }
 
     ~wxPyTreeItemData() {
-        bool doSave = wxPyRestoreThread();
+        wxPyBeginBlockThreads();
         Py_DECREF(m_obj);
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
     }
 
     PyObject* GetData() {
@@ -728,9 +971,9 @@ public:
     }
 
     void SetData(PyObject* obj) {
-        bool doSave = wxPyRestoreThread();
+        wxPyBeginBlockThreads();
         Py_DECREF(m_obj);
-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();
         m_obj = obj;
         Py_INCREF(obj);
     }
@@ -756,19 +999,23 @@ public:
 
 class wxTreeEvent : public wxNotifyEvent {
 public:
+    wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
+
     wxTreeItemId GetItem();
     wxTreeItemId GetOldItem();
     wxPoint GetPoint();
+    const wxKeyEvent& GetKeyEvent();
     int GetCode();
     const wxString& GetLabel();
 };
 
 
 
-%{
+%{ // C++ version of Python aware wxTreeCtrl
 class wxPyTreeCtrl : public wxTreeCtrl {
     DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl);
 public:
+    wxPyTreeCtrl() : wxTreeCtrl() {}
     wxPyTreeCtrl(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos,
                  const wxSize& size,
@@ -777,18 +1024,29 @@ public:
                  char* name) :
         wxTreeCtrl(parent, id, pos, size, style, validator, name) {}
 
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                const wxValidator& validator,
+                char* name) {
+        return wxTreeCtrl::Create(parent, id, pos, size, style, validator, name);
+    }
+
+
     int OnCompareItems(const wxTreeItemId& item1,
                        const wxTreeItemId& item2) {
         int rval = 0;
-        bool doSave = wxPyRestoreThread();
-        if (m_myInst.findCallback("OnCompareItems"))
+        bool found;
+        wxPyBeginBlockThreads();
+        if ((found = m_myInst.findCallback("OnCompareItems")))
             rval = m_myInst.callCallback(Py_BuildValue(
                 "(OO)",
                 wxPyConstructObject((void*)&item1, "wxTreeItemId"),
                 wxPyConstructObject((void*)&item2, "wxTreeItemId")));
-        else
+        wxPyEndBlockThreads();
+        if (! found)
             rval = wxTreeCtrl::OnCompareItems(item1, item2);
-        wxPySaveThread(doSave);
         return rval;
     }
     PYPRIVATE;
@@ -811,13 +1069,21 @@ public:
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                const wxValidator& validator = wxDefaultValidator,
                char* name = "wxTreeCtrl");
+    %name(wxPreTreeCtrl)wxPyTreeCtrl();
 
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxTreeCtrl)"
+    bool Create(wxWindow *parent, wxWindowID id = -1,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
+               const wxValidator& validator = wxDefaultValidator,
+               char* name = "wxTreeCtrl");
+
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxTreeCtrl)"
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreTreeCtrl:val._setOORInfo(val)"
 
-    void AssignImageList(wxImageList* imageList);
-    %pragma(python) addtomethod = "AssignImageList:_args[0].thisown = 0"
     size_t GetCount();
     unsigned int GetIndent();
     void SetIndent(unsigned int indent);
@@ -825,6 +1091,10 @@ public:
     wxImageList *GetStateImageList();
     void SetImageList(wxImageList *imageList);
     void SetStateImageList(wxImageList *imageList);
+    void AssignImageList(wxImageList* imageList);
+    %pragma(python) addtomethod = "AssignImageList:_args[0].thisown = 0"
+    void AssignStateImageList(wxImageList* imageList);
+    %pragma(python) addtomethod = "AssignStateImageList:_args[0].thisown = 0"
 
     unsigned int GetSpacing();
     void SetSpacing(unsigned int spacing);
@@ -893,7 +1163,7 @@ public:
     //size_t GetSelections(wxArrayTreeItemIds& selection);
     %addmethods {
         PyObject* GetSelections() {
-            bool doSave = wxPyRestoreThread();
+            wxPyBeginBlockThreads();
             PyObject*           rval = PyList_New(0);
             wxArrayTreeItemIds  array;
             size_t              num, x;
@@ -903,7 +1173,7 @@ public:
                 PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE);
                 PyList_Append(rval, item);
             }
-            wxPySaveThread(doSave);
+            wxPyEndBlockThreads();
             return rval;
         }
     }
@@ -982,16 +1252,17 @@ public:
 
 #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 doSave = wxPyRestoreThread();
+                wxPyBeginBlockThreads();
                 wxRect* r = new wxRect(rect);
                 PyObject* val = wxPyConstructObject((void*)r, "wxRect");
-                wxPySaveThread(doSave);
+                wxPyEndBlockThreads();
                 return val;
             }
             else {
@@ -1000,7 +1271,7 @@ public:
             }
         }
     }
-#endif
+
 
 %pragma(python) addtoclass = "
     # Redefine some methods that SWIG gets a bit confused on...
@@ -1020,77 +1291,132 @@ public:
         val1.thisown = 1
         return (val1,val2)
 "
+
 };
 
 
 //----------------------------------------------------------------------
 
-#ifdef SKIPTHIS
-#ifdef __WXMSW__
-
 
 enum {
-     /* tab control event types */
-    wxEVT_COMMAND_TAB_SEL_CHANGED,
-    wxEVT_COMMAND_TAB_SEL_CHANGING,
+    wxDIRCTRL_DIR_ONLY,
+    wxDIRCTRL_SELECT_FIRST,
+    wxDIRCTRL_SHOW_FILTERS,
+    wxDIRCTRL_3D_INTERNAL,
 };
 
 
-class wxTabEvent : public wxCommandEvent {
+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 wxTabCtrl : public wxControl {
+class wxGenericDirCtrl: public wxControl
+{
 public:
-    wxTabCtrl(wxWindow* parent, wxWindowID id,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = 0,
-              char* name = "tabCtrl");
+    wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1,
+                     const char* dir = wxDirDialogDefaultFolderStr,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
+                     const char* filter = wxEmptyString,
+                     int defaultFilter = 0,
+                     const char* name = "dirCtrl" );
+    %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 char* dir = wxDirDialogDefaultFolderStr,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
+                const char* filter = wxEmptyString,
+                int defaultFilter = 0,
+                const char* name = "dirCtrl" );
+
+
+    // 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);
+};
 
-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
 
-    bool DeleteAllItems();
-    bool DeleteItem(int item);
-    wxImageList* GetImageList();
-    int GetItemCount();
-    // TODO: void* GetItemData();
-    int GetItemImage(int item);
+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();
 
-    %addmethods {
-        %new wxRect* GetItemRect(int item) {
-            wxRect* rect = new wxRect;
-            self->GetItemRect(item, *rect);
-            return rect;
-        }
-    }
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreDirFilterListCtrl:val._setOORInfo(val)"
 
-    wxString GetItemText(int item);
-    bool GetRowCount();
-    int GetSelection();
-    int HitTest(const wxPoint& pt, long& OUTPUT);
-    void InsertItem(int item, const wxString& text,
-                    int imageId = -1, void* clientData = NULL);
-    // TODO: bool SetItemData(int item, void* data);
-    bool SetItemImage(int item, int image);
-    void SetImageList(wxImageList* imageList);
-    void SetItemSize(const wxSize& size);
-    bool SetItemText(int item, const wxString& text);
-    void SetPadding(const wxSize& padding);
-    int SetSelection(int item);
+    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);
 };
 
-#endif
-#endif
 
+//----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 %init %{
+    // Map renamed classes back to their common name for OOR
     wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData");
     wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl");
+    wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl");
 %}
 
 //----------------------------------------------------------------------