a workaround for Mac update problems

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index c1bda3cbd6282ddd1360c66d455bf29b3277c657..cc8d6c55fddca29e609e84e8d0e0416c519e24cf 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -79,7 +79,7 @@
 #endif
 #include <stdlib.h>
 #include <ctype.h>
 #endif
 #include <stdlib.h>
 #include <ctype.h>

-
+extern bool wxIsDriveAvailable(const wxString& dirName);

 #endif // __WXPM__
 
 #if defined(__WXMAC__)
 #endif // __WXPM__
 
 #if defined(__WXMAC__)


@@ -459,10 +459,14 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
 
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;

+    else
+        treeStyle |= wxBORDER_SUNKEN;

 
     long filterStyle = 0;
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         filterStyle |= wxNO_BORDER;
 
     long filterStyle = 0;
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         filterStyle |= wxNO_BORDER;

+    else
+        filterStyle |= wxBORDER_SUNKEN;

 
     m_treeCtrl = new wxTreeCtrl(this, wxID_TREECTRL, pos, size, treeStyle);
 
 
     m_treeCtrl = new wxTreeCtrl(this, wxID_TREECTRL, pos, size, treeStyle);
 


@@ -530,7 +534,7 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in
     wxDirItemData *dir_item = new wxDirItemData(path,name,TRUE);
 
     wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item);
     wxDirItemData *dir_item = new wxDirItemData(path,name,TRUE);
 
     wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item);

-            
+

     m_treeCtrl->SetItemHasChildren(id);
 }
 
     m_treeCtrl->SetItemHasChildren(id);
 }
 


@@ -540,7 +544,7 @@ void wxGenericDirCtrl::SetupSections()
     wxArrayInt icons;
 
     size_t n, count = wxGetAvailableDrives(paths, names, icons);
     wxArrayInt icons;
 
     size_t n, count = wxGetAvailableDrives(paths, names, icons);

-      
+

     for (n = 0; n < count; n++)
     {
         AddSection(paths[n], names[n], icons[n]);
     for (n = 0; n < count; n++)
     {
         AddSection(paths[n], names[n], icons[n]);


@@ -614,7 +618,9 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
 
     // VS: this is needed because the event handler is called from wxTreeCtrl
     //     ctor when wxTR_HIDE_ROOT was specified
 
     // VS: this is needed because the event handler is called from wxTreeCtrl
     //     ctor when wxTR_HIDE_ROOT was specified

-    if (m_rootId == 0)
+
+    if (!m_rootId.IsOk())
+

         m_rootId = m_treeCtrl->GetRootItem();
 
     ExpandDir(parentId);
         m_rootId = m_treeCtrl->GetRootItem();
 
     ExpandDir(parentId);


@@ -1373,7 +1379,6 @@ wxFileIconsTable::~wxFileIconsTable()
 void wxFileIconsTable::Create()
 {
     wxCHECK_RET(!m_smallImageList && !m_HashTable, wxT("creating icons twice"));
 void wxFileIconsTable::Create()
 {
     wxCHECK_RET(!m_smallImageList && !m_HashTable, wxT("creating icons twice"));

-printf("creating \n"); fflush(stdout);

     m_HashTable = new wxHashTable(wxKEY_STRING);
     m_smallImageList = new wxImageList(16, 16);
 
     m_HashTable = new wxHashTable(wxKEY_STRING);
     m_smallImageList = new wxImageList(16, 16);