Applied patch [ 603104 ] wxX11 wxClientDC, wxPaintDC fix

[wxWidgets.git] / src / generic / dirctrlg.cpp

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index dddbbad58759a6f3897e339740fab024a866fe97..0572945ee107154837244993ab94d90a2128fd1c 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -57,8 +57,8 @@
 // FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume
 //         older releases don't, but it should be verified and the checks modified
 //         accordingly.
 // FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume
 //         older releases don't, but it should be verified and the checks modified
 //         accordingly.

-#if !defined(__GNUWIN32__) || \
-    (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
+#if !defined(__WXWINE__) && (!defined(__GNUWIN32__) || \
+    (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1))

   #include <direct.h>
   #include <stdlib.h>
   #include <ctype.h>
   #include <direct.h>
   #include <stdlib.h>
   #include <ctype.h>


@@ -312,9 +312,6 @@ static const char * icon8_xpm[] = {
 "                "};
 
 
 "                "};
 
 

-#define wxID_TREECTRL          7000
-#define wxID_FILTERLISTCTRL    7001
-

 #if defined(__DOS__)
 
 bool wxIsDriveAvailable(const wxString& dirName)
 #if defined(__DOS__)
 
 bool wxIsDriveAvailable(const wxString& dirName)


@@ -378,8 +375,8 @@ bool wxIsDriveAvailable(const wxString& dirName)
     if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
     {
         wxString dirNameLower(dirName.Lower());
     if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
     {
         wxString dirNameLower(dirName.Lower());

-#if defined(__GNUWIN32__) && \
-    !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
+#if defined(__WXWINE__) || (defined(__GNUWIN32__) && \
+    !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1))

         success = wxPathExists(dirNameLower);
 #else
         int currentDrive = _getdrive();
         success = wxPathExists(dirNameLower);
 #else
         int currentDrive = _getdrive();


@@ -505,18 +502,10 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     Init();
 
 
     Init();
 

-    long treeStyle = wxTR_HAS_BUTTONS;
-#ifdef __WXMSW__
-    // VS: Do **NOT** remove this style, ever. MSW native wxTreeCtrl::EditLabel doesn't 
-    //     work without this style and we need it to be able to create new directories.
-    //     Generic wxTreeCtrl can do it even w/o wxTR_EDIT_LABELS, so we only add it
-    //     in case of wxMSW (as it is arguably better to not have the style enabled)
-    treeStyle |= wxTR_EDIT_LABELS;
-#endif
-#ifndef __WXMSW__
-    // FIXME, doesn't work for some reason
-    treeStyle |= wxTR_HIDE_ROOT;
-#endif
+    long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT;
+
+    if (style & wxDIRCTRL_EDIT_LABELS)
+        treeStyle |= wxTR_EDIT_LABELS;

 
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
 
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;


@@ -562,7 +551,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData);
     m_treeCtrl->SetItemHasChildren(m_rootId);
 
     m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData);
     m_treeCtrl->SetItemHasChildren(m_rootId);

-    m_treeCtrl->Expand(m_rootId); // automatically expand first level
+    ExpandDir(m_rootId); // automatically expand first level

 
     // Expand and select the default path
     if (!m_defaultPath.IsEmpty())
 
     // Expand and select the default path
     if (!m_defaultPath.IsEmpty())


@@ -592,8 +581,7 @@ void wxGenericDirCtrl::ShowHidden( bool show )
     m_showHidden = show;
 
     wxString path = GetPath();
     m_showHidden = show;
 
     wxString path = GetPath();

-    m_treeCtrl->Collapse(m_treeCtrl->GetRootItem());
-    m_treeCtrl->Expand(m_treeCtrl->GetRootItem());
+    ReCreateTree();

     SetPath(path);
 }
 
     SetPath(path);
 }
 


@@ -760,9 +748,14 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
 
 void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
 {
 
 void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
 {

-    wxTreeItemId child, parent = event.GetItem();
+    CollapseDir(event.GetItem());
+}
+
+void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
+{
+    wxTreeItemId child;

 
 

-    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(event.GetItem());
+    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);

     if (!data->m_isExpanded)
         return;
 
     if (!data->m_isExpanded)
         return;
 


@@ -770,13 +763,13 @@ void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
     long cookie;
     /* Workaround because DeleteChildren has disapeared (why?) and
      * CollapseAndReset doesn't work as advertised (deletes parent too) */
     long cookie;
     /* Workaround because DeleteChildren has disapeared (why?) and
      * CollapseAndReset doesn't work as advertised (deletes parent too) */

-    child = m_treeCtrl->GetFirstChild(parent, cookie);
+    child = m_treeCtrl->GetFirstChild(parentId, cookie);

     while (child.IsOk())
     {
         m_treeCtrl->Delete(child);
         /* Not GetNextChild below, because the cookie mechanism can't
          * handle disappearing children! */
     while (child.IsOk())
     {
         m_treeCtrl->Delete(child);
         /* Not GetNextChild below, because the cookie mechanism can't
          * handle disappearing children! */

-        child = m_treeCtrl->GetFirstChild(parent, cookie);
+        child = m_treeCtrl->GetFirstChild(parentId, cookie);

     }
 }
 
     }
 }
 


@@ -914,6 +907,12 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
     }
 }
 
     }
 }
 

+void wxGenericDirCtrl::ReCreateTree()
+{
+    CollapseDir(m_treeCtrl->GetRootItem());
+    ExpandDir(m_treeCtrl->GetRootItem());
+}
+

 // 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.
 // 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.


@@ -1252,8 +1251,7 @@ void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event))
 
     // If the filter has changed, the view is out of date, so
     // collapse the tree.
 
     // If the filter has changed, the view is out of date, so
     // collapse the tree.

-    m_dirCtrl->GetTreeCtrl()->Collapse(m_dirCtrl->GetRootId());
-    m_dirCtrl->GetTreeCtrl()->Expand(m_dirCtrl->GetRootId());
+    m_dirCtrl->ReCreateTree();

 
     // Try to restore the selection, or at least the directory
     m_dirCtrl->ExpandPath(currentPath);
 
     // Try to restore the selection, or at least the directory
     m_dirCtrl->ExpandPath(currentPath);