Added wxHelpControllerHelpProvider, added DisplayContextPopup, DisplayTextPopup

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 33a6be8d0575be3696c1792c83823392821bd640..173eb12a0e48ec9e928b80b84450ac7af616de84 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "dirctrl.h"
+#pragma implementation "dirctrlg.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -38,6 +38,7 @@
 #include "wx/sizer.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"
 #include "wx/sizer.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"

+#include "wx/settings.h"

 
 #if wxUSE_STATLINE
     #include "wx/statline.h"
 
 #if wxUSE_STATLINE
     #include "wx/statline.h"


@@ -46,11 +47,16 @@
 #include "wx/generic/dirctrlg.h"
 
 #ifdef __WXMSW__
 #include "wx/generic/dirctrlg.h"
 
 #ifdef __WXMSW__

+#include <windows.h>

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

+#ifdef __BORLANDC__
+#include "dos.h"
+#endif
+

 // If compiled under Windows, this macro can cause problems
 #ifdef GetFirstChild
 #undef GetFirstChild
 // If compiled under Windows, this macro can cause problems
 #ifdef GetFirstChild
 #undef GetFirstChild


@@ -120,9 +126,9 @@ static char * icon3_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 3 1",
 /* colors */
 /* width height ncolors chars_per_pixel */
 "16 16 3 1",
 /* colors */

-"      s None  c None",
-".     c #000000",
-"+     c #ffffff",
+"     s None    c None",
+".    c #000000",
+"+    c #ffffff",

 /* pixels */
 "                ",
 "  ........      ",
 /* pixels */
 "                ",
 "  ........      ",


@@ -144,13 +150,13 @@ static char * icon3_xpm[] = {
 /* Computer */
 static char * icon4_xpm[] = {
 "16 16 7 1",
 /* Computer */
 static char * icon4_xpm[] = {
 "16 16 7 1",

-"      s None  c None",
-".     c #808080",
-"X     c #c0c0c0",
-"o     c Black",
-"O     c Gray100",
-"+     c #008080",
-"@     c Blue",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Black",
+"O    c Gray100",
+"+    c #008080",
+"@    c Blue",

 "    ........... ",
 "   .XXXXXXXXXX.o",
 "   .OOOOOOOOO..o",
 "    ........... ",
 "   .XXXXXXXXXX.o",
 "   .OOOOOOOOO..o",


@@ -171,13 +177,13 @@ static char * icon4_xpm[] = {
 /* Drive */
 static char * icon5_xpm[] = {
 "16 16 7 1",
 /* Drive */
 static char * icon5_xpm[] = {
 "16 16 7 1",

-"      s None  c None",
-".     c #808080",
-"X     c #c0c0c0",
-"o     c Black",
-"O     c Gray100",
-"+     c Green",
-"@     c #008000",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Black",
+"O    c Gray100",
+"+    c Green",
+"@    c #008000",

 "                ",
 "                ",
 "                ",
 "                ",
 "                ",
 "                ",


@@ -198,16 +204,16 @@ static char * icon5_xpm[] = {
 /* CD-ROM */
 static char *icon6_xpm[] = {
 "16 16 10 1",
 /* CD-ROM */
 static char *icon6_xpm[] = {
 "16 16 10 1",

-"      s None  c None",
-".     c #808080",
-"X     c #c0c0c0",
-"o     c Yellow",
-"O     c Blue",
-"+     c Black",
-"@     c Gray100",
-"#     c #008080",
-"$     c Green",
-"%     c #008000",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Yellow",
+"O    c Blue",
+"+    c Black",
+"@    c Gray100",
+"#    c #008080",
+"$    c Green",
+"%    c #008000",

 "        ...     ",
 "      ..XoX..   ",
 "     .O.XoXXX+  ",
 "        ...     ",
 "      ..XoX..   ",
 "     .O.XoXXX+  ",


@@ -228,13 +234,13 @@ static char *icon6_xpm[] = {
 /* Floppy */
 static char * icon7_xpm[] = {
 "16 16 7 1",
 /* Floppy */
 static char * icon7_xpm[] = {
 "16 16 7 1",

-"      s None  c None",
-".     c #808080",
-"X     c Gray100",
-"o     c #c0c0c0",
-"O     c Black",
-"+     c Cyan",
-"@     c Red",
+"     s None    c None",
+".    c #808080",
+"X    c Gray100",
+"o    c #c0c0c0",
+"O    c Black",
+"+    c Cyan",
+"@    c Red",

 "         ......X",
 "        .ooooooO",
 "        .+++++OO",
 "         ......X",
 "        .ooooooO",
 "        .+++++OO",


@@ -255,13 +261,13 @@ static char * icon7_xpm[] = {
 /* Removeable */
 static char * icon8_xpm[] = {
 "16 16 7 1",
 /* Removeable */
 static char * icon8_xpm[] = {
 "16 16 7 1",

-"      s None  c None",
-".     c #808080",
-"X     c #c0c0c0",
-"o     c Black",
-"O     c Gray100",
-"+     c Red",
-"@     c #800000",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Black",
+"O    c Gray100",
+"+    c Red",
+"@    c #800000",

 "                ",
 "                ",
 "                ",
 "                ",
 "                ",
 "                ",


@@ -287,6 +293,37 @@ static const int ID_CANCEL = 1003;
 static const int ID_NEW = 1004;
 //static const int ID_CHECK = 1005;
 
 static const int ID_NEW = 1004;
 //static const int ID_CHECK = 1005;
 

+#ifdef __WXMSW__
+static bool wxIsDriveAvailable(const wxString dirName)
+{
+#ifdef __WIN32__
+    UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
+#endif
+    bool success = TRUE;
+
+    // Check if this is a root directory and if so,
+    // whether the drive is avaiable.
+    if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
+    {
+        wxString dirNameLower(dirName.Lower());
+        int currentDrive = _getdrive();
+        int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ;
+        int err = _chdrive( thisDrive ) ;
+        _chdrive( currentDrive );
+
+        if (err == -1)
+        {
+            success = FALSE;
+        }
+    }
+#ifdef __WIN32__
+    (void) SetErrorMode(errorMode);
+#endif
+
+    return success;
+}
+#endif
+

 //-----------------------------------------------------------------------------
 // wxDirItemDataEx
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDirItemDataEx
 //-----------------------------------------------------------------------------


@@ -318,7 +355,24 @@ void wxDirItemDataEx::SetNewDirName( wxString path )
 
 bool wxDirItemDataEx::HasSubDirs()
 {
 
 bool wxDirItemDataEx::HasSubDirs()
 {

-    wxString search = m_path + wxT("/*");
+    if (m_path.IsEmpty())
+        return TRUE;
+
+    // On WIN32, must check if this volume is mounted or
+    // we get an error dialog for e.g. drive a:
+#ifdef __WIN32__
+    if (!wxIsDriveAvailable(m_path))
+        return FALSE;
+#endif
+
+    wxString search = m_path;
+    
+    if (m_path.Last() != wxFILE_SEP_PATH)
+    {
+        search += wxString(wxFILE_SEP_PATH);
+    }
+    search += wxT("*");
+

     wxLogNull log;
     wxString path = wxFindFirstFile( search, wxDIR );
     return (bool)(!path.IsNull());
     wxLogNull log;
     wxString path = wxFindFirstFile( search, wxDIR );
     return (bool)(!path.IsNull());


@@ -392,14 +446,14 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
     m_imageList->Add(wxIcon(icon7_xpm));
     m_imageList->Add(wxIcon(icon8_xpm));
 #elif defined(__WXMSW__)
     m_imageList->Add(wxIcon(icon7_xpm));
     m_imageList->Add(wxIcon(icon8_xpm));
 #elif defined(__WXMSW__)

-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CLOSED_FOLDER"), wxBITMAP_TYPE_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_OPEN_FOLDER"), wxBITMAP_TYPE_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_COMPUTER"), wxBITMAP_TYPE_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_DRIVE"), wxBITMAP_TYPE_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CDROM"), wxBITMAP_TYPE_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FLOPPY"), wxBITMAP_TYPE_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_REMOVEABLE"), wxBITMAP_TYPE_RESOURCE));
+    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CLOSED_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE));
+    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_OPEN_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE));
+    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE));
+    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_COMPUTER"), wxBITMAP_TYPE_ICO_RESOURCE));
+    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_DRIVE"), wxBITMAP_TYPE_ICO_RESOURCE));
+    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CDROM"), wxBITMAP_TYPE_ICO_RESOURCE));
+    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FLOPPY"), wxBITMAP_TYPE_ICO_RESOURCE));
+    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_REMOVEABLE"), wxBITMAP_TYPE_ICO_RESOURCE));

 #else
 #error "Sorry, we don't have icons available for this platforms."
 #endif
 #else
 #error "Sorry, we don't have icons available for this platforms."
 #endif


@@ -439,7 +493,6 @@ void wxGenericDirCtrl::Init()
 {
     m_showHidden = FALSE;
     m_imageList = NULL;
 {
     m_showHidden = FALSE;
     m_imageList = NULL;

-    m_rootId = 0;

     m_currentFilter = 0;
     m_currentFilterStr = wxEmptyString; // Default: any file
     m_treeCtrl = NULL;
     m_currentFilter = 0;
     m_currentFilterStr = wxEmptyString; // Default: any file
     m_treeCtrl = NULL;


@@ -456,7 +509,7 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in
 #else
     // Unix: sections are displayed as folders
     wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, 0, -1, dir_item);
 #else
     // Unix: sections are displayed as folders
     wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, 0, -1, dir_item);

-    SetItemImage( id, 1, wxTreeItemIcon_Expanded );
+    m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded );

 #endif
     // TODO: other operating systems.
 
 #endif
     // TODO: other operating systems.
 


@@ -513,9 +566,6 @@ void wxGenericDirCtrl::SetupSections()
     int drive;
     int currentDrive;
 
     int drive;
     int currentDrive;
 

-    /* Save current drive. */
-    currentDrive = _getdrive();
-

     /* If we can switch to the drive, it exists. */
     for( drive = 1; drive <= 26; drive++ )
     {
     /* If we can switch to the drive, it exists. */
     for( drive = 1; drive <= 26; drive++ )
     {


@@ -523,28 +573,23 @@ void wxGenericDirCtrl::SetupSections()
         path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1));
         name.Printf(wxT("(%c:)"), (char) (drive + 'a' - 1));
 
         path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1));
         name.Printf(wxT("(%c:)"), (char) (drive + 'a' - 1));
 

-        if( !_chdrive( drive ) )
+        if (wxIsDriveAvailable(path))

         {
             
             AddSection(path, name);
         }
     }
         {
             
             AddSection(path, name);
         }
     }

-
-    /* Restore original drive.*/
-    _chdrive( currentDrive );

 #endif
 
 #else
 #endif
 
 #else

-  wxString home;
-  AddSection(wxT("/"), _("The Computer"), 0)
-  wxGetHomeDir(&home);
-  AddSection(home, _("My Home"), 0 )
-  AddSection(wxT("/mnt"), _("Mounted Devices"), 0 )
-  AddSection(wxT("/usr/local"), _("User Local"), 0 )
-  AddSection(wxT("/usr"), _("User"), 0 )
-  AddSection(wxT("/var"), _("Variables"), 0 )
-  AddSection(wxT("/etc"), _("Etcetera"), 0 )
-  AddSection(wxT("/tmp"), _("Temporary"), 0 )
+  AddSection(wxT("/"), _("The Computer"), 0);
+  AddSection(wxGetHomeDir(), _("My Home"), 0 );
+  AddSection(wxT("/mnt"), _("Mounted Devices"), 0 );
+  AddSection(wxT("/usr/local"), _("User Local"), 0 );
+  AddSection(wxT("/usr"), _("User"), 0 );
+  AddSection(wxT("/var"), _("Variables"), 0 );
+  AddSection(wxT("/etc"), _("Etcetera"), 0 );
+  AddSection(wxT("/tmp"), _("Temporary"), 0 );

 #endif
 }
 
 #endif
 }
 


@@ -583,7 +628,7 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
     wxASSERT( data );
 
     wxString new_name( wxPathOnly( data->m_path ) );
     wxASSERT( data );
 
     wxString new_name( wxPathOnly( data->m_path ) );

-    new_name += wxT("/");
+    new_name += wxString(wxFILE_SEP_PATH);

     new_name += event.GetLabel();
 
     wxLogNull log;
     new_name += event.GetLabel();
 
     wxLogNull log;


@@ -660,19 +705,11 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 #ifdef __WXMSW__
     // Check if this is a root directory and if so,
     // whether the drive is avaiable.
 #ifdef __WXMSW__
     // Check if this is a root directory and if so,
     // whether the drive is avaiable.

-    if (dirName.Len() == 3 && dirName[1] == wxT(':'))
+    if (!wxIsDriveAvailable(dirName))

     {
     {

-        int currentDrive = _getdrive();
-        int thisDrive = (int) (dirName[0] - 'a' + 1) ;
-        int err = _chdrive( thisDrive ) ;
-        _chdrive( currentDrive );
-
-        if (err == -1)
-        {
-            data->m_isExpanded = FALSE;
-            wxMessageBox(wxT("Sorry, this drive is not available."));
-            return;
-        }
+        data->m_isExpanded = FALSE;
+        wxMessageBox(wxT("Sorry, this drive is not available."));
+          return;

     }
 #endif
 
     }
 #endif
 


@@ -690,6 +727,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
     wxDir d;
     wxString eachFilename;
 
     wxDir d;
     wxString eachFilename;
 

+    wxLogNull log;

     d.Open(dirName);
 
     if (d.IsOpened())
     d.Open(dirName);
 
     if (d.IsOpened())


@@ -711,6 +749,8 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
     // Now do the filenames -- but only if we're allowed to
     if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
     {
     // Now do the filenames -- but only if we're allowed to
     if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
     {

+        wxLogNull log;
+

         d.Open(dirName);
         
         if (d.IsOpened())
         d.Open(dirName);
         
         if (d.IsOpened())


@@ -751,14 +791,18 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
             options = wxDIR_DIRS;
         }
 
             options = wxDIR_DIRS;
         }
 

-        wxDir dir2(path);
-        wxString str;
-        // Have to test for wxDIR_DIRS separately in case m_currentFilterStr is non-empty and
-        // and filters out any directories
-        if (dir2.GetFirst(& str, m_currentFilterStr, options) || dir2.GetFirst(& str, wxEmptyString, wxDIR_DIRS))
+        wxLogNull log;
+        wxDir dir2;
+        if (dir2.Open(path))

         {
         {

-            m_treeCtrl->SetItemHasChildren(id);
-        }
+            wxString str;
+            // Have to test for wxDIR_DIRS separately in case m_currentFilterStr is non-empty and
+            // and filters out any directories
+            if (dir2.GetFirst(& str, m_currentFilterStr, options) || dir2.GetFirst(& str, wxEmptyString, wxDIR_DIRS))
+            {
+                m_treeCtrl->SetItemHasChildren(id);
+            }
+    }

     }
 
     // Add the sorted filenames
     }
 
     // Add the sorted filenames


@@ -773,7 +817,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
             path += eachFilename;
             //path = dirName + wxString(wxT("/")) + eachFilename;
             wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,FALSE);
             path += eachFilename;
             //path = dirName + wxString(wxT("/")) + eachFilename;
             wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,FALSE);

-            wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item);
+            (void)m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item);

         }
     }
 }
         }
     }
 }


@@ -830,7 +874,8 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
         
         childId = m_treeCtrl->GetNextChild(childId, cookie);
     }
         
         childId = m_treeCtrl->GetNextChild(childId, cookie);
     }

-    return 0;
+    wxTreeItemId invalid;
+    return invalid;

 }
 
 // Try to expand as much of the given path as possible,
 }
 
 // Try to expand as much of the given path as possible,


@@ -949,6 +994,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayStri
     wxDir d;
     wxString eachFilename;
 
     wxDir d;
     wxString eachFilename;
 

+    wxLogNull log;

     d.Open(dirName);
 
     if (d.IsOpened())
     d.Open(dirName);
 
     if (d.IsOpened())


@@ -1147,7 +1193,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     // 1) dir ctrl
     m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
         defaultPath, wxPoint(5, 5),
     // 1) dir ctrl
     m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
         defaultPath, wxPoint(5, 5),

-        wxSize(300, 200), wxDIRCTRL_DIR_ONLY);
+        wxSize(300, 200), wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER);

 
     topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
 
 
     topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );